Changeset 13899 for NEMO/branches/2020/tickets_icb_1900/tests/BENCH/MY_SRC/usrdef_hgr.F90

Timestamp:

2020-11-27T17:26:33+01:00 (4 years ago)

Author:

mathiot

Message:

ticket #1900: update branch to trunk and add ICB test case

Location:

NEMO/branches/2020/tickets_icb_1900

Files:

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

NEMO/branches/2020/tickets_icb_1900

@@ -2 +2 @@
 ^/utils/build/makenemo@HEAD   makenemo
 ^/utils/build/mk@HEAD         mk
-^/utils/tools/@HEAD           tools
+^/utils/tools@HEAD            tools
 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@12931        sette
+^/utils/CI/sette@13559        sette

@@ -2 +2 @@
 ^/utils/build/makenemo@HEAD   makenemo
 ^/utils/build/mk@HEAD         mk
-^/utils/tools/@HEAD           tools
+^/utils/tools@HEAD            tools
 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@12931        sette
+^/utils/CI/sette@13559        sette

NEMO/branches/2020/tickets_icb_1900/tests/BENCH/MY_SRC/usrdef_hgr.F90

@@ -61 +61 @@
       REAL(wp), DIMENSION(:,:), INTENT(out) ::   pe1e2u, pe1e2v               ! u- & v-surfaces (if reduction in strait)   [m2]
       !
-      INTEGER  ::   ji, jj   ! dummy loop indices
+      INTEGER  ::   ji, jj         ! dummy loop indices
       REAL(wp) ::   zres, zf0
-      REAL(wp) ::   zti, zui, ztj, zvj   ! local scalars
+      REAL(wp) ::   zti, ztj       ! local scalars
       !!-------------------------------------------------------------------------------
       !
@@ -72 +72 @@
       IF(lwp) WRITE(numout,*) '          given by rn_dx and rn_dy' 
       !
-      !                          
       ! Position coordinates (in grid points)
       !                          ==========
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          
-         zti = REAL( ji - 1 + nimpp - 1, wp )          ;  ztj = REAL( jj - 1 + njmpp - 1, wp )
-         zui = REAL( ji - 1 + nimpp - 1, wp ) + 0.5_wp ;  zvj = REAL( jj - 1 + njmpp - 1, wp ) + 0.5_wp
+         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
          
          plamt(ji,jj) = zti
-         plamu(ji,jj) = zui
+         plamu(ji,jj) = zti + 0.5_wp
          plamv(ji,jj) = zti
-         plamf(ji,jj) = zui
+         plamf(ji,jj) = zti + 0.5_wp
          
          pphit(ji,jj) = ztj
-         pphiv(ji,jj) = zvj
          pphiu(ji,jj) = ztj
-         pphif(ji,jj) = zvj
+         pphiv(ji,jj) = ztj + 0.5_wp
+         pphif(ji,jj) = ztj + 0.5_wp
 
       END_2D
@@ -109 +108 @@
       kff = 1                       !  indicate not to compute Coriolis parameter afterward
       !
-      zf0   = 2._wp * omega * SIN( rad * 45 )   ! constant coriolis factor corresponding to 45°N
+      zf0 = 2._wp * omega * SIN( rad * 45 )   ! constant coriolis factor corresponding to 45°N
       pff_f(:,:) = zf0
       pff_t(:,:) = zf0

@@ -2 +2 @@
 ^/utils/build/makenemo@HEAD   makenemo
 ^/utils/build/mk@HEAD         mk
-^/utils/tools/@HEAD           tools
+^/utils/tools@HEAD            tools
 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@12931        sette
+^/utils/CI/sette@13559        sette