Merge pull request #2 from immerse-project/domcfg_params

malmans2 · web-flow · commit cb6b59bf6fe1 · 2022-02-09T18:23:33.000Z
Better DOMAINcfg settings
diff --git a/cfgs/AGRIF_LINSSH/GSRIDGE36Z-GIBSTRA36Z/1_namelist b/cfgs/AGRIF_LINSSH/GSRIDGE36Z-GIBSTRA36Z/1_namelist
@@ -694,7 +694,7 @@
    ln_agrif_2way   = .true.,  !  activate two way nesting
    ln_init_chfrpar = .false., !  initialize child grids from parent
    ln_vert_remap   = .false., !  use vertical remapping
-   ln_spc_dyn      = .true.,  !  use 0 as special value for dynamics
+   ln_spc_dyn      = .false., !  use 0 as special value for dynamics
    ln_chk_bathy    = .true.,  !  =T  check the parent bathymetry
    rn_sponge_tra   = 0.002   !  coefficient for tracer   sponge layer []
    rn_sponge_dyn   = 0.002   !  coefficient for dynamics sponge layer []
diff --git a/cfgs/AGRIF_LINSSH/GSRIDGE36Z-GIBSTRA36Z/2_namelist b/cfgs/AGRIF_LINSSH/GSRIDGE36Z-GIBSTRA36Z/2_namelist
@@ -694,7 +694,7 @@
    ln_agrif_2way   = .true.,  !  activate two way nesting
    ln_init_chfrpar = .false., !  initialize child grids from parent
    ln_vert_remap   = .false., !  use vertical remapping
-   ln_spc_dyn      = .true.,  !  use 0 as special value for dynamics
+   ln_spc_dyn      = .false., !  use 0 as special value for dynamics
    ln_chk_bathy    = .true.,  !  =T  check the parent bathymetry
    rn_sponge_tra   = 0.002   !  coefficient for tracer   sponge layer []
    rn_sponge_dyn   = 0.002   !  coefficient for dynamics sponge layer []
diff --git a/cfgs/AGRIF_LINSSH/GSRIDGE36Z-GIBSTRA36Z/namelist b/cfgs/AGRIF_LINSSH/GSRIDGE36Z-GIBSTRA36Z/namelist
@@ -694,7 +694,7 @@
    ln_agrif_2way   = .true.,  !  activate two way nesting
    ln_init_chfrpar = .false., !  initialize child grids from parent
    ln_vert_remap   = .false., !  use vertical remapping
-   ln_spc_dyn      = .true.,  !  use 0 as special value for dynamics
+   ln_spc_dyn      = .false., !  use 0 as special value for dynamics
    ln_chk_bathy    = .true.,  !  =T  check the parent bathymetry
    rn_sponge_tra   = 0.002   !  coefficient for tracer   sponge layer []
    rn_sponge_dyn   = 0.002   !  coefficient for dynamics sponge layer []
diff --git a/cfgs/AGRIF_LINSSH/GSRIDGE36Zx2-GIBSTRA36Zx2/1_namelist b/cfgs/AGRIF_LINSSH/GSRIDGE36Zx2-GIBSTRA36Zx2/1_namelist
@@ -694,7 +694,7 @@
    ln_agrif_2way   = .true.,  !  activate two way nesting
    ln_init_chfrpar = .false., !  initialize child grids from parent
    ln_vert_remap   = .true. !  use vertical remapping
-   ln_spc_dyn      = .true.,  !  use 0 as special value for dynamics
+   ln_spc_dyn      = .false., !  use 0 as special value for dynamics
    ln_chk_bathy    = .true.,  !  =T  check the parent bathymetry
    rn_sponge_tra   = 0.002   !  coefficient for tracer   sponge layer []
    rn_sponge_dyn   = 0.002   !  coefficient for dynamics sponge layer []
diff --git a/cfgs/AGRIF_LINSSH/GSRIDGE36Zx2-GIBSTRA36Zx2/2_namelist b/cfgs/AGRIF_LINSSH/GSRIDGE36Zx2-GIBSTRA36Zx2/2_namelist
@@ -694,7 +694,7 @@
    ln_agrif_2way   = .true.,  !  activate two way nesting
    ln_init_chfrpar = .false., !  initialize child grids from parent
    ln_vert_remap   = .true. !  use vertical remapping
