Changeset 14822 for NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/tests/WAD/MY_SRC/usrdef_hgr.F90

Timestamp:

2021-05-10T13:32:16+02:00 (3 years ago)

Author:

smueller

Message:

Synchronizing with ^{/NEMO/trunk@14820 (ticket #2353)}

Location:

NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining

Files:

• . (modified) (1 prop)
• tests/WAD/MY_SRC/usrdef_hgr.F90 (modified) (1 diff)

NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining

@@ -1 @@
-^/utils/build/arch@14122      arch
-^/utils/build/makenemo@14122  makenemo
-^/utils/build/mk@14122        mk
-^/utils/tools@14122           tools
-^/vendors/AGRIF/dev@14122     ext/AGRIF
-^/vendors/FCM@14122           ext/FCM
-^/vendors/IOIPSL@14122        ext/IOIPSL
-^/vendors/PPR@14122           ext/PPR
+^/utils/build/arch@HEAD       arch
+^/utils/build/makenemo@HEAD   makenemo
+^/utils/build/mk@HEAD         mk
+^/utils/tools@HEAD            tools
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/FCM@HEAD            ext/FCM
+^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/vendors/PPR@HEAD            ext/PPR
 
 # SETTE
-^/utils/CI/sette_wave@13990         sette
+^/utils/CI/sette@14244        sette

@@ -1 @@
-^/utils/build/arch@14122      arch
-^/utils/build/makenemo@14122  makenemo
-^/utils/build/mk@14122        mk
-^/utils/tools@14122           tools
-^/vendors/AGRIF/dev@14122     ext/AGRIF
-^/vendors/FCM@14122           ext/FCM
-^/vendors/IOIPSL@14122        ext/IOIPSL
-^/vendors/PPR@14122           ext/PPR
+^/utils/build/arch@HEAD       arch
+^/utils/build/makenemo@HEAD   makenemo
+^/utils/build/mk@HEAD         mk
+^/utils/tools@HEAD            tools
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/FCM@HEAD            ext/FCM
+^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/vendors/PPR@HEAD            ext/PPR
 
 # SETTE
-^/utils/CI/sette_wave@13990         sette
+^/utils/CI/sette@14244        sette

NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/tests/WAD/MY_SRC/usrdef_hgr.F90

@@ -74 +74 @@
       !                       !==  grid point position  ==!   (in kilometers)
       zfact = rn_dx * 1.e-3         ! conversion in km
-      DO_2D( 1, 1, 1, 1 )
-         !                       ! longitude
-         plamt(ji,jj) = zfact * (  - 0.5 + REAL( mig0_oldcmp(ji)-1 , wp )  )  
-         plamu(ji,jj) = zfact * (          REAL( mig0_oldcmp(ji)-1 , wp )  )
+      DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
+         !                       ! longitude   (west coast at lon=0°)
+         plamt(ji,jj) = zfact * (  - 0.5 + REAL( mig0(ji)-1 , wp )  )  
+         plamu(ji,jj) = zfact * (          REAL( mig0(ji)-1 , wp )  )
          plamv(ji,jj) = plamt(ji,jj)
          plamf(ji,jj) = plamu(ji,jj)
-         !                       ! latitude
-         pphit(ji,jj) = zfact * (  - 0.5 + REAL( mjg0_oldcmp(jj)-1 , wp )  )
+         !                       ! latitude   (south coast at lat= 0°)
+         pphit(ji,jj) = zfact * (  - 0.5 + REAL( mjg0(jj)-1 , wp )  )
          pphiu(ji,jj) = pphit(ji,jj)
-         pphiv(ji,jj) = zfact * (          REAL( mjg0_oldcmp(jj)-1 , wp )  )
+         pphiv(ji,jj) = zfact * (          REAL( mjg0(jj)-1 , wp )  )
          pphif(ji,jj) = pphiv(ji,jj)
       END_2D

@@ -1 @@
-^/utils/build/arch@14122      arch
-^/utils/build/makenemo@14122  makenemo
-^/utils/build/mk@14122        mk
-^/utils/tools@14122           tools
-^/vendors/AGRIF/dev@14122     ext/AGRIF
-^/vendors/FCM@14122           ext/FCM
-^/vendors/IOIPSL@14122        ext/IOIPSL
-^/vendors/PPR@14122           ext/PPR
+^/utils/build/arch@HEAD       arch
+^/utils/build/makenemo@HEAD   makenemo
+^/utils/build/mk@HEAD         mk
+^/utils/tools@HEAD            tools
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/FCM@HEAD            ext/FCM
+^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/vendors/PPR@HEAD            ext/PPR
 
 # SETTE
-^/utils/CI/sette_wave@13990         sette
+^/utils/CI/sette@14244        sette