Skip to content

Commit bc41d88

Browse files
SamuelTrahanNOAASamuelTrahanNOAA
committed
minor revisions for clarity and debugging
1. Remove duplicate variables. 2. Disable progsigma since the model disables it internally anyway. (Due to resolution) 3. Add some _NEST02 variables 4. Enable some gravity wave diagnostics 5. Write restart at time 1 and validate output at time 2. This way we can reduce the run length to 2 hours 6. Increase the run length to 24 hours, with hourly output, for debugging. Should shorten run length before merge.
1 parent 280ef90 commit bc41d88

File tree

3 files changed

+105
-59
lines changed

3 files changed

+105
-59
lines changed

‎tests/parm/diag_table/diag_additional_ldiag3d_ugwp

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Diagnostic variables for Unified Gravity Wave Physics (UGWP)
2+
"gfs_phys", "dws3dt_ogw", "dws3dt_ogw", "fv3_history2d", "all", .false., "none", 2
3+
"gfs_phys", "dws3dt_obl", "dws3dt_obl", "fv3_history2d", "all", .false., "none", 2
4+
"gfs_phys", "dws3dt_oss", "dws3dt_oss", "fv3_history2d", "all", .false., "none", 2
5+
"gfs_phys", "dws3dt_ofd", "dws3dt_ofd", "fv3_history2d", "all", .false., "none", 2
6+
"gfs_phys", "ldu3dt_ogw", "ldu3dt_ogw", "fv3_history2d", "all", .false., "none", 2
7+
"gfs_phys", "ldu3dt_obl", "ldu3dt_obl", "fv3_history2d", "all", .false., "none", 2
8+
"gfs_phys", "ldu3dt_oss", "ldu3dt_oss", "fv3_history2d", "all", .false., "none", 2
9+
"gfs_phys", "ldu3dt_ofd", "ldu3dt_ofd", "fv3_history2d", "all", .false., "none", 2
10+
"gfs_phys", "ldu3dt_ngw", "ldu3dt_ngw", "fv3_history2d", "all", .false., "none", 2
11+
"gfs_phys", "ldv3dt_ngw", "ldv3dt_ngw", "fv3_history2d", "all", .false., "none", 2
12+
"gfs_phys", "ldt3dt_ngw", "ldt3dt_ngw", "fv3_history2d", "all", .false., "none", 2
13+
14+
"gfs_phys", "dudt_ogw", "dudt_ogw", "fv3_history2d", "all", .false., "none", 2
15+
"gfs_phys", "dvdt_ogw", "dvdt_ogw", "fv3_history2d", "all", .false., "none", 2
16+
"gfs_phys", "dudt_obl", "dudt_obl", "fv3_history2d", "all", .false., "none", 2
17+
"gfs_phys", "dvdt_obl", "dvdt_obl", "fv3_history2d", "all", .false., "none", 2
18+
"gfs_phys", "dudt_oss", "dudt_oss", "fv3_history2d", "all", .false., "none", 2
19+
"gfs_phys", "dvdt_oss", "dvdt_oss", "fv3_history2d", "all", .false., "none", 2
20+
"gfs_phys", "dudt_ofd", "dudt_ofd", "fv3_history2d", "all", .false., "none", 2
21+
"gfs_phys", "dvdt_ofd", "dvdt_ofd", "fv3_history2d", "all", .false., "none", 2
22+
"gfs_phys", "du_ogwcol", "du_ogwcol", "fv3_history2d", "all", .false., "none", 2
23+
"gfs_phys", "dv_ogwcol", "dv_ogwcol", "fv3_history2d", "all", .false., "none", 2
24+
"gfs_phys", "du_oblcol", "du_oblcol", "fv3_history2d", "all", .false., "none", 2
25+
"gfs_phys", "dv_oblcol", "dv_oblcol", "fv3_history2d", "all", .false., "none", 2
26+
"gfs_phys", "du_osscol", "du_osscol", "fv3_history2d", "all", .false., "none", 2
27+
"gfs_phys", "dv_osscol", "dv_osscol", "fv3_history2d", "all", .false., "none", 2
28+
"gfs_phys", "du_ofdcol", "du_ofdcol", "fv3_history2d", "all", .false., "none", 2
29+
"gfs_phys", "dv_ofdcol", "dv_ofdcol", "fv3_history2d", "all", .false., "none", 2
30+
"gfs_phys", "du3_ogwcol", "du3_ogwcol", "fv3_history2d", "all", .false., "none", 2
31+
"gfs_phys", "dv3_ogwcol", "dv3_ogwcol", "fv3_history2d", "all", .false., "none", 2
32+
"gfs_phys", "du3_oblcol", "du3_oblcol", "fv3_history2d", "all", .false., "none", 2
33+
"gfs_phys", "dv3_oblcol", "dv3_oblcol", "fv3_history2d", "all", .false., "none", 2
34+
"gfs_phys", "du3_osscol", "du3_osscol", "fv3_history2d", "all", .false., "none", 2
35+
"gfs_phys", "dv3_osscol", "dv3_osscol", "fv3_history2d", "all", .false., "none", 2
36+
"gfs_phys", "du3_ofdcol", "du3_ofdcol", "fv3_history2d", "all", .false., "none", 2
37+
"gfs_phys", "dv3_ofdcol", "dv3_ofdcol", "fv3_history2d", "all", .false., "none", 2
38+

