Improve Land variable handling

tests/integration/generated/test_min_case_global_time_series_original_8_missing_ocn_chrysalis.cfg

@@ -0,0 +1,38 @@
+[default]
+case = "v3.LR.historical_0051"
+constraint = ""
+dry_run = "False"
+environment_commands = ""
+input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
+input_subdir = archive/atm/hist
+mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_missing_ocn_output/unique_id/v3.LR.historical_0051"
+partition = "debug"
+qos = "regular"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_missing_ocn_www/unique_id"
+
+[ts]
+active = True
+walltime = "00:30:00"
+
+  [[ atm_monthly_glb ]]
+  # Note global average won't work for 3D variables.
+  frequency = "monthly"
+  input_files = "eam.h0"
+  input_subdir = "archive/atm/hist"
+  mapping_file = "glb"
+  years = "1985:1995:5",
+
+[global_time_series]
+active = True
+climo_years = "1985-1989", "1990-1995",
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
+experiment_name = "v3.LR.historical_0051"
+figstr = "v3.LR.historical_0051"
+# plots_original -- use the default vars,
+# which includes 3 ocean plots that won't work since we're not running mpas_analysis.
+# This should cause `skipping because of dependency status file missing`.
+ts_num_years = 5
+ts_years = "1985-1989", "1985-1995",
+walltime = "00:30:00"
+years = "1985-1995",

tests/integration/generated/test_min_case_global_time_series_viewers_all_land_variables_chrysalis.cfg

@@ -0,0 +1,45 @@
+[default]
+case = "v3.LR.historical_0051"
+constraint = ""
+dry_run = "False"
+environment_commands = ""
+input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
+input_subdir = archive/atm/hist
+mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_all_land_variables_output/unique_id/v3.LR.historical_0051"
+partition = "debug"
+qos = "regular"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_all_land_variables_www/unique_id"
+
+[ts]
+active = True
+walltime = "00:30:00"
+years = "1985:1995:5",
+
+  [[ atm_monthly_glb ]]
+  # Note global average won't work for 3D variables.
+  frequency = "monthly"
+  input_files = "eam.h0"
+  input_subdir = "archive/atm/hist"
+  mapping_file = "glb"
+  vars = "TREFHT,AODDUST"
+
+  [[ lnd_monthly_glb ]]
+  frequency = "monthly"
+  input_files = "elm.h0"
+  input_subdir = "archive/lnd/hist"
+  mapping_file = "glb"
+  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"
+
+[global_time_series]
+active = True
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
+experiment_name = "v3.LR.historical_0051"
+figstr = "v3.LR.historical_0051"
+make_viewer = True
+plots_original=""
+plots_atm = "TREFHT"
+plots_lnd = "all" # This should prompt global_time_series to attempt plotting all 354 Land variables.
+ts_num_years = 5
+walltime = "00:30:00"
+years = "1985-1995",

tests/integration/generated/test_min_case_global_time_series_viewers_chrysalis.cfg

@@ -0,0 +1,45 @@
+[default]
+case = "v3.LR.historical_0051"
+constraint = ""
+dry_run = "False"
+environment_commands = ""
+input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
+input_subdir = archive/atm/hist
+mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_output/unique_id/v3.LR.historical_0051"
+partition = "debug"
+qos = "regular"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_www/unique_id"
+
+[ts]
+active = True
+walltime = "00:30:00"
+years = "1985:1995:5",
+
+  [[ atm_monthly_glb ]]
+  # Note global average won't work for 3D variables.
+  frequency = "monthly"
+  input_files = "eam.h0"
+  input_subdir = "archive/atm/hist"
+  mapping_file = "glb"
+  vars = "TREFHT,AODDUST"
+
+  [[ lnd_monthly_glb ]]
+  frequency = "monthly"
+  input_files = "elm.h0"
+  input_subdir = "archive/lnd/hist"
+  mapping_file = "glb"
+  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"
+
+[global_time_series]
+active = True
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
+experiment_name = "v3.LR.historical_0051"
+figstr = "v3.LR.historical_0051"
+make_viewer = True
+plots_original=""
+plots_atm = "TREFHT"
+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"
+ts_num_years = 5
+walltime = "00:30:00"
+years = "1985-1995",

