Changeset 8993 for branches/2017/dev_METO_MERCATOR_2017/NEMOGCM/CONFIG

Timestamp:

2017-12-12T16:42:29+01:00 (6 years ago)

Author:

timgraham

Message:

Merged Mercator branch in

Location:

branches/2017/dev_METO_MERCATOR_2017/NEMOGCM/CONFIG

Files:

• ORCA2_LIM3_PISCES/EXP00/1_namelist_cfg (modified) (3 diffs)
• ORCA2_LIM3_PISCES/EXP00/namelist_cfg (modified) (1 diff)
• SHARED/namelist_ref (modified) (3 diffs)
• TEST_CASES/VORTEX (copied) (copied from branches/2017/dev_MERCATOR_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX)
• TEST_CASES/cfg.txt (modified) (1 diff)

branches/2017/dev_METO_MERCATOR_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_cfg

@@ -22 +22 @@
 &namdom        !   space and time domain (bathymetry, mesh, timestep)
 !-----------------------------------------------------------------------  
-   ln_linssh   = .true.   !  =T  linear free surface  ==>>  model level are fixed in time
+   ln_linssh   = .false.   !  =T  linear free surface  ==>>  model level are fixed in time
    nn_closea   =    0      !  remove (=0) or keep (=1) closed seas and lakes (ORCA)
    !
@@ -85 +85 @@
 &namagrif      !  AGRIF zoom                                            ("key_agrif")
 !-----------------------------------------------------------------------
-   nn_cln_update =    1    !  baroclinic update frequency
 /
 !-----------------------------------------------------------------------
@@ -171 +170 @@
 &namdyn_hpg    !   Hydrostatic pressure gradient option
 !-----------------------------------------------------------------------
+   ln_hpg_sco  = .true.   !  s-coordinate (standard jacobian formulation)
 /
 !-----------------------------------------------------------------------

branches/2017/dev_METO_MERCATOR_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/namelist_cfg

@@ -102 +102 @@
 &namagrif      !  AGRIF zoom                                            ("key_agrif")
 !-----------------------------------------------------------------------
-   nn_cln_update =    3    !  baroclinic update frequency
 /
 !-----------------------------------------------------------------------

branches/2017/dev_METO_MERCATOR_2017/NEMOGCM/CONFIG/SHARED/namelist_ref

@@ -531 +531 @@
 &namagrif      !  AGRIF zoom                                            ("key_agrif")
 !-----------------------------------------------------------------------
-   nn_cln_update =    3    !  baroclinic update frequency
    ln_spc_dyn    = .true.  !  use 0 as special value for dynamics
    rn_sponge_tra = 2880.   !  coefficient for tracer   sponge layer [m2/s]
@@ -540 +539 @@
 &nam_tide      !   tide parameters
 !-----------------------------------------------------------------------
-   ln_tide     = .false.
-   ln_tide_pot = .true.    !  use tidal potential forcing
-   ln_tide_ramp= .false.   !
-   rdttideramp =    0.     !
-   clname(1)   = 'DUMMY'   !  name of constituent - all tidal components must be set in namelist_cfg
+   ln_tide       = .false.                ! Activate tides
+      ln_tide_pot   = .true.                !  use tidal potential forcing
+         ln_scal_load  = .false.               ! Use scalar approximation for
+            rn_scal_load = 0.094               !     load potential
+         ln_read_load  = .false.               ! Or read load potential from file
+            cn_tide_load = 'tide_LOAD_grid_T.nc'  ! filename for load potential
+            !      
+      ln_tide_ramp  = .false.               !  Use linear ramp for tides at startup
+         rdttideramp   =    0.                 !  ramp duration in days
+      clname(1)     = 'DUMMY'               !  name of constituent - all tidal components must be set in namelist_cfg
 /
 !-----------------------------------------------------------------------
@@ -849 +853 @@
          rn_bt_cmax   =  0.8        ! =T : the Maximum Courant Number allowed
          nn_baro      = 30          ! =F : the number of sub-step in rn_rdt seconds
+      rn_bt_alpha   = 0.         ! Temporal diffusion parameter (if ln_bt_av=F)
 /
 !-----------------------------------------------------------------------

branches/2017/dev_METO_MERCATOR_2017/NEMOGCM/CONFIG/TEST_CASES/cfg.txt

@@ -1 @@
-OVERFLOW OPA_SRC
 WAD OPA_SRC
 LOCK_EXCHANGE OPA_SRC
 SAS_BIPER OPA_SRC SAS_SRC LIM_SRC_3 NST_SRC
 ISOMIP OPA_SRC
+OVERFLOW OPA_SRC
+VORTEX OPA_SRC NST_SRC
+ISOMIP_LONG OPA_SRC
+ISOMIP_32 OPA_SRC