Skip to content

Commit 45e5c38

Browse files
forsyth2forsyth2
authored
Merge pull request #697 from E3SM-Project/improve-land-vars
Improve Land variable handling
2 parents 28da980 + 6f714a5 commit 45e5c38

17 files changed

+560
-6
lines changed

‎tests/integration/generated/test_min_case_global_time_series_original_8_missing_ocn_chrysalis.cfg‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
[default]
2+
case = "v3.LR.historical_0051"
3+
constraint = ""
4+
dry_run = "False"
5+
environment_commands = ""
6+
input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
7+
input_subdir = archive/atm/hist
8+
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
9+
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_missing_ocn_output/unique_id/v3.LR.historical_0051"
10+
partition = "debug"
11+
qos = "regular"
12+
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_missing_ocn_www/unique_id"
13+
14+
[ts]
15+
active = True
16+
walltime = "00:30:00"
17+
18+
[[ atm_monthly_glb ]]
19+
# Note global average won't work for 3D variables.
20+
frequency = "monthly"
21+
input_files = "eam.h0"
22+
input_subdir = "archive/atm/hist"
23+
mapping_file = "glb"
24+
years = "1985:1995:5",
25+
26+
[global_time_series]
27+
active = True
28+
climo_years = "1985-1989", "1990-1995",
29+
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
30+
experiment_name = "v3.LR.historical_0051"
31+
figstr = "v3.LR.historical_0051"
32+
# plots_original -- use the default vars,
33+
# which includes 3 ocean plots that won't work since we're not running mpas_analysis.
34+
# This should cause `skipping because of dependency status file missing`.
35+
ts_num_years = 5
36+
ts_years = "1985-1989", "1985-1995",
37+
walltime = "00:30:00"
38+
years = "1985-1995",

‎tests/integration/generated/test_min_case_global_time_series_viewers_all_land_variables_chrysalis.cfg‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
[default]
2+
case = "v3.LR.historical_0051"
3+
constraint = ""
4+
dry_run = "False"
5+
environment_commands = ""
6+
input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
7+
input_subdir = archive/atm/hist
8+
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
9+
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_all_land_variables_output/unique_id/v3.LR.historical_0051"
10+
partition = "debug"
11+
qos = "regular"
12+
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_all_land_variables_www/unique_id"
13+
14+
[ts]
15+
active = True
16+
walltime = "00:30:00"
17+
years = "1985:1995:5",
18+
19+
[[ atm_monthly_glb ]]
20+
# Note global average won't work for 3D variables.
21+
frequency = "monthly"
22+
input_files = "eam.h0"
23+
input_subdir = "archive/atm/hist"
24+
mapping_file = "glb"
25+
vars = "TREFHT,AODDUST"
26+
27+
[[ lnd_monthly_glb ]]
28+
frequency = "monthly"
29+
input_files = "elm.h0"
30+
input_subdir = "archive/lnd/hist"
31+
mapping_file = "glb"
32+
vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
33+
34+
[global_time_series]
35+
active = True
36+
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
37+
experiment_name = "v3.LR.historical_0051"
38+
figstr = "v3.LR.historical_0051"
39+
make_viewer = True
40+
plots_original=""
41+
plots_atm = "TREFHT"
42+
plots_lnd = "all" # This should prompt global_time_series to attempt plotting all 354 Land variables.
43+
ts_num_years = 5
44+
walltime = "00:30:00"
45+
years = "1985-1995",

‎tests/integration/generated/test_min_case_global_time_series_viewers_chrysalis.cfg‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
[default]
2+
case = "v3.LR.historical_0051"
3+
constraint = ""
4+
dry_run = "False"
5+
environment_commands = ""
6+
input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
7+
input_subdir = archive/atm/hist
8+
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
9+
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_output/unique_id/v3.LR.historical_0051"
10+
partition = "debug"
11+
qos = "regular"
12+
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_www/unique_id"
13+
14+
[ts]
15+
active = True
16+
walltime = "00:30:00"
17+
years = "1985:1995:5",
18+
19+
[[ atm_monthly_glb ]]
20+
# Note global average won't work for 3D variables.
21+
frequency = "monthly"
22+
input_files = "eam.h0"
23+
input_subdir = "archive/atm/hist"
24+
mapping_file = "glb"
25+
vars = "TREFHT,AODDUST"
26+
27+
[[ lnd_monthly_glb ]]
28+
frequency = "monthly"
29+
input_files = "elm.h0"
30+
input_subdir = "archive/lnd/hist"
31+
mapping_file = "glb"
32+
vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
33+
34+
[global_time_series]
35+
active = True
36+
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
37+
experiment_name = "v3.LR.historical_0051"
38+
figstr = "v3.LR.historical_0051"
39+
make_viewer = True
40+
plots_original=""
41+
plots_atm = "TREFHT"
42+
plots_lnd = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
43+
ts_num_years = 5
44+
walltime = "00:30:00"
45+
years = "1985-1995",