-   ln_spc_dyn      = .true.,  !  use 0 as special value for dynamics
+   ln_spc_dyn      = .false., !  use 0 as special value for dynamics
    ln_chk_bathy    = .true.,  !  =T  check the parent bathymetry
    rn_sponge_tra   = 0.002   !  coefficient for tracer   sponge layer []
    rn_sponge_dyn   = 0.002   !  coefficient for dynamics sponge layer []
diff --git a/cfgs/AGRIF_LINSSH/GSRIDGE36Zx2-GIBSTRA36Zx2/namelist b/cfgs/AGRIF_LINSSH/GSRIDGE36Zx2-GIBSTRA36Zx2/namelist
@@ -694,7 +694,7 @@
    ln_agrif_2way   = .true.,  !  activate two way nesting
    ln_init_chfrpar = .false., !  initialize child grids from parent
    ln_vert_remap   = .false., !  use vertical remapping
-   ln_spc_dyn      = .true.,  !  use 0 as special value for dynamics
+   ln_spc_dyn      = .false., !  use 0 as special value for dynamics
    ln_chk_bathy    = .true.,  !  =T  check the parent bathymetry
    rn_sponge_tra   = 0.002   !  coefficient for tracer   sponge layer []
    rn_sponge_dyn   = 0.002   !  coefficient for dynamics sponge layer []
diff --git a/cfgs/AGRIF_QCO/GSRIDGE36Z-GIBSTRA36Z/1_namelist b/cfgs/AGRIF_QCO/GSRIDGE36Z-GIBSTRA36Z/1_namelist
@@ -694,7 +694,7 @@
    ln_agrif_2way   = .true.,  !  activate two way nesting
    ln_init_chfrpar = .false., !  initialize child grids from parent
    ln_vert_remap   = .false., !  use vertical remapping
-   ln_spc_dyn      = .true.,  !  use 0 as special value for dynamics
+   ln_spc_dyn      = .false., !  use 0 as special value for dynamics
    ln_chk_bathy    = .true.,  !  =T  check the parent bathymetry
    rn_sponge_tra   = 0.002   !  coefficient for tracer   sponge layer []
    rn_sponge_dyn   = 0.002   !  coefficient for dynamics sponge layer []
diff --git a/cfgs/AGRIF_QCO/GSRIDGE36Z-GIBSTRA36Z/2_namelist b/cfgs/AGRIF_QCO/GSRIDGE36Z-GIBSTRA36Z/2_namelist
@@ -694,7 +694,7 @@
    ln_agrif_2way   = .true.,  !  activate two way nesting
    ln_init_chfrpar = .false., !  initialize child grids from parent
    ln_vert_remap   = .false., !  use vertical remapping
-   ln_spc_dyn      = .true.,  !  use 0 as special value for dynamics
+   ln_spc_dyn      = .false., !  use 0 as special value for dynamics
    ln_chk_bathy    = .true.,  !  =T  check the parent bathymetry
    rn_sponge_tra   = 0.002   !  coefficient for tracer   sponge layer []
    rn_sponge_dyn   = 0.002   !  coefficient for dynamics sponge layer []
diff --git a/cfgs/AGRIF_QCO/GSRIDGE36Z-GIBSTRA36Z/namelist b/cfgs/AGRIF_QCO/GSRIDGE36Z-GIBSTRA36Z/namelist
@@ -694,7 +694,7 @@
    ln_agrif_2way   = .true.,  !  activate two way nesting
    ln_init_chfrpar = .false., !  initialize child grids from parent
    ln_vert_remap   = .false., !  use vertical remapping
-   ln_spc_dyn      = .true.,  !  use 0 as special value for dynamics
+   ln_spc_dyn      = .false., !  use 0 as special value for dynamics
    ln_chk_bathy    = .true.,  !  =T  check the parent bathymetry
    rn_sponge_tra   = 0.002   !  coefficient for tracer   sponge layer []
    rn_sponge_dyn   = 0.002   !  coefficient for dynamics sponge layer []
diff --git a/cfgs/AGRIF_QCO/GSRIDGE36Zx2-GIBSTRA36Zx2/1_namelist b/cfgs/AGRIF_QCO/GSRIDGE36Zx2-GIBSTRA36Zx2/1_namelist
@@ -694,7 +694,7 @@
    ln_agrif_2way   = .true.,  !  activate two way nesting
    ln_init_chfrpar = .false., !  initialize child grids from parent
    ln_vert_remap   = .true. !  use vertical remapping
