Changeset 13934 for NEMO/branches/2020/test_12905_xios_restart/src/SAS/step.F90

Timestamp:

2020-12-01T13:17:32+01:00 (3 years ago)

Author:

andmirek

Message:

Ticket #2462: update test branch

File:

• NEMO/branches/2020/test_12905_xios_restart/src/SAS/step.F90 (modified) (4 diffs)

NEMO/branches/2020/test_12905_xios_restart/src/SAS/step.F90

@@ -91 +91 @@
                              CALL iom_setkt( kstp - nit000 + 1, cxios_context )   ! tell iom we are at time step kstp
       IF((kstp == nitrst) .AND. lwxios) THEN
-         CALL iom_swap(      cwxios_context          )
-         CALL iom_init_closedef(cwxios_context)
-         CALL iom_setkt( kstp - nit000 + 1,      cwxios_context          )
+         CALL iom_swap(      cw_ocerst_cxt          )
+         CALL iom_init_closedef(cw_ocerst_cxt)
+         CALL iom_setkt( kstp - nit000 + 1,      cw_ocerst_cxt          )
 #if defined key_top
-         CALL iom_swap(      cwtxios_context          )
-         CALL iom_init_closedef(cwtxios_context)
-         CALL iom_setkt( kstp - nit000 + 1,      cwtxios_context          )
+         CALL iom_swap(      cw_toprst_cxt          )
+         CALL iom_init_closedef(cw_toprst_cxt)
+         CALL iom_setkt( kstp - nit000 + 1,      cw_toprst_cxt          )
 #endif
       ENDIF
@@ -104 +104 @@
 #if defined key_si3
       IF(((kstp + nn_fsbc - 1) == nitrst) .AND. lwxios) THEN
-         CALL iom_swap(      cwixios_context          )
-         CALL iom_init_closedef(cwixios_context)
-         CALL iom_setkt( kstp - nit000 + 1,      cwixios_context          )
+         CALL iom_swap(      cw_icerst_cxt          )
+         CALL iom_init_closedef(cw_icerst_cxt)
+         CALL iom_setkt( kstp - nit000 + 1,      cw_icerst_cxt          )
       ENDIF
 #endif
@@ -148 +148 @@
       IF( kstp == nit000   ) THEN
             CALL iom_close( numror )                          ! close input  ocean restart file
-            IF( lroxios )     CALL iom_context_finalize(      crxios_context      )
+            IF( lrxios )     CALL iom_context_finalize(      cr_ocerst_cxt      )
       ENDIF
       
@@ -161 +161 @@
             CALL iom_close( numrow )     
          ELSE
-            CALL iom_context_finalize( cwxios_context )
+            CALL iom_context_finalize( cw_ocerst_cxt )
+            iom_file(numrow)%nfid       = 0
+            numrow = 0
          ENDIF
          lrst_oce = .FALSE.