Skip to content

Commit 380328e

Browse files
forsyth2forsyth2
committed
Improved example cfgs
1 parent 3edb4e8 commit 380328e

File tree

8 files changed

+39
-28
lines changed

8 files changed

+39
-28
lines changed

‎examples/post.v3.LR.amip.0101.cfg‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
# 5. Then, you can run those lines stand-alone.
88
[default]
99
input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/AMIP/v3.LR.amip_0101
10-
output = /lcrc/group/e3sm/ac.forsyth2/zppy_pmp_amip/unique_id_20251009_2/v3.LR.amip_0101
11-
www = /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_pmp_amip/unique_id_20251009_2
10+
output = /lcrc/group/e3sm/ac.forsyth2/zppy_pmp_amip/unique_id_20251009_3/v3.LR.amip_0101
11+
www = /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_pmp_amip/unique_id_20251009_3
1212
campaign = "water_cycle"
1313
case = v3.LR.amip_0101
1414
debug = True
@@ -36,7 +36,6 @@ walltime = "00:10:00"
3636
years = "2005:2015:5"
3737

3838
[[ atm_monthly_180x360_aave ]]
39-
cmip_plevdata = "/lcrc/group/e3sm/ac.szhang/acme_scratch/e3sm_project/zppy/zppy/templates/inclusions/e3sm_to_cmip/vrt_remap_plev19.nc"
4039
input_files = "eam.h0"
4140
interp_vars = "U,V,T,Z3"
4241
ts_subsection = "atm_monthly_180x360_aave"

‎examples/post.v3.LR.historical.0101.cfg‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[default]
22
input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0101
3-
output = /lcrc/group/e3sm/ac.forsyth2/zppy_pmp_hist/unique_id_20251009_2/v3.LR.amip_0101
4-
www = /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_pmp_hist/unique_id_20251009_2
3+
output = /lcrc/group/e3sm/ac.forsyth2/zppy_pmp_hist/unique_id_20251009_3/v3.LR.hist_0101
4+
www = /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_pmp_hist/unique_id_20251009_3
55
campaign = "water_cycle"
66
case = v3.LR.historical_0101
77
debug = True
@@ -29,7 +29,6 @@ walltime = "00:10:00"
2929
years = "2005:2015:5"
3030

3131
[[ atm_monthly_180x360_aave ]]
32-
cmip_plevdata = "/lcrc/group/e3sm/ac.szhang/acme_scratch/e3sm_project/zppy/zppy/templates/inclusions/e3sm_to_cmip/vrt_remap_plev19.nc"
3332
input_files = "eam.h0"
3433
interp_vars = "U,V,T,Z3"
3534
ts_subsection = "atm_monthly_180x360_aave"

‎tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ infer_section_parameters = False
1010
input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
1111
input_subdir = archive/atm/hist
1212
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
13-
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_test_20251009_2/v3.LR.historical_0051"
13+
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_test_20251009_3a/v3.LR.historical_0051"
1414
partition = "debug"
1515
qos = "regular"
16-
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/unique_id_test_20251009_2"
16+
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/unique_id_test_20251009_3a"
1717
years = "1985:1989:2",
1818

1919
[climo]
@@ -100,7 +100,9 @@ ts_num_years=2
100100
walltime = "00:30:00"
101101

102102
[[ atm_monthly_180x360_aave ]]
103-
cmip_plevdata = "/lcrc/group/e3sm/ac.szhang/acme_scratch/e3sm_project/zppy/zppy/templates/inclusions/e3sm_to_cmip/vrt_remap_plev19.nc"
103+
cmip_plevdata = "/lcrc/group/e3sm/diagnostics/e3sm_to_cmip_data/maps/vrt_remap_plev19.nc"
104+
# Remove rlutcs
105+
cmip_vars = "ua, va, ta, wa, zg, hur, tas, ts, psl, ps, sfcWind, huss, pr, prc, prsn, evspsbl, tauu, tauv, hfls, clt, rlds, rlus, rsds, rsus, hfss, clivi, clwvi, prw, rldscs, rlut, rsdt, rsuscs, rsut, rsutcs, rtmt, abs550aer, od550aer, rsdscs, tasmax, tasmin"
104106
input_files = "eam.h0"
105107
ts_subsection = "atm_monthly_180x360_aave"
106108
vars = "ICEFRAC,LANDFRAC,OCNFRAC,PSL,FSNTC,FSNTOAC,SWCF,LWCF,FLUT,FSNT,FSNTOA,FLNT,FLNTC,FSNS,FLNS,FSNS,SHFLX,QFLX,LHFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,U10,QREFHT,TMQ,CLDTOT,CLDHGH,CLDMED,CLDLOW,FLDS,FSDS,TGCLDIWP,TGCLDCWP,TGCLDLWP,FLNSC,FLUTC,FSDSC,SOLIN,FSNSC,AODABS,AODVIS,AODDUST,AREL,TREFMNAV,TREFMXAV,PS,PHIS,U,V,T,Z3"
@@ -172,16 +174,16 @@ tc_obs = "/lcrc/group/e3sm/diagnostics/observations/Atm/tc-analysis/"
172174
tag = "model_vs_model"
173175
ts_num_years_ref = 2
174176
# Reference paths
175-
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_test_20251009_2/v3.LR.historical_0051/post/atm/180x360_aave/clim"
177+
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_test_20251009_3a/v3.LR.historical_0051/post/atm/180x360_aave/clim"
176178
# mvm streamflow only
177179
gauges_path = "/lcrc/group/e3sm/diagnostics/observations/Atm/time-series/GSIM/GSIM_catchment_characteristics_all_1km2.csv"
178-
reference_data_path_ts_rof = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_test_20251009_2/v3.LR.historical_0051/post/rof/native/ts/monthly"
180+
reference_data_path_ts_rof = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_test_20251009_3a/v3.LR.historical_0051/post/rof/native/ts/monthly"
179181
# mvm diurnal_cycle only
180-
reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_test_20251009_2/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily"
182+
reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_test_20251009_3a/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily"
181183
# mvm "enso_diags", "qbo", "area_mean_time_series"
182-
reference_data_path_ts = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_test_20251009_2/v3.LR.historical_0051/post/atm/180x360_aave/ts/monthly"
184+
reference_data_path_ts = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_test_20251009_3a/v3.LR.historical_0051/post/atm/180x360_aave/ts/monthly"
183185
# mvm tropical_subseasonal only
184-
reference_data_path_ts_daily = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_test_20251009_2/v3.LR.historical_0051/post/atm/180x360_aave/ts/daily"
186+
reference_data_path_ts_daily = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_test_20251009_3a/v3.LR.historical_0051/post/atm/180x360_aave/ts/daily"
185187