‎tests/parm/input_global_nest.nml.IN

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
n_zs_filter = @[N_ZS_FILTER_NEST02]
4242
nudge_qv = .false.
4343
nudge_dz = .false.
44-
tau = @[FV_CORE_TAU]
45-
rf_cutoff = @[RF_CUTOFF]
44+
tau = @[FV_CORE_TAU_NEST02]
45+
rf_cutoff = @[RF_CUTOFF_NEST02]
4646
rf_fast = @[RF_FAST]
4747
sg_cutoff = @[SG_CUTOFF]
4848
upoff = @[UPOFF]
@@ -90,7 +90,7 @@
9090
dry_mass = @[DRY_MASS]
9191
consv_te = @[CONSV_TE_NEST02]
9292
do_sat_adj = @[DO_SAT_ADJ]
93-
fast_tau_w_sec = @[FAST_TAU_W_SEC]
93+
fast_tau_w_sec = @[FAST_TAU_W_SEC_NEST02]
9494
consv_am = .false.
9595
fill = .true.
9696
full_zs_filter = @[FULL_ZS_FILTER]

‎tests/tests/gnv1_nested

+64-56
Original file line numberDiff line numberDiff line change
@@ -8,48 +8,48 @@ export TEST_DESCR="Compare rotated C96 global with 1 nest and atmosphere only gl
88

99
export CNTL_DIR=gnv1_nested
1010