-   ln_spc_dyn      = .true.,  !  use 0 as special value for dynamics
+   ln_spc_dyn      = .false., !  use 0 as special value for dynamics
    ln_chk_bathy    = .true.,  !  =T  check the parent bathymetry
    rn_sponge_tra   = 0.002   !  coefficient for tracer   sponge layer []
    rn_sponge_dyn   = 0.002   !  coefficient for dynamics sponge layer []
diff --git a/cfgs/AGRIF_QCO/GSRIDGE36Zx2-GIBSTRA36Zx2/2_namelist b/cfgs/AGRIF_QCO/GSRIDGE36Zx2-GIBSTRA36Zx2/2_namelist
@@ -694,7 +694,7 @@
    ln_agrif_2way   = .true.,  !  activate two way nesting
    ln_init_chfrpar = .false., !  initialize child grids from parent
    ln_vert_remap   = .true. !  use vertical remapping
-   ln_spc_dyn      = .true.,  !  use 0 as special value for dynamics
+   ln_spc_dyn      = .false., !  use 0 as special value for dynamics
    ln_chk_bathy    = .true.,  !  =T  check the parent bathymetry
    rn_sponge_tra   = 0.002   !  coefficient for tracer   sponge layer []
    rn_sponge_dyn   = 0.002   !  coefficient for dynamics sponge layer []
diff --git a/cfgs/AGRIF_QCO/GSRIDGE36Zx2-GIBSTRA36Zx2/namelist b/cfgs/AGRIF_QCO/GSRIDGE36Zx2-GIBSTRA36Zx2/namelist
@@ -694,7 +694,7 @@
    ln_agrif_2way   = .true.,  !  activate two way nesting
    ln_init_chfrpar = .false., !  initialize child grids from parent
    ln_vert_remap   = .false., !  use vertical remapping
-   ln_spc_dyn      = .true.,  !  use 0 as special value for dynamics
+   ln_spc_dyn      = .false., !  use 0 as special value for dynamics
    ln_chk_bathy    = .true.,  !  =T  check the parent bathymetry
    rn_sponge_tra   = 0.002   !  coefficient for tracer   sponge layer []
    rn_sponge_dyn   = 0.002   !  coefficient for dynamics sponge layer []
diff --git a/cfgs/AGRIF_VVL/GSRIDGE36Z-GIBSTRA36Z/1_namelist b/cfgs/AGRIF_VVL/GSRIDGE36Z-GIBSTRA36Z/1_namelist
@@ -694,7 +694,7 @@
    ln_agrif_2way   = .true.,  !  activate two way nesting
    ln_init_chfrpar = .false., !  initialize child grids from parent
    ln_vert_remap   = .false., !  use vertical remapping
-   ln_spc_dyn      = .true.,  !  use 0 as special value for dynamics
+   ln_spc_dyn      = .false., !  use 0 as special value for dynamics
    ln_chk_bathy    = .true.,  !  =T  check the parent bathymetry
    rn_sponge_tra   = 0.002   !  coefficient for tracer   sponge layer []
    rn_sponge_dyn   = 0.002   !  coefficient for dynamics sponge layer []
diff --git a/cfgs/AGRIF_VVL/GSRIDGE36Z-GIBSTRA36Z/2_namelist b/cfgs/AGRIF_VVL/GSRIDGE36Z-GIBSTRA36Z/2_namelist
@@ -694,7 +694,7 @@
    ln_agrif_2way   = .true.,  !  activate two way nesting
    ln_init_chfrpar = .false., !  initialize child grids from parent
    ln_vert_remap   = .false., !  use vertical remapping
-   ln_spc_dyn      = .true.,  !  use 0 as special value for dynamics
+   ln_spc_dyn      = .false., !  use 0 as special value for dynamics
    ln_chk_bathy    = .true.,  !  =T  check the parent bathymetry
    rn_sponge_tra   = 0.002   !  coefficient for tracer   sponge layer []
    rn_sponge_dyn   = 0.002   !  coefficient for dynamics sponge layer []
