Changeset 6546 for branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

Timestamp:

2016-05-17T16:20:29+02:00 (8 years ago)

Author:

frrh

Message:

Commit final changes relating to manual addition of relevant code
from fcm:NEMO.xm/branches/UKMO/dev_r5107_hadgem3_mct@6355.

Note this is a subset of the total changnes... I have ecluded those which
have become or appear redundant or unnecessary.

This version bit compares with the original.

File:

• branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) (3 diffs)

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

@@ -82 +82 @@
 
    REAL(wp), DIMENSION(:,:), ALLOCATABLE ::   exfld   ! Temporary buffer for receiving
-
+   INTEGER, PUBLIC :: localComm 
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
@@ -120 +120 @@
       IF ( nerror /= OASIS_Ok ) &
          CALL oasis_abort (ncomp_id, 'cpl_init','Failure in oasis_get_localcomm' )
+      localComm = kl_comm 
       !
    END SUBROUTINE cpl_init
@@ -463 +464 @@
          CALL oasis_get_freqs(id, mop, 1, itmp, info)
 #else
-         CALL oasis_get_freqs(id,      1, itmp, info)
-#endif
-         cpl_freq = itmp(1)
+!         CALL oasis_get_freqs(id,      1, itmp, info)
+#endif
+          cpl_freq = itmp(1)
+
+#if defined key_oasis3
+         cpl_freq = namflddti( id )
+#endif
       ENDIF
       !