186188
[[ lnd_monthly_mvm_lnd ]]
187189
# Test model-vs-model using the same files as the reference
@@ -197,7 +199,7 @@ tc_obs = "/lcrc/group/e3sm/diagnostics/observations/Atm/tc-analysis/"
197199
tag = "model_vs_model"
198200
ts_num_years_ref = 2
199201
# Reference paths
200-
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_test_20251009_2/v3.LR.historical_0051/post/lnd/180x360_aave/clim"
202+
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_test_20251009_3a/v3.LR.historical_0051/post/lnd/180x360_aave/clim"
201203

202204
[mpas_analysis]
203205
active = False
@@ -333,6 +335,8 @@ ts_years = "1985-1994",
333335
ref_final_yr = 1994
334336
ref_start_yr = 1985
335337
ref_years = "1985-1994",
338+
# Remove rlutcs
339+
cmip_vars = "pr,prw,psl,rlds,rldscs,rlut,rsut,rsutcs,rsds,rsdscs,rsdt,rsus,rsuscs,rlus,rtmt,sfcWind,tas,tauu,tauv,ts,ta,ua,va,zg"
336340
target_grid = "2.5x2.5"
337341
target_grid_string = "2p5x2p5"
338342
clim_vars = "pr,prw,psl,rlds,rldscs,rltcre,rstcre,rsus,rsuscs,rlus,rlut,rsds,rsdscs,rsdt,rsut,rsutcs,rtmt,sfcWind,tas,tauu,tauv,ts,ta-200,ta-850,ua-200,ua-850,va-200,va-850,zg-500"

‎tests/integration/generated/update_weekly_expected_files_chrysalis.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ do
3535
# Copy output so you don't have to rerun zppy to generate the output.
3636
if [[ "${test_name,,}" =~ "v2" ]]; then
3737
# We need the v2 case name
38-
cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/unique_id_test_20251009_2/v2.LR.historical_0201 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name}
38+
cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/unique_id_test_20251009_3a/v2.LR.historical_0201 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name}
3939
else
4040
# We need the v3 case name
41-
cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/unique_id_test_20251009_2/v3.LR.historical_0051 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name}
41+
cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/unique_id_test_20251009_3a/v3.LR.historical_0051 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name}
4242
fi
4343

4444
# test_bundles.py also needs the bash files transferred.
4545
# Note that for legacy cfgs, we're only testing test_images.py
4646
if [[ "${test_name,,}" == "bundles" ]]; then
4747
mkdir -p /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files
48-
cp -r /lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/unique_id_test_20251009_2/v3.LR.historical_0051/post/scripts/bundle*.bash /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files
48+
cp -r /lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/unique_id_test_20251009_3a/v3.LR.historical_0051/post/scripts/bundle*.bash /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files
4949
fi
5050

5151
zppy_top_level=$(pwd)

‎tests/integration/template_weekly_comprehensive_v3.cfg‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,9 @@ ts_num_years=2
100100
walltime = "00:30:00"
101101

