remove some unneeded variables from gnv1_nested

SamuelTrahanNOAA · May 31, 2024 · 6b42c76 · 6b42c76
1 parent ac88fdc
commit 6b42c76
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 26 deletions.
diff --git a/tests/parm/input_global_nest.nml.IN b/tests/parm/input_global_nest.nml.IN
@@ -200,22 +200,19 @@
  imfdeepcnv = @[IMFDEEPCNV_NEST02]
  do_deep = @[DO_DEEP_NEST02]
  ! NOTE: progsigma should be .true. for the global_nest_v1 suite.
- ! The code turns it off automatically at low resolutions (nominally, less than C768 resolution).
- ! That means it would turn off for the regression tests (C96 globe, C384 resolution nest).
- ! Hence, we turn it off manually, to avoid advecting a field of 0.
+ ! The code turns it off automatically at low resolutions.
+ ! This leads to an erronious situation where it is off for the globe, but on for the nest.
+ ! Hence, we turn it off manually, to avoid advecting a field of 0 from the nest boundary.
+ ! For practical global resolutions (C384 or higher) it should be turned on.
  progsigma = @[PROGSIGMA_NEST02]
  betascu = @[BETASCU_NEST02]
  betamcu = @[BETAMCU_NEST02]
  betadcu = @[BETADCU_NEST02]
- betal_deep = @[BETAL_DEEP_NEST02]
- betas_deep = @[BETAS_DEEP_NEST02]
  ras = @[RAS]
  cdmbgwd = @[CDMBWD]
- clam_deep = @[CLAM_DEEP_NEST02]
  prslrd0 = 0.
  ivegsrc = 1
  isot = 1
- elmx = @[ELMX]
  lsoil = 4
  lsm = @[LSM]
  iopt_dveg = @[IOPT_DVEG]
@@ -264,7 +261,6 @@
  cplice = @[CPLICE]
  cplwav = @[CPLWAV]
  cplwav2atm = @[CPLWAV2ATM]
- lndp_type = @[LNDP_TYPE]
 /
 
 &cires_ugwp_nml

diff --git a/tests/parm/input_global_parent.nml.IN b/tests/parm/input_global_parent.nml.IN
@@ -181,7 +181,6 @@
  isubc_sw = 2
  isubc_lw = 2
  isol = 2
- elmx = @[ELMX]
  lwhtr = .true.
  swhtr = .true.
  cnvgwd = @[CNVGWD]
@@ -202,18 +201,16 @@
  imfdeepcnv = @[IMFDEEPCNV]
  do_deep = @[DO_DEEP]
  ! NOTE: progsigma should be .true. for the global_nest_v1 suite.
- ! The code turns it off automatically at low resolutions (nominally, less than C768 resolution).
- ! That means it would turn off for the regression tests (C96 globe, C384 resolution nest).
- ! Hence, we turn it off manually, to avoid advecting a field of 0.
+ ! The code turns it off automatically at low resolutions.
+ ! This leads to an erronious situation where it is off for the globe, but on for the nest.
+ ! Hence, we turn it off manually, to avoid advecting a field of 0 from the nest boundary.
+ ! For practical resolutions (C384 globe or larger), it would be on.
  progsigma = @[PROGSIGMA]
  betascu = @[BETASCU]
  betamcu = @[BETAMCU]
  betadcu = @[BETADCU]
- betal_deep = @[BETAL_DEEP]
- betas_deep = @[BETAS_DEEP]
  ras = @[RAS]
  cdmbgwd = @[CDMBWD_NEST02]
- clam_deep = @[CLAM_DEEP]
  prslrd0 = 0.
  ivegsrc = 1
  isot = 1
@@ -265,7 +262,6 @@
  cplice = @[CPLICE]
  cplwav = @[CPLWAV]
  cplwav2atm = @[CPLWAV2ATM]
- lndp_type = @[LNDP_TYPE]
 /
 
 &fv_nest_nml

diff --git a/tests/tests/gnv1_nested b/tests/tests/gnv1_nested
@@ -206,7 +206,6 @@ export D_EXT=0.0
 export DELT_MAX=0.002
 export DELT_MAX_NEST02=0.008
 export NORD_ZS_FILTER=4
-export LNDP_TYPE=0
 export NGASES=0
 
 export IAER=5111
@@ -247,17 +246,13 @@ export VTDM4=0.04
 export BETADCU=2.0
 export BETAMCU=1.0
 export BETASCU=8.0
-export BETAL_DEEP=0.05
-export BETAS_DEEP=0.05
 export BETADCU_NEST02=8.0
 export BETAMCU_NEST02=1.5
 export BETASCU_NEST02=8.0
 export BETAL_DEEP_NEST02=0.05
 export BETAS_DEEP_NEST02=0.05
 export CDMBWD=20.0,2.5,1.0,1.0
 export CDMBWD_NEST02=5.0,5.0,1.0,1.0
-export CLAM_DEEP=0.15
-export CLAM_DEEP_NEST02=0.1
 export CPL_IMP_MRG=.true.
 export DO_CA=.false.
 export FHLWR=720.
@@ -270,7 +265,6 @@ export SG_CUTOFF=-1.
 export DO_DEEP=.true.
 export DO_DEEP_NEST02=.true.
 export FRAC_GRID=.false.
-export ELMX=300.
 export KNOB_UGWP_TAUAMP=1.5e-3
 export KNOB_UGWP_TAUAMP_NEST02=0.8e-3
 export KNOB_UGWP_DOKDIS=2
@@ -279,10 +273,11 @@ export KNOB_UGWP_VERSION=1
 export KNOB_UGWP_PALAUNCH=275.0e2
 export LIGHTNING_THREAT=.true.
 
-# NOTE: The global_nest_v1 uses prognostic sigma, so this should be
-# .true. HOWEVER, the code turns it off automatically for this
-# resolution. Hence, we turn it off here so we're not advecting a grid
-# of 0. The field_table must match this setting (see below).
+# NOTE: progsigma should be .true. for the global_nest_v1 suite.
+# The code turns it off automatically at low resolutions.
+# This leads to an erronious situation where it is off for the globe, but on for the nest.
+# Hence, we turn it off manually, to avoid advecting a field of 0 from the nest boundary.
+# For practical resolutions (C384 or higher), it would be on.
 export PROGSIGMA=.false.
 export PROGSIGMA_NEST02=.false.