Changeset 13632 for NEMO/branches/2020/dev_r13296_HPC-07_mocavero_mpi3/tests/BENCH/MY_SRC

Timestamp:

2020-10-19T10:53:30+02:00 (4 years ago)

Author:

mocavero

Message:

Add neighborhood collectives calls in the NEMO test - ticket #2496

Location:

NEMO/branches/2020/dev_r13296_HPC-07_mocavero_mpi3/tests/BENCH/MY_SRC

Files:

• usrdef_istate.F90 (modified) (1 diff)
• usrdef_sbc.F90 (modified) (3 diffs)
• usrdef_zgr.F90 (modified) (1 diff)

NEMO/branches/2020/dev_r13296_HPC-07_mocavero_mpi3/tests/BENCH/MY_SRC/usrdef_istate.F90

@@ -95 +95 @@
       pv( :,:,jpk  ) = 0._wp
       !
+#if defined key_mpi3
+      CALL lbc_lnk_nc_multi('usrdef_istate', pssh, 'T',  1. )            ! apply boundary conditions
+      CALL lbc_lnk_nc_multi('usrdef_istate',  pts, 'T',  1. )            ! apply boundary conditions
+      CALL lbc_lnk_nc_multi('usrdef_istate',   pu, 'U', -1. )            ! apply boundary conditions
+      CALL lbc_lnk_nc_multi('usrdef_istate',   pv, 'V', -1. )            ! apply boundary conditions
+#else
       CALL lbc_lnk('usrdef_istate', pssh, 'T',  1. )            ! apply boundary conditions
       CALL lbc_lnk('usrdef_istate',  pts, 'T',  1. )            ! apply boundary conditions
       CALL lbc_lnk('usrdef_istate',   pu, 'U', -1. )            ! apply boundary conditions
       CALL lbc_lnk('usrdef_istate',   pv, 'V', -1. )            ! apply boundary conditions
+#endif
       
    END SUBROUTINE usr_def_istate

NEMO/branches/2020/dev_r13296_HPC-07_mocavero_mpi3/tests/BENCH/MY_SRC/usrdef_sbc.F90

@@ -120 +120 @@
       vtau_ice(:,:) = 0.1_wp + z2d(:,:)
 
+#if defined key_mpi3
+      CALL lbc_lnk_nc_multi( 'usrdef_sbc', utau_ice, 'U', -1., vtau_ice, 'V', -1. )
+#else
       CALL lbc_lnk_multi( 'usrdef_sbc', utau_ice, 'U', -1., vtau_ice, 'V', -1. )
+#endif
 #endif
       !
@@ -137 +141 @@
       REAL(wp), DIMENSION(:,:,:), INTENT(in)  ::   phi    ! ice thickness
       !!
-      REAL(wp) ::   zfr1, zfr2                 ! local variables
       REAL(wp), DIMENSION(jpi,jpj) ::   zsnw   ! snw distribution after wind blowing
       !!---------------------------------------------------------------------
@@ -172 +175 @@
       qsr_tot (:,:) = at_i_b(:,:) * qsr_oce(:,:) + SUM( a_i_b(:,:,:) * qsr_ice(:,:,:), dim=3 )
 
-      ! --- shortwave radiation transmitted below the surface (W/m2, see Grenfell Maykut 77) --- !
-      zfr1 = ( 0.18 * ( 1.0 - cldf_ice ) + 0.35 * cldf_ice )            ! transmission when hi>10cm
-      zfr2 = ( 0.82 * ( 1.0 - cldf_ice ) + 0.65 * cldf_ice )            ! zfr2 such that zfr1 + zfr2 to equal 1
-      !
-      WHERE    ( phs(:,:,:) <= 0._wp .AND. phi(:,:,:) <  0.1_wp )       ! linear decrease from hi=0 to 10cm  
-         qtr_ice_top(:,:,:) = qsr_ice(:,:,:) * ( zfr1 + zfr2 * ( 1._wp - phi(:,:,:) * 10._wp ) )
-      ELSEWHERE( phs(:,:,:) <= 0._wp .AND. phi(:,:,:) >= 0.1_wp )       ! constant (zfr1) when hi>10cm
-         qtr_ice_top(:,:,:) = qsr_ice(:,:,:) * zfr1
-      ELSEWHERE                                                         ! zero when hs>0
-         qtr_ice_top(:,:,:) = 0._wp 
-      END WHERE
+      ! --- shortwave radiation transmitted thru the surface scattering layer (W/m2) --- !
+      qtr_ice_top(:,:,:) = 0._wp
+
 #endif
 

NEMO/branches/2020/dev_r13296_HPC-07_mocavero_mpi3/tests/BENCH/MY_SRC/usrdef_zgr.F90

@@ -210 +210 @@
 
       !
+#if defined key_mpi3
+      CALL lbc_lnk_nc_multi( 'usrdef_zgr', z2d, 'T', 1. )           ! set surrounding land to zero (here jperio=0 ==>> closed)
+#else
       CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. )           ! set surrounding land to zero (here jperio=0 ==>> closed)
+#endif
       !
       k_bot(:,:) = INT( z2d(:,:) )           ! =jpkm1 over the ocean point, =0 elsewhere