Changeset 14799 for NEMO/branches/2021

Timestamp:

2021-05-06T15:57:06+02:00 (3 years ago)

Author:

jchanut

Message:

#2605: Correct Vortex setup by reverting some changes introduced @r14223

File:

• NEMO/branches/2021/dev_r14318_RK3_stage1/tests/VORTEX/MY_SRC/usrdef_hgr.F90 (modified) (1 diff)

NEMO/branches/2021/dev_r14318_RK3_stage1/tests/VORTEX/MY_SRC/usrdef_hgr.F90

@@ -80 +80 @@
       IF( Agrif_Root() ) THEN
 #endif
-         zlam0 = -REAL(Ni0glo, wp) * 0.5 * 1.e-3 * rn_dx
-         zphi0 = -REAL(Nj0glo, wp) * 0.5 * 1.e-3 * rn_dy
+         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
       ELSE
          ! ! let lower left longitude and latitude from parent
-         zlam0 = ( 0.5_wp - REAL(Ni0glo, wp) * 0.5 ) * 1.e-3 * Agrif_irhox() * rn_dx  &
+         zlam0 = ( 0.5_wp - REAL(Agrif_Parent(Ni0glo)-1, wp) * 0.5 ) * 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(Nj0glo, wp) * 0.5 ) * 1.e-3 * Agrif_irhoy() * rn_dy  &
+         zphi0 = ( 0.5_wp - REAL(Agrif_Parent(Nj0glo)-1, wp) * 0.5 ) * 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
          
-      DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
-         zti = REAL( mig0(ji), wp ) - 0.5_wp  ! start at i=0.5 in the global grid without halos
-         ztj = REAL( mjg0(jj), wp ) - 0.5_wp  ! start at j=0.5 in the global grid without halos
+      DO_2D( nn_hls , nn_hls, nn_hls, nn_hls )
+         zti = REAL( mig0(ji)-1, wp )   ! start at i=0.5 in the global grid without halos
+         ztj = REAL( mjg0(jj)-1, wp )   ! start at j=0.5 in the global grid without halos
          
          plamt(ji,jj) = zlam0 + rn_dx * 1.e-3 *   zti