Changeset 10386 for NEMO/branches

Timestamp:

2018-12-14T11:55:21+01:00 (5 years ago)

Author:

smasson

Message:

dev_r10164_HPC09_ESIWACE_PREP_MERGE: safer use of l_full_nf_update (2 lines north fold exchange), see #2133

Location:

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src

Files:

• ICE/icedyn_adv_umx.F90 (modified) (2 diffs)
• ICE/icedyn_rhg_evp.F90 (modified) (1 diff)
• OCE/DYN/dynspg_ts.F90 (modified) (1 diff)
• OCE/LBC/lib_mpp.F90 (modified) (1 diff)
• OCE/SBC/cpl_oasis3.F90 (modified) (1 diff)

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

@@ -123 +123 @@
       !---------------!
       DO jt = 1, initad
+         
+         l_full_nf_update = .FALSE.   ! false: disable full North fold update (performances)
          CALL adv_umx( k_order, kt,   1, zdt, zudy, zvdx, zcu_box, zcv_box, zpato(:,:,1) )        ! Open water area 
-         CALL lbc_lnk( 'icedyn_adv_umx', zpato, 'T',  1. )
          CALL adv_umx( k_order, kt, jpl, zdt, zudy, zvdx, zcu_box, zcv_box, pa_i(:,:,:) )         ! Ice area
          CALL adv_umx( k_order, kt, jpl, zdt, zudy, zvdx, zcu_box, zcv_box, pv_i(:,:,:) )         ! Ice  volume
@@ -132 +133 @@
             CALL adv_umx( k_order, kt, jpl, zdt, zudy, zvdx, zcu_box, zcv_box, pe_i(:,:,jk,:) )   ! Ice  heat content
          END DO
-         CALL lbc_lnk( 'icedyn_adv_umx', pe_i, 'T',  1. )
-
          CALL adv_umx( k_order, kt, jpl, zdt, zudy, zvdx, zcu_box, zcv_box, pv_s(:,:,:) )         ! Snow volume
          DO jk = 1, nlay_s
             CALL adv_umx( k_order, kt, jpl, zdt, zudy, zvdx, zcu_box, zcv_box, pe_s(:,:,jk,:) )   ! Snow heat content
          END DO
-         CALL lbc_lnk( 'icedyn_adv_umx', pe_s, 'T',  1. )
-
          IF ( ln_pnd_H12 ) THEN
             CALL adv_umx( k_order, kt, jpl, zdt, zudy, zvdx, zcu_box, zcv_box, pa_ip(:,:,:) )     ! Melt pond fraction
             CALL adv_umx( k_order, kt, jpl, zdt, zudy, zvdx, zcu_box, zcv_box, pv_ip(:,:,:) )     ! Melt pond volume
-            CALL lbc_lnk_multi( 'icedyn_adv_umx', pa_i, 'T',  1., pv_i, 'T',  1., psv_i, 'T',  1., &
+         ENDIF
+
+         l_full_nf_update = jt == initad   ! true: enable full North fold update (performances) when exiting the loop
+         CALL lbc_lnk( 'icedyn_adv_umx', zpato, 'T',  1. )
+         CALL lbc_lnk( 'icedyn_adv_umx', pe_i, 'T',  1. )
+         CALL lbc_lnk( 'icedyn_adv_umx', pe_s, 'T',  1. )
+         IF ( ln_pnd_H12 ) THEN
+            CALL lbc_lnk_multi( 'icedyn_adv_umx',  pa_i, 'T',  1., pv_i, 'T',  1., psv_i, 'T',  1., &
                                                 & poa_i, 'T',  1., pv_s, 'T',  1., pa_ip, 'T',  1., &
                                                 & pv_ip, 'T',  1. )
          ELSE
-            CALL lbc_lnk_multi( 'icedyn_adv_umx', pa_i, 'T',  1., pv_i, 'T',  1., psv_i, 'T',  1., &
+            CALL lbc_lnk_multi( 'icedyn_adv_umx',  pa_i, 'T',  1., pv_i, 'T',  1., psv_i, 'T',  1., &
                                                 & poa_i, 'T',  1., pv_s, 'T',  1. )
          ENDIF
+         
       END DO
       !

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

@@ -324 +324 @@
       DO jter = 1 , nn_nevp                           !    loop over jter    !
          !                                            !----------------------!        
+         l_full_nf_update = jter == nn_nevp   ! false: disable full North fold update (performances) for iter = 1 to nn_nevp-1
+         !
 !!$         IF(ln_ctl) THEN   ! Convergence test
 !!$            DO jj = 1, jpjm1

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/DYN/dynspg_ts.F90

@@ -711 +711 @@
       DO jn = 1, icycle                             !  sub-time-step loop  !
          !                                          ! ==================== !
+         !
+         l_full_nf_update = jn == icycle   ! false: disable full North fold update (performances) for jn = 1 to icycle-1
+         !                                                !  ------------------
          !                                                !* Update the forcing (BDY and tides)
          !                                                !  ------------------

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/LBC/lib_mpp.F90

@@ -163 +163 @@
    INTEGER, PUBLIC                               ::   n_sequence_glb = 0           !: # of global communications
    INTEGER, PUBLIC                               ::   numcom = -1                  !: logical unit for communicaton report
-   LOGICAL, PUBLIC                               ::   l_full_nf_update = .FALSE.   !: logical for a full (2lines) update of bc at North fold report
+   LOGICAL, PUBLIC                               ::   l_full_nf_update = .TRUE.    !: logical for a full (2lines) update of bc at North fold report
    INTEGER,                    PARAMETER, PUBLIC ::   nbdelay = 1       !: number of delayed operations
 !$AGRIF_DO_NOT_TREAT

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/SBC/cpl_oasis3.F90

@@ -455 +455 @@
          !--- check periodicity conditions (all cases)
          IF( .not. llfisrt ) THEN
-            l_full_nf_update = .TRUE.    ! enable full North fold update
             CALL lbc_lnk( 'cpl_oasis3', pdata(:,:,jc), srcv(kid)%clgrid, srcv(kid)%nsgn )   
-            l_full_nf_update = .FALSE.   ! disable full North fold update (performances)
          ENDIF