Changeset 12465 for NEMO/branches/UKMO/r12083_coupling_sequence/src/OCE/nemogcm.F90

Timestamp:

2020-02-26T10:27:04+01:00 (4 years ago)

Author:

jcastill

Message:

Changes as in the original branch but updated to vn4.1

File:

• NEMO/branches/UKMO/r12083_coupling_sequence/src/OCE/nemogcm.F90 (modified) (5 diffs)

NEMO/branches/UKMO/r12083_coupling_sequence/src/OCE/nemogcm.F90

@@ -87 +87 @@
    USE lbcnfd  , ONLY : isendto, nsndto, nfsloop, nfeloop   ! Setup of north fold exchanges 
    USE lib_fortran    ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)
+   USE sbccpl
 #if defined key_iomput
    USE xios           ! xIOserver
@@ -199 +200 @@
             ENDIF
             
+            IF (lk_oasis) CALL sbc_cpl_snd( istp )  ! Coupling to atmos
             CALL stp        ( istp ) 
+            ! We don't couple on the final timestep because  
+            ! our restart file has already been written  
+            ! and contains all the necessary data for a  
+            ! restart. sbc_cpl_snd could be called here  
+            ! but it would require  
+            ! a) A test to ensure it was not performed  
+            !    on the very last time-step  
+            ! b) the presence of another call to  
+            !    sbc_cpl_snd call prior to the main DO loop  
+            ! This solution produces identical results  
+            ! with fewer lines of code.
             istp = istp + 1
 
@@ -279 +292 @@
       IF( Agrif_Root() ) THEN
          IF( lk_oasis ) THEN
-            CALL cpl_init( "oceanx", ilocal_comm )                               ! nemo local communicator given by oasis
+            CALL cpl_init( "toyoce", ilocal_comm )                               ! nemo local communicator given by oasis
             CALL xios_initialize( "not used"       , local_comm =ilocal_comm )   ! send nemo communicator to xios
          ELSE
@@ -289 +302 @@
       IF( lk_oasis ) THEN
          IF( Agrif_Root() ) THEN
-            CALL cpl_init( "oceanx", ilocal_comm )          ! nemo local communicator given by oasis
+            CALL cpl_init( "toyoce", ilocal_comm )          ! nemo local communicator given by oasis
          ENDIF
          CALL mpp_start( ilocal_comm )
@@ -493 +506 @@
       !
       IF(lwp) WRITE(numout,cform_aaa)           ! Flag AAAAAAA
+      !
+      IF (nstop > 0) THEN  
+        CALL CTL_STOP('STOP','Critical errors in NEMO initialisation')  
+      END IF
       !
       IF( ln_timing    )   CALL timing_stop( 'nemo_init')