11-
export LIST_FILES="atmf006.nc \
12-
sfcf006.nc \
13-
atm.nest02.f006.nc \
14-
sfc.nest02.f006.nc \
15-
RESTART/20230224.120000.coupler.res \
16-
RESTART/20230224.120000.fv_core.res.nc \
17-
RESTART/20230224.120000.fv_core.res.nest02.nc \
18-
RESTART/20230224.120000.fv_core.res.nest02.tile7.nc \
19-
RESTART/20230224.120000.fv_core.res.tile1.nc \
20-
RESTART/20230224.120000.fv_core.res.tile2.nc \
21-
RESTART/20230224.120000.fv_core.res.tile3.nc \
22-
RESTART/20230224.120000.fv_core.res.tile4.nc \
23-
RESTART/20230224.120000.fv_core.res.tile5.nc \
24-
RESTART/20230224.120000.fv_core.res.tile6.nc \
25-
RESTART/20230224.120000.fv_srf_wnd.res.nest02.tile7.nc \
26-
RESTART/20230224.120000.fv_srf_wnd.res.tile1.nc \
27-
RESTART/20230224.120000.fv_srf_wnd.res.tile2.nc \
28-
RESTART/20230224.120000.fv_srf_wnd.res.tile3.nc \
29-
RESTART/20230224.120000.fv_srf_wnd.res.tile4.nc \
30-
RESTART/20230224.120000.fv_srf_wnd.res.tile5.nc \
31-
RESTART/20230224.120000.fv_srf_wnd.res.tile6.nc \
32-
RESTART/20230224.120000.fv_tracer.res.nest02.tile7.nc \
33-
RESTART/20230224.120000.fv_tracer.res.tile1.nc \
34-
RESTART/20230224.120000.fv_tracer.res.tile2.nc \
35-
RESTART/20230224.120000.fv_tracer.res.tile3.nc \
36-
RESTART/20230224.120000.fv_tracer.res.tile4.nc \
37-
RESTART/20230224.120000.fv_tracer.res.tile5.nc \
38-
RESTART/20230224.120000.fv_tracer.res.tile6.nc \
39-
RESTART/20230224.120000.phy_data.nest02.tile7.nc \
40-
RESTART/20230224.120000.phy_data.tile1.nc \
41-
RESTART/20230224.120000.phy_data.tile2.nc \
42-
RESTART/20230224.120000.phy_data.tile3.nc \
43-
RESTART/20230224.120000.phy_data.tile4.nc \
44-
RESTART/20230224.120000.phy_data.tile5.nc \
45-
RESTART/20230224.120000.phy_data.tile6.nc \
46-
RESTART/20230224.120000.sfc_data.nest02.tile7.nc \
47-
RESTART/20230224.120000.sfc_data.tile1.nc \
48-
RESTART/20230224.120000.sfc_data.tile2.nc \
49-
RESTART/20230224.120000.sfc_data.tile3.nc \
50-
RESTART/20230224.120000.sfc_data.tile4.nc \
51-
RESTART/20230224.120000.sfc_data.tile5.nc \
52-
RESTART/20230224.120000.sfc_data.tile6.nc \
11+
export LIST_FILES="atmf002.nc \
12+
sfcf002.nc \
13+
atm.nest02.f002.nc \
14+
sfc.nest02.f002.nc \
15+
RESTART/20230224.010000.coupler.res \
16+
RESTART/20230224.010000.fv_core.res.nc \
17+
RESTART/20230224.010000.fv_core.res.nest02.nc \
18+
RESTART/20230224.010000.fv_core.res.nest02.tile7.nc \
19+
RESTART/20230224.010000.fv_core.res.tile1.nc \
20+
RESTART/20230224.010000.fv_core.res.tile2.nc \
21+
RESTART/20230224.010000.fv_core.res.tile3.nc \
22+
RESTART/20230224.010000.fv_core.res.tile4.nc \
23+
RESTART/20230224.010000.fv_core.res.tile5.nc \
24+
RESTART/20230224.010000.fv_core.res.tile6.nc \
25+
RESTART/20230224.010000.fv_srf_wnd.res.nest02.tile7.nc \
26+
RESTART/20230224.010000.fv_srf_wnd.res.tile1.nc \
27+
RESTART/20230224.010000.fv_srf_wnd.res.tile2.nc \
28+
RESTART/20230224.010000.fv_srf_wnd.res.tile3.nc \
29+
RESTART/20230224.010000.fv_srf_wnd.res.tile4.nc \
30+
RESTART/20230224.010000.fv_srf_wnd.res.tile5.nc \
31+
RESTART/20230224.010000.fv_srf_wnd.res.tile6.nc \
32+
RESTART/20230224.010000.fv_tracer.res.nest02.tile7.nc \
33+
RESTART/20230224.010000.fv_tracer.res.tile1.nc \
34+
RESTART/20230224.010000.fv_tracer.res.tile2.nc \
35+
RESTART/20230224.010000.fv_tracer.res.tile3.nc \
36+
RESTART/20230224.010000.fv_tracer.res.tile4.nc \
37+
RESTART/20230224.010000.fv_tracer.res.tile5.nc \
38+
RESTART/20230224.010000.fv_tracer.res.tile6.nc \
39+
RESTART/20230224.010000.phy_data.nest02.tile7.nc \
40+
RESTART/20230224.010000.phy_data.tile1.nc \
41+
RESTART/20230224.010000.phy_data.tile2.nc \
42+
RESTART/20230224.010000.phy_data.tile3.nc \
43+
RESTART/20230224.010000.phy_data.tile4.nc \
44+
RESTART/20230224.010000.phy_data.tile5.nc \
45+
RESTART/20230224.010000.phy_data.tile6.nc \
46+
RESTART/20230224.010000.sfc_data.nest02.tile7.nc \
47+
RESTART/20230224.010000.sfc_data.tile1.nc \
48+
RESTART/20230224.010000.sfc_data.tile2.nc \
49+
RESTART/20230224.010000.sfc_data.tile3.nc \
50+
RESTART/20230224.010000.sfc_data.tile4.nc \
51+
RESTART/20230224.010000.sfc_data.tile5.nc \
52+
RESTART/20230224.010000.sfc_data.tile6.nc \
5353
RESTART/fv_BC_ne.res.nest02.nc \
5454
RESTART/fv_BC_sw.res.nest02.nc"
5555

