Changeset 12933 for NEMO/trunk/src/OCE/C1D

Timestamp:

2020-05-15T10:06:25+02:00 (4 years ago)

Author:

smasson

Message:

trunk: merge back r12581_ticket2418 branch into the trunk, see #2418

Location:

NEMO/trunk

Files:

• . (modified) (1 prop)
• src/OCE/C1D/step_c1d.F90 (modified) (2 diffs)

NEMO/trunk

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@12798        sette
+^/utils/CI/sette@12931        sette

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@12798        sette
+^/utils/CI/sette@12931        sette

NEMO/trunk/src/OCE/C1D/step_c1d.F90

@@ -56 +56 @@
       !
       INTEGER ::   jk       ! dummy loop indice
-      INTEGER ::   indic    ! error indicator if < 0
       !! ---------------------------------------------------------------------
-
-                             indic = 0                ! reset to no error condition
       IF( kstp == nit000 )   CALL iom_init( "nemo")   ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS)
       IF( kstp /= nit000 )   CALL day( kstp )         ! Calendar (day was already called at nit000 in day_init)
@@ -137 +134 @@
       ! Control and restarts
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-                             CALL stp_ctl( kstp, Nbb, Nnn, indic )
+                             CALL stp_ctl( kstp, Nnn )
       IF( kstp == nit000 )   CALL iom_close( numror )          ! close input  ocean restart file
       IF( lrst_oce       )   CALL rst_write( kstp, Nbb, Nnn )  ! write output ocean restart file
       !
 #if defined key_iomput
-      IF( kstp == nitend .OR. indic < 0 )   CALL xios_context_finalize()   ! needed for XIOS
+      IF( kstp == nitend .OR. nstop > 0 )   CALL xios_context_finalize()   ! needed for XIOS
       !
 #endif

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@12798        sette
+^/utils/CI/sette@12931        sette