Changeset 8181

Timestamp:

2017-06-15T15:47:05+02:00 (7 years ago)

Author:

frrh

Message:

Changes for stand-alone ocean GO6 compatibility.

Location:

branches/UKMO/dev_r5518_GC3_couple_pkg_GO6/NEMOGCM/NEMO/OPA_SRC

Files:

• LBC/lib_mpp.F90 (modified) (1 diff)
• SBC/cpl_oasis3.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_GC3_couple_pkg_GO6/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

@@ -2007 +2007 @@
    SUBROUTINE mppstop
    
+#if defined key_oasis3
    USE mod_oasis      ! coupling routines
-
+#endif
       !!----------------------------------------------------------------------
       !!                  ***  routine mppstop  ***

branches/UKMO/dev_r5518_GC3_couple_pkg_GO6/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

@@ -475 +475 @@
 #if defined key_oa3mct_v3
          CALL oasis_get_freqs(id, mop, 1, itmp, info)
+#elseif key_oasis3 
+         itmp(1) = namflddti( id )
 #else
-!         CALL oasis_get_freqs(id,      1, itmp, info)
-         cpl_freq = namflddti( id )
-#endif
+         CALL oasis_get_freqs(id,      1, itmp, info)
+#endif
+         cpl_freq = itmp(1)
       ENDIF
       !
@@ -527 +529 @@
    END SUBROUTINE oasis_get_localcomm
 
-   SUBROUTINE oasis_def_partition(k1,k2,k3)
+   SUBROUTINE oasis_def_partition(k1,k2,k3,k4)
       INTEGER     , INTENT(  out) ::  k1,k3
       INTEGER     , INTENT(in   ) ::  k2(5)
+      INTEGER     , OPTIONAL, INTENT(in   ) ::  k4
       k1 = k2(1) ; k3 = k2(5)
       WRITE(numout,*) 'oasis_def_partition: Error you sould not be there...'