Changeset 13174 for NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests

Timestamp:

2020-06-29T17:28:55+02:00 (4 years ago)

Author:

smasson

Message:

Extra_Halo: works if jpni = 1, allows nn_hls >2, remove island in BENCH, see #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_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_zgr.F90

@@ -191 +191 @@
       !
       z2d(:,:) = REAL( jpkm1 , wp )          ! flat bottom
-      IF( .NOT. (nbondj == 1 .OR. nbondj == 0 .OR. l_Jperio) )   &
-         z2d(mi0(  1 ):mi1(jpiglo),mj0(Njs0):mj1( Njs0 )) = 0._wp   ! line   number Njs0 at 0
-      IF( .NOT. (nbondi == 1 .OR. nbondi == 0 .OR. l_Iperio) )   & 
-         z2d(mi0(Nis0):mi1( Nis0 ),mj0(  1 ):mj1(jpjglo)) = 0._wp   ! column number Nis0 at 0
-      !
-      IF( jperio == 3 .OR. jperio ==4 ) THEN   ! add a small island in the upper corners to avoid model instabilities...
-         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
+      !
+      !
+      ! BENCH should work without these 2 small islands on the 2 poles of the folding...
+      !   -> Comment out these lines if instabilities are too large...
+      !
+      
+!!$      IF( jperio == 3 .OR. jperio == 4 ) THEN   ! add a small island in the upper corners to avoid model instabilities...
+!!$         z2d(mi0(       nn_hls):mi1(                  nn_hls+2 ),mj0(jpjglo-nn_hls-1):mj1(jpjglo-nn_hls+1)) = 0.
+!!$         z2d(mi0(jpiglo-nn_hls):mi1(MIN(jpiglo,jpiglo-nn_hls+2)),mj0(jpjglo-nn_hls-1):mj1(jpjglo-nn_hls+1)) = 0.
+!!$         z2d(mi0(jpiglo/2     ):mi1(           jpiglo/2     +2 ),mj0(jpjglo-nn_hls-1):mj1(jpjglo-nn_hls+1)) = 0.
+!!$      ENDIF
+!!$      !
+!!$      IF( jperio == 5 .OR. jperio == 6 ) THEN   ! add a small island in the upper corners to avoid model instabilities...
+!!$         z2d(mi0(       nn_hls):mi1(       nn_hls+1),mj0(jpjglo-nn_hls):mj1(jpjglo-nn_hls+1)) = 0.
+!!$         z2d(mi0(jpiglo-nn_hls):mi1(jpiglo-nn_hls+1),mj0(jpjglo-nn_hls):mj1(jpjglo-nn_hls+1)) = 0.
+!!$         z2d(mi0(jpiglo/2     ):mi1(jpiglo/2     +1),mj0(jpjglo-nn_hls):mj1(jpjglo-nn_hls+1)) = 0.
+!!$      ENDIF
+
       !
       CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. )           ! set surrounding land to zero (here jperio=0 ==>> closed)