Skip to content

Commit 4c6779c

Browse files
forsyth2forsyth2
committed
Remove cdscan for e3sm_diags
1 parent 44d6069 commit 4c6779c

File tree

3 files changed

+300
-18
lines changed

3 files changed

+300
-18
lines changed

‎tests/integration/generated/test_debug_chrysalis.cfg‎

Lines changed: 149 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
[default]
2+
case = v2.LR.historical_0201
3+
constraint = ""
4+
dry_run = "False"
5+
environment_commands = ""
6+
input = "/lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201"
7+
input_subdir = archive/atm/hist
8+
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
9+
# To run this test, edit `output` and `www` in this file, along with `actual_images_dir` in test_debug.py
10+
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_debug_output/unique_id/v2.LR.historical_0201"
11+
partition = "debug"
12+
qos = "regular"
13+
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_debug_www/unique_id"
14+
15+
[climo]
16+
active = True
17+
walltime = "00:30:00"
18+
years = "1850:1854:2", "1850:1854:4",
19+
20+
[[ atm_monthly_180x360_aave ]]
21+
frequency = "monthly"
22+
input_files = "eam.h0"
23+
input_subdir = "archive/atm/hist"
24+
vars = ""
25+
26+
[[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
27+
frequency = "diurnal_8xdaily"
28+
input_files = "eam.h4"
29+
input_subdir = "archive/atm/hist"
30+
vars = "PRECT"
31+
32+
[[ land_monthly_climo ]]
33+
frequency = "monthly"
34+
input_files = "elm.h0"
35+
input_subdir = "archive/lnd/hist"
36+
vars = ""
37+
38+
[ts]
39+
active = True
40+
e3sm_to_cmip_environment_commands = ""
41+
walltime = "00:30:00"
42+
years = "1850:1854:2",
43+
44+
[[ atm_monthly_180x360_aave ]]
45+
frequency = "monthly"
46+
input_files = "eam.h0"
47+
input_subdir = "archive/atm/hist"
48+
ts_fmt = "cmip"
49+
50+
[[ atm_daily_180x360_aave ]]
51+
frequency = "daily"
52+
input_files = "eam.h1"
53+
input_subdir = "archive/atm/hist"
54+
vars = "PRECT"
55+
56+
[[ atm_monthly_glb ]]
57+
# Note global average won't work for 3D variables.
58+
frequency = "monthly"
59+
input_files = "eam.h0"
60+
input_subdir = "archive/atm/hist"
61+
mapping_file = "glb"
62+
years = "1850:1860:5",
63+
64+
[[ land_monthly ]]
65+
e3sm_to_cmip_environment_commands = ""
66+
extra_vars = "landfrac"
67+
frequency = "monthly"
68+
input_files = "elm.h0"
69+
input_subdir = "archive/lnd/hist"
70+
vars = "LAISHA,LAISUN"
71+
ts_fmt = "cmip"
72+
73+
[[ lnd_monthly_glb ]]
74+
frequency = "monthly"
75+
input_files = "elm.h0"
76+
input_subdir = "archive/lnd/hist"
77+
mapping_file = "glb"
78+
vars = "LAISHA,LAISUN"
79+
years = "1850:1860:5",
80+
81+
[[ rof_monthly ]]
82+
extra_vars = 'areatotal2'
83+
frequency = "monthly"
84+
input_files = "mosart.h0"
85+
input_subdir = "archive/rof/hist"
86+
mapping_file = ""
87+
vars = "RIVER_DISCHARGE_OVER_LAND_LIQ"
88+
89+
[e3sm_diags]
90+
active = True
91+
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
92+
grid = '180x360_aave'
93+
ref_final_yr = 2014
94+
ref_start_yr = 1985
95+
# TODO: this directory is missing OMI-MLS
96+
sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","enso_diags","qbo","diurnal_cycle","annual_cycle_zonal_mean","streamflow", "zonal_mean_2d_stratosphere",
97+
short_name = 'v2.LR.historical_0201'
98+
ts_num_years = 2
99+
walltime = "00:30:00"
100+
years = "1850:1854:2", "1850:1854:4",
101+
102+
[[ atm_monthly_180x360_aave ]]
103+
climo_diurnal_frequency = "diurnal_8xdaily"
104+
climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave"
105+
partition = "compute"
106+
qos = "regular"
107+
sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","enso_diags","qbo","diurnal_cycle","annual_cycle_zonal_mean","streamflow", "zonal_mean_2d_stratosphere",
108+
walltime = "5:00:00"
109+
110+
[[ atm_monthly_180x360_aave_mvm ]]
111+
# Test model-vs-model using the same files as the reference
112+
climo_diurnal_frequency = "diurnal_8xdaily"
113+
climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave"
114+
climo_subsection = "atm_monthly_180x360_aave"
115+
diff_title = "Difference"
116+
partition = "compute"
117+
qos = "regular"
118+
ref_final_yr = 1851
119+
ref_name = "v2.LR.historical_0201"
120+
ref_start_yr = 1850
121+
ref_years = "1850-1851",
122+
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_debug_output/unique_id/v2.LR.historical_0201/post/atm/180x360_aave/clim"
123+
run_type = "model_vs_model"
124+
short_ref_name = "v2.LR.historical_0201"
125+
swap_test_ref = False
126+
tag = "model_vs_model"
127+
ts_num_years_ref = 2
128+
ts_subsection = "atm_monthly_180x360_aave"
129+
walltime = "5:00:00"
130+
years = "1852-1853",
131+
132+
[[ lnd_monthly_mvm_lnd ]]
133+
# Test model-vs-model using the same files as the reference
134+
climo_subsection = "land_monthly_climo"
135+
diff_title = "Difference"
136+
#grid = 'native'
137+
partition = "compute"
138+
qos = "regular"
139+
ref_final_yr = 1851
140+
ref_name = "v2.LR.historical_0201"
141+
ref_start_yr = 1850
142+
ref_years = "1850-1851",
143+
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_debug_output/unique_id/v2.LR.historical_0201/post/lnd/180x360_aave/clim"
144+
run_type = "model_vs_model"
145+
sets = "lat_lon_land",
146+
short_ref_name = "same simulation"
147+
swap_test_ref = False
148+
tag = "model_vs_model"
149+
ts_num_years_ref = 2

‎tests/integration/template_debug.cfg‎

Lines changed: 149 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
[default]
2+
case = v2.LR.historical_0201
3+
constraint = "#expand constraint#"
4+
dry_run = "#expand dry_run#"
5+
environment_commands = "#expand environment_commands#"
6+
input = "#expand user_input#/E3SMv2/v2.LR.historical_0201"
7+
input_subdir = archive/atm/hist
8+
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
9+
# To run this test, edit `output` and `www` in this file, along with `actual_images_dir` in test_debug.py
10+
output = "#expand user_output#zppy_test_debug_output/#expand unique_id#/v2.LR.historical_0201"
11+
partition = "#expand partition_short#"
12+
qos = "#expand qos_short#"
13+
www = "#expand user_www#zppy_test_debug_www/#expand unique_id#"
14+
15+
[climo]
16+
active = True
17+
walltime = "00:30:00"
18+
years = "1850:1854:2", "1850:1854:4",
19+
20+
[[ atm_monthly_180x360_aave ]]
21+
frequency = "monthly"
22+
input_files = "eam.h0"
23+
input_subdir = "archive/atm/hist"
24+
vars = ""
25+
26+
[[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
27+
frequency = "diurnal_8xdaily"
28+
input_files = "eam.h4"
29+
input_subdir = "archive/atm/hist"
30+
vars = "PRECT"
31+
32+
[[ land_monthly_climo ]]
33+
frequency = "monthly"
34+
input_files = "elm.h0"
35+
input_subdir = "archive/lnd/hist"
36+
vars = ""
37+
38+
[ts]
39+
active = True
40+
e3sm_to_cmip_environment_commands = "#expand e3sm_to_cmip_environment_commands#"
41+
walltime = "00:30:00"
42+
years = "1850:1854:2",
43+
44+
[[ atm_monthly_180x360_aave ]]
45+
frequency = "monthly"
46+
input_files = "eam.h0"
47+
input_subdir = "archive/atm/hist"
48+
ts_fmt = "cmip"
49+
50+
[[ atm_daily_180x360_aave ]]
51+
frequency = "daily"
52+
input_files = "eam.h1"
53+
input_subdir = "archive/atm/hist"
54+
vars = "PRECT"
55+
56+
[[ atm_monthly_glb ]]
57+
# Note global average won't work for 3D variables.
58+
frequency = "monthly"
59+
input_files = "eam.h0"
60+
input_subdir = "archive/atm/hist"
61+
mapping_file = "glb"
62+
years = "1850:1860:5",
63+
64+
[[ land_monthly ]]
65+
e3sm_to_cmip_environment_commands = "#expand e3sm_to_cmip_environment_commands#"
66+
extra_vars = "landfrac"
67+
frequency = "monthly"
68+
input_files = "elm.h0"
69+
input_subdir = "archive/lnd/hist"
70+
vars = "LAISHA,LAISUN"
71+
ts_fmt = "cmip"
72+
73+
[[ lnd_monthly_glb ]]
74+
frequency = "monthly"
75+
input_files = "elm.h0"
76+
input_subdir = "archive/lnd/hist"
77+
mapping_file = "glb"
78+
vars = "LAISHA,LAISUN"
79+
years = "1850:1860:5",
80+
81+
[[ rof_monthly ]]
82+
extra_vars = 'areatotal2'
83+
frequency = "monthly"
84+
input_files = "mosart.h0"
85+
input_subdir = "archive/rof/hist"
86+
mapping_file = ""
87+
vars = "RIVER_DISCHARGE_OVER_LAND_LIQ"
88+
89+
[e3sm_diags]
90+
active = True
91+
environment_commands = "#expand diags_environment_commands#"
92+
grid = '180x360_aave'
93+
ref_final_yr = 2014
94+
ref_start_yr = 1985
95+
# TODO: this directory is missing OMI-MLS
96+
sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","enso_diags","qbo","diurnal_cycle","annual_cycle_zonal_mean","streamflow", "zonal_mean_2d_stratosphere",
97+
short_name = 'v2.LR.historical_0201'
98+
ts_num_years = 2
99+
walltime = "00:30:00"
100+
years = "1850:1854:2", "1850:1854:4",
101+
102+
[[ atm_monthly_180x360_aave ]]
103+
climo_diurnal_frequency = "diurnal_8xdaily"
104+
climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave"
105+
partition = "#expand partition_long#"
106+
qos = "#expand qos_long#"
107+
sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","enso_diags","qbo","diurnal_cycle","annual_cycle_zonal_mean","streamflow", "zonal_mean_2d_stratosphere",
108+
walltime = "#expand diags_walltime#"
109+
110+
[[ atm_monthly_180x360_aave_mvm ]]
111+
# Test model-vs-model using the same files as the reference
112+
climo_diurnal_frequency = "diurnal_8xdaily"
113+
climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave"
114+
climo_subsection = "atm_monthly_180x360_aave"
115+
diff_title = "Difference"
116+
partition = "#expand partition_long#"
117+
qos = "#expand qos_long#"
118+
ref_final_yr = 1851
119+
ref_name = "v2.LR.historical_0201"
120+
ref_start_yr = 1850
121+
ref_years = "1850-1851",
122+
reference_data_path = "#expand user_output#zppy_test_debug_output/#expand unique_id#/v2.LR.historical_0201/post/atm/180x360_aave/clim"
123+
run_type = "model_vs_model"
124+
short_ref_name = "v2.LR.historical_0201"
125+
swap_test_ref = False
126+
tag = "model_vs_model"
127+
ts_num_years_ref = 2
128+
ts_subsection = "atm_monthly_180x360_aave"
129+
walltime = "#expand diags_walltime#"
130+
years = "1852-1853",
131+
132+
[[ lnd_monthly_mvm_lnd ]]
133+
# Test model-vs-model using the same files as the reference
134+
climo_subsection = "land_monthly_climo"
135+
diff_title = "Difference"
136+
#grid = 'native'
137+
partition = "#expand partition_long#"
138+
qos = "#expand qos_long#"
139+
ref_final_yr = 1851
140+
ref_name = "v2.LR.historical_0201"
141+
ref_start_yr = 1850
142+
ref_years = "1850-1851",
143+
reference_data_path = "#expand user_output#zppy_test_debug_output/#expand unique_id#/v2.LR.historical_0201/post/lnd/180x360_aave/clim"
144+
run_type = "model_vs_model"
145+
sets = "lat_lon_land",
146+
short_ref_name = "same simulation"
147+
swap_test_ref = False
148+
tag = "model_vs_model"
149+
ts_num_years_ref = 2

‎zppy/templates/e3sm_diags.bash‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -101,19 +101,9 @@ create_links_ts()
101101
YYYY=`printf "%04d" ${year}`
102102
for file in ${ts_dir_source}/${v}_${YYYY}*.nc
103103
do
104-
# Add this time series file to the list of files for cdscan to use
105-
echo ${file} >> ${v}_files.txt
104+
cp ${file} ${ts_dir_destination}/${v}_${YYYY}*.nc
106105
done
107106
done
108-
# xml file will cover the whole period from year1 to year2
109-
xml_name=${v}_${begin_year}01_${end_year}12.xml
110-
export CDMS_NO_MPI=true
111-
cdscan -x ${xml_name} -f ${v}_files.txt
112-
if [ $? != 0 ]; then
113-
cd {{ scriptDir }}
114-
echo "ERROR (${error_num})" > {{ prefix }}.status
115-
exit ${error_num}
116-
fi
117107
done
118108
cd ..
119109
}
@@ -128,13 +118,7 @@ create_links_ts_rof()
128118
mkdir -p ${ts_rof_dir_destination}
129119
cd ${ts_rof_dir_destination}
130120
v="RIVER_DISCHARGE_OVER_LAND_LIQ"
131-
xml_name=${v}_${begin_year}01_${end_year}12.xml
132-
cdscan -x ${xml_name} ${ts_rof_dir_source}/${v}_*.nc
133-
if [ $? != 0 ]; then
134-
cd {{ scriptDir }}
135-
echo "ERROR (${error_num})" > {{ prefix }}.status
136-
exit ${error_num}
137-
fi
121+
cp ${ts_rof_dir_source}/${v}_*.nc ${v}_*.nc
138122
cd ..
139123
}
140124

0 commit comments

Comments
 (0)