diff --git a/cfgs/AGRIF_VVL/GSRIDGE36Z-GIBSTRA36Z/namelist b/cfgs/AGRIF_VVL/GSRIDGE36Z-GIBSTRA36Z/namelist
@@ -694,7 +694,7 @@
    ln_agrif_2way   = .true.,  !  activate two way nesting
    ln_init_chfrpar = .false., !  initialize child grids from parent
    ln_vert_remap   = .false., !  use vertical remapping
-   ln_spc_dyn      = .true.,  !  use 0 as special value for dynamics
+   ln_spc_dyn      = .false., !  use 0 as special value for dynamics
    ln_chk_bathy    = .true.,  !  =T  check the parent bathymetry
    rn_sponge_tra   = 0.002   !  coefficient for tracer   sponge layer []
    rn_sponge_dyn   = 0.002   !  coefficient for dynamics sponge layer []
diff --git a/cfgs/AGRIF_VVL/GSRIDGE36Zx2-GIBSTRA36Zx2/1_namelist b/cfgs/AGRIF_VVL/GSRIDGE36Zx2-GIBSTRA36Zx2/1_namelist
@@ -694,7 +694,7 @@
    ln_agrif_2way   = .true.,  !  activate two way nesting
    ln_init_chfrpar = .false., !  initialize child grids from parent
    ln_vert_remap   = .true. !  use vertical remapping
-   ln_spc_dyn      = .true.,  !  use 0 as special value for dynamics
+   ln_spc_dyn      = .false., !  use 0 as special value for dynamics
    ln_chk_bathy    = .true.,  !  =T  check the parent bathymetry
    rn_sponge_tra   = 0.002   !  coefficient for tracer   sponge layer []
    rn_sponge_dyn   = 0.002   !  coefficient for dynamics sponge layer []
diff --git a/cfgs/AGRIF_VVL/GSRIDGE36Zx2-GIBSTRA36Zx2/2_namelist b/cfgs/AGRIF_VVL/GSRIDGE36Zx2-GIBSTRA36Zx2/2_namelist
@@ -694,7 +694,7 @@
    ln_agrif_2way   = .true.,  !  activate two way nesting
    ln_init_chfrpar = .false., !  initialize child grids from parent
    ln_vert_remap   = .true. !  use vertical remapping
-   ln_spc_dyn      = .true.,  !  use 0 as special value for dynamics
+   ln_spc_dyn      = .false., !  use 0 as special value for dynamics
    ln_chk_bathy    = .true.,  !  =T  check the parent bathymetry
    rn_sponge_tra   = 0.002   !  coefficient for tracer   sponge layer []
    rn_sponge_dyn   = 0.002   !  coefficient for dynamics sponge layer []
diff --git a/cfgs/AGRIF_VVL/GSRIDGE36Zx2-GIBSTRA36Zx2/namelist b/cfgs/AGRIF_VVL/GSRIDGE36Zx2-GIBSTRA36Zx2/namelist
@@ -694,7 +694,7 @@
    ln_agrif_2way   = .true.,  !  activate two way nesting
    ln_init_chfrpar = .false., !  initialize child grids from parent
    ln_vert_remap   = .false., !  use vertical remapping
-   ln_spc_dyn      = .true.,  !  use 0 as special value for dynamics
+   ln_spc_dyn      = .false., !  use 0 as special value for dynamics
    ln_chk_bathy    = .true.,  !  =T  check the parent bathymetry
    rn_sponge_tra   = 0.002   !  coefficient for tracer   sponge layer []
    rn_sponge_dyn   = 0.002   !  coefficient for dynamics sponge layer []
diff --git a/cfgs/GLOBAL_QCO/eORCA12/namelist b/cfgs/GLOBAL_QCO/eORCA12/namelist
@@ -694,7 +694,7 @@
    ln_agrif_2way   = .true.,  !  activate two way nesting
    ln_init_chfrpar = .false., !  initialize child grids from parent
    ln_vert_remap   = .false., !  use vertical remapping
-   ln_spc_dyn      = .true.,  !  use 0 as special value for dynamics
+   ln_spc_dyn      = .false., !  use 0 as special value for dynamics
    ln_chk_bathy    = .true.,  !  =T  check the parent bathymetry
    rn_sponge_tra   = 0.002   !  coefficient for tracer   sponge layer []
    rn_sponge_dyn   = 0.002   !  coefficient for dynamics sponge layer []