tests/integration/generated/test_min_case_global_time_series_viewers_original_8_chrysalis.cfg

@@ -0,0 +1,50 @@
+[default]
+case = "v3.LR.historical_0051"
+constraint = ""
+dry_run = "False"
+environment_commands = ""
+input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
+input_subdir = archive/atm/hist
+mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_8_output/unique_id/v3.LR.historical_0051"
+partition = "debug"
+qos = "regular"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_8_www/unique_id"
+
+[ts]
+active = True
+walltime = "00:30:00"
+
+  [[ atm_monthly_glb ]]
+  # Note global average won't work for 3D variables.
+  frequency = "monthly"
+  input_files = "eam.h0"
+  input_subdir = "archive/atm/hist"
+  mapping_file = "glb"
+  years = "1985:1995:5",
+
+[mpas_analysis]
+active = True
+anomalyRefYear = 1985
+climo_years = "1985-1989", "1990-1995",
+enso_years = "1985-1989", "1990-1995",
+mesh = "IcoswISC30E3r5"
+parallelTaskCount = 6
+partition = "compute"
+qos = "regular"
+shortTermArchive = True
+ts_years = "1985-1989", "1985-1995",
+walltime = "00:30:00"
+
+[global_time_series]
+active = True
+climo_years = "1985-1989", "1990-1995",
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
+experiment_name = "v3.LR.historical_0051"
+figstr = "v3.LR.historical_0051"
+make_viewer = True
+moc_file=mocTimeSeries_1985-1995.nc
+ts_num_years = 5
+ts_years = "1985-1989", "1985-1995",
+walltime = "00:30:00"
+years = "1985-1995",

tests/integration/generated/test_min_case_global_time_series_viewers_original_atm_plus_land_chrysalis.cfg

@@ -0,0 +1,45 @@
+[default]
+case = "v3.LR.historical_0051"
+constraint = ""
+dry_run = "False"
+environment_commands = ""
+input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
+input_subdir = archive/atm/hist
+mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_atm_plus_land_output/unique_id/v3.LR.historical_0051"
+partition = "debug"
+qos = "regular"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_atm_plus_land_www/unique_id"
+
+[ts]
+active = True
+walltime = "00:30:00"
+years = "1985:1995:5",
+
+  [[ atm_monthly_glb ]]
+  # Note global average won't work for 3D variables.
+  frequency = "monthly"
+  input_files = "eam.h0"
+  input_subdir = "archive/atm/hist"
+  mapping_file = "glb"
+
+  [[ lnd_monthly_glb ]]
+  frequency = "monthly"
+  input_files = "elm.h0"
+  input_subdir = "archive/lnd/hist"
+  mapping_file = "glb"
+  vars = "" # Get all available variables
+
+[global_time_series]
+active = True
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
+experiment_name = "v3.LR.historical_0051"
+figstr = "v3.LR.historical_0051"
+make_viewer = True
+# We have to set plots_original to the 5 plots that don't require ocean.
+plots_original="net_toa_flux_restom,global_surface_air_temperature,toa_radiation,net_atm_energy_imbalance,net_atm_water_imbalance"
+plots_atm = "TREFHT"
+plots_lnd = "FSH,RH2M,LAISHA,LAISUN"
+ts_num_years = 5
+walltime = "00:30:00"
+years = "1985-1995",

tests/integration/generated/test_min_case_global_time_series_viewers_undefined_variables_chrysalis.cfg

