From aa1db7fcc378c75e8a43259657c062f6aa076adf Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Wed, 22 Nov 2023 12:43:48 -0600 Subject: [PATCH 1/7] Test ts for land variables --- .../generated/test_bundles_chrysalis.cfg | 4 +- .../generated/test_complete_run_chrysalis.cfg | 130 ++---------------- tests/integration/template_complete_run.cfg | 126 ++--------------- tests/integration/utils.py | 2 +- 4 files changed, 27 insertions(+), 235 deletions(-) diff --git a/tests/integration/generated/test_bundles_chrysalis.cfg b/tests/integration/generated/test_bundles_chrysalis.cfg index a8bf3ccb..2e8e73d2 100644 --- a/tests/integration/generated/test_bundles_chrysalis.cfg +++ b/tests/integration/generated/test_bundles_chrysalis.cfg @@ -7,11 +7,11 @@ input = "/lcrc/group/e3sm/ac.forsyth2/E3SMv2/v2.LR.historical_0201" input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" # To run this test, edit `output` and `www` in this file, along with `actual_images_dir` in test_bundles.py -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_bundles_output/unique_id/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_bundles_output/issue_531/v2.LR.historical_0201" partition = "compute" qos = "regular" walltime = "07:00:00" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_bundles_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_bundles_www/issue_531" [bundle] diff --git a/tests/integration/generated/test_complete_run_chrysalis.cfg b/tests/integration/generated/test_complete_run_chrysalis.cfg index b96d5f3c..5bab1626 100644 --- a/tests/integration/generated/test_complete_run_chrysalis.cfg +++ b/tests/integration/generated/test_complete_run_chrysalis.cfg @@ -7,24 +7,10 @@ input = "/lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201" input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" # To run this test, edit `output` and `www` in this file, along with `actual_images_dir` in test_complete_run.py -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/unique_id/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/issue_531/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_complete_run_www/unique_id" - -[climo] -active = True -walltime = "00:30:00" -years = "1850:1854:2", "1850:1854:4", - - [[ atm_monthly_180x360_aave ]] - frequency = "monthly" - - [[ atm_monthly_diurnal_8xdaily_180x360_aave ]] - frequency = "diurnal_8xdaily" - input_files = "eam.h4" - input_subdir = "archive/atm/hist" - vars = "PRECT" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_complete_run_www/issue_531" [ts] active = True @@ -37,12 +23,6 @@ years = "1850:1854:2", input_subdir = "archive/atm/hist" ts_fmt = "cmip" - [[ atm_daily_180x360_aave ]] - frequency = "daily" - input_files = "eam.h1" - input_subdir = "archive/atm/hist" - vars = "PRECT" - [[ atm_monthly_glb ]] frequency = "monthly" input_files = "eam.h0" @@ -55,101 +35,17 @@ years = "1850:1854:2", frequency = "monthly" input_files = "elm.h0" input_subdir = "archive/lnd/hist" - vars = "FSH,LAISHA,LAISUN,RH2M" + # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 + vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" ts_fmt = "cmip" - [[ rof_monthly ]] - extra_vars = 'areatotal2' + [[ land_monthly_glb ]] + extra_vars = "landfrac" frequency = "monthly" - input_files = "mosart.h0" - input_subdir = "archive/rof/hist" - mapping_file = "" - vars = "RIVER_DISCHARGE_OVER_LAND_LIQ" - -[tc_analysis] -active = True -scratch = "/lcrc/globalscratch/ac.forsyth2/" -walltime = "00:30:00" -years = "1850:1854:2", - -[e3sm_diags] -active = True -grid = '180x360_aave' -ref_final_yr = 2014 -ref_start_yr = 1985 -# TODO: this directory is missing OMI-MLS -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", "tc_analysis", -short_name = 'v2.LR.historical_0201' -ts_num_years = 2 -walltime = "00:30:00" -years = "1850:1854:2", "1850:1854:4", - - [[ atm_monthly_180x360_aave ]] - climo_diurnal_frequency = "diurnal_8xdaily" - climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave" - partition = "compute" - qos = "regular" - 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", - walltime = "5:00:00" - - [[ atm_monthly_180x360_aave_environment_commands ]] - environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20231027v2" - sets = "qbo", - ts_subsection = "atm_monthly_180x360_aave" - - [[ atm_monthly_180x360_aave_tc_analysis ]] - # Running as its own subtask because tc_analysis requires jobs to run sequentially, which slows down testing - sets = "tc_analysis", - years = "1850:1852:2", - - [[ atm_monthly_180x360_aave_mvm ]] - # Test model-vs-model using the same files as the reference - climo_diurnal_frequency = "diurnal_8xdaily" - climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave" - climo_subsection = "atm_monthly_180x360_aave" - diff_title = "Difference" - partition = "compute" - qos = "regular" - ref_final_yr = 1851 - ref_name = "v2.LR.historical_0201" - ref_start_yr = 1850 - ref_years = "1850-1851", - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/v2.LR.historical_0201/post/atm/180x360_aave/clim" - run_type = "model_vs_model" - short_ref_name = "v2.LR.historical_0201" - swap_test_ref = False - tag = "model_vs_model" - ts_num_years_ref = 2 - ts_subsection = "atm_monthly_180x360_aave" - walltime = "5:00:00" - years = "1852-1853", - -[mpas_analysis] -active = True -anomalyRefYear = 1850 -climo_years ="1850-1854", "1855-1860", -enso_years = "1850-1854", "1855-1860", -mesh = "EC30to60E2r2" -parallelTaskCount = 6 -partition = "compute" -qos = "regular" -ts_years = "1850-1854", "1850-1860", -walltime = "00:30:00" - -[global_time_series] -active = True -climo_years ="1850-1854", "1855-1860", -experiment_name = "v2.LR.historical_0201" -figstr = "v2_historical_0201" -moc_file=mocTimeSeries_1850-1860.nc -ts_num_years = 5 -ts_years = "1850-1854", "1850-1860", -walltime = "00:30:00" -years = "1850-1860", - -[ilamb] -active = True -grid = '180x360_aave' -short_name = 'v2.LR.historical_0201' -ts_num_years = 2 -years = "1850:1854:2", + input_files = "elm.h0" + input_subdir = "archive/lnd/hist" + mapping_file = "glb" + # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 + vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" + ts_fmt = "cmip" + years = "1850:1860:5", diff --git a/tests/integration/template_complete_run.cfg b/tests/integration/template_complete_run.cfg index e4b1cd06..44cc68c9 100644 --- a/tests/integration/template_complete_run.cfg +++ b/tests/integration/template_complete_run.cfg @@ -12,20 +12,6 @@ partition = "#expand partition_short#" qos = "#expand qos_short#" www = "#expand user_www#zppy_test_complete_run_www/#expand unique_id#" -[climo] -active = True -walltime = "00:30:00" -years = "1850:1854:2", "1850:1854:4", - - [[ atm_monthly_180x360_aave ]] - frequency = "monthly" - - [[ atm_monthly_diurnal_8xdaily_180x360_aave ]] - frequency = "diurnal_8xdaily" - input_files = "eam.h4" - input_subdir = "archive/atm/hist" - vars = "PRECT" - [ts] active = True walltime = "00:30:00" @@ -37,12 +23,6 @@ years = "1850:1854:2", input_subdir = "archive/atm/hist" ts_fmt = "cmip" - [[ atm_daily_180x360_aave ]] - frequency = "daily" - input_files = "eam.h1" - input_subdir = "archive/atm/hist" - vars = "PRECT" - [[ atm_monthly_glb ]] frequency = "monthly" input_files = "eam.h0" @@ -55,101 +35,17 @@ years = "1850:1854:2", frequency = "monthly" input_files = "elm.h0" input_subdir = "archive/lnd/hist" - vars = "FSH,LAISHA,LAISUN,RH2M" + # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 + vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" ts_fmt = "cmip" - [[ rof_monthly ]] - extra_vars = 'areatotal2' + [[ land_monthly_glb ]] + extra_vars = "landfrac" frequency = "monthly" - input_files = "mosart.h0" - input_subdir = "archive/rof/hist" - mapping_file = "" - vars = "RIVER_DISCHARGE_OVER_LAND_LIQ" - -[tc_analysis] -active = True -scratch = "#expand scratch#" -walltime = "00:30:00" -years = "1850:1854:2", - -[e3sm_diags] -active = True -grid = '180x360_aave' -ref_final_yr = 2014 -ref_start_yr = 1985 -# TODO: this directory is missing OMI-MLS -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", "tc_analysis", -short_name = 'v2.LR.historical_0201' -ts_num_years = 2 -walltime = "00:30:00" -years = "1850:1854:2", "1850:1854:4", - - [[ atm_monthly_180x360_aave ]] - climo_diurnal_frequency = "diurnal_8xdaily" - climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave" - partition = "#expand partition_long#" - qos = "#expand qos_long#" - 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", - walltime = "#expand diags_walltime#" - - [[ atm_monthly_180x360_aave_environment_commands ]] - environment_commands = "#expand diags_environment_commands#" - sets = "qbo", - ts_subsection = "atm_monthly_180x360_aave" - - [[ atm_monthly_180x360_aave_tc_analysis ]] - # Running as its own subtask because tc_analysis requires jobs to run sequentially, which slows down testing - sets = "tc_analysis", - years = "1850:1852:2", - - [[ atm_monthly_180x360_aave_mvm ]] - # Test model-vs-model using the same files as the reference - climo_diurnal_frequency = "diurnal_8xdaily" - climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave" - climo_subsection = "atm_monthly_180x360_aave" - diff_title = "Difference" - partition = "#expand partition_long#" - qos = "#expand qos_long#" - ref_final_yr = 1851 - ref_name = "v2.LR.historical_0201" - ref_start_yr = 1850 - ref_years = "1850-1851", - reference_data_path = "#expand user_output#zppy_test_complete_run_output/v2.LR.historical_0201/post/atm/180x360_aave/clim" - run_type = "model_vs_model" - short_ref_name = "v2.LR.historical_0201" - swap_test_ref = False - tag = "model_vs_model" - ts_num_years_ref = 2 - ts_subsection = "atm_monthly_180x360_aave" - walltime = "#expand diags_walltime#" - years = "1852-1853", - -[mpas_analysis] -active = True -anomalyRefYear = 1850 -climo_years ="1850-1854", "1855-1860", -enso_years = "1850-1854", "1855-1860", -mesh = "EC30to60E2r2" -parallelTaskCount = 6 -partition = "#expand partition_long#" -qos = "#expand qos_long#" -ts_years = "1850-1854", "1850-1860", -walltime = "#expand mpas_analysis_walltime#" - -[global_time_series] -active = True -climo_years ="1850-1854", "1855-1860", -experiment_name = "v2.LR.historical_0201" -figstr = "v2_historical_0201" -moc_file=mocTimeSeries_1850-1860.nc -ts_num_years = 5 -ts_years = "1850-1854", "1850-1860", -walltime = "00:30:00" -years = "1850-1860", - -[ilamb] -active = True -grid = '180x360_aave' -short_name = 'v2.LR.historical_0201' -ts_num_years = 2 -years = "1850:1854:2", + input_files = "elm.h0" + input_subdir = "archive/lnd/hist" + mapping_file = "glb" + # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 + vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" + ts_fmt = "cmip" + years = "1850:1860:5", diff --git a/tests/integration/utils.py b/tests/integration/utils.py index 45f63d8e..67220080 100644 --- a/tests/integration/utils.py +++ b/tests/integration/utils.py @@ -7,7 +7,7 @@ from mache import MachineInfo from PIL import Image, ImageChops, ImageDraw -UNIQUE_ID = "unique_id" +UNIQUE_ID = "issue_531" # Image checking ########################################################## From f2f6a7c38300a61eab49eeb231664ff5458befd6 Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Wed, 22 Nov 2023 13:07:59 -0600 Subject: [PATCH 2/7] Test climo for land variables --- .../generated/test_complete_run_chrysalis.cfg | 12 ++++++++++++ tests/integration/template_complete_run.cfg | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/tests/integration/generated/test_complete_run_chrysalis.cfg b/tests/integration/generated/test_complete_run_chrysalis.cfg index 5bab1626..a1ac5b80 100644 --- a/tests/integration/generated/test_complete_run_chrysalis.cfg +++ b/tests/integration/generated/test_complete_run_chrysalis.cfg @@ -12,6 +12,18 @@ partition = "debug" qos = "regular" www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_complete_run_www/issue_531" +[climo] +active = True +walltime = "00:30:00" +years = "1850:1854:2", "1850:1854:4", + + [[ atm_monthly_180x360_aave ]] + frequency = "monthly" + + [[ land_monthly_180x360_aave ]] + frequency = "monthly" + vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" + [ts] active = True walltime = "00:30:00" diff --git a/tests/integration/template_complete_run.cfg b/tests/integration/template_complete_run.cfg index 44cc68c9..0bef1e00 100644 --- a/tests/integration/template_complete_run.cfg +++ b/tests/integration/template_complete_run.cfg @@ -12,6 +12,18 @@ partition = "#expand partition_short#" qos = "#expand qos_short#" www = "#expand user_www#zppy_test_complete_run_www/#expand unique_id#" +[climo] +active = True +walltime = "00:30:00" +years = "1850:1854:2", "1850:1854:4", + + [[ atm_monthly_180x360_aave ]] + frequency = "monthly" + + [[ land_monthly_180x360_aave ]] + frequency = "monthly" + vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" + [ts] active = True walltime = "00:30:00" From 75eb5f58e741afa4ef50983a201df4aa2834e5de Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Wed, 22 Nov 2023 14:14:25 -0600 Subject: [PATCH 3/7] Smaller subset of vars --- .../generated/test_complete_run_chrysalis.cfg | 19 ++++++++++++++++--- tests/integration/template_complete_run.cfg | 19 ++++++++++++++++--- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/tests/integration/generated/test_complete_run_chrysalis.cfg b/tests/integration/generated/test_complete_run_chrysalis.cfg index a1ac5b80..a8a26d1f 100644 --- a/tests/integration/generated/test_complete_run_chrysalis.cfg +++ b/tests/integration/generated/test_complete_run_chrysalis.cfg @@ -19,10 +19,15 @@ years = "1850:1854:2", "1850:1854:4", [[ atm_monthly_180x360_aave ]] frequency = "monthly" + # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests + vars = "AODVIS, FLNS, FSNTOA, PRECSL, TGCLDLWP, TS, CCN3, FLNT, LINOZ_O3COL, QFLX, TMCO2, U10, CLDHGH, FLUT, LWCF, RESTOM, TMCO2, TMCO2_FFF, U850, CLDLOW, FSNS, PRECC, RHREFHT, TMCO2_LND, CLDMED, FSNT, PRECL, SHFLX, TMCO2_OCN, CO2, CO2_FFF,CO2_OCN,CO2_LND, FSNTC, PRECSC, SWCF, TREFHT" [[ land_monthly_180x360_aave ]] frequency = "monthly" - vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" + # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 + #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" + # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests + vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL, FAREA_BURNED, NFIRES, FPI, FP_UPTAKE, PLANT_NDEMAND_COL, PLANT_PDEMAND_COL, SMINN_TO_PLANT, SMINP_TO_PLANT" [ts] active = True @@ -33,6 +38,8 @@ years = "1850:1854:2", frequency = "monthly" input_files = "eam.h0" input_subdir = "archive/atm/hist" + # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests + vars = "AODVIS, FLNS, FSNTOA, PRECSL, TGCLDLWP, TS, CCN3, FLNT, LINOZ_O3COL, QFLX, TMCO2, U10, CLDHGH, FLUT, LWCF, RESTOM, TMCO2, TMCO2_FFF, U850, CLDLOW, FSNS, PRECC, RHREFHT, TMCO2_LND, CLDMED, FSNT, PRECL, SHFLX, TMCO2_OCN, CO2, CO2_FFF,CO2_OCN,CO2_LND, FSNTC, PRECSC, SWCF, TREFHT" ts_fmt = "cmip" [[ atm_monthly_glb ]] @@ -40,6 +47,8 @@ years = "1850:1854:2", input_files = "eam.h0" input_subdir = "archive/atm/hist" mapping_file = "glb" + # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests + vars = "AODVIS, FLNS, FSNTOA, PRECSL, TGCLDLWP, TS, CCN3, FLNT, LINOZ_O3COL, QFLX, TMCO2, U10, CLDHGH, FLUT, LWCF, RESTOM, TMCO2, TMCO2_FFF, U850, CLDLOW, FSNS, PRECC, RHREFHT, TMCO2_LND, CLDMED, FSNT, PRECL, SHFLX, TMCO2_OCN, CO2, CO2_FFF,CO2_OCN,CO2_LND, FSNTC, PRECSC, SWCF, TREFHT" years = "1850:1860:5", [[ land_monthly ]] @@ -48,7 +57,9 @@ years = "1850:1854:2", input_files = "elm.h0" input_subdir = "archive/lnd/hist" # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 - vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" + #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" + # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests + vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL, FAREA_BURNED, NFIRES, FPI, FP_UPTAKE, PLANT_NDEMAND_COL, PLANT_PDEMAND_COL, SMINN_TO_PLANT, SMINP_TO_PLANT" ts_fmt = "cmip" [[ land_monthly_glb ]] @@ -58,6 +69,8 @@ years = "1850:1854:2", input_subdir = "archive/lnd/hist" mapping_file = "glb" # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 - vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" + #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" + # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests + vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL, FAREA_BURNED, NFIRES, FPI, FP_UPTAKE, PLANT_NDEMAND_COL, PLANT_PDEMAND_COL, SMINN_TO_PLANT, SMINP_TO_PLANT" ts_fmt = "cmip" years = "1850:1860:5", diff --git a/tests/integration/template_complete_run.cfg b/tests/integration/template_complete_run.cfg index 0bef1e00..10345c31 100644 --- a/tests/integration/template_complete_run.cfg +++ b/tests/integration/template_complete_run.cfg @@ -19,10 +19,15 @@ years = "1850:1854:2", "1850:1854:4", [[ atm_monthly_180x360_aave ]] frequency = "monthly" + # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests + vars = "AODVIS, FLNS, FSNTOA, PRECSL, TGCLDLWP, TS, CCN3, FLNT, LINOZ_O3COL, QFLX, TMCO2, U10, CLDHGH, FLUT, LWCF, RESTOM, TMCO2, TMCO2_FFF, U850, CLDLOW, FSNS, PRECC, RHREFHT, TMCO2_LND, CLDMED, FSNT, PRECL, SHFLX, TMCO2_OCN, CO2, CO2_FFF,CO2_OCN,CO2_LND, FSNTC, PRECSC, SWCF, TREFHT" [[ land_monthly_180x360_aave ]] frequency = "monthly" - vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" + # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 + #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" + # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests + vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL, FAREA_BURNED, NFIRES, FPI, FP_UPTAKE, PLANT_NDEMAND_COL, PLANT_PDEMAND_COL, SMINN_TO_PLANT, SMINP_TO_PLANT" [ts] active = True @@ -33,6 +38,8 @@ years = "1850:1854:2", frequency = "monthly" input_files = "eam.h0" input_subdir = "archive/atm/hist" + # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests + vars = "AODVIS, FLNS, FSNTOA, PRECSL, TGCLDLWP, TS, CCN3, FLNT, LINOZ_O3COL, QFLX, TMCO2, U10, CLDHGH, FLUT, LWCF, RESTOM, TMCO2, TMCO2_FFF, U850, CLDLOW, FSNS, PRECC, RHREFHT, TMCO2_LND, CLDMED, FSNT, PRECL, SHFLX, TMCO2_OCN, CO2, CO2_FFF,CO2_OCN,CO2_LND, FSNTC, PRECSC, SWCF, TREFHT" ts_fmt = "cmip" [[ atm_monthly_glb ]] @@ -40,6 +47,8 @@ years = "1850:1854:2", input_files = "eam.h0" input_subdir = "archive/atm/hist" mapping_file = "glb" + # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests + vars = "AODVIS, FLNS, FSNTOA, PRECSL, TGCLDLWP, TS, CCN3, FLNT, LINOZ_O3COL, QFLX, TMCO2, U10, CLDHGH, FLUT, LWCF, RESTOM, TMCO2, TMCO2_FFF, U850, CLDLOW, FSNS, PRECC, RHREFHT, TMCO2_LND, CLDMED, FSNT, PRECL, SHFLX, TMCO2_OCN, CO2, CO2_FFF,CO2_OCN,CO2_LND, FSNTC, PRECSC, SWCF, TREFHT" years = "1850:1860:5", [[ land_monthly ]] @@ -48,7 +57,9 @@ years = "1850:1854:2", input_files = "elm.h0" input_subdir = "archive/lnd/hist" # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 - vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" + #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" + # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests + vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL, FAREA_BURNED, NFIRES, FPI, FP_UPTAKE, PLANT_NDEMAND_COL, PLANT_PDEMAND_COL, SMINN_TO_PLANT, SMINP_TO_PLANT" ts_fmt = "cmip" [[ land_monthly_glb ]] @@ -58,6 +69,8 @@ years = "1850:1854:2", input_subdir = "archive/lnd/hist" mapping_file = "glb" # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 - vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" + #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" + # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests + vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL, FAREA_BURNED, NFIRES, FPI, FP_UPTAKE, PLANT_NDEMAND_COL, PLANT_PDEMAND_COL, SMINN_TO_PLANT, SMINP_TO_PLANT" ts_fmt = "cmip" years = "1850:1860:5", From 8b69df66c6dc96062539c9562911f3255c9add0f Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Wed, 22 Nov 2023 14:34:15 -0600 Subject: [PATCH 4/7] Remove spaces in vars --- .../generated/test_complete_run_chrysalis.cfg | 12 ++++++------ tests/integration/template_complete_run.cfg | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/integration/generated/test_complete_run_chrysalis.cfg b/tests/integration/generated/test_complete_run_chrysalis.cfg index a8a26d1f..b5d6a2ca 100644 --- a/tests/integration/generated/test_complete_run_chrysalis.cfg +++ b/tests/integration/generated/test_complete_run_chrysalis.cfg @@ -20,14 +20,14 @@ years = "1850:1854:2", "1850:1854:4", [[ atm_monthly_180x360_aave ]] frequency = "monthly" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "AODVIS, FLNS, FSNTOA, PRECSL, TGCLDLWP, TS, CCN3, FLNT, LINOZ_O3COL, QFLX, TMCO2, U10, CLDHGH, FLUT, LWCF, RESTOM, TMCO2, TMCO2_FFF, U850, CLDLOW, FSNS, PRECC, RHREFHT, TMCO2_LND, CLDMED, FSNT, PRECL, SHFLX, TMCO2_OCN, CO2, CO2_FFF,CO2_OCN,CO2_LND, FSNTC, PRECSC, SWCF, TREFHT" + vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,LINOZ_O3COL,QFLX,TMCO2,U10,CLDHGH,FLUT,LWCF,RESTOM,TMCO2,TMCO2_FFF,U850,CLDLOW,FSNS,PRECC,RHREFHT,TMCO2_LND,CLDMED,FSNT,PRECL,SHFLX,TMCO2_OCN,CO2,CO2_FFF,CO2_OCN,CO2_LND,FSNTC,PRECSC,SWCF,TREFHT" [[ land_monthly_180x360_aave ]] frequency = "monthly" # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL, FAREA_BURNED, NFIRES, FPI, FP_UPTAKE, PLANT_NDEMAND_COL, PLANT_PDEMAND_COL, SMINN_TO_PLANT, SMINP_TO_PLANT" + vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" [ts] active = True @@ -39,7 +39,7 @@ years = "1850:1854:2", input_files = "eam.h0" input_subdir = "archive/atm/hist" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "AODVIS, FLNS, FSNTOA, PRECSL, TGCLDLWP, TS, CCN3, FLNT, LINOZ_O3COL, QFLX, TMCO2, U10, CLDHGH, FLUT, LWCF, RESTOM, TMCO2, TMCO2_FFF, U850, CLDLOW, FSNS, PRECC, RHREFHT, TMCO2_LND, CLDMED, FSNT, PRECL, SHFLX, TMCO2_OCN, CO2, CO2_FFF,CO2_OCN,CO2_LND, FSNTC, PRECSC, SWCF, TREFHT" + vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,LINOZ_O3COL,QFLX,TMCO2,U10,CLDHGH,FLUT,LWCF,RESTOM,TMCO2,TMCO2_FFF,U850,CLDLOW,FSNS,PRECC,RHREFHT,TMCO2_LND,CLDMED,FSNT,PRECL,SHFLX,TMCO2_OCN,CO2,CO2_FFF,CO2_OCN,CO2_LND,FSNTC,PRECSC,SWCF,TREFHT" ts_fmt = "cmip" [[ atm_monthly_glb ]] @@ -48,7 +48,7 @@ years = "1850:1854:2", input_subdir = "archive/atm/hist" mapping_file = "glb" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "AODVIS, FLNS, FSNTOA, PRECSL, TGCLDLWP, TS, CCN3, FLNT, LINOZ_O3COL, QFLX, TMCO2, U10, CLDHGH, FLUT, LWCF, RESTOM, TMCO2, TMCO2_FFF, U850, CLDLOW, FSNS, PRECC, RHREFHT, TMCO2_LND, CLDMED, FSNT, PRECL, SHFLX, TMCO2_OCN, CO2, CO2_FFF,CO2_OCN,CO2_LND, FSNTC, PRECSC, SWCF, TREFHT" + vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,LINOZ_O3COL,QFLX,TMCO2,U10,CLDHGH,FLUT,LWCF,RESTOM,TMCO2,TMCO2_FFF,U850,CLDLOW,FSNS,PRECC,RHREFHT,TMCO2_LND,CLDMED,FSNT,PRECL,SHFLX,TMCO2_OCN,CO2,CO2_FFF,CO2_OCN,CO2_LND,FSNTC,PRECSC,SWCF,TREFHT" years = "1850:1860:5", [[ land_monthly ]] @@ -59,7 +59,7 @@ years = "1850:1854:2", # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL, FAREA_BURNED, NFIRES, FPI, FP_UPTAKE, PLANT_NDEMAND_COL, PLANT_PDEMAND_COL, SMINN_TO_PLANT, SMINP_TO_PLANT" + vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" ts_fmt = "cmip" [[ land_monthly_glb ]] @@ -71,6 +71,6 @@ years = "1850:1854:2", # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL, FAREA_BURNED, NFIRES, FPI, FP_UPTAKE, PLANT_NDEMAND_COL, PLANT_PDEMAND_COL, SMINN_TO_PLANT, SMINP_TO_PLANT" + vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" ts_fmt = "cmip" years = "1850:1860:5", diff --git a/tests/integration/template_complete_run.cfg b/tests/integration/template_complete_run.cfg index 10345c31..ada1f3cc 100644 --- a/tests/integration/template_complete_run.cfg +++ b/tests/integration/template_complete_run.cfg @@ -20,14 +20,14 @@ years = "1850:1854:2", "1850:1854:4", [[ atm_monthly_180x360_aave ]] frequency = "monthly" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "AODVIS, FLNS, FSNTOA, PRECSL, TGCLDLWP, TS, CCN3, FLNT, LINOZ_O3COL, QFLX, TMCO2, U10, CLDHGH, FLUT, LWCF, RESTOM, TMCO2, TMCO2_FFF, U850, CLDLOW, FSNS, PRECC, RHREFHT, TMCO2_LND, CLDMED, FSNT, PRECL, SHFLX, TMCO2_OCN, CO2, CO2_FFF,CO2_OCN,CO2_LND, FSNTC, PRECSC, SWCF, TREFHT" + vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,LINOZ_O3COL,QFLX,TMCO2,U10,CLDHGH,FLUT,LWCF,RESTOM,TMCO2,TMCO2_FFF,U850,CLDLOW,FSNS,PRECC,RHREFHT,TMCO2_LND,CLDMED,FSNT,PRECL,SHFLX,TMCO2_OCN,CO2,CO2_FFF,CO2_OCN,CO2_LND,FSNTC,PRECSC,SWCF,TREFHT" [[ land_monthly_180x360_aave ]] frequency = "monthly" # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL, FAREA_BURNED, NFIRES, FPI, FP_UPTAKE, PLANT_NDEMAND_COL, PLANT_PDEMAND_COL, SMINN_TO_PLANT, SMINP_TO_PLANT" + vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" [ts] active = True @@ -39,7 +39,7 @@ years = "1850:1854:2", input_files = "eam.h0" input_subdir = "archive/atm/hist" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "AODVIS, FLNS, FSNTOA, PRECSL, TGCLDLWP, TS, CCN3, FLNT, LINOZ_O3COL, QFLX, TMCO2, U10, CLDHGH, FLUT, LWCF, RESTOM, TMCO2, TMCO2_FFF, U850, CLDLOW, FSNS, PRECC, RHREFHT, TMCO2_LND, CLDMED, FSNT, PRECL, SHFLX, TMCO2_OCN, CO2, CO2_FFF,CO2_OCN,CO2_LND, FSNTC, PRECSC, SWCF, TREFHT" + vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,LINOZ_O3COL,QFLX,TMCO2,U10,CLDHGH,FLUT,LWCF,RESTOM,TMCO2,TMCO2_FFF,U850,CLDLOW,FSNS,PRECC,RHREFHT,TMCO2_LND,CLDMED,FSNT,PRECL,SHFLX,TMCO2_OCN,CO2,CO2_FFF,CO2_OCN,CO2_LND,FSNTC,PRECSC,SWCF,TREFHT" ts_fmt = "cmip" [[ atm_monthly_glb ]] @@ -48,7 +48,7 @@ years = "1850:1854:2", input_subdir = "archive/atm/hist" mapping_file = "glb" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "AODVIS, FLNS, FSNTOA, PRECSL, TGCLDLWP, TS, CCN3, FLNT, LINOZ_O3COL, QFLX, TMCO2, U10, CLDHGH, FLUT, LWCF, RESTOM, TMCO2, TMCO2_FFF, U850, CLDLOW, FSNS, PRECC, RHREFHT, TMCO2_LND, CLDMED, FSNT, PRECL, SHFLX, TMCO2_OCN, CO2, CO2_FFF,CO2_OCN,CO2_LND, FSNTC, PRECSC, SWCF, TREFHT" + vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,LINOZ_O3COL,QFLX,TMCO2,U10,CLDHGH,FLUT,LWCF,RESTOM,TMCO2,TMCO2_FFF,U850,CLDLOW,FSNS,PRECC,RHREFHT,TMCO2_LND,CLDMED,FSNT,PRECL,SHFLX,TMCO2_OCN,CO2,CO2_FFF,CO2_OCN,CO2_LND,FSNTC,PRECSC,SWCF,TREFHT" years = "1850:1860:5", [[ land_monthly ]] @@ -59,7 +59,7 @@ years = "1850:1854:2", # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL, FAREA_BURNED, NFIRES, FPI, FP_UPTAKE, PLANT_NDEMAND_COL, PLANT_PDEMAND_COL, SMINN_TO_PLANT, SMINP_TO_PLANT" + vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" ts_fmt = "cmip" [[ land_monthly_glb ]] @@ -71,6 +71,6 @@ years = "1850:1854:2", # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL, FAREA_BURNED, NFIRES, FPI, FP_UPTAKE, PLANT_NDEMAND_COL, PLANT_PDEMAND_COL, SMINN_TO_PLANT, SMINP_TO_PLANT" + vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" ts_fmt = "cmip" years = "1850:1860:5", From 49e45c7943982c3a34f14fade56d7a35236e7e4f Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Wed, 29 Nov 2023 11:33:19 -0600 Subject: [PATCH 5/7] Test variables --- .../generated/test_complete_run_chrysalis.cfg | 72 ++++++++++++++++-- tests/integration/template_complete_run.cfg | 73 +++++++++++++++++-- 2 files changed, 133 insertions(+), 12 deletions(-) diff --git a/tests/integration/generated/test_complete_run_chrysalis.cfg b/tests/integration/generated/test_complete_run_chrysalis.cfg index b5d6a2ca..b9b5511b 100644 --- a/tests/integration/generated/test_complete_run_chrysalis.cfg +++ b/tests/integration/generated/test_complete_run_chrysalis.cfg @@ -20,14 +20,46 @@ years = "1850:1854:2", "1850:1854:4", [[ atm_monthly_180x360_aave ]] frequency = "monthly" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,LINOZ_O3COL,QFLX,TMCO2,U10,CLDHGH,FLUT,LWCF,RESTOM,TMCO2,TMCO2_FFF,U850,CLDLOW,FSNS,PRECC,RHREFHT,TMCO2_LND,CLDMED,FSNT,PRECL,SHFLX,TMCO2_OCN,CO2,CO2_FFF,CO2_OCN,CO2_LND,FSNTC,PRECSC,SWCF,TREFHT" + #vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,LINOZ_O3COL,QFLX,TMCO2,U10,CLDHGH,FLUT,LWCF,RESTOM,TMCO2,TMCO2_FFF,U850,CLDLOW,FSNS,PRECC,RHREFHT,TMCO2_LND,CLDMED,FSNT,PRECL,SHFLX,TMCO2_OCN,CO2,CO2_FFF,CO2_OCN,CO2_LND,FSNTC,PRECSC,SWCF,TREFHT" + # 1. Remove LINOZ_O3COL + # 2. Remove TMCO2 + # 3. Remove RESTOM + # 4. Remove TMCO2 + # 5. Remove TMCO2_FFF + # 6. Remove U850 + # 7. Remove RHREFHT + # 8. Remove TMCO2_LND + # 9. Remove TMCO2_OCN + # 10. Remove CO2 + # 11. Remove CO2_FFF + # 12. Remove CO2_OCN + # 13. Remove CO2_LND + vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,QFLX,U10,CLDHGH,FLUT,LWCF,CLDLOW,FSNS,PRECC,CLDMED,FSNT,PRECL,SHFLX,FSNTC,PRECSC,SWCF,TREFHT" [[ land_monthly_180x360_aave ]] frequency = "monthly" # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" + #vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" + # vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO" + # 1. Remove FSH + # 2. Remove RH2M + # 3. Remove LAISHA + # 4. Remove LAISUN + # 5. Remove QINTR + # 6. Remove QOVER + # 7. Remove QRUNOFF + # 8. Remove QSOIL + # 9. Remove QVEGE + # 10. Remove QVEGT + # 11. Remove SOILICE + # 12. Remove SOILLIQ + # 13. Remove SOILWATER_10CM + # 14. Remove TSA + # 15. Remove TSOI + # 16. Remove H2OSNO + vars = "" [ts] active = True @@ -39,7 +71,9 @@ years = "1850:1854:2", input_files = "eam.h0" input_subdir = "archive/atm/hist" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,LINOZ_O3COL,QFLX,TMCO2,U10,CLDHGH,FLUT,LWCF,RESTOM,TMCO2,TMCO2_FFF,U850,CLDLOW,FSNS,PRECC,RHREFHT,TMCO2_LND,CLDMED,FSNT,PRECL,SHFLX,TMCO2_OCN,CO2,CO2_FFF,CO2_OCN,CO2_LND,FSNTC,PRECSC,SWCF,TREFHT" + #vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,LINOZ_O3COL,QFLX,TMCO2,U10,CLDHGH,FLUT,LWCF,RESTOM,TMCO2,TMCO2_FFF,U850,CLDLOW,FSNS,PRECC,RHREFHT,TMCO2_LND,CLDMED,FSNT,PRECL,SHFLX,TMCO2_OCN,CO2,CO2_FFF,CO2_OCN,CO2_LND,FSNTC,PRECSC,SWCF,TREFHT" + # 1. Remove LINOZ_O3COL,TMCO2_FFF,TMCO2,CO2_OCN,CO2_LND,CO2_FFF,CO2,U850,TMCO2_OCN,TMCO2_LND,RESTOM,RHREFHT + vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,QFLX,U10,CLDHGH,FLUT,LWCF,CLDLOW,FSNS,PRECC,CLDMED,FSNT,PRECL,SHFLX,FSNTC,PRECSC,SWCF,TREFHT" ts_fmt = "cmip" [[ atm_monthly_glb ]] @@ -48,7 +82,13 @@ years = "1850:1854:2", input_subdir = "archive/atm/hist" mapping_file = "glb" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,LINOZ_O3COL,QFLX,TMCO2,U10,CLDHGH,FLUT,LWCF,RESTOM,TMCO2,TMCO2_FFF,U850,CLDLOW,FSNS,PRECC,RHREFHT,TMCO2_LND,CLDMED,FSNT,PRECL,SHFLX,TMCO2_OCN,CO2,CO2_FFF,CO2_OCN,CO2_LND,FSNTC,PRECSC,SWCF,TREFHT" + #vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,LINOZ_O3COL,QFLX,TMCO2,U10,CLDHGH,FLUT,LWCF,RESTOM,TMCO2,TMCO2_FFF,U850,CLDLOW,FSNS,PRECC,RHREFHT,TMCO2_LND,CLDMED,FSNT,PRECL,SHFLX,TMCO2_OCN,CO2,CO2_FFF,CO2_OCN,CO2_LND,FSNTC,PRECSC,SWCF,TREFHT" + # 1. Remove RESTOM,LINOZ_O3COL,CO2,CO2_FFF,CO2_LND,TMCO2_OCN,RHREFHT,TMCO2,CO2_OCN,TMCO2_LND + # 2. Remove U10,U850 as they appear to be adding on to variables names: TMCO2_FFF850,TMCO210 + # 3. Remove TMCO2 + # 4. Remove TMCO2_FFF + # 5. ERROR Failed to globally and regionally average -- try removing CCN3 + vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,FLNT,QFLX,CLDHGH,FLUT,LWCF,CLDLOW,FSNS,PRECC,CLDMED,FSNT,PRECL,SHFLX,FSNTC,PRECSC,SWCF,TREFHT" years = "1850:1860:5", [[ land_monthly ]] @@ -59,7 +99,8 @@ years = "1850:1854:2", # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" + #vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" + vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO" ts_fmt = "cmip" [[ land_monthly_glb ]] @@ -71,6 +112,25 @@ years = "1850:1854:2", # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" + #vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" + #vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO" + # 1. Remove QOVER,QVEGE + # 2. Remove QRUNOFF + # 3. Still errors on QOVER + # 4. Still errors on QVEGE + # 5. Still errors on QOVER + # 6. Remove QVEGT + # 7. Still errors on QVEGT + # 8. Remove TSOI + # 9. Remove QSOIL + # 10. Remove SOILICE + # 11. Still errors on SOILICE + # 12. Remove LAISHA + # 13. Remove QINTR + # 14. Still errors on QVEGE + # 15. Still errors on LAISHA + # 16. Still errors on QVEGE + # 17. Still errors on SOILICE + vars = "FSH,RH2M,LAISUN,SOILLIQ,SOILWATER_10CM,TSA,H2OSNO" ts_fmt = "cmip" years = "1850:1860:5", diff --git a/tests/integration/template_complete_run.cfg b/tests/integration/template_complete_run.cfg index ada1f3cc..0e252057 100644 --- a/tests/integration/template_complete_run.cfg +++ b/tests/integration/template_complete_run.cfg @@ -20,14 +20,46 @@ years = "1850:1854:2", "1850:1854:4", [[ atm_monthly_180x360_aave ]] frequency = "monthly" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,LINOZ_O3COL,QFLX,TMCO2,U10,CLDHGH,FLUT,LWCF,RESTOM,TMCO2,TMCO2_FFF,U850,CLDLOW,FSNS,PRECC,RHREFHT,TMCO2_LND,CLDMED,FSNT,PRECL,SHFLX,TMCO2_OCN,CO2,CO2_FFF,CO2_OCN,CO2_LND,FSNTC,PRECSC,SWCF,TREFHT" + #vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,LINOZ_O3COL,QFLX,TMCO2,U10,CLDHGH,FLUT,LWCF,RESTOM,TMCO2,TMCO2_FFF,U850,CLDLOW,FSNS,PRECC,RHREFHT,TMCO2_LND,CLDMED,FSNT,PRECL,SHFLX,TMCO2_OCN,CO2,CO2_FFF,CO2_OCN,CO2_LND,FSNTC,PRECSC,SWCF,TREFHT" + # 1. Remove LINOZ_O3COL + # 2. Remove TMCO2 + # 3. Remove RESTOM + # 4. Remove TMCO2 + # 5. Remove TMCO2_FFF + # 6. Remove U850 + # 7. Remove RHREFHT + # 8. Remove TMCO2_LND + # 9. Remove TMCO2_OCN + # 10. Remove CO2 + # 11. Remove CO2_FFF + # 12. Remove CO2_OCN + # 13. Remove CO2_LND + vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,QFLX,U10,CLDHGH,FLUT,LWCF,CLDLOW,FSNS,PRECC,CLDMED,FSNT,PRECL,SHFLX,FSNTC,PRECSC,SWCF,TREFHT" [[ land_monthly_180x360_aave ]] frequency = "monthly" # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" + #vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" + # vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO" + # 1. Remove FSH + # 2. Remove RH2M + # 3. Remove LAISHA + # 4. Remove LAISUN + # 5. Remove QINTR + # 6. Remove QOVER + # 7. Remove QRUNOFF + # 8. Remove QSOIL + # 9. Remove QVEGE + # 10. Remove QVEGT + # 11. Remove SOILICE + # 12. Remove SOILLIQ + # 13. Remove SOILWATER_10CM + # 14. Remove TSA + # 15. Remove TSOI + # 16. Remove H2OSNO + vars = "" [ts] active = True @@ -39,7 +71,9 @@ years = "1850:1854:2", input_files = "eam.h0" input_subdir = "archive/atm/hist" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,LINOZ_O3COL,QFLX,TMCO2,U10,CLDHGH,FLUT,LWCF,RESTOM,TMCO2,TMCO2_FFF,U850,CLDLOW,FSNS,PRECC,RHREFHT,TMCO2_LND,CLDMED,FSNT,PRECL,SHFLX,TMCO2_OCN,CO2,CO2_FFF,CO2_OCN,CO2_LND,FSNTC,PRECSC,SWCF,TREFHT" + #vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,LINOZ_O3COL,QFLX,TMCO2,U10,CLDHGH,FLUT,LWCF,RESTOM,TMCO2,TMCO2_FFF,U850,CLDLOW,FSNS,PRECC,RHREFHT,TMCO2_LND,CLDMED,FSNT,PRECL,SHFLX,TMCO2_OCN,CO2,CO2_FFF,CO2_OCN,CO2_LND,FSNTC,PRECSC,SWCF,TREFHT" + # 1. Remove LINOZ_O3COL,TMCO2_FFF,TMCO2,CO2_OCN,CO2_LND,CO2_FFF,CO2,U850,TMCO2_OCN,TMCO2_LND,RESTOM,RHREFHT + vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,QFLX,U10,CLDHGH,FLUT,LWCF,CLDLOW,FSNS,PRECC,CLDMED,FSNT,PRECL,SHFLX,FSNTC,PRECSC,SWCF,TREFHT" ts_fmt = "cmip" [[ atm_monthly_glb ]] @@ -48,7 +82,13 @@ years = "1850:1854:2", input_subdir = "archive/atm/hist" mapping_file = "glb" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,LINOZ_O3COL,QFLX,TMCO2,U10,CLDHGH,FLUT,LWCF,RESTOM,TMCO2,TMCO2_FFF,U850,CLDLOW,FSNS,PRECC,RHREFHT,TMCO2_LND,CLDMED,FSNT,PRECL,SHFLX,TMCO2_OCN,CO2,CO2_FFF,CO2_OCN,CO2_LND,FSNTC,PRECSC,SWCF,TREFHT" + #vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,CCN3,FLNT,LINOZ_O3COL,QFLX,TMCO2,U10,CLDHGH,FLUT,LWCF,RESTOM,TMCO2,TMCO2_FFF,U850,CLDLOW,FSNS,PRECC,RHREFHT,TMCO2_LND,CLDMED,FSNT,PRECL,SHFLX,TMCO2_OCN,CO2,CO2_FFF,CO2_OCN,CO2_LND,FSNTC,PRECSC,SWCF,TREFHT" + # 1. Remove RESTOM,LINOZ_O3COL,CO2,CO2_FFF,CO2_LND,TMCO2_OCN,RHREFHT,TMCO2,CO2_OCN,TMCO2_LND + # 2. Remove U10,U850 as they appear to be adding on to variables names: TMCO2_FFF850,TMCO210 + # 3. Remove TMCO2 + # 4. Remove TMCO2_FFF + # 5. ERROR Failed to globally and regionally average -- try removing CCN3 + vars = "AODVIS,FLNS,FSNTOA,PRECSL,TGCLDLWP,TS,FLNT,QFLX,CLDHGH,FLUT,LWCF,CLDLOW,FSNS,PRECC,CLDMED,FSNT,PRECL,SHFLX,FSNTC,PRECSC,SWCF,TREFHT" years = "1850:1860:5", [[ land_monthly ]] @@ -59,7 +99,8 @@ years = "1850:1854:2", # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" + #vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" + vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO" ts_fmt = "cmip" [[ land_monthly_glb ]] @@ -71,6 +112,26 @@ years = "1850:1854:2", # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests - vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" + #vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" + #vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO" + # 1. Remove QOVER,QVEGE + # 2. Remove QRUNOFF + # 3. Still errors on QOVER + # 4. Still errors on QVEGE + # 5. Still errors on QOVER + # 6. Remove QVEGT + # 7. Still errors on QVEGT + # 8. Remove TSOI + # 9. Remove QSOIL + # 10. Remove SOILICE + # 11. Still errors on SOILICE + # 12. Remove LAISHA + # 13. Remove QINTR + # 14. Still errors on QVEGE + # 15. Still errors on LAISHA + # 16. Still errors on QVEGE + # 17. Still errors on SOILICE + # 18. Still errors on TSOI + vars = "FSH,RH2M,LAISUN,SOILLIQ,SOILWATER_10CM,TSA,H2OSNO" ts_fmt = "cmip" years = "1850:1860:5", From 1de44bc38ef22439100456d933b09386c4b7be07 Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Wed, 13 Dec 2023 12:38:34 -0600 Subject: [PATCH 6/7] Update --- .../generated/test_complete_run_chrysalis.cfg | 21 ++++--------------- tests/integration/template_complete_run.cfg | 20 +++--------------- 2 files changed, 7 insertions(+), 34 deletions(-) diff --git a/tests/integration/generated/test_complete_run_chrysalis.cfg b/tests/integration/generated/test_complete_run_chrysalis.cfg index b9b5511b..9e4073b7 100644 --- a/tests/integration/generated/test_complete_run_chrysalis.cfg +++ b/tests/integration/generated/test_complete_run_chrysalis.cfg @@ -38,28 +38,14 @@ years = "1850:1854:2", "1850:1854:4", [[ land_monthly_180x360_aave ]] frequency = "monthly" + input_files = "elm.h0" + input_subdir = archive/lnd/hist # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests #vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" # vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO" - # 1. Remove FSH - # 2. Remove RH2M - # 3. Remove LAISHA - # 4. Remove LAISUN - # 5. Remove QINTR - # 6. Remove QOVER - # 7. Remove QRUNOFF - # 8. Remove QSOIL - # 9. Remove QVEGE - # 10. Remove QVEGT - # 11. Remove SOILICE - # 12. Remove SOILLIQ - # 13. Remove SOILWATER_10CM - # 14. Remove TSA - # 15. Remove TSOI - # 16. Remove H2OSNO - vars = "" + #vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO" [ts] active = True @@ -131,6 +117,7 @@ years = "1850:1854:2", # 15. Still errors on LAISHA # 16. Still errors on QVEGE # 17. Still errors on SOILICE + # 18. Still errors on TSOI vars = "FSH,RH2M,LAISUN,SOILLIQ,SOILWATER_10CM,TSA,H2OSNO" ts_fmt = "cmip" years = "1850:1860:5", diff --git a/tests/integration/template_complete_run.cfg b/tests/integration/template_complete_run.cfg index 0e252057..69e4e496 100644 --- a/tests/integration/template_complete_run.cfg +++ b/tests/integration/template_complete_run.cfg @@ -38,28 +38,14 @@ years = "1850:1854:2", "1850:1854:4", [[ land_monthly_180x360_aave ]] frequency = "monthly" + input_files = "elm.h0" + input_subdir = archive/lnd/hist # From https://bitbucket.org/minxu/alm2ilamb_wkflow/src/8b8fb98911911d930cc7f598ea64b83fdb199d4c/elm_singlevar_ts.bash#lines-304 #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests #vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" # vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO" - # 1. Remove FSH - # 2. Remove RH2M - # 3. Remove LAISHA - # 4. Remove LAISUN - # 5. Remove QINTR - # 6. Remove QOVER - # 7. Remove QRUNOFF - # 8. Remove QSOIL - # 9. Remove QVEGE - # 10. Remove QVEGT - # 11. Remove SOILICE - # 12. Remove SOILLIQ - # 13. Remove SOILWATER_10CM - # 14. Remove TSA - # 15. Remove TSOI - # 16. Remove H2OSNO - vars = "" + #vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO" [ts] active = True From 6c65f93994cfbf9f4fd807ea7f792a4ee216212c Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Fri, 2 Feb 2024 12:19:42 -0600 Subject: [PATCH 7/7] Update --- tests/integration/generated/test_bundles_chrysalis.cfg | 4 ++-- .../integration/generated/test_complete_run_chrysalis.cfg | 8 ++++---- tests/integration/template_complete_run.cfg | 4 ++-- tests/integration/utils.py | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/integration/generated/test_bundles_chrysalis.cfg b/tests/integration/generated/test_bundles_chrysalis.cfg index 2e8e73d2..b16b043e 100644 --- a/tests/integration/generated/test_bundles_chrysalis.cfg +++ b/tests/integration/generated/test_bundles_chrysalis.cfg @@ -7,11 +7,11 @@ input = "/lcrc/group/e3sm/ac.forsyth2/E3SMv2/v2.LR.historical_0201" input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" # To run this test, edit `output` and `www` in this file, along with `actual_images_dir` in test_bundles.py -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_bundles_output/issue_531/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_bundles_output/issue_531_20240202/v2.LR.historical_0201" partition = "compute" qos = "regular" walltime = "07:00:00" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_bundles_www/issue_531" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_bundles_www/issue_531_20240202" [bundle] diff --git a/tests/integration/generated/test_complete_run_chrysalis.cfg b/tests/integration/generated/test_complete_run_chrysalis.cfg index 9e4073b7..d46e559e 100644 --- a/tests/integration/generated/test_complete_run_chrysalis.cfg +++ b/tests/integration/generated/test_complete_run_chrysalis.cfg @@ -7,10 +7,10 @@ input = "/lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201" input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" # To run this test, edit `output` and `www` in this file, along with `actual_images_dir` in test_complete_run.py -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/issue_531/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/issue_531_20240202/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_complete_run_www/issue_531" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_complete_run_www/issue_531_20240202" [climo] active = True @@ -44,8 +44,8 @@ years = "1850:1854:2", "1850:1854:4", #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests #vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" - # vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO" #vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO" + vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO,landfrac" [ts] active = True @@ -119,5 +119,5 @@ years = "1850:1854:2", # 17. Still errors on SOILICE # 18. Still errors on TSOI vars = "FSH,RH2M,LAISUN,SOILLIQ,SOILWATER_10CM,TSA,H2OSNO" - ts_fmt = "cmip" + #ts_fmt = "cmip" years = "1850:1860:5", diff --git a/tests/integration/template_complete_run.cfg b/tests/integration/template_complete_run.cfg index 69e4e496..68342978 100644 --- a/tests/integration/template_complete_run.cfg +++ b/tests/integration/template_complete_run.cfg @@ -44,8 +44,8 @@ years = "1850:1854:2", "1850:1854:4", #vars = "ALT,AR,BTRAN,CH4PROD,DENIT,EFLX_LH_TOT,ELAI,ER,ESAI,FAREA_BURNED,FCEV,FCH4,FCH4TOCO2,FCOV,FCTR,FGEV,FGR,FGR12,FH2OSFC,FINUNDATED,FIRA,FIRE,FLDS,FPG,FPI,FPSN,FROST_TABLE,FSA,FSAT,FSDS,FSH,FSM,FSNO,FSR,F_DENIT,F_NIT,GPP,GROSS_NMIN,H2OSFC,H2OSNO,HR,HTOP,LAND_USE_FLUX,LEAFC,FROOTC,NDEP_TO_SMINN,NBP,NEE,NEP,NET_NMIN,NFIX_TO_SMINN,NPP,Q2M,QCHARGE,QDRAI,QOVER,QRUNOFF,QRGWL,QSNOMELT,QSOIL,QVEGE,QVEGT,RAIN,RH2M,SMIN_NO3,SMIN_NH4,SNOW,SNOWDP,SNOWICE,SNOWLIQ,SNOW_DEPTH,SNOW_SINKS,SNOW_SOURCES,SOMHR,TG,TSA,TREFMXAV,TREFMNAV,TSAI,TLAI,TV,QBOT,TBOT,AGNPP,FROOTC_ALLOC,LEAFC_ALLOC,WOODC_ALLOC,WOOD_HARVESTC,CH4_SURF_AERE_SAT,CH4_SURF_AERE_UNSAT,CH4_SURF_DIFF_SAT,CH4_SURF_DIFF_UNSAT,CH4_SURF_EBUL_SAT,CONC_CH4_SAT,CONC_CH4_UNSAT,FCH4_DFSAT,MR,TOTCOLCH4,ZWT_CH4_UNSAT,FSDSND,FSDSNI,FSDSVD,FSDSVI,TWS,VOLR,WA,ZWT_PERCH,ZWT,WIND,COL_FIRE_CLOSS,F_DENIT_vr,F_NIT_vr,H2OSOI,O_SCALAR,SOILICE,SOILLIQ,SOILPSI,TLAKE,TSOI,T_SCALAR,W_SCALAR,SOIL1N,SOIL2N,SOIL3N,SOIL1C,SOIL2C,SOIL3C,TOTVEGC,TOTVEGN,TOTECOSYSC,TOTLITC,TOTLITC_1m,TOTLITN_1m,TOTSOMC,TOTSOMC_1m,TOTSOMN_1m,CWDC,PBOT" # From https://acme-climate.atlassian.net/wiki/spaces/EIDMG/pages/3476979729/zppy+New+Feature+Requests #vars = "NBP,PCO2,GPP,NPP,NEE,TOTECOSYSC,TOTVEGC,TOTSOMC,TOTSOMN,TOTSOMP,TOTLITC,CPOOL,FAREA_BURNED,NFIRES,FPI,FP_UPTAKE,PLANT_NDEMAND_COL,PLANT_PDEMAND_COL,SMINN_TO_PLANT,SMINP_TO_PLANT" - # vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO" #vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO" + vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO,landfrac" [ts] active = True @@ -119,5 +119,5 @@ years = "1850:1854:2", # 17. Still errors on SOILICE # 18. Still errors on TSOI vars = "FSH,RH2M,LAISUN,SOILLIQ,SOILWATER_10CM,TSA,H2OSNO" - ts_fmt = "cmip" + #ts_fmt = "cmip" years = "1850:1860:5", diff --git a/tests/integration/utils.py b/tests/integration/utils.py index 67220080..16a09a3a 100644 --- a/tests/integration/utils.py +++ b/tests/integration/utils.py @@ -7,7 +7,7 @@ from mache import MachineInfo from PIL import Image, ImageChops, ImageDraw -UNIQUE_ID = "issue_531" +UNIQUE_ID = "issue_531_20240202" # Image checking ##########################################################