diff --git a/tools/DOMAINcfg/eORCA12_GSRIDGE36Z-GIBSTRA36Z/1_namelist b/tools/DOMAINcfg/eORCA12_GSRIDGE36Z-GIBSTRA36Z/1_namelist
@@ -83,6 +83,10 @@
    !                       ! =F : e3 analytical derivative of depth function
    !                       !      only there for backward compatibility test with v3.6
    !                       !
+      !                       ! if ln_e3_dep = T 
+      ln_dept_mid = .false.,   ! =T : set T points in the middle of cells 
+      !                       ! =F : e3 analytical depth function
+      !                       !
    cp_cfg      =  'dumb'   !  name of the configuration
    jp_cfg      =       36   !  resolution of the configuration
    jpidta      =     1478   !  1st lateral dimension ( >= jpi )
diff --git a/tools/DOMAINcfg/eORCA12_GSRIDGE36Z-GIBSTRA36Z/2_namelist b/tools/DOMAINcfg/eORCA12_GSRIDGE36Z-GIBSTRA36Z/2_namelist
@@ -83,6 +83,10 @@
    !                       ! =F : e3 analytical derivative of depth function
    !                       !      only there for backward compatibility test with v3.6
    !                       !
+      !                       ! if ln_e3_dep = T 
+      ln_dept_mid = .false.,   ! =T : set T points in the middle of cells 
+      !                       ! =F : e3 analytical depth function
+      !                       !
    cp_cfg      =  'dumb'   !  name of the configuration
    jp_cfg      =       36   !  resolution of the configuration
    jpidta      =     263   !  1st lateral dimension ( >= jpi )
diff --git a/tools/DOMAINcfg/eORCA12_GSRIDGE36Z-GIBSTRA36Z/namelist b/tools/DOMAINcfg/eORCA12_GSRIDGE36Z-GIBSTRA36Z/namelist
@@ -83,6 +83,10 @@
    !                       ! =F : e3 analytical derivative of depth function
    !                       !      only there for backward compatibility test with v3.6
    !                       !
+      !                       ! if ln_e3_dep = T 
+      ln_dept_mid = .false.,   ! =T : set T points in the middle of cells 
+      !                       ! =F : e3 analytical depth function
+      !                       !
    cp_cfg      =  "orca"   !  name of the configuration
    jp_cfg      =       12   !  resolution of the configuration
    jpidta      =     4320   !  1st lateral dimension ( >= jpi )
diff --git a/tools/DOMAINcfg/eORCA12_GSRIDGE36Zx2-GIBSTRA36Zx2/1_namelist b/tools/DOMAINcfg/eORCA12_GSRIDGE36Zx2-GIBSTRA36Zx2/1_namelist
@@ -43,9 +43,9 @@
    rn_scale    =    1.     !  multiplicative factor to account for possibly negative input bathymetry (agrif only) 
    rn_bathy    =    0.     !  value of the bathymetry. if (=0) bottom flat at jpkm1
    nn_msh      =    0      !  create (=1) a mesh file or not (=0)
-   rn_hmin     =   -3.     !  min depth of the ocean (>0) or min number of ocean level (<0)
-   rn_e3zps_min=   20.     !  partial step thickness is set larger than the minimum of
-   rn_e3zps_rat=    0.1    !  rn_e3zps_min and rn_e3zps_rat*e3t, with 0<rn_e3zps_rat<1
+   rn_hmin     =   -8.0     !  min depth of the ocean (>0) or min number of ocean level (<0)
+   rn_e3zps_min=   25.0     !  partial step thickness is set larger than the minimum of
+   rn_e3zps_rat=    0.2    !  rn_e3zps_min and rn_e3zps_rat*e3t, with 0<rn_e3zps_rat<1
                            !
    rn_rdt      = 5760.     !  time step for the dynamics (and tracer if nn_acc=0)
    rn_atfp     =    0.1    !  asselin time filter parameter
@@ -83,6 +83,10 @@
    !                       ! =F : e3 analytical derivative of depth function
    !                       !      only there for backward compatibility test with v3.6
    !                       !
