Changeset 10761 for NEMO/branches/UKMO/r8395_coupling_sequence/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

2019-03-15T12:57:31+01:00 (5 years ago)

Author:

jcastill

Message:

Remove svn keys

File:

• NEMO/branches/UKMO/r8395_coupling_sequence/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (5 diffs, 1 prop)

NEMO/branches/UKMO/r8395_coupling_sequence/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -90 +90 @@
    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
@@ -181 +182 @@
 #else
             IF ( .NOT. ln_diurnal_only ) THEN 
+               IF (lk_oasis) CALL sbc_cpl_snd( istp )  ! Coupling to atmos
                CALL stp( istp )                 ! standard time stepping 
+               ! 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.
             ELSE 
                CALL stp_diurnal( istp )        ! time step only the diurnal SST 
@@ -304 +317 @@
       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
@@ -315 +328 @@
       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
          ! Nodes selection (control print return in cltxt)
@@ -516 +529 @@
                             CALL dia_tmb_init  ! TMB outputs
                             CALL dia_25h_init  ! 25h mean  outputs
+     
+      IF (nstop > 0) THEN 
+        CALL CTL_STOP('STOP','Critical errors in NEMO initialisation') 
+      END IF 
       !
    END SUBROUTINE nemo_init