‎tests/integration/generated/test_min_case_global_time_series_viewers_original_8_chrysalis.cfg‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
[default]
2+
case = "v3.LR.historical_0051"
3+
constraint = ""
4+
dry_run = "False"
5+
environment_commands = ""
6+
input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
7+
input_subdir = archive/atm/hist
8+
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
9+
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_8_output/unique_id/v3.LR.historical_0051"
10+
partition = "debug"
11+
qos = "regular"
12+
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_8_www/unique_id"
13+
14+
[ts]
15+
active = True
16+
walltime = "00:30:00"
17+
18+
[[ atm_monthly_glb ]]
19+
# Note global average won't work for 3D variables.
20+
frequency = "monthly"
21+
input_files = "eam.h0"
22+
input_subdir = "archive/atm/hist"
23+
mapping_file = "glb"
24+
years = "1985:1995:5",
25+
26+
[mpas_analysis]
27+
active = True
28+
anomalyRefYear = 1985
29+
climo_years = "1985-1989", "1990-1995",
30+
enso_years = "1985-1989", "1990-1995",
31+
mesh = "IcoswISC30E3r5"
32+
parallelTaskCount = 6
33+
partition = "compute"
34+
qos = "regular"
35+
shortTermArchive = True
36+
ts_years = "1985-1989", "1985-1995",
37+
walltime = "00:30:00"
38+
39+
[global_time_series]
40+
active = True
41+
climo_years = "1985-1989", "1990-1995",
42+
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
43+
experiment_name = "v3.LR.historical_0051"
44+
figstr = "v3.LR.historical_0051"
45+
make_viewer = True
46+
moc_file=mocTimeSeries_1985-1995.nc
47+
ts_num_years = 5
48+
ts_years = "1985-1989", "1985-1995",
49+
walltime = "00:30:00"
50+
years = "1985-1995",

‎tests/integration/generated/test_min_case_global_time_series_viewers_original_atm_plus_land_chrysalis.cfg‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
[default]
2+
case = "v3.LR.historical_0051"
3+
constraint = ""
4+
dry_run = "False"
5+
environment_commands = ""
6+
input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
7+
input_subdir = archive/atm/hist
8+
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
9+
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_atm_plus_land_output/unique_id/v3.LR.historical_0051"
10+
partition = "debug"
11+
qos = "regular"
12+
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_atm_plus_land_www/unique_id"
13+
14+
[ts]
15+
active = True
16+
walltime = "00:30:00"
17+
years = "1985:1995:5",
18+
19+
[[ atm_monthly_glb ]]
20+
# Note global average won't work for 3D variables.
21+
frequency = "monthly"
22+
input_files = "eam.h0"
23+
input_subdir = "archive/atm/hist"
24+
mapping_file = "glb"
25+
26+
[[ lnd_monthly_glb ]]
27+
frequency = "monthly"
28+
input_files = "elm.h0"
29+
input_subdir = "archive/lnd/hist"
30+
mapping_file = "glb"
31+
vars = "" # Get all available variables
32+
33+
[global_time_series]
34+
active = True
35+
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
36+
experiment_name = "v3.LR.historical_0051"
37+
figstr = "v3.LR.historical_0051"
38+
make_viewer = True
39+
# We have to set plots_original to the 5 plots that don't require ocean.
40+
plots_original="net_toa_flux_restom,global_surface_air_temperature,toa_radiation,net_atm_energy_imbalance,net_atm_water_imbalance"
41+
plots_atm = "TREFHT"
42+
plots_lnd = "FSH,RH2M,LAISHA,LAISUN"
43+
ts_num_years = 5
44+
walltime = "00:30:00"
45+
years = "1985-1995",

