Changeset 14683 for NEMO/branches/2020

Timestamp:

2021-04-08T11:52:58+02:00 (3 years ago)

Author:

ayoung

Message:

Compatibility changes for periodic bc and north fold in usr def nam. See tickets #2480 and #2651.

File:

• NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/SEAMOUNT/MY_SRC/usrdef_nam.F90 (modified) (5 diffs)

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/SEAMOUNT/MY_SRC/usrdef_nam.F90

@@ -49 +49 @@
 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  ***
@@ -62 +62 @@
       !! ** 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
@@ -79 +82 @@
       !
       cd_cfg = 'Seamount'      ! name & resolution (not used)
+      kk_cfg = 0
+
+      !                             ! Set the lateral boundary condition of the global domain
+      ldIperio = .TRUE.    ;   ldJperio = .true.   ! C1D configuration : 3x3 basin with cyclic Est-West and Norht-South condition
+      ldNFold  = .FALSE.   ;   cdNFtype = '-'
+
       !
       ! Global Domain size:  SEAMOUNT_TEST_CASE domain is rn_length km x rn_width km x rn_bathy m
@@ -88 +97 @@
       rn_drho = 1000._wp * rn_bathy * ( rn_s * rn_f * rn_l / rn_bathy ) ** 2._wp / grav
       !
-      kperio = 1                    ! SEAMOUNT_TEST_CASE configuration : closed domain
+      !                             ! SEAMOUNT_TEST_CASE configuration : closed domain
       !                             ! control print
       IF(lwp) THEN
@@ -104 +113 @@
          WRITE(numout,*) '   '                                                                          
          WRITE(numout,*) '   Lateral boundary condition of the global domain'                           
-         WRITE(numout,*) '      closed                                   jperio = ', kperio        
+         WRITE(numout,*) '      east-west                                   ldIperio = ', ldIperio     
+         WRITE(numout,*) '      north-south                                 ldJperio = ', ldJperio   
          WRITE(numout,*) '   Initial condition:                          ln_exp_init =    ', ln_exp_init
          WRITE(numout,*) '                                               ln_linear_init = ', ln_linear_init