Skip to content

Commit cabe0cd

Browse files
forsyth2forsyth2
authored
Latest NCO removes 3D vars (#717)
1 parent 2523de3 commit cabe0cd

File tree

5 files changed

+21
-12
lines changed

5 files changed

+21
-12
lines changed

‎tests/integration/generated/test_min_case_deprecated_parameters_chrysalis.cfg‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,15 @@ walltime = "00:30:00"
2626
input_files = "eam.h0"
2727
input_subdir = "archive/atm/hist"
2828

29+
[[ land_monthly_climo ]]
30+
frequency = "monthly"
31+
input_files = "elm.h0"
32+
input_subdir = "archive/lnd/hist"
33+
mapping_file = "map_r05_to_cmip6_180x360_aave.20231110.nc"
34+
# DEPRECATED in https://github.com/E3SM-Project/zppy/pull/717
35+
vars_exclude = "H2OSOI,LAKEICEFRAC,O_SCALAR,PCT_LANDUNIT,PCT_NAT_PFT,SOILICE,SOILICE_ICE,SOILLIQ,SOILLIQ_ICE,SOILPSI,T_SCALAR,TLAKE,TSOI,TSOI_ICE,W_SCALAR"
36+
vars = ""
37+
2938
# TODO: Add "tc_analysis" back in after empty dat is resolved.
3039
# [tc_analysis]
3140
# active = True

‎tests/integration/template_min_case_deprecated_parameters.cfg‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,15 @@ walltime = "00:30:00"
2626
input_files = "eam.h0"
2727
input_subdir = "archive/atm/hist"
2828

29+
[[ land_monthly_climo ]]
30+
frequency = "monthly"
31+
input_files = "elm.h0"
32+
input_subdir = "archive/lnd/hist"
33+
mapping_file = "map_r05_to_cmip6_180x360_aave.20231110.nc"
34+
# DEPRECATED in https://github.com/E3SM-Project/zppy/pull/717
35+
vars_exclude = "H2OSOI,LAKEICEFRAC,O_SCALAR,PCT_LANDUNIT,PCT_NAT_PFT,SOILICE,SOILICE_ICE,SOILLIQ,SOILLIQ_ICE,SOILPSI,T_SCALAR,TLAKE,TSOI,TSOI_ICE,W_SCALAR"
36+
vars = ""
37+
2938
# TODO: Add "tc_analysis" back in after empty dat is resolved.
3039
# [tc_analysis]
3140
# active = True

‎tests/test_sections.py‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ def test_sections():
9898
"ts_num_years": 5,
9999
"ts_subsection": "",
100100
"vars": "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,CLDTOT,CLDHGH,CLDMED,CLDLOW,U",
101-
"vars_exclude": "H2OSOI,LAKEICEFRAC,O_SCALAR,PCT_LANDUNIT,PCT_NAT_PFT,SOILICE,SOILICE_ICE,SOILLIQ,SOILLIQ_ICE,SOILPSI,T_SCALAR,TLAKE,TSOI,TSOI_ICE,W_SCALAR",
102101
"walltime": "02:00:00",
103102
"www": "WWWW",
104103
"years": [""],
@@ -164,7 +163,6 @@ def test_sections():
164163
"ts_num_years": 5,
165164
"ts_subsection": "",
166165
"vars": "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT",
167-
"vars_exclude": "H2OSOI,LAKEICEFRAC,O_SCALAR,PCT_LANDUNIT,PCT_NAT_PFT,SOILICE,SOILICE_ICE,SOILLIQ,SOILLIQ_ICE,SOILPSI,T_SCALAR,TLAKE,TSOI,TSOI_ICE,W_SCALAR",
168166
"walltime": "02:00:00",
169167
"www": "WWWW",
170168
"years": ["0001:0020:5"],
@@ -226,7 +224,6 @@ def test_sections():
226224
"ts_num_years": 5,
227225
"ts_subsection": "",
228226
"vars": "",
229-
"vars_exclude": "H2OSOI,LAKEICEFRAC,O_SCALAR,PCT_LANDUNIT,PCT_NAT_PFT,SOILICE,SOILICE_ICE,SOILLIQ,SOILLIQ_ICE,SOILPSI,T_SCALAR,TLAKE,TSOI,TSOI_ICE,W_SCALAR",
230227
"walltime": "02:00:00",
231228
"www": "WWWW",
232229
"years": ["0001:0050:50"],
@@ -288,7 +285,6 @@ def test_subsections():
288285
"ts_num_years": 5,
289286
"ts_subsection": "",
290287
"vars": "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,CLDTOT,CLDHGH,CLDMED,CLDLOW,U",
291-
"vars_exclude": "H2OSOI,LAKEICEFRAC,O_SCALAR,PCT_LANDUNIT,PCT_NAT_PFT,SOILICE,SOILICE_ICE,SOILLIQ,SOILLIQ_ICE,SOILPSI,T_SCALAR,TLAKE,TSOI,TSOI_ICE,W_SCALAR",
292288
"walltime": "02:00:00",
293289
"www": "WWWW",
294290
"years": [""],
@@ -370,7 +366,6 @@ def test_subsections():
370366
"ts_num_years": 5,
371367
"ts_subsection": "",
372368
"vars": "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT",
373-
"vars_exclude": "H2OSOI,LAKEICEFRAC,O_SCALAR,PCT_LANDUNIT,PCT_NAT_PFT,SOILICE,SOILICE_ICE,SOILLIQ,SOILLIQ_ICE,SOILPSI,T_SCALAR,TLAKE,TSOI,TSOI_ICE,W_SCALAR",
374369
"walltime": "02:00:00",
375370
"www": "WWWW",
376371
"years": ["0001:0020:5"],
@@ -418,7 +413,6 @@ def test_subsections():
418413
"ts_num_years": 5,
419414
"ts_subsection": "",
420415
"vars": "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT",
421-
"vars_exclude": "H2OSOI,LAKEICEFRAC,O_SCALAR,PCT_LANDUNIT,PCT_NAT_PFT,SOILICE,SOILICE_ICE,SOILLIQ,SOILLIQ_ICE,SOILPSI,T_SCALAR,TLAKE,TSOI,TSOI_ICE,W_SCALAR",
422416
"walltime": "02:00:00",
423417
"www": "WWWW",
424418
"years": ["0001:0020:10"],
@@ -496,7 +490,6 @@ def test_subsections():
496490
"ts_num_years": 5,
497491
"ts_subsection": "",
498492
"vars": "",
499-
"vars_exclude": "H2OSOI,LAKEICEFRAC,O_SCALAR,PCT_LANDUNIT,PCT_NAT_PFT,SOILICE,SOILICE_ICE,SOILLIQ,SOILLIQ_ICE,SOILPSI,T_SCALAR,TLAKE,TSOI,TSOI_ICE,W_SCALAR",
500493
"walltime": "02:00:00",
501494
"www": "WWWW",
502495
"years": ["0001:0050:50"],
@@ -541,7 +534,6 @@ def test_subsections():
541534
"ts_num_years": 5,
542535
"ts_subsection": "",
543536
"vars": "",
544-
"vars_exclude": "H2OSOI,LAKEICEFRAC,O_SCALAR,PCT_LANDUNIT,PCT_NAT_PFT,SOILICE,SOILICE_ICE,SOILLIQ,SOILLIQ_ICE,SOILPSI,T_SCALAR,TLAKE,TSOI,TSOI_ICE,W_SCALAR",
545537
"walltime": "02:00:00",
546538
"www": "WWWW",
547539
"years": ["0001:0100:50"],

‎zppy/defaults/default.ini‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,9 @@ ts_subsection = string(default="")
8585
# If `vars` is set to "", then climo and ts will process *all* variables.
8686
# This is accomplished by not setting `-v`/`--vars` for `ncclimo`.
8787
vars = string(default="FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,CLDTOT,CLDHGH,CLDMED,CLDLOW,U")
88+
# DEPRECATED: vars_exclude
8889
# This is the list of variables to exclude. It is only used if `vars` is set to "".
89-
vars_exclude = string(default="H2OSOI,LAKEICEFRAC,O_SCALAR,PCT_LANDUNIT,PCT_NAT_PFT,SOILICE,SOILICE_ICE,SOILLIQ,SOILLIQ_ICE,SOILPSI,T_SCALAR,TLAKE,TSOI,TSOI_ICE,W_SCALAR")
90+
# vars_exclude = string(default="H2OSOI,LAKEICEFRAC,O_SCALAR,PCT_LANDUNIT,PCT_NAT_PFT,SOILICE,SOILICE_ICE,SOILLIQ,SOILLIQ_ICE,SOILPSI,T_SCALAR,TLAKE,TSOI,TSOI_ICE,W_SCALAR")
9091
# The maximum time to run
9192
walltime = string(default="02:00:00")
9293
# web_portal_base_path -- NOTE: this parameter is created internally

‎zppy/templates/ts.bash‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,10 @@ if grep -q "*" input.txt; then
6262
fi
6363
# Generate time series files
6464
# If the user-defined parameter "vars" is "", then ${vars}, defined above, will be too.
65-
cat input.txt | ncclimo \
65+
cat input.txt | /home/ac.zender/bin_chrysalis/ncclimo --npo \
6666
-c {{ case }} \
6767
{%- if vars != '' %}
6868
-v ${vars} \
69-
{%- elif 'elm' in input_files %}
70-
--xcl_var -v {{ vars_exclude }} \
7169
{%- endif %}
7270
--split \
7371
{%- if extra_vars != '' %}

0 commit comments

Comments
 (0)