102102
[[ atm_monthly_180x360_aave ]]
103-
cmip_plevdata = "/lcrc/group/e3sm/ac.szhang/acme_scratch/e3sm_project/zppy/zppy/templates/inclusions/e3sm_to_cmip/vrt_remap_plev19.nc"
103+
cmip_plevdata = "#expand diagnostics_base_path#/e3sm_to_cmip_data/maps/vrt_remap_plev19.nc"
104+
# Remove rlutcs
105+
cmip_vars = "ua, va, ta, wa, zg, hur, tas, ts, psl, ps, sfcWind, huss, pr, prc, prsn, evspsbl, tauu, tauv, hfls, clt, rlds, rlus, rsds, rsus, hfss, clivi, clwvi, prw, rldscs, rlut, rsdt, rsuscs, rsut, rsutcs, rtmt, abs550aer, od550aer, rsdscs, tasmax, tasmin"
104106
input_files = "eam.h0"
105107
ts_subsection = "atm_monthly_180x360_aave"
106108
vars = "ICEFRAC,LANDFRAC,OCNFRAC,PSL,FSNTC,FSNTOAC,SWCF,LWCF,FLUT,FSNT,FSNTOA,FLNT,FLNTC,FSNS,FLNS,FSNS,SHFLX,QFLX,LHFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,U10,QREFHT,TMQ,CLDTOT,CLDHGH,CLDMED,CLDLOW,FLDS,FSDS,TGCLDIWP,TGCLDCWP,TGCLDLWP,FLNSC,FLUTC,FSDSC,SOLIN,FSNSC,AODABS,AODVIS,AODDUST,AREL,TREFMNAV,TREFMXAV,PS,PHIS,U,V,T,Z3"
@@ -333,6 +335,8 @@ ts_years = "1985-1994",
333335
ref_final_yr = 1994
334336
ref_start_yr = 1985
335337
ref_years = "1985-1994",
338+
# Remove rlutcs
339+
cmip_vars = "pr,prw,psl,rlds,rldscs,rlut,rsut,rsutcs,rsds,rsdscs,rsdt,rsus,rsuscs,rlus,rtmt,sfcWind,tas,tauu,tauv,ts,ta,ua,va,zg"
336340
target_grid = "2.5x2.5"
337341
target_grid_string = "2p5x2p5"
338342
clim_vars = "pr,prw,psl,rlds,rldscs,rltcre,rstcre,rsus,rsuscs,rlus,rlut,rsds,rsdscs,rsdt,rsut,rsutcs,rtmt,sfcWind,tas,tauu,tauv,ts,ta-200,ta-850,ua-200,ua-850,va-200,va-850,zg-500"

‎tests/integration/utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"tasks_to_run": [
2222
"pcmdi_diags",
2323
],
24-
"unique_id": "unique_id_test_20251009_2",
24+
"unique_id": "unique_id_test_20251009_3a",
2525
}
2626

2727
# Multi-machine testing #########################################################

‎zppy/e3sm_to_cmip.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def e3sm_to_cmip(config: ConfigObj, script_dir: str, existing_bundles, job_ids_f
3939
check_parameters_for_bash(c)
4040
c["cmor_tables_prefix"] = c["diagnostics_base_path"]
4141
if c["component"] == "atm":
42-
default_cmip_plevdata = f"{c['diagnostics_base_path']}/vrt_remap_plev19.nc"
42+
default_cmip_plevdata = f"{c['diagnostics_base_path']}/e3sm_to_cmip_data/maps/vrt_remap_plev19.nc"
4343
set_value_of_parameter_if_undefined(
4444
c,
4545
"cmip_plevdata",

‎zppy/templates/e3sm_to_cmip.bash‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,13 @@ EOF
3737
if [ -f ${file} ]; then
3838
#ncks --rgr xtr_mth=mss_val --vrt_fl='{{cmip_plevdata}}' ${file} ${file}.plev
3939
ncremap -p mpi --vrt_ntp=log --vrt_xtr=mss_val --vrt_out='{{cmip_plevdata}}' ${file} ${file}.plev
40+
if [ $? != 0 ]; then
41+
cd {{ scriptDir }}
42+
echo 'ERROR (1)' > {{ prefix }}.status
43+
exit 1
44+
fi
4045
#overwrite the model level data
41-
mv ${file}.plev ${file}
46+
mv ${file}.plev ${file}
4247
fi
4348
done
4449
done
@@ -63,25 +68,25 @@ EOF
6368

6469
if [ $? != 0 ]; then
6570
cd {{ scriptDir }}
66-
echo 'ERROR (1)' > {{ prefix }}.status
67-
exit 1
71+
echo 'ERROR (2)' > {{ prefix }}.status
72+
exit 2
6873
fi
6974

7075
# Move output ts files to final destination
7176
mv ${dest_cmip}/${tmp_dir}/CMIP6/CMIP/*/*/*/*/*/*/*/*/*.nc ${dest_cmip}
7277
if [ $? != 0 ]; then
7378
cd {{ scriptDir }}
74-
echo 'ERROR (2)' > {{ prefix }}.status
75-
exit 2
79+
echo 'ERROR (3)' > {{ prefix }}.status
80+
exit 3
7681
fi
7782

7883
rm -r ${dest_cmip}/${tmp_dir}
7984

8085
}
8186
if [ $? != 0 ]; then
8287
cd {{ scriptDir }}
83-
echo 'ERROR (3)' > {{ prefix }}.status
84-
exit 3
88+
echo 'ERROR (4)' > {{ prefix }}.status
89+
exit 4
8590
fi
8691

8792
# Delete temporary workdir

0 commit comments

Comments
 (0)