# Changeset 14576

Ignore:
Timestamp:
2021-03-03T17:04:07+01:00 (3 months ago)
Message:

#2600: Merge in dev_r14393_HPC-03_Mele_Comm_Cleanup r14538

Location:
NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE
Files:
11 edited

Unmodified
Removed

• ## NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE/LDF/ldftra.F90

 r14574 !                       ! Compute lateral diffusive coefficient at T-point IF( ln_traldf_triad ) THEN DO_3D( 0, 0, 0, 0, 1, jpk ) ! [comm_cleanup] ! DO_3D( 0, 0, 0, 0, 1, jpk ) DO_3D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 1, jpk ) ! Take the max of N^2 and zero then take the vertical sum ! of the square root of the resulting N^2 ( required to compute END_3D ELSE DO_3D( 0, 0, 0, 0, 1, jpk ) ! [comm_cleanup] ! DO_3D( 0, 0, 0, 0, 1, jpk ) DO_3D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 1, jpk ) ! Take the max of N^2 and zero then take the vertical sum ! of the square root of the resulting N^2 ( required to compute ENDIF DO_2D( 0, 0, 0, 0 ) ! [comm_cleanup] ! DO_2D( 0, 0, 0, 0 ) DO_2D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1 ) zfw = MAX( ABS( 2. * omega * SIN( rad * gphit(ji,jj) ) ) , 1.e-10 ) ! Rossby radius at w-point taken betwenn 2 km and  40km !                                         !==  Bound on eiv coeff.  ==! z1_f20 = 1._wp / (  2._wp * omega * sin( rad * 20._wp )  ) DO_2D( 0, 0, 0, 0 ) ! [comm_cleanup] ! DO_2D( 0, 0, 0, 0 ) DO_2D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1 ) zzaei = MIN( 1._wp, ABS( ff_t(ji,jj) * z1_f20 ) ) * zaeiw(ji,jj)     ! tropical decrease zaeiw(ji,jj) = MIN( zzaei , paei0 )                                  ! Max value = paei0 CALL lbc_lnk( 'ldftra', zaeiw(:,:), 'W', 1.0_wp )       ! lateral boundary condition ! DO_2D( 0, 0, 0, 0 )                       !== aei at u- and v-points  ==! ! [comm_cleanup] ! DO_2D( 0, 0, 0, 0 ) DO_2D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1 ) paeiu(ji,jj,1) = 0.5_wp * ( zaeiw(ji,jj) + zaeiw(ji+1,jj  ) ) * umask(ji,jj,1) paeiv(ji,jj,1) = 0.5_wp * ( zaeiw(ji,jj) + zaeiw(ji  ,jj+1) ) * vmask(ji,jj,1) zpsi_uw(:,:,jpk) = 0._wp   ;   zpsi_vw(:,:,jpk) = 0._wp ! DO_3D( 1, 0, 1, 0, 2, jpkm1 ) ! [comm_cleanup] ! DO_3D( 1, 0, 1, 0, 2, jpkm1 ) DO_3D( nn_hls, nn_hls-1, nn_hls, nn_hls-1, 2, jpkm1 ) zpsi_uw(ji,jj,jk) = - r1_4 * e2u(ji,jj) * ( wslpi(ji,jj,jk  ) + wslpi(ji+1,jj,jk) )   & &                                    * ( aeiu (ji,jj,jk-1) + aeiu (ji  ,jj,jk) ) * wumask(ji,jj,jk) END_3D ! DO_3D( 1, 0, 1, 0, 1, jpkm1 ) ! [comm_cleanup] ! DO_3D( 1, 0, 1, 0, 1, jpkm1 ) DO_3D( nn_hls, nn_hls-1, nn_hls, nn_hls-1, 1, jpkm1 ) pu(ji,jj,jk) = pu(ji,jj,jk) - ( zpsi_uw(ji,jj,jk) - zpsi_uw(ji,jj,jk+1) ) pv(ji,jj,jk) = pv(ji,jj,jk) - ( zpsi_vw(ji,jj,jk) - zpsi_vw(ji,jj,jk+1) ) END_3D DO_3D( 0, 0, 0, 0, 1, jpkm1 ) ! [comm_cleanup] ! DO_3D( 0, 0, 0, 0, 1, jpkm1 ) DO_3D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 1, jpkm1 ) pw(ji,jj,jk) = pw(ji,jj,jk) + (  zpsi_uw(ji,jj,jk) - zpsi_uw(ji-1,jj  ,jk)   & &                             + zpsi_vw(ji,jj,jk) - zpsi_vw(ji  ,jj-1,jk) )

• ## NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE/TRA/traatf.F90

 r14574 #endif !                                              ! local domain boundaries  (T-point, unchanged sign) CALL lbc_lnk( 'traatf', pts(:,:,:,jp_tem,Kaa), 'T', 1.0_wp, pts(:,:,:,jp_sal,Kaa), 'T', 1.0_wp ) ! [comm_cleanup] ! lbc_lnk moved into stp ! CALL lbc_lnk( 'traatf', pts(:,:,:,jp_tem,Kaa), 'T', 1.0_wp, pts(:,:,:,jp_sal,Kaa), 'T', 1.0_wp ) ! IF( ln_bdy )   CALL bdy_tra( kt, Kbb, pts, Kaa )  ! BDY open boundaries ENDIF ! CALL lbc_lnk( 'traatf',  pts(:,:,:,jp_tem,Kmm) , 'T', 1.0_wp, pts(:,:,:,jp_sal,Kmm) , 'T', 1.0_wp ) ! [comm_cleanup] ! CALL lbc_lnk( 'traatf',  pts(:,:,:,jp_tem,Kmm) , 'T', 1.0_wp, pts(:,:,:,jp_sal,Kmm) , 'T', 1.0_wp ) ENDIF
• ## NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE/TRA/traldf.F90

 r14537 CALL tra_ldf_triad( kt, Kmm, nit000,'TRA', ahtu, ahtv, gtsu, gtsv, gtui, gtvi, pts(:,:,:,:,Kbb), pts(:,:,:,:,Kbb), pts(:,:,:,:,Krhs), jpts,  1 ) CASE ( np_blp , np_blp_i , np_blp_it )             ! bilaplacian: iso-level & iso-neutral operators IF(nn_hls.EQ.2) CALL lbc_lnk( 'tra_ldf', pts(:,:,:,:,Kbb), 'T',1.) ! [comm_cleanup] ! IF (nn_hls.EQ.2) CALL lbc_lnk( 'tra_ldf', pts(:,:,:,:,Kbb), 'T',1.) CALL tra_ldf_blp  ( kt, Kmm, nit000,'TRA', ahtu, ahtv, gtsu, gtsv, gtui, gtvi, pts(:,:,:,:,Kbb), pts(:,:,:,:,Krhs),             jpts, nldf_tra ) END SELECT

• ## NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE/TRA/traldf_lap_blp.F90

 r14537 END SELECT ! CALL lbc_lnk( 'traldf_lap_blp', zlap(:,:,:,:) , 'T', 1.0_wp )     ! Lateral boundary conditions (unchanged sign) ! [comm_cleanup] IF (nn_hls.EQ.1) CALL lbc_lnk( 'traldf_lap_blp', zlap(:,:,:,:) , 'T', 1.0_wp )     ! Lateral boundary conditions (unchanged sign) !                                               ! Partial top/bottom cell: GRADh( zlap ) IF( ln_isfcav .AND. ln_zps ) THEN   ;   CALL zps_hde_isf( kt, Kmm, kjpt, zlap, zglu, zglv, zgui, zgvi )  ! both top & bottom