Changeset 14297

Timestamp:

2021-01-13T12:54:45+01:00 (3 years ago)

Author:

smasson

Message:

trunk: simplify TSUNAMI test case

Location:

NEMO/trunk/tests/TSUNAMI

Files:

• EXPREF/namelist_cfg (modified) (1 diff)
• MY_SRC/usrdef_nam.F90 (modified) (5 diffs)

NEMO/trunk/tests/TSUNAMI/EXPREF/namelist_cfg

@@ -25 +25 @@
    rn_dx       =     10.   !  x horizontal resolution   [km]
    rn_dy       =     10.   !  y horizontal resolution   [km]
-   rn_dz       =    100.   !  z vertical resolution      [m]
    rn_0xratio  =      0.2  !  x-domain ratio of the 0
    rn_0yratio  =      0.4  !  y-domain ratio of the 0
-   nn_fcase    =      0    !  F computation (0:f0, 1:Beta, 2:real)
+   nn_fcase    =      0    !  Coriolis frequency(f) computation (0:f0, 1:Beta plan, 2:real)
    rn_ppgphi0  =    38.5   !  Reference latitude      [degrees]
    nn_perio    =      7

NEMO/trunk/tests/TSUNAMI/MY_SRC/usrdef_nam.F90

@@ -33 +33 @@
    REAL(wp), PUBLIC ::   rn_dx      =   30.  ! x horizontal resolution   [km]
    REAL(wp), PUBLIC ::   rn_dy      =   30.  ! y horizontal resolution   [km]
-   REAL(wp), PUBLIC ::   rn_dz      =  500.  ! vertical resolution        [m]
    REAL(wp), PUBLIC ::   rn_0xratio =    0.5 ! x domain ratio of the 0
    REAL(wp), PUBLIC ::   rn_0yratio =    0.5 ! x domain ratio of the 0
@@ -65 +64 @@
       !
       INTEGER ::   ios      ! Local integer
-      REAL(wp)::   zh       ! Local scalars
       !!
-      NAMELIST/namusr_def/  rn_domszx, rn_domszy, rn_domszz, rn_dx, rn_dy, rn_dz, rn_0xratio, rn_0yratio   &
+      NAMELIST/namusr_def/  rn_domszx, rn_domszy, rn_domszz, rn_dx, rn_dy, rn_0xratio, rn_0yratio   &
          &                 , nn_fcase, rn_ppgphi0, nn_perio
       !!----------------------------------------------------------------------
@@ -81 +79 @@
          rn_dx = Agrif_Parent(rn_dx)/Agrif_Rhox()
          rn_dy = Agrif_Parent(rn_dy)/Agrif_Rhoy()
-         rn_dz = Agrif_Parent(rn_dz)
          rn_ppgphi0 = Agrif_Parent(rn_ppgphi0)
       ENDIF
-      rn_0xratio = 0.5
+      rn_0xratio = 0.5   ! not really working I guess... 
       rn_0yratio = 0.5
 #endif
@@ -100 +97 @@
          kpj  = nbcellsy + nbghostcells_y_s + nbghostcells_y_n + 2
       ENDIF
-      kpk = MAX( 2, NINT( rn_domszz / rn_dz ) + 1 )
-      !
-      zh  = (kpk-1)*rn_dz
+      kpk = 2
       !                             ! Set the lateral boundary condition of the global domain
       kperio = 1                    ! TSUNAMI configuration : closed basin
@@ -116 +111 @@
          WRITE(numout,*) '      horizontal x-resolution           rn_dx      = ',     rn_dx, ' km'
          WRITE(numout,*) '      horizontal y-resolution           rn_dy      = ',     rn_dy, ' km'
-         WRITE(numout,*) '      vertical resolution               rn_dz      = ',     rn_dz, '  m'
          WRITE(numout,*) '      x-domain ratio of the 0           rn_0xratio = ', rn_0xratio
          WRITE(numout,*) '      y-domain ratio of the 0           rn_0yratio = ', rn_0yratio
-         WRITE(numout,*) '          H [m] : ', zh
          WRITE(numout,*) '      F computation                     nn_fcase   = ',   nn_fcase
          WRITE(numout,*) '      Reference latitude                rn_ppgphi0 = ', rn_ppgphi0