Changeset 14976 for NEMO/trunk/tests/DOME/MY_SRC/usrdef_hgr.F90

Timestamp:

2021-06-11T11:14:27+02:00 (3 years ago)

Author:

jchanut

Message:

#2638, merge dev_14608_AGRIF_domcfg branch into trunk

Location:

NEMO/trunk

Files:

• . (modified) (1 prop)
• tests/DOME/MY_SRC/usrdef_hgr.F90 (modified) (3 diffs)

NEMO/trunk

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/AGRIF/dev_r14608_AGRIF_domcfg@HEAD      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/AGRIF/dev_r14608_AGRIF_domcfg@HEAD      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL

NEMO/trunk/tests/DOME/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 
       REAL(wp) ::   zti, ztj   ! local scalars
       !!-------------------------------------------------------------------------------
@@ -77 +78 @@
       ! Position coordinates (in kilometers)
       !                          ==========
-      zlam0 = -REAL( 0.5 + 1700._wp * 1.e3 / rn_dx)
-      zphi0 = -REAL( 0.5 +  800._wp * 1.e3 / rn_dy)
+      ! Offsets in km of the first south west f-point: 
+      roffsetx = -1700._wp
+      roffsety =  -800._wp 
 #if defined key_agrif
-      IF( .NOT.Agrif_Root() ) THEN 
-         zlam0 = - REAL( 0.5 + 1700._wp * 1.e3 / rn_dx + nbghostcells) &
-               & + REAL((nbghostcells + Agrif_Ix() - 1)*Agrif_irhox())  
-         zphi0 = - REAL( 0.5 +  800._wp * 1.e3 / rn_dy + nbghostcells) &
-               & + REAL((nbghostcells + Agrif_Iy() - 1)*Agrif_irhoy())  
-      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( 1, 1, 1, 1 )
-         zti = REAL( mig0_oldcmp(ji) - 1, wp )   ! start at i=0 in the global grid without halos
-         ztj = REAL( mjg0_oldcmp(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) - 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
          
-         plamt(ji,jj) = rn_dx * 1.e-3 * ( zlam0 + zti )
-         plamu(ji,jj) = rn_dx * 1.e-3 * ( zlam0 + 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) = rn_dy * 1.e-3 * ( zphi0 + ztj )
-         pphiv(ji,jj) = rn_dy * 1.e-3 * ( zphi0 + 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) 

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/AGRIF/dev_r14608_AGRIF_domcfg@HEAD      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL