Changeset 14336 for NEMO/branches/2021/dev_r14312_MPI_Interface/src/OCE/USR

Timestamp:

2021-01-23T11:09:54+01:00 (3 years ago)

Author:

smasson

Message:

dev_r14312_MPI_Interface: replace jperio by l_Iperio, l_Jperio, l_NFold, c_NFtype, #2598

Location:

NEMO/branches/2021/dev_r14312_MPI_Interface/src/OCE/USR

Files:

• README.rst (modified) (1 diff)
• usrdef_nam.F90 (modified) (4 diffs)

NEMO/branches/2021/dev_r14312_MPI_Interface/src/OCE/USR/README.rst

@@ -111 +111 @@
    /* configuration name, configuration resolution                 */
    int    ORCA, ORCA_index
-   /* global domain sizes                                          */
-   int    jpiglo, jpjglo, jpkglo
    /* lateral global domain b.c.                                   */
-   int    jperio
+   int    Iperio, Jperio, NFoldT, NFoldF
    /* flags for z-coord, z-coord with partial steps and s-coord    */
    int    ln_zco, ln_zps, ln_sco

NEMO/branches/2021/dev_r14312_MPI_Interface/src/OCE/USR/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
@@ -82 +84 @@
       kpk = jpkglo
       !                             ! Set the lateral boundary condition of the global domain
-      kperio = 0                    ! GYRE configuration : closed domain
+      ldIperio = .FALSE.   ;   ldJperio = .FALSE.   ! GYRE configuration : closed domain
+      ldNFold  = .FALSE.   ;   cdNFtype = '-'
       !
       !                             ! control print
@@ -102 +105 @@
          WRITE(numout,*) '      number of model levels                           jpkglo = ', kpk
          WRITE(numout,*) '   '
-         WRITE(numout,*) '   Lateral b.c. of the global domain set to closed     jperio = ', kperio
       ENDIF
       !