+      !                       ! if ln_e3_dep = T 
+      ln_dept_mid = .false.,   ! =T : set T points in the middle of cells 
+      !                       ! =F : e3 analytical depth function
+      !                       !
    cp_cfg      =  'dumb'   !  name of the configuration
    jp_cfg      =       36   !  resolution of the configuration
    jpidta      =     1478   !  1st lateral dimension ( >= jpi )
diff --git a/tools/DOMAINcfg/eORCA12_GSRIDGE36Zx2-GIBSTRA36Zx2/1_namelist_cfg b/tools/DOMAINcfg/eORCA12_GSRIDGE36Zx2-GIBSTRA36Zx2/1_namelist_cfg
@@ -18,6 +18,9 @@
     ppa2 = 57.857101458,
     ppkth2 = 96.05978744,
     ppacr2 = 39.0,
+    rn_e3zps_min = 25.0,
+    rn_e3zps_rat = 0.2,
+    rn_hmin = -8.0,
 /
 
 &namcfg
diff --git a/tools/DOMAINcfg/eORCA12_GSRIDGE36Zx2-GIBSTRA36Zx2/2_namelist b/tools/DOMAINcfg/eORCA12_GSRIDGE36Zx2-GIBSTRA36Zx2/2_namelist
@@ -43,9 +43,9 @@
    rn_scale    =    1.     !  multiplicative factor to account for possibly negative input bathymetry (agrif only) 
    rn_bathy    =    0.     !  value of the bathymetry. if (=0) bottom flat at jpkm1
    nn_msh      =    0      !  create (=1) a mesh file or not (=0)
-   rn_hmin     =   -3.     !  min depth of the ocean (>0) or min number of ocean level (<0)
-   rn_e3zps_min=   20.     !  partial step thickness is set larger than the minimum of
-   rn_e3zps_rat=    0.1    !  rn_e3zps_min and rn_e3zps_rat*e3t, with 0<rn_e3zps_rat<1
+   rn_hmin     =   -8.0     !  min depth of the ocean (>0) or min number of ocean level (<0)
+   rn_e3zps_min=   25.0     !  partial step thickness is set larger than the minimum of
+   rn_e3zps_rat=    0.2    !  rn_e3zps_min and rn_e3zps_rat*e3t, with 0<rn_e3zps_rat<1
                            !
    rn_rdt      = 5760.     !  time step for the dynamics (and tracer if nn_acc=0)
    rn_atfp     =    0.1    !  asselin time filter parameter
@@ -83,6 +83,10 @@
    !                       ! =F : e3 analytical derivative of depth function
    !                       !      only there for backward compatibility test with v3.6
    !                       !
+      !                       ! if ln_e3_dep = T 
+      ln_dept_mid = .false.,   ! =T : set T points in the middle of cells 
+      !                       ! =F : e3 analytical depth function
+      !                       !
    cp_cfg      =  'dumb'   !  name of the configuration
    jp_cfg      =       36   !  resolution of the configuration
    jpidta      =     263   !  1st lateral dimension ( >= jpi )
diff --git a/tools/DOMAINcfg/eORCA12_GSRIDGE36Zx2-GIBSTRA36Zx2/2_namelist_cfg b/tools/DOMAINcfg/eORCA12_GSRIDGE36Zx2-GIBSTRA36Zx2/2_namelist_cfg
@@ -18,6 +18,9 @@
     ppa2 = 57.857101458,
     ppkth2 = 96.05978744,
     ppacr2 = 39.0,
+    rn_e3zps_min = 25.0,
+    rn_e3zps_rat = 0.2,
+    rn_hmin = -8.0,
 /
 
 &namcfg
diff --git a/tools/DOMAINcfg/eORCA12_GSRIDGE36Zx2-GIBSTRA36Zx2/namelist b/tools/DOMAINcfg/eORCA12_GSRIDGE36Zx2-GIBSTRA36Zx2/namelist
@@ -83,6 +83,10 @@
    !                       ! =F : e3 analytical derivative of depth function
    !                       !      only there for backward compatibility test with v3.6
    !                       !
+      !                       ! if ln_e3_dep = T 
+      ln_dept_mid = .false.,   ! =T : set T points in the middle of cells 
+      !                       ! =F : e3 analytical depth function
+      !                       !
    cp_cfg      =  "orca"   !  name of the configuration
    jp_cfg      =       12   !  resolution of the configuration
    jpidta      =     4320   !  1st lateral dimension ( >= jpi )
