Changeset 14822 for NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/tests/LOCK_EXCHANGE/MY_SRC/usrdef_nam.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/LOCK_EXCHANGE/MY_SRC/usrdef_nam.F90 (modified) (4 diffs)

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/LOCK_EXCHANGE/MY_SRC/usrdef_nam.F90

@@ -37 +37 @@
 CONTAINS
 
-   SUBROUTINE usr_def_nam( cd_cfg, kk_cfg, kpi, kpj, kpk, kperio )
+   SUBROUTINE usr_def_nam( cd_cfg, kk_cfg, kpi, kpj, kpk, ldIperio, ldJperio, ldNFold, cdNFtype )
       !!----------------------------------------------------------------------
       !!                     ***  ROUTINE dom_nam  ***
@@ -49 +49 @@
       !! ** input   : - namusr_def namelist found in namelist_cfg
       !!----------------------------------------------------------------------
-      CHARACTER(len=*)              , INTENT(out) ::   cd_cfg          ! configuration name
-      INTEGER                       , INTENT(out) ::   kk_cfg          ! configuration resolution
-      INTEGER                       , INTENT(out) ::   kpi, kpj, kpk   ! global domain sizes 
-      INTEGER                       , INTENT(out) ::   kperio          ! lateral global domain b.c. 
+      CHARACTER(len=*), INTENT(out) ::   cd_cfg               ! configuration name
+      INTEGER         , INTENT(out) ::   kk_cfg               ! configuration resolution
+      INTEGER         , INTENT(out) ::   kpi, kpj, kpk        ! global domain sizes
+      LOGICAL         , INTENT(out) ::   ldIperio, ldJperio   ! i- and j- periodicity
+      LOGICAL         , INTENT(out) ::   ldNFold              ! North pole folding
+      CHARACTER(len=1), INTENT(out) ::   cdNFtype             ! Folding type: T or F
       !
       INTEGER ::   ios   ! Local integer
@@ -73 +75 @@
       kpk = INT(  20.  / rn_dz ) + 1
       !                             ! Set the lateral boundary condition of the global domain
-      kperio = 0                    ! LOCK_EXCHANGE configuration : closed domain
+      ldIperio = .FALSE.   ;   ldJperio = .FALSE.   ! LOCK_EXCHANGE configuration : closed domain
+      ldNFold  = .FALSE.   ;   cdNFtype = '-'
       !
       !                             ! control print
@@ -88 +91 @@
          WRITE(numout,*) '                                               jpkglo = ', kpk
          WRITE(numout,*) '   '
-         WRITE(numout,*) '   Lateral boundary condition of the global domain'
-         WRITE(numout,*) '      closed                                   jperio = ', kperio
       ENDIF
       !

@@ -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