Changeset 13871 for NEMO/branches/2020/dev_12905_xios_restart/src/ICE/icedia.F90

Timestamp:

2020-11-25T12:51:29+01:00 (4 years ago)

Author:

andmirek

Message:

Ticket #2462: Addressing reviewr comments stage 1

File:

• NEMO/branches/2020/dev_12905_xios_restart/src/ICE/icedia.F90 (modified) (2 diffs)

NEMO/branches/2020/dev_12905_xios_restart/src/ICE/icedia.F90

@@ -221 +221 @@
          IF( ln_rstart ) THEN                   !* Read the restart file
             !
-            IF(lrixios) CALL iom_swap(crixios_context)
-            CALL iom_get( numrir, 'kt_ice' , ziter, ldxios = lrixios )
+            IF(lrxios) CALL iom_swap(cr_icerst_cxt)
+            CALL iom_get( numrir, 'kt_ice' , ziter, ldxios = lrxios )
             IF(lwp) WRITE(numout,*)
             IF(lwp) WRITE(numout,*) 'ice_dia_rst read at time step = ', ziter
             IF(lwp) WRITE(numout,*) '~~~~~~~~~~'
-            CALL iom_get( numrir, 'frc_voltop' , frc_voltop, ldxios = lrixios  )
-            CALL iom_get( numrir, 'frc_volbot' , frc_volbot, ldxios = lrixios  )
-            CALL iom_get( numrir, 'frc_temtop' , frc_temtop, ldxios = lrixios  )
-            CALL iom_get( numrir, 'frc_tembot' , frc_tembot, ldxios = lrixios  )
-            CALL iom_get( numrir, 'frc_sal'    , frc_sal,    ldxios = lrixios  )
-            CALL iom_get( numrir, jpdom_auto, 'vol_loc_ini', vol_loc_ini, ldxios = lrixios )
-            CALL iom_get( numrir, jpdom_auto, 'tem_loc_ini', tem_loc_ini, ldxios = lrixios )
-            CALL iom_get( numrir, jpdom_auto, 'sal_loc_ini', sal_loc_ini, ldxios = lrixios )
-            IF(lrixios) CALL iom_swap(cxios_context)
+            CALL iom_get( numrir, 'frc_voltop' , frc_voltop, ldxios = lrxios  )
+            CALL iom_get( numrir, 'frc_volbot' , frc_volbot, ldxios = lrxios  )
+            CALL iom_get( numrir, 'frc_temtop' , frc_temtop, ldxios = lrxios  )
+            CALL iom_get( numrir, 'frc_tembot' , frc_tembot, ldxios = lrxios  )
+            CALL iom_get( numrir, 'frc_sal'    , frc_sal,    ldxios = lrxios  )
+            CALL iom_get( numrir, jpdom_auto, 'vol_loc_ini', vol_loc_ini, ldxios = lrxios )
+            CALL iom_get( numrir, jpdom_auto, 'tem_loc_ini', tem_loc_ini, ldxios = lrxios )
+            CALL iom_get( numrir, jpdom_auto, 'sal_loc_ini', sal_loc_ini, ldxios = lrxios )
+            IF(lrxios) CALL iom_swap(cxios_context)
          ELSE
             IF(lwp) WRITE(numout,*)
@@ -263 +263 @@
          ! Write in numriw (if iter == nitrst)
          ! ------------------ 
-         IF( lwxios ) CALL iom_swap(      cwixios_context         )
+         IF( lwxios ) CALL iom_swap(      cw_icerst_cxt         )
          CALL iom_rstput( iter, nitrst, numriw, 'frc_voltop' , frc_voltop,  ldxios = lwxios )
          CALL iom_rstput( iter, nitrst, numriw, 'frc_volbot' , frc_volbot,  ldxios = lwxios )