diff --git a/tests/integration/generated/test_min_case_global_time_series_original_8_missing_ocn_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_original_8_missing_ocn_chrysalis.cfg new file mode 100644 index 00000000..6711b353 --- /dev/null +++ b/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 /conda.sh; conda activate " +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", diff --git a/tests/integration/generated/test_min_case_global_time_series_viewers_all_land_variables_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_viewers_all_land_variables_chrysalis.cfg new file mode 100644 index 00000000..3456df34 --- /dev/null +++ b/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 /conda.sh; conda activate " +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", diff --git a/tests/integration/generated/test_min_case_global_time_series_viewers_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_viewers_chrysalis.cfg new file mode 100644 index 00000000..c02d488c --- /dev/null +++ b/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 /conda.sh; conda activate " +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", diff --git a/tests/integration/generated/test_min_case_global_time_series_viewers_original_8_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_viewers_original_8_chrysalis.cfg new file mode 100644 index 00000000..a2d27a7c --- /dev/null +++ b/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 /conda.sh; conda activate " +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", diff --git a/tests/integration/generated/test_min_case_global_time_series_viewers_original_atm_plus_land_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_viewers_original_atm_plus_land_chrysalis.cfg new file mode 100644 index 00000000..5ffafc6b --- /dev/null +++ b/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 /conda.sh; conda activate " +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", diff --git a/tests/integration/generated/test_min_case_global_time_series_viewers_undefined_variables_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_viewers_undefined_variables_chrysalis.cfg new file mode 100644 index 00000000..d2457dd1 --- /dev/null +++ b/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 /conda.sh; conda activate " +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", diff --git a/tests/integration/template_min_case_global_time_series_original_8_missing_ocn.cfg b/tests/integration/template_min_case_global_time_series_original_8_missing_ocn.cfg new file mode 100644 index 00000000..a72f28d4 --- /dev/null +++ b/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", diff --git a/tests/integration/template_min_case_global_time_series_viewers.cfg b/tests/integration/template_min_case_global_time_series_viewers.cfg new file mode 100644 index 00000000..fc49406e --- /dev/null +++ b/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", diff --git a/tests/integration/template_min_case_global_time_series_viewers_all_land_variables.cfg b/tests/integration/template_min_case_global_time_series_viewers_all_land_variables.cfg new file mode 100644 index 00000000..fa4580cf --- /dev/null +++ b/tests/integration/template_min_case_global_time_series_viewers_all_land_variables.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_all_land_variables_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_all_land_variables_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 = "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", diff --git a/tests/integration/template_min_case_global_time_series_viewers_original_8.cfg b/tests/integration/template_min_case_global_time_series_viewers_original_8.cfg new file mode 100644 index 00000000..620a25f3 --- /dev/null +++ b/tests/integration/template_min_case_global_time_series_viewers_original_8.cfg @@ -0,0 +1,50 @@ +[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_original_8_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_original_8_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", + +[mpas_analysis] +active = True +anomalyRefYear = 1985 +climo_years = "1985-1989", "1990-1995", +enso_years = "1985-1989", "1990-1995", +mesh = "IcoswISC30E3r5" +parallelTaskCount = 6 +partition = "#expand partition_long#" +qos = "#expand qos_long#" +shortTermArchive = True +ts_years = "1985-1989", "1985-1995", +walltime = "#expand mpas_analysis_walltime#" + +[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#" +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", diff --git a/tests/integration/template_min_case_global_time_series_viewers_original_atm_plus_land.cfg b/tests/integration/template_min_case_global_time_series_viewers_original_atm_plus_land.cfg new file mode 100644 index 00000000..678d9908 --- /dev/null +++ b/tests/integration/template_min_case_global_time_series_viewers_original_atm_plus_land.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_original_atm_plus_land_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_original_atm_plus_land_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" + + [[ 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 = "#expand global_time_series_environment_commands#" +experiment_name = "#expand case_name#" +figstr = "#expand case_name#" +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", diff --git a/tests/integration/template_min_case_global_time_series_viewers_undefined_variables.cfg b/tests/integration/template_min_case_global_time_series_viewers_undefined_variables.cfg new file mode 100644 index 00000000..e139f477 --- /dev/null +++ b/tests/integration/template_min_case_global_time_series_viewers_undefined_variables.cfg @@ -0,0 +1,47 @@ +[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_undefined_variables_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_undefined_variables_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 = "" # This should prompt NCO to process all available variables. + +[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 +partition = "#expand partition_long#" +plots_original="" +plots_atm = "TREFHT" +plots_lnd = "all" # This should prompt global_time_series to attempt plotting all 354 Land variables. +qos = "#expand qos_long#" +ts_num_years = 5 +walltime = "04:00:00" +years = "1985-1995", diff --git a/tests/integration/utils.py b/tests/integration/utils.py index d2613d70..31b5518f 100644 --- a/tests/integration/utils.py +++ b/tests/integration/utils.py @@ -349,8 +349,14 @@ def generate_cfgs(unified_testing=False, dry_run=False): "min_case_e3sm_diags_tropical_subseasonal", "min_case_global_time_series_comprehensive_v3_setup_only", "min_case_global_time_series_custom", + "min_case_global_time_series_original_8_missing_ocn", "min_case_global_time_series_original_8_no_ocn", "min_case_global_time_series_original_8", + "min_case_global_time_series_viewers", + "min_case_global_time_series_viewers_all_land_variables", + "min_case_global_time_series_viewers_original_8", + "min_case_global_time_series_viewers_original_atm_plus_land", + "min_case_global_time_series_viewers_undefined_variables", "min_case_ilamb_diff_years", "min_case_ilamb_land_only", "min_case_ilamb", diff --git a/tests/test_sections.py b/tests/test_sections.py index 218ecc66..9f2ee20d 100644 --- a/tests/test_sections.py +++ b/tests/test_sections.py @@ -98,6 +98,7 @@ def test_sections(): "ts_num_years": 5, "ts_subsection": "", "vars": "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,CLDTOT,CLDHGH,CLDMED,CLDLOW,U", + "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", "walltime": "02:00:00", "www": "WWWW", "years": [""], @@ -163,6 +164,7 @@ def test_sections(): "ts_num_years": 5, "ts_subsection": "", "vars": "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT", + "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", "walltime": "02:00:00", "www": "WWWW", "years": ["0001:0020:5"], @@ -224,6 +226,7 @@ def test_sections(): "ts_num_years": 5, "ts_subsection": "", "vars": "", + "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", "walltime": "02:00:00", "www": "WWWW", "years": ["0001:0050:50"], @@ -285,6 +288,7 @@ def test_subsections(): "ts_num_years": 5, "ts_subsection": "", "vars": "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,CLDTOT,CLDHGH,CLDMED,CLDLOW,U", + "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", "walltime": "02:00:00", "www": "WWWW", "years": [""], @@ -366,6 +370,7 @@ def test_subsections(): "ts_num_years": 5, "ts_subsection": "", "vars": "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT", + "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", "walltime": "02:00:00", "www": "WWWW", "years": ["0001:0020:5"], @@ -413,6 +418,7 @@ def test_subsections(): "ts_num_years": 5, "ts_subsection": "", "vars": "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT", + "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", "walltime": "02:00:00", "www": "WWWW", "years": ["0001:0020:10"], @@ -490,6 +496,7 @@ def test_subsections(): "ts_num_years": 5, "ts_subsection": "", "vars": "", + "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", "walltime": "02:00:00", "www": "WWWW", "years": ["0001:0050:50"], @@ -534,6 +541,7 @@ def test_subsections(): "ts_num_years": 5, "ts_subsection": "", "vars": "", + "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", "walltime": "02:00:00", "www": "WWWW", "years": ["0001:0100:50"], diff --git a/zppy/defaults/default.ini b/zppy/defaults/default.ini index f04df56b..f98d57df 100644 --- a/zppy/defaults/default.ini +++ b/zppy/defaults/default.ini @@ -85,6 +85,8 @@ ts_subsection = string(default="") # If `vars` is set to "", then climo and ts will process *all* variables. # This is accomplished by not setting `-v`/`--vars` for `ncclimo`. vars = string(default="FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,CLDTOT,CLDHGH,CLDMED,CLDLOW,U") +# This is the list of variables to exclude. It is only used if `vars` is set to "". +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") # The maximum time to run walltime = string(default="02:00:00") # web_portal_base_path -- NOTE: this parameter is created internally @@ -319,7 +321,7 @@ figstr = string(default="") # NOTE: always overrides value in [default] input_subdir = string(default="archive/ocn/hist") # Set to True to construct a Viewer page -make_viewer = string(default="False") +make_viewer = boolean(default=False) moc_file = string(default="") # Number of columns per page ncols = integer(default=2) diff --git a/zppy/templates/global_time_series.bash b/zppy/templates/global_time_series.bash index 8b1a2e0e..8e73b440 100644 --- a/zppy/templates/global_time_series.bash +++ b/zppy/templates/global_time_series.bash @@ -9,12 +9,8 @@ results_dir={{ prefix }}_results zi-global-time-series --use_ocn {{ use_ocn }} --input {{ input }} --input_subdir {{ input_subdir }} --moc_file {{ moc_file }} --case_dir {{ output }} --experiment_name {{ experiment_name }} --figstr {{ figstr }} --color {{ color }} --ts_num_years {{ ts_num_years }} --plots_original {{ plots_original }} --plots_atm {{ plots_atm }} --plots_ice {{ plots_ice }} --plots_lnd {{ plots_lnd }} --plots_ocn {{ plots_ocn }} --nrows {{ nrows }} --ncols {{ ncols }} --results_dir ${results_dir} --regions {{ regions }} --make_viewer {{ make_viewer }} --start_yr {{ year1 }} --end_yr {{ year2 }} -echo 'Copy images to directory' results_dir_absolute_path={{ scriptDir }}/${results_dir} -mkdir -p ${results_dir_absolute_path} -cp ${results_dir}/*.pdf ${results_dir_absolute_path} -cp ${results_dir}/*.png ${results_dir_absolute_path} -cp -r ${results_dir}/viewer ${results_dir_absolute_path} +# We are already in scriptDir so we don't have to copy files over to results_dir_absolute_path ################################################################################ case={{ case }} diff --git a/zppy/templates/ts.bash b/zppy/templates/ts.bash index de24489a..cd718993 100644 --- a/zppy/templates/ts.bash +++ b/zppy/templates/ts.bash @@ -66,6 +66,8 @@ cat input.txt | ncclimo \ -c {{ case }} \ {%- if vars != '' %} -v ${vars} \ +{%- elif 'elm' in input_files %} +--xcl_var -v {{ vars_exclude }} \ {%- endif %} --split \ {%- if extra_vars != '' %}