Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test climo and ts for land variables #533

Closed
wants to merge 7 commits into from
Closed

Test climo and ts for land variables #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aa1db7f
Test ts for land variables
forsyth2 Nov 22, 2023
f2f6a7c
Test climo for land variables
forsyth2 Nov 22, 2023
75eb5f5
Smaller subset of vars
forsyth2 Nov 22, 2023
8b69df6
Remove spaces in vars
forsyth2 Nov 22, 2023
49e45c7
Test variables
forsyth2 Nov 29, 2023
1de44bc
Update
forsyth2 Dec 13, 2023
6c65f93
Update
forsyth2 Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/integration/generated/test_bundles_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_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/unique_id"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_bundles_www/issue_531_20240202"

[bundle]

Expand Down
186 changes: 77 additions & 109 deletions tests/integration/generated/test_complete_run_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/unique_id/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/unique_id"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_complete_run_www/issue_531_20240202"

[climo]
active = True
Expand All @@ -19,12 +19,33 @@ 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"
# 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"
# 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"
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"
vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO,landfrac"

[ts]
active = True
Expand All @@ -35,121 +56,68 @@ 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"
# 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_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"
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"
# 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 ]]
extra_vars = "landfrac"
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"
# 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"
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"
# 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 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",
Loading
Loading