Changeset 10359 for NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/ICE

Timestamp:

2018-11-25T22:33:50+01:00 (5 years ago)

Author:

smasson

Message:

dev_r10164_HPC09_ESIWACE_PREP_MERGE: action 4c: introduce a better version of the non-blocking mpp_max, see #2133

Location:

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/ICE

Files:

• icedyn_adv_umx.F90 (modified) (2 diffs)
• icerst.F90 (modified) (4 diffs)

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

@@ -73 +73 @@
       INTEGER  ::   ipl                     ! third dimention of tracer array
 
-      REAL(wp) ::   zcfl , zusnit, zdt      !   -      -
+      REAL(wp) ::   zcfl(2), zusnit, zdt      !   -      -
       REAL(wp), ALLOCATABLE, DIMENSION(:,:)   ::   zudy, zvdx, zcu_box, zcv_box
       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::   zpato
@@ -86 +86 @@
       !     When needed, the advection split is applied at the next time-step in order to avoid blocking global comm.
       !     ...this should not affect too much the stability... Was ok on the tests we did...
-      zcfl =            MAXVAL( ABS( pu_ice(:,:) ) * rdt_ice * r1_e1u(:,:) )
-      zcfl = MAX( zcfl, MAXVAL( ABS( pv_ice(:,:) ) * rdt_ice * r1_e2v(:,:) ) )
-      IF( zcfl > 0.5 ) THEN   ;   l_split_advumx(1) = .TRUE.    ! split advection time-step if CFL violated
-      ELSE                    ;   l_split_advumx(1) = .FALSE.
-      ENDIF
+      zcfl(1) =               MAXVAL( ABS( pu_ice(:,:) ) * rdt_ice * r1_e1u(:,:) )
+      zcfl(1) = MAX( zcfl(1), MAXVAL( ABS( pv_ice(:,:) ) * rdt_ice * r1_e2v(:,:) ) )
       
-      ! non-blocking global communication send l_split_advumx(1) and receive l_split_advumx(2)
-      IF( lk_mpp )   CALL mpp_ilor( l_split_advumx, ldlast = kt == nitend - nn_fsbc + 1 )
-
-      IF( l_split_advumx(2) ) THEN   ;   initad = 2   ;   zusnit = 0.5_wp    ! split defined at the previous time-step
-      ELSE                           ;   initad = 1   ;   zusnit = 1.0_wp
+      ! non-blocking global communication send zcfl(1) and receive zcfl(2)
+      IF( lk_mpp )   CALL mpp_delay_max( 'icedyn_adv_umx', 'advumx_delay', zcfl, kt == nitend - nn_fsbc + 1 )
+
+      IF( zcfl(2) > .5 ) THEN   ;   initad = 2   ;   zusnit = 0.5_wp   ! zcfl(2) corresponding to zcfl(1) of the previous time-step
+      ELSE                      ;   initad = 1   ;   zusnit = 1.0_wp
       ENDIF
 

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

@@ -98 +98 @@
       INTEGER, INTENT(in) ::   kt     ! number of iteration
       !!
-      INTEGER ::   jk ,jl   ! dummy loop indices
+      INTEGER ::   ji, jk ,jl   ! dummy loop indices
       INTEGER ::   iter
       CHARACTER(len=25) ::   znam
@@ -118 +118 @@
       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
 
       ! Prognostic variables
@@ -169 +172 @@
       !! ** purpose  :   read restart file
       !!----------------------------------------------------------------------
-      INTEGER           ::   jk, jl
+      INTEGER           ::   ji, jk, jl
       LOGICAL           ::   llok
       INTEGER           ::   id1            ! local integer
@@ -240 +243 @@
       zcfl =            MAXVAL( ABS( u_ice(:,:) ) * rdt_ice * r1_e1u(:,:) )
       zcfl = MAX( zcfl, MAXVAL( ABS( v_ice(:,:) ) * rdt_ice * r1_e2v(:,:) ) )
-      ! define split from previous run, so we ca used mpp_ilor
-      IF( zcfl > 0.5 ) THEN   ;   l_split_advumx(1) = .TRUE.
-      ELSE                    ;   l_split_advumx(1) = .FALSE.
-      ENDIF
-      IF( lk_mpp )   CALL mpp_ilor( l_split_advumx )   ! non-blocking global communication send l_split_advumx(1)
+
+      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
 
       ! fields needed for Met Office (Jules) coupling