‎tests/integration/generated/test_min_case_global_time_series_viewers_undefined_variables_chrysalis.cfg‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
[default]
2+
case = "v3.LR.historical_0051"
3+
constraint = ""
4+
dry_run = "False"
5+
environment_commands = ""
6+
input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
7+
input_subdir = archive/atm/hist
8+
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
9+
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_undefined_variables_output/unique_id/v3.LR.historical_0051"
10+
partition = "debug"
11+
qos = "regular"
12+
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_undefined_variables_www/unique_id"
13+
14+
[ts]
15+
active = True
16+
walltime = "00:30:00"
17+
years = "1985:1995:5",
18+
19+
[[ atm_monthly_glb ]]
20+
# Note global average won't work for 3D variables.
21+
frequency = "monthly"
22+
input_files = "eam.h0"
23+
input_subdir = "archive/atm/hist"
24+
mapping_file = "glb"
25+
vars = "TREFHT,AODDUST"
26+
27+
[[ lnd_monthly_glb ]]
28+
frequency = "monthly"
29+
input_files = "elm.h0"
30+
input_subdir = "archive/lnd/hist"
31+
mapping_file = "glb"
32+
vars = "" # This should prompt NCO to process all available variables.
33+
34+
[global_time_series]
35+
active = True
36+
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
37+
experiment_name = "v3.LR.historical_0051"
38+
figstr = "v3.LR.historical_0051"
39+
make_viewer = True
40+
partition = "compute"
41+
plots_original=""
42+
plots_atm = "TREFHT"
43+
plots_lnd = "all" # This should prompt global_time_series to attempt plotting all 354 Land variables.
44+
qos = "regular"
45+
ts_num_years = 5
46+
walltime = "04:00:00"
47+
years = "1985-1995",

‎tests/integration/template_min_case_global_time_series_original_8_missing_ocn.cfg‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
[default]
2+
case = "#expand case_name#"
3+
constraint = "#expand constraint#"
4+
dry_run = "#expand dry_run#"
5+
environment_commands = "#expand environment_commands#"
6+
input = #expand user_input_v3#/E3SMv3/#expand case_name#
7+
input_subdir = archive/atm/hist
8+
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
9+
output = "#expand user_output#zppy_min_case_global_time_series_original_8_missing_ocn_output/#expand unique_id#/#expand case_name#"
10+
partition = "#expand partition_short#"
11+
qos = "#expand qos_short#"
12+
www = "#expand user_www#zppy_min_case_global_time_series_original_8_missing_ocn_www/#expand unique_id#"
13+
14+
[ts]
15+
active = True
16+
walltime = "00:30:00"
17+
18+
[[ atm_monthly_glb ]]
19+
# Note global average won't work for 3D variables.
20+
frequency = "monthly"
21+
input_files = "eam.h0"
22+
input_subdir = "archive/atm/hist"
23+
mapping_file = "glb"
24+
years = "1985:1995:5",
25+
26+
[global_time_series]
27+
active = True
28+
climo_years = "1985-1989", "1990-1995",
29+
environment_commands = "#expand global_time_series_environment_commands#"
30+
experiment_name = "#expand case_name#"
31+
figstr = "#expand case_name#"
32+
# plots_original -- use the default vars,
33+
# which includes 3 ocean plots that won't work since we're not running mpas_analysis.
34+
# This should cause `skipping because of dependency status file missing`.
35+
ts_num_years = 5
36+
ts_years = "1985-1989", "1985-1995",
37+
walltime = "00:30:00"
38+
years = "1985-1995",

‎tests/integration/template_min_case_global_time_series_viewers.cfg‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
[default]
2+
case = "#expand case_name#"
3+
constraint = "#expand constraint#"
4+
dry_run = "#expand dry_run#"
5+
environment_commands = "#expand environment_commands#"
6+
input = #expand user_input_v3#/E3SMv3/#expand case_name#
7+
input_subdir = archive/atm/hist
8+
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
9+
output = "#expand user_output#zppy_min_case_global_time_series_viewers_output/#expand unique_id#/#expand case_name#"
10+
partition = "#expand partition_short#"
11+
qos = "#expand qos_short#"
12+
www = "#expand user_www#zppy_min_case_global_time_series_viewers_www/#expand unique_id#"
13+
14+
[ts]
15+
active = True
16+
walltime = "00:30:00"
17+
years = "1985:1995:5",
18+
19+
[[ atm_monthly_glb ]]
20+
# Note global average won't work for 3D variables.
21+
frequency = "monthly"
22+
input_files = "eam.h0"
23+
input_subdir = "archive/atm/hist"
24+
mapping_file = "glb"
25+
vars = "TREFHT,AODDUST"
26+
27+
[[ lnd_monthly_glb ]]
28+
frequency = "monthly"
29+
input_files = "elm.h0"
30+
input_subdir = "archive/lnd/hist"
31+
mapping_file = "glb"
32+
vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
33+
34+
[global_time_series]
35+
active = True
36+
environment_commands = "#expand global_time_series_environment_commands#"
37+
experiment_name = "#expand case_name#"
38+
figstr = "#expand case_name#"
39+
make_viewer = True
40+
plots_original=""
41+
plots_atm = "TREFHT"
42+
plots_lnd = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
43+
ts_num_years = 5
44+
walltime = "00:30:00"
45+
years = "1985-1995",

0 commit comments

Comments
 (0)