@@ -0,0 +1,47 @@
+[default]
+case = "v3.LR.historical_0051"
+constraint = ""
+dry_run = "False"
+environment_commands = ""
+input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
+input_subdir = archive/atm/hist
+mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_undefined_variables_output/unique_id/v3.LR.historical_0051"
+partition = "debug"
+qos = "regular"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_undefined_variables_www/unique_id"
+
+[ts]
+active = True
+walltime = "00:30:00"
+years = "1985:1995:5",
+
+  [[ atm_monthly_glb ]]
+  # Note global average won't work for 3D variables.
+  frequency = "monthly"
+  input_files = "eam.h0"
+  input_subdir = "archive/atm/hist"
+  mapping_file = "glb"
+  vars = "TREFHT,AODDUST"
+
+  [[ lnd_monthly_glb ]]
+  frequency = "monthly"
+  input_files = "elm.h0"
+  input_subdir = "archive/lnd/hist"
+  mapping_file = "glb"
+  vars = "" # This should prompt NCO to process all available variables.
+
+[global_time_series]
+active = True
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
+experiment_name = "v3.LR.historical_0051"
+figstr = "v3.LR.historical_0051"
+make_viewer = True
+partition = "compute"
+plots_original=""
+plots_atm = "TREFHT"
+plots_lnd = "all" # This should prompt global_time_series to attempt plotting all 354 Land variables.
+qos = "regular"
+ts_num_years = 5
+walltime = "04:00:00"
+years = "1985-1995",

tests/integration/template_min_case_global_time_series_original_8_missing_ocn.cfg

@@ -0,0 +1,38 @@
+[default]
+case = "#expand case_name#"
+constraint = "#expand constraint#"
+dry_run = "#expand dry_run#"
+environment_commands = "#expand environment_commands#"
+input = #expand user_input_v3#/E3SMv3/#expand case_name#
+input_subdir = archive/atm/hist
+mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
+output = "#expand user_output#zppy_min_case_global_time_series_original_8_missing_ocn_output/#expand unique_id#/#expand case_name#"
+partition = "#expand partition_short#"
+qos = "#expand qos_short#"
+www = "#expand user_www#zppy_min_case_global_time_series_original_8_missing_ocn_www/#expand unique_id#"
+
+[ts]
+active = True
+walltime = "00:30:00"
+
+  [[ atm_monthly_glb ]]
+  # Note global average won't work for 3D variables.
+  frequency = "monthly"
+  input_files = "eam.h0"
+  input_subdir = "archive/atm/hist"
+  mapping_file = "glb"
+  years = "1985:1995:5",
+
+[global_time_series]
+active = True
+climo_years = "1985-1989", "1990-1995",
+environment_commands = "#expand global_time_series_environment_commands#"
+experiment_name = "#expand case_name#"
+figstr = "#expand case_name#"
+# plots_original -- use the default vars,
+# which includes 3 ocean plots that won't work since we're not running mpas_analysis.
+# This should cause `skipping because of dependency status file missing`.
+ts_num_years = 5
+ts_years = "1985-1989", "1985-1995",
+walltime = "00:30:00"
+years = "1985-1995",

tests/integration/template_min_case_global_time_series_viewers.cfg

@@ -0,0 +1,45 @@
+[default]
+case = "#expand case_name#"
+constraint = "#expand constraint#"
+dry_run = "#expand dry_run#"
+environment_commands = "#expand environment_commands#"
+input = #expand user_input_v3#/E3SMv3/#expand case_name#
+input_subdir = archive/atm/hist
+mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
+output = "#expand user_output#zppy_min_case_global_time_series_viewers_output/#expand unique_id#/#expand case_name#"
+partition = "#expand partition_short#"
+qos = "#expand qos_short#"
+www = "#expand user_www#zppy_min_case_global_time_series_viewers_www/#expand unique_id#"
+
+[ts]
+active = True
+walltime = "00:30:00"
+years = "1985:1995:5",
+
+  [[ atm_monthly_glb ]]
+  # Note global average won't work for 3D variables.
+  frequency = "monthly"
+  input_files = "eam.h0"
+  input_subdir = "archive/atm/hist"
+  mapping_file = "glb"
+  vars = "TREFHT,AODDUST"
+
+  [[ lnd_monthly_glb ]]
+  frequency = "monthly"
+  input_files = "elm.h0"
+  input_subdir = "archive/lnd/hist"
+  mapping_file = "glb"
+  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"
+
+[global_time_series]
+active = True
+environment_commands = "#expand global_time_series_environment_commands#"
+experiment_name = "#expand case_name#"
+figstr = "#expand case_name#"
+make_viewer = True
+plots_original=""
+plots_atm = "TREFHT"
+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"
+ts_num_years = 5
+walltime = "00:30:00"
+years = "1985-1995",