Changeset 6546

Timestamp:

2016-05-17T16:20:29+02:00 (9 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.

Location:

branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC

Files:

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

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

@@ -2016 +2016 @@
       !!----------------------------------------------------------------------
       !
-      #if defined key_oasis3
+#if defined key_oasis3
       ! If we're trying to shut down cleanly then we need to consider the fact
       ! that this could be part of an MPMD configuration - we don't want to
@@ -2023 +2023 @@
       CALL oasis_abort(nproc,"mppstop","NEMO initiated abort")
 
-      #else
+#else
 
       CALL mppsync
       CALL mpi_finalize( info )
 
-      #endif
+#endif
 
       !

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
       !

branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/wrk_nemo.F90

@@ -485 +485 @@
          ii = ii + 1
          IF (ii > jparray) CALL ctl_stop('STOP', 'NEMO aborted wrk_allocbase')
-                           ! increase the value of jparray (should not be needed as already very big!)      END DO
+                           ! increase the value of jparray (should not be needed as already very big!)      
+      END DO
       
       IF( SUM( tree(ii)%ishape ) == 0 ) THEN                    ! create a new branch