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

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/WAD

Files:

• EXPREF/context_nemo.xml (modified) (1 diff)
• EXPREF/namelist_cfg (modified) (4 diffs)
• MY_SRC/usrdef_zgr.F90 (modified) (5 diffs)

NEMO/branches/2020/dev_r13296_HPC-07_mocavero_mpi3/tests/WAD/EXPREF/context_nemo.xml

@@ -11 +11 @@
        <variable id="ref_month" type="int"> 01 </variable>
        <variable id="ref_day"   type="int"> 01 </variable>
-       <variable id="rau0"      type="float" > 1026.0 </variable>
+       <variable id="rho0"      type="float" > 1026.0 </variable>
        <variable id="cpocean"   type="float" > 3991.86795711963 </variable>
        <variable id="convSpsu"  type="float" > 0.99530670233846  </variable>

NEMO/branches/2020/dev_r13296_HPC-07_mocavero_mpi3/tests/WAD/EXPREF/namelist_cfg

@@ -200 +200 @@
 !!                                                                    !!
 !!   namdrg        top/bottom drag coefficient                          (default: NO selection)
-!!   namdrg_top    top    friction                                      (ln_OFF=F & ln_isfcav=T)
-!!   namdrg_bot    bottom friction                                      (ln_OFF=F)
+!!   namdrg_top    top    friction                                      (ln_drg_OFF=F & ln_isfcav=T)
+!!   namdrg_bot    bottom friction                                      (ln_drg_OFF=F)
 !!   nambbc        bottom temperature boundary condition                (default: OFF)
 !!   nambbl        bottom boundary layer scheme                         (default: OFF)
@@ -253 +253 @@
                                  !
    !                     ! S-EOS coefficients (ln_seos=T):
-   !                             !  rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+   !                             !  rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
    rn_a0       =  1.6550e-1      !  thermal expension coefficient (nn_eos= 1)
    rn_b0       =  7.6554e-1      !  saline  expension coefficient (nn_eos= 1)
@@ -263 +263 @@
 !!org GYRE   rn_alpha    =   2.0e-4  !  thermal expension coefficient (nn_eos= 1 or 2)
 !!org GYRE   rn_beta     =   7.7e-4  !  saline  expension coefficient (nn_eos= 2)
-!!org  caution  now a0 = alpha / rau0   with rau0 = 1026
+!!org  caution  now a0 = alpha / rho0   with rho0 = 1026
 /
 !-----------------------------------------------------------------------
@@ -417 +417 @@
 !!                                                                    !!
 !!   namtrd       dynamics and/or tracer trends                         (default: OFF)
-!!   namptr       Poleward Transport Diagnostics                        (default: OFF)
 !!   namhsb       Heat and salt budgets                                 (default: OFF)
 !!   namdiu       Cool skin and warm layer models                       (default: OFF)

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

@@ -233 +233 @@
          zhu(ji,:) = 0.5_wp * ( zht(ji,:) + zht(ji+1,:) )
       END DO
+#if defined key_mpi3
+      CALL lbc_lnk_nc_multi( 'usrdef_zgr', zhu, 'U', 1. )     ! boundary condition: this mask the surrounding grid-points
+#else
       CALL lbc_lnk( 'usrdef_zgr', zhu, 'U', 1. )     ! boundary condition: this mask the surrounding grid-points
+#endif
       !                                ! ==>>>  set by hand non-zero value on first/last columns & rows 
       DO ji = mi0(1), mi1(1)              ! first row of global domain only
@@ -246 +250 @@
          zhv(ji,jj) = 0.5_wp * ( zht(ji,jj) + zht(ji,jj+1) )
       END_2D
+#if defined key_mpi3
+      CALL lbc_lnk_nc_multi( 'usrdef_zgr', zhv, 'V', 1. )     ! boundary condition: this mask the surrounding grid-points
+#else
       CALL lbc_lnk( 'usrdef_zgr', zhv, 'V', 1. )     ! boundary condition: this mask the surrounding grid-points
+#endif
       DO jj = mj0(1), mj1(1)   ! first  row of global domain only
          zhv(:,jj) = zht(:,jj)
@@ -271 +279 @@
 
 
+#if defined key_mpi3
+      CALL lbc_lnk_nc_multi( 'usrdef_zgr', z2d, 'T', 1. )        ! closed basin since jperio = 0 (see userdef_nam.F90)
+#else
       CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. )        ! closed basin since jperio = 0 (see userdef_nam.F90)
+#endif
       k_top(:,:) = NINT( z2d(:,:) )
       !
@@ -306 +318 @@
             END DO
          END_2D     
+#if defined key_mpi3
+         CALL lbc_lnk_nc_multi( 'usrdef_zgr', pdept, 'T', 1. )
+         CALL lbc_lnk_nc_multi( 'usrdef_zgr', pdepw, 'T', 1. )
+         CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3t , 'T', 1. )
+         CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3w , 'T', 1. )
+         CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3u , 'U', 1. )
+         CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3uw, 'U', 1. )
+         CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3f , 'F', 1. )
+         CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3v , 'V', 1. )
+         CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3vw, 'V', 1. )
+#else
          CALL lbc_lnk( 'usrdef_zgr', pdept, 'T', 1. )
          CALL lbc_lnk( 'usrdef_zgr', pdepw, 'T', 1. )
@@ -315 +338 @@
          CALL lbc_lnk( 'usrdef_zgr', pe3v , 'V', 1. )
          CALL lbc_lnk( 'usrdef_zgr', pe3vw, 'V', 1. )
+#endif
          WHERE( pe3t (:,:,:) == 0._wp )   pe3t (:,:,:) = 1._wp
          WHERE( pe3u (:,:,:) == 0._wp )   pe3u (:,:,:) = 1._wp