Changeset 12989 for NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/BENCH

Timestamp:

2020-05-29T11:31:16+02:00 (4 years ago)

Author:

francesca

Message:

Extra_Halo: developments for running BENCH test case with halo 2 - ticket #2366

Location:

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/BENCH

Files:

• EXPREF/namelist_cfg_orca025_like (modified) (1 diff)
• EXPREF/namelist_cfg_orca12_like (modified) (1 diff)
• EXPREF/namelist_cfg_orca1_like (modified) (1 diff)
• MY_SRC/usrdef_istate.F90 (modified) (1 diff)
• MY_SRC/usrdef_nam.F90 (modified) (4 diffs)
• MY_SRC/usrdef_zgr.F90 (modified) (1 diff)

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/BENCH/EXPREF/namelist_cfg_orca025_like

@@ -19 +19 @@
    nn_ksize   =   75       ! total number of point in k-direction
    nn_perio   =   4        ! periodicity
+   nn_hls     =   2        ! halo dimension
 /
 !-----------------------------------------------------------------------

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/BENCH/EXPREF/namelist_cfg_orca12_like

@@ -19 +19 @@
    nn_ksize   =   75       ! total number of point in k-direction
    nn_perio   =   4        ! periodicity
+   nn_hls     =   2        ! halo dimension
 /
 !-----------------------------------------------------------------------

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/BENCH/EXPREF/namelist_cfg_orca1_like

@@ -19 +19 @@
    nn_ksize   =   75       ! total number of point in k-direction
    nn_perio   =   6        ! periodicity
+   nn_hls     =   2        ! halo dimension
 /
 !-----------------------------------------------------------------------

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/BENCH/MY_SRC/usrdef_istate.F90

@@ -90 +90 @@
          pu(:,:,jk) = z2d(:,:) *  0.1_wp * umask(:,:,jk)                  ! +/- 0.005  m/s
          pv(:,:,jk) = z2d(:,:) * 0.01_wp * vmask(:,:,jk)                  ! +/- 0.0005 m/s
-      ENDDO
+      END_3D
       pts(:,:,jpk,:) = 0._wp
       pu( :,:,jpk  ) = 0._wp

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/BENCH/MY_SRC/usrdef_nam.F90

@@ -29 +29 @@
 CONTAINS
 
-   SUBROUTINE usr_def_nam( cd_cfg, kk_cfg, kpi, kpj, kpk, kperio )
+   SUBROUTINE usr_def_nam( cd_cfg, kk_cfg, kpi, kpj, kpk, kperio, khls )
       !!----------------------------------------------------------------------
       !!                     ***  ROUTINE dom_nam  ***
@@ -45 +45 @@
       INTEGER                       , INTENT(out) ::   kpi, kpj, kpk   ! global domain sizes 
       INTEGER                       , INTENT(out) ::   kperio          ! lateral global domain b.c. 
+      INTEGER                       , INTENT(out) ::   khls            ! halo dimension 
       !
       !
@@ -57 +58 @@
       LOGICAL          ::   ln_nnogather, ln_listonly
       !!
-      NAMELIST/namusr_def/ nn_isize, nn_jsize, nn_ksize, nn_perio
+      NAMELIST/namusr_def/ nn_isize, nn_jsize, nn_ksize, nn_perio, nn_hls
       NAMELIST/nammpp/ jpni, jpnj, ln_nnogather, ln_listonly
       !!----------------------------------------------------------------------     
@@ -86 +87 @@
       kpk = nn_ksize
       kperio = nn_perio
+      khls = nn_hls 
       !                             ! control print
       IF(lwp) THEN

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/BENCH/MY_SRC/usrdef_zgr.F90

@@ -197 +197 @@
       !
       IF( jperio == 3 .OR. jperio ==4 ) THEN   ! add a small island in the upper corners to avoid model instabilities...
-         z2d(mi0(       1):mi1(     3),mj0(jpjglo-2):mj1(jpjglo)) = 0.
-         z2d(mi0(jpiglo-2):mi1(jpiglo),mj0(jpjglo-2):mj1(jpjglo)) = 0.
+         z2d(mi0(              1):mi1(Nis0+1),mj0(jpjglo-nn_hls-1):mj1(jpjglo)) = 0.
+         z2d(mi0(jpiglo-nn_hls-1):mi1(jpiglo),mj0(jpjglo-nn_hls-1):mj1(jpjglo)) = 0.
       ENDIF
       !