Changeset 10397 for NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/ICE/icerst.F90

Timestamp:

2018-12-14T17:27:24+01:00 (5 years ago)

Author:

smasson

Message:

dev_r10164_HPC09_ESIWACE_PREP_MERGE: action 5 introduce mpp_delay_sum, see #2133

File:

• NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/ICE/icerst.F90 (modified) (4 diffs)

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/ICE/icerst.F90

@@ -95 +95 @@
       INTEGER, INTENT(in) ::   kt     ! number of iteration
       !!
-      INTEGER ::   ji, jk ,jl   ! dummy loop indices
+      INTEGER ::   jk    ! dummy loop indices
       INTEGER ::   iter
       CHARACTER(len=25) ::   znam
@@ -115 +115 @@
       CALL iom_rstput( iter, nitrst, numriw, 'nn_fsbc', REAL( nn_fsbc, wp ) )      ! time-step 
       CALL iom_rstput( iter, nitrst, numriw, 'kt_ice' , REAL( iter   , wp ) )      ! date
-      DO ji = 1, nbdelay
-         CALL iom_rstput( iter, nitrst, numriw, c_delaylist(ji), todelay(ji) )
-      END DO
+      CALL iom_delay_rst( 'WRITE', 'ICE', numriw )   ! save only ice delayed global communication variables
 
       ! Prognostic variables
@@ -169 +167 @@
       !! ** purpose  :   read restart file
       !!----------------------------------------------------------------------
-      INTEGER           ::   ji, jk, jl
+      INTEGER           ::   jk
       LOGICAL           ::   llok
       INTEGER           ::   id1            ! local integer
       CHARACTER(len=25) ::   znam
       CHARACTER(len=2)  ::   zchar, zchar1
-      REAL(wp)          ::   zfice, ziter, zcfl
+      REAL(wp)          ::   zfice, ziter
       REAL(wp), DIMENSION(jpi,jpj,jpl) ::   z3d   ! 3D workspace
       !!----------------------------------------------------------------------
@@ -236 +234 @@
       CALL iom_get( numrir, jpdom_autoglo, 'v_ice', v_ice )
 
-      ! fields needed for ice_dyn_adv_umx
-      zcfl =            MAXVAL( ABS( u_ice(:,:) ) * rdt_ice * r1_e1u(:,:) )
-      zcfl = MAX( zcfl, MAXVAL( ABS( v_ice(:,:) ) * rdt_ice * r1_e2v(:,:) ) )
-
-      DO ji = 1, nbdelay
-         IF( iom_varid( numrir, c_delaylist(ji), ldstop = .FALSE. ) > 0 )  THEN
-            CALL iom_get( numrir, c_delaylist(ji), todelay(ji) )
-            ndelayid(ji) = 0   ! set to 0 to speficy that the value was read in the restart
-         ENDIF
-      END DO
+      CALL iom_delay_rst( 'READ', 'ICE', numrir )   ! read only ice delayed global communication variables
 
       ! fields needed for Met Office (Jules) coupling