Changeset 14511 for NEMO/branches/2021/dev_r14393_HPC-03_Mele_Comm_Cleanup/cfgs

Timestamp:

2021-02-19T17:06:46+01:00 (3 years ago)

Author:

francesca

Message:

align branch with trunk@14509

Location:

NEMO/branches/2021/dev_r14393_HPC-03_Mele_Comm_Cleanup/cfgs

Files:

• C1D_PAPA/MY_SRC/usrdef_nam.F90 (modified) (4 diffs)
• README.rst (modified) (1 diff)
• SHARED/namelist_ref (modified) (2 diffs)
• WED025/MY_SRC (deleted)

NEMO/branches/2021/dev_r14393_HPC-03_Mele_Comm_Cleanup/cfgs/C1D_PAPA/MY_SRC/usrdef_nam.F90

@@ -39 +39 @@
 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  ***
@@ -51 +51 @@
       !! ** 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
@@ -74 +76 @@
       kpk = 75 
       !                             ! Set the lateral boundary condition of the global domain
-      kperio =  7                   ! C1D configuration : 3x3 basin with cyclic Est-West and Norht-South condition
+      ldIperio =  .TRUE.   ;   ldJperio = .TRUE.   ! C1D configuration : 3x3 basin with cyclic Est-West and Norht-South condition
+      ldNFold  = .FALSE.   ;   cdNFtype = '-'
       !
       !                             ! control print
@@ -90 +93 @@
          WRITE(numout,*) '                                               jpjglo = ', kpj
          WRITE(numout,*) '                                               jpkglo = ', kpk
-         WRITE(numout,*) '   Lateral boundary condition of the global domain'
-         WRITE(numout,*) '      C1D : closed basin                       jperio = ', kperio
+         WRITE(numout,*) '   '
       ENDIF
       !

NEMO/branches/2021/dev_r14393_HPC-03_Mele_Comm_Cleanup/cfgs/README.rst

@@ -240 +240 @@
    The vertical eddy viscosity and diffusivity coefficients are increased to 1 m\ :sup:`2`/s in
    case of static instability.
-:time step: is 5760sec (1h36') so that there is 15 time steps in one day.
+:time step: is 5400sec (1h30') so that there is 16 time steps in one day.
 
 ORCA2_OFF_PISCES

NEMO/branches/2021/dev_r14393_HPC-03_Mele_Comm_Cleanup/cfgs/SHARED/namelist_ref

@@ -644 +644 @@
    rn_test_box             = 108.0,  116.0, -66.0, -58.0
    ln_use_calving          = .false. ! Use calving data even when nn_test_icebergs > 0
-   rn_speed_limit          = 0.      ! CFL speed limit for a berg
+   rn_speed_limit          = 0.      ! CFL speed limit for a berg (safe value is 0.4, see #2581)
    !
    ln_M2016                = .false. ! use Merino et al. (2016) modification (use of 3d ocean data instead of only sea surface data)
@@ -1498 +1498 @@
    jpnj        =   0       !  number of processors following j (set automatically if < 1), see also ln_listonly = T
    nn_hls      =   1       !  halo width (applies to both rows and columns)
+   nn_comm     =   1       !  comm choice
 /
 !-----------------------------------------------------------------------