Changeset 13065 for NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/VORTEX/MY_SRC

Timestamp:

2020-06-08T18:11:57+02:00 (4 years ago)

Author:

smasson

Message:

Extra_Halo: toward AGRIF compatibility, see #2366

Location:

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/VORTEX/MY_SRC

Files:

• usrdef_hgr.F90 (modified) (1 diff)
• usrdef_nam.F90 (modified) (2 diffs)

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/VORTEX/MY_SRC/usrdef_hgr.F90

@@ -77 +77 @@
       ! Position coordinates (in kilometers)
       !                          ==========
-      zlam0 = -REAL(Ni0glo-1)/2, wp) * 1.e-3 * rn_dx
-      zphi0 = -REAL(Nj0glo-1)/2, wp) * 1.e-3 * rn_dy 
-
+#if defined key_agrif 
+      IF( Agrif_Root() ) THEN
+#endif
+         ! Compatibility WITH old version: 
+         ! jperio = 0 =>  Ni0glo = jpigo_old_version
+         !            =>  jpiglo-1 replaced by Ni0glo-1
+         zlam0 = -REAL( (Ni0glo-1)/2, wp) * 1.e-3 * rn_dx
+         zphi0 = -REAL( (Nj0glo-1)/2, wp) * 1.e-3 * rn_dy 
 #if defined key_agrif
-      ! ! let lower left longitude and latitude from parent
-      IF (.NOT.Agrif_root()) THEN
-          zlam0 = (0.5_wp-(Agrif_parent(jpiglo)-1)/2)*1.e-3*Agrif_irhox()*rn_dx &
-             &+(Agrif_Ix()+nbghostcells-1)*Agrif_irhox()*rn_dx*1.e-3-(0.5_wp+nbghostcells)*rn_dx*1.e-3
-          zphi0 = (0.5_wp-(Agrif_parent(jpjglo)-1)/2)*1.e-3*Agrif_irhoy()*rn_dy &
-             &+(Agrif_Iy()+nbghostcells-1)*Agrif_irhoy()*rn_dy*1.e-3-(0.5_wp+nbghostcells)*rn_dy*1.e-3
+      ELSE
+         ! ! let lower left longitude and latitude from parent
+         ! Compatibility WITH old version: 
+         ! jperio = 0 =>  Ni0glo = jpigo_old_version
+         !            =>  Agrif_parent(jpiglo)-1 replaced by  Agrif_parent(Ni0glo)-1
+         zlam0 = ( 0.5_wp - REAL( ( Agrif_parent(Ni0glo)-1 ) / 2, wp) ) * 1.e-3 * Agrif_irhox() * rn_dx  &
+            &  + ( Agrif_Ix() + nbghostcells - 1 ) * Agrif_irhox() * rn_dx * 1.e-3 - ( 0.5_wp + nbghostcells ) * rn_dx * 1.e-3
+         zphi0 = ( 0.5_wp - REAL( ( Agrif_parent(Nj0glo)-1 ) / 2, wp) ) * 1.e-3 * Agrif_irhoy() * rn_dy  &
+            &  + ( Agrif_Iy() + nbghostcells - 1 ) * Agrif_irhoy() * rn_dy * 1.e-3 - ( 0.5_wp + nbghostcells ) * rn_dy * 1.e-3
       ENDIF 
 #endif

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

@@ -85 +85 @@
          kpj = NINT( 1800.e3  / rn_dy ) + 3 
       ELSE
-         kpi  = nbcellsx + 2 + 2*nbghostcells
-         kpj  = nbcellsy + 2 + 2*nbghostcells
+         kpi  = nbcellsx + 2 * ( nbghostcells + 1 )   ! Global Domain size: add nbghostcells + 1 "land" point on each side
+         kpj  = nbcellsy + 2 * ( nbghostcells + 1 )
       ENDIF
       kpk = NINT( 5000._wp / rn_dz ) + 1
@@ -104 +104 @@
          WRITE(numout,*) '      horizontal resolution             rn_dy  = ', rn_dy, ' m'
          WRITE(numout,*) '      vertical resolution               rn_dz  = ', rn_dz, ' m'
+         WRITE(numout,*) '      resulting global domain size :    Ni0glo = ', kpi
+         WRITE(numout,*) '                                        Nj0glo = ', kpj
+         WRITE(numout,*) '                                        jpkglo = ', kpk
          WRITE(numout,*) '      VORTEX domain: '
          WRITE(numout,*) '         LX [km]: ', zlx