Skip to content

Commit 6b42c76

Browse files
remove some unneeded variables from gnv1_nested
1 parent ac88fdc commit 6b42c76

File tree

3 files changed

+13
-26
lines changed

3 files changed

+13
-26
lines changed

tests/parm/input_global_nest.nml.IN

+4-8
Original file line numberDiff line numberDiff line change
@@ -200,22 +200,19 @@
200200
imfdeepcnv = @[IMFDEEPCNV_NEST02]
201201
do_deep = @[DO_DEEP_NEST02]
202202
! NOTE: progsigma should be .true. for the global_nest_v1 suite.
203-
! The code turns it off automatically at low resolutions (nominally, less than C768 resolution).
204-
! That means it would turn off for the regression tests (C96 globe, C384 resolution nest).
205-
! Hence, we turn it off manually, to avoid advecting a field of 0.
203+
! The code turns it off automatically at low resolutions.
204+
! This leads to an erronious situation where it is off for the globe, but on for the nest.
205+
! Hence, we turn it off manually, to avoid advecting a field of 0 from the nest boundary.
206+
! For practical global resolutions (C384 or higher) it should be turned on.
206207
progsigma = @[PROGSIGMA_NEST02]
207208
betascu = @[BETASCU_NEST02]
208209
betamcu = @[BETAMCU_NEST02]
209210
betadcu = @[BETADCU_NEST02]
210-
betal_deep = @[BETAL_DEEP_NEST02]
211-
betas_deep = @[BETAS_DEEP_NEST02]
212211
ras = @[RAS]
213212
cdmbgwd = @[CDMBWD]
214-
clam_deep = @[CLAM_DEEP_NEST02]
215213
prslrd0 = 0.
216214
ivegsrc = 1
217215
isot = 1
218-
elmx = @[ELMX]
219216
lsoil = 4
220217
lsm = @[LSM]
221218
iopt_dveg = @[IOPT_DVEG]
@@ -264,7 +261,6 @@
264261
cplice = @[CPLICE]
265262
cplwav = @[CPLWAV]
266263
cplwav2atm = @[CPLWAV2ATM]
267-
lndp_type = @[LNDP_TYPE]
268264
/
269265

270266
&cires_ugwp_nml

tests/parm/input_global_parent.nml.IN

+4-8
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@
181181
isubc_sw = 2
182182
isubc_lw = 2
183183
isol = 2
184-
elmx = @[ELMX]
185184
lwhtr = .true.
186185
swhtr = .true.
187186
cnvgwd = @[CNVGWD]
@@ -202,18 +201,16 @@
202201
imfdeepcnv = @[IMFDEEPCNV]
203202
do_deep = @[DO_DEEP]
204203
! NOTE: progsigma should be .true. for the global_nest_v1 suite.
205-
! The code turns it off automatically at low resolutions (nominally, less than C768 resolution).
206-
! That means it would turn off for the regression tests (C96 globe, C384 resolution nest).
207-
! Hence, we turn it off manually, to avoid advecting a field of 0.
204+
! The code turns it off automatically at low resolutions.
205+
! This leads to an erronious situation where it is off for the globe, but on for the nest.
206+
! Hence, we turn it off manually, to avoid advecting a field of 0 from the nest boundary.
207+
! For practical resolutions (C384 globe or larger), it would be on.
208208
progsigma = @[PROGSIGMA]
209209
betascu = @[BETASCU]
210210
betamcu = @[BETAMCU]
211211
betadcu = @[BETADCU]
212-
betal_deep = @[BETAL_DEEP]
213-
betas_deep = @[BETAS_DEEP]
214212
ras = @[RAS]
215213
cdmbgwd = @[CDMBWD_NEST02]
216-
clam_deep = @[CLAM_DEEP]
217214
prslrd0 = 0.
218215
ivegsrc = 1
219216
isot = 1
@@ -265,7 +262,6 @@
265262
cplice = @[CPLICE]
266263
cplwav = @[CPLWAV]
267264
cplwav2atm = @[CPLWAV2ATM]
268-
lndp_type = @[LNDP_TYPE]
269265
/
270266

271267
&fv_nest_nml

tests/tests/gnv1_nested

+5-10
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ export D_EXT=0.0
206206
export DELT_MAX=0.002
207207
export DELT_MAX_NEST02=0.008
208208
export NORD_ZS_FILTER=4
209-
export LNDP_TYPE=0
210209
export NGASES=0
211210

212211
export IAER=5111
@@ -247,17 +246,13 @@ export VTDM4=0.04
247246
export BETADCU=2.0
248247
export BETAMCU=1.0
249248
export BETASCU=8.0
250-
export BETAL_DEEP=0.05
251-
export BETAS_DEEP=0.05
252249
export BETADCU_NEST02=8.0
253250
export BETAMCU_NEST02=1.5
254251
export BETASCU_NEST02=8.0
255252
export BETAL_DEEP_NEST02=0.05
256253
export BETAS_DEEP_NEST02=0.05
257254
export CDMBWD=20.0,2.5,1.0,1.0
258255
export CDMBWD_NEST02=5.0,5.0,1.0,1.0
259-
export CLAM_DEEP=0.15
260-
export CLAM_DEEP_NEST02=0.1
261256
export CPL_IMP_MRG=.true.
262257
export DO_CA=.false.
263258
export FHLWR=720.
@@ -270,7 +265,6 @@ export SG_CUTOFF=-1.
270265
export DO_DEEP=.true.
271266
export DO_DEEP_NEST02=.true.
272267
export FRAC_GRID=.false.
273-
export ELMX=300.
274268
export KNOB_UGWP_TAUAMP=1.5e-3
275269
export KNOB_UGWP_TAUAMP_NEST02=0.8e-3
276270
export KNOB_UGWP_DOKDIS=2
@@ -279,10 +273,11 @@ export KNOB_UGWP_VERSION=1
279273
export KNOB_UGWP_PALAUNCH=275.0e2
280274
export LIGHTNING_THREAT=.true.
281275

282-
# NOTE: The global_nest_v1 uses prognostic sigma, so this should be
283-
# .true. HOWEVER, the code turns it off automatically for this
284-
# resolution. Hence, we turn it off here so we're not advecting a grid
285-
# of 0. The field_table must match this setting (see below).
276+
# NOTE: progsigma should be .true. for the global_nest_v1 suite.
277+
# The code turns it off automatically at low resolutions.
278+
# This leads to an erronious situation where it is off for the globe, but on for the nest.
279+
# Hence, we turn it off manually, to avoid advecting a field of 0 from the nest boundary.
280+
# For practical resolutions (C384 or higher), it would be on.
286281
export PROGSIGMA=.false.
287282
export PROGSIGMA_NEST02=.false.
288283

0 commit comments

Comments
 (0)