@@ -63,10 +63,10 @@ export SYEAR=2023
6363
export SMONTH=02
6464
export SDAY=24
6565
export SHOUR=00
66-
export FHMAX=18
66+
export FHMAX=24
6767
export FHROT=0
6868
export DT_ATMOS=300
69-
export RESTART_INTERVAL='12 -1'
69+
export RESTART_INTERVAL='1 -1'
7070
export WRITE_GROUP=2
7171
export WRTTASK_PER_GROUP=12
7272
export WRITE_DOPOST=.true.
@@ -82,7 +82,7 @@ export JCHUNK3D=-1
8282
export KCHUNK3D=1
8383
export IMO=384
8484
export JMO=192
85-
export OUTPUT_FH='6 -1'
85+
export OUTPUT_FH='1 -1'
8686
export NTILES=6
8787

8888
export OUTPUT_GRID_2=regional_latlon
@@ -113,7 +113,18 @@ export NPY=97
113113
export NPZ=127
114114
export DNATS=0
115115
export DO_SAT_ADJ=.false.
116+
117+
export FV_CORE_TAU=0.
118+
export RF_CUTOFF=10.
116119
export FAST_TAU_W_SEC=0.2
120+
121+
export LDIAG3D=.true.
122+
export LDIAG_UGWP=.true.
123+
124+
export FV_CORE_TAU_NEST02=$FV_CORE_TAU
125+
export RF_CUTOFF_NEST02=$RF_CUTOFF
126+
export FAST_TAU_W_SEC_NEST02=$FAST_TAU_W_SEC
127+
117128
export TARGET_LON=-135.0
118129
export TARGET_LAT=32.5
119130
export TWOWAYNEST02=.true.
@@ -145,14 +156,10 @@ export LSEASPRAY=.false.
145156
export IMFDEEPCNV=5
146157
export IMFDEEPCNV_NEST02=5
147158
export PROGSIGMA=.false.
148-
export PROGSIGMA_NEST02=.true.
149-
export BETASCU=0.5
150-
export BETAMCU=1.5
151-
export BETADCU=8.0
159+
export PROGSIGMA_NEST02=.false.
152160
export IOPT_DIAG=1
153161
export NSTF_NAME=2,0,0,0,0
154162
export EFFR_IN=.true.
155-
export RF_CUTOFF=10.0
156163
export RES_LATLON_DYNAMICS='""'
157164
export DOGP_CLDOPTICS_LUT=.false.
158165
export DOGP_LWSCAT=.false.
@@ -204,15 +211,15 @@ export PSM_BC_NEST02=1
204211
export UPOFF=2
205212
export VTDM4=0.04
206213
export BETADCU=2.0
207-
export BETAL_DEEP=0.05
208214
export BETAMCU=1.0
209-
export BETAS_DEEP=0.05
210215
export BETASCU=8.0
216+
export BETAL_DEEP=0.05
217+
export BETAS_DEEP=0.05
211218
export BETADCU_NEST02=8.0
212-
export BETAL_DEEP_NEST02=0.05
213219
export BETAMCU_NEST02=1.5
214-
export BETAS_DEEP_NEST02=0.05
215220
export BETASCU_NEST02=8.0
221+
export BETAL_DEEP_NEST02=0.05
222+
export BETAS_DEEP_NEST02=0.05
216223
export CDMBWD=20.0,2.5,1.0,1.0
217224
export CDMBWD_NEST02=5.0,5.0,1.0,1.0
218225
export CLAM_DEEP=0.15
@@ -229,7 +236,7 @@ export DO_DEEP=.true.
229236
export DO_DEEP_NEST02=.true.
230237
export FRAC_GRID=.false.
231238
export ELMX=300.
232-
export KNOB_UGWP_TAUAMP=3.0e-3
239+
export KNOB_UGWP_TAUAMP=1.5e-3
233240
export KNOB_UGWP_TAUAMP_NEST02=0.8e-3
234241
export KNOB_UGWP_DOKDIS=2
235242
export KNOB_UGWP_NDX4LH=4
@@ -273,6 +280,7 @@ export MODEL_CONFIGURE=model_configure_gnv1.IN
273280
export INPUT_NML=input_global_parent.nml.IN
274281
export INPUT_NEST02_NML=input_global_nest.nml.IN
275282
export TILEDFIX=.true.
276-
export FIELD_TABLE=field_table_thompson_aero_tke_progsigma
283+
export FIELD_TABLE=field_table_thompson_aero_tke
284+
export DIAG_TABLE_ADDITIONAL=diag_additional_ldiag3d_ugwp
277285

278286
ATM_compute_tasks=$(( INPES*JNPES*NTILES + INPES_NEST02*JNPES_NEST02 ))

0 commit comments

Comments
 (0)