Changeset 4147 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2013-11-04T12:51:55+01:00 (10 years ago)

Author:

cetlod

Message:

merge in dev_LOCEAN_2013, the 1st development branch dev_r3853_CNRS9_Confsetting, from its starting point ( r3853 ) on the trunk: see ticket #1169

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (3 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -81 +81 @@
 # endif
 #endif
+
                              indic = 0                ! reset to no error condition
       IF( kstp == nit000 )   CALL iom_init            ! 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)
                              CALL iom_setkt( kstp - nit000 + 1 )   ! say to iom that we are at time step kstp
@@ -90 +92 @@
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
                          CALL sbc    ( kstp )         ! Sea Boundary Condition (including sea-ice)
+
       IF( lk_tide.AND.(kstp /= nit000 ))   CALL tide_init ( kstp )
       IF( lk_tide    )   CALL sbc_tide( kstp )
@@ -251 +254 @@
                                CALL dia_wri_state( 'output.abort', kstp )
       ENDIF
-      IF( kstp == nit000   )   CALL iom_close( numror )     ! close input  ocean restart file
+      IF( kstp == nit000   )   THEN
+         CALL iom_close( numror )     ! close input  ocean restart file
+         CALL FLUSH    ( numond )     ! flush output namelist oce
+         CALL FLUSH    ( numoni )     ! flush output namelist ice    
+      ENDIF
       IF( lrst_oce         )   CALL rst_write    ( kstp )   ! write output ocean restart file
       IF( lk_obc           )   CALL obc_rst_write( kstp )   ! write open boundary restart file