Changeset 14994 for NEMO/branches/2021/ticket2669_isf_fluxes/tests/VORTEX/MY_SRC/usrdef_hgr.F90

Timestamp:

2021-06-15T16:39:31+02:00 (3 years ago)

Author:

mathiot

Message:

ticket #2669: update to the head of trunk

File:

• NEMO/branches/2021/ticket2669_isf_fluxes/tests/VORTEX/MY_SRC/usrdef_hgr.F90 (modified) (3 diffs)

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

@@ -23 +23 @@
    IMPLICIT NONE
    PRIVATE
+
+   REAL(wp) :: roffsetx, roffsety ! Offset in km to first f-point
 
    PUBLIC   usr_def_hgr   ! called by domhgr.F90
@@ -64 +66 @@
       !
       INTEGER  ::   ji, jj     ! dummy loop indices
-      REAL(wp) ::   zphi0, zlam0, zbeta, zf0
+      REAL(wp) ::   zbeta, zf0
       REAL(wp) ::   zti, ztj   ! local scalars
       !!-------------------------------------------------------------------------------
@@ -77 +79 @@
       ! Position coordinates (in kilometers)
       !                          ==========
-#if defined key_agrif 
-      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
+      ! offset is given at first f-point, i.e. at (i,j) = (nn_hls+1, nn_hls+1)
+      ! Here we assume the grid is centred around a T-point at the middle of
+      ! of the domain (hence domain size is odd) 
+      roffsetx = (-REAL(Ni0glo-1, wp) + 1._wp) * 0.5 * 1.e-3 * rn_dx
+      roffsety = (-REAL(Nj0glo-1, wp) + 1._wp) * 0.5 * 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  &
-            &  + ( 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  &
-            &  + ( Agrif_Iy() + nbghostcells - 1 ) * Agrif_irhoy() * rn_dy * 1.e-3 - ( 0.5_wp + nbghostcells ) * rn_dy * 1.e-3
-      ENDIF 
-#endif
+      IF( .NOT.Agrif_Root() ) THEN
+         ! deduce offset from parent:
+         roffsetx = Agrif_Parent(roffsetx) &
+                  & + (-(nbghostcells_x   - 1) + (Agrif_Parent(nbghostcells_x  ) + Agrif_Ix()-2)*Agrif_Rhox()) * 1.e-3 * rn_dx
+         roffsety = Agrif_Parent(roffsety) &
+                  & + (-(nbghostcells_y_s - 1) + (Agrif_Parent(nbghostcells_y_s) + Agrif_Iy()-2)*Agrif_Rhoy()) * 1.e-3 * rn_dy
+      ENDIF
+#endif         
+      DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
+         zti = REAL( mig0(ji)-1, wp )  ! start at i=0 in the global grid without halos
+         ztj = REAL( mjg0(jj)-1, wp )  ! start at j=0 in the global grid without halos
          
-      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
-         
-         plamt(ji,jj) = zlam0 + rn_dx * 1.e-3 *   zti
-         plamu(ji,jj) = zlam0 + rn_dx * 1.e-3 * ( zti + 0.5_wp )
+         plamt(ji,jj) = roffsetx + rn_dx * 1.e-3 * ( zti - 0.5_wp )
+         plamu(ji,jj) = roffsetx + rn_dx * 1.e-3 *   zti 
          plamv(ji,jj) = plamt(ji,jj) 
          plamf(ji,jj) = plamu(ji,jj) 
          
-         pphit(ji,jj) = zphi0 + rn_dy * 1.e-3 *   ztj
-         pphiv(ji,jj) = zphi0 + rn_dy * 1.e-3 * ( ztj + 0.5_wp )
+         pphit(ji,jj) = roffsety + rn_dy * 1.e-3 * ( ztj - 0.5_wp )
+         pphiv(ji,jj) = roffsety + rn_dy * 1.e-3 *   ztj 
          pphiu(ji,jj) = pphit(ji,jj) 
          pphif(ji,jj) = pphiv(ji,jj)