From 492b52a22c06c226e6d4db986b232f02c6fb055d Mon Sep 17 00:00:00 2001 From: chengzhuzhang Date: Fri, 30 May 2025 11:44:06 -0500 Subject: [PATCH 1/6] update example cfg --- examples/post.v3.LR.historical.zppy_v3.cfg | 32 ++++++++++++---------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/examples/post.v3.LR.historical.zppy_v3.cfg b/examples/post.v3.LR.historical.zppy_v3.cfg index 2b16fa75..2963450b 100644 --- a/examples/post.v3.LR.historical.zppy_v3.cfg +++ b/examples/post.v3.LR.historical.zppy_v3.cfg @@ -3,16 +3,18 @@ # These are described here. # In particular, there are a total of 5 deprecated parameters. # (Search for "DEPRECATED" in this file to find them.) -# zppy v3.0.0 is included in E3SM Unified 1.11.0. +# zppy v3.0.0 is included in E3SM Unified 1.11. [default] # Change these two paths to include your username instead # You can also change these to match your preferred directory structure -output = /lcrc/group/e3sm/ac.forsyth2/zppy_example_v3/v3.LR.historical_0051 -www = /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_example_v3 +output = /lcrc/group/e3sm/ac.zhang40/zppy_example_v3/v3.LR.historical_0051_v3.1 +www = /lcrc/group/e3sm/public_html/diagnostic_output/ac.zhang40/zppy_example_v3.1 # Other paths input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 -environment_commands = "source /lcrc/soft/climate/e3sm-unified/load_latest_e3sm_unified_chrysalis.sh" + +# zppy auto-determines and sources latest e3sm-unified on each supported machine with environment_commands commented out. +#environment_commands = "source /lcrc/soft/climate/e3sm-unified/load_latest_e3sm_unified_chrysalis.sh" # Other parameters: campaign = "water_cycle" case = v3.LR.historical_0051 @@ -58,7 +60,7 @@ years = "1985:2014:30", # ts_fmt (e.g., `ts_fmt = "cmip"`) active = True walltime = "00:50:00" -years = "1985:2014:5" +years = "1850:2014:5", "1985:2014:30" [[ atm_monthly_180x360_aave ]] # This subtask is a dependency for the e3sm_diags task's atm_monthly_180x360 and atm_monthly_180x360_aave_mvm subtasks. @@ -169,7 +171,7 @@ years = "1985:2014:30", # you can do something like the following: # environment_commands = "source /home/ac.zhang40/y/etc/profile.d/conda.sh; conda activate e3sm_diags_dev" # `e3sm_diags` is largely driven by which e3sm_diags sets are requested: - sets="lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","qbo","diurnal_cycle","zonal_mean_2d_stratosphere","aerosol_aeronet","tropical_subseasonal","tc_analysis", "tropical_subseasonal", + sets="lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","enso_diags","qbo","diurnal_cycle","zonal_mean_2d_stratosphere","aerosol_aeronet","tropical_subseasonal","tc_analysis", "tropical_subseasonal", # We can categorize e3sm_diags sets into 6 groups, based on dependencies. # Different e3sm_diags sets require different parameters to be set. # @@ -181,7 +183,7 @@ years = "1985:2014:30", # The name of this subtask doesn't match up with the name of the subtask for diurnal data in the `climo` task. We therefore need to explicitly tell zppy which subtask to use. climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave" # 3. These sets depend on the ts task's atm_monthly_180x360_aave subtask: - # "enso_diags" (not requested), "qbo", "area_mean_time_series" (not requested) + # "enso_diags" , "qbo", "area_mean_time_series" (not requested) # 4. These sets depend on the ts task's atm_daily_180x360_aave subtask: # "tropical_subseasonal" ts_daily_subsection = "atm_daily_180x360_aave" @@ -194,6 +196,8 @@ years = "1985:2014:30", # Plus several other parameters: grid = '180x360_aave' short_name = 'v3.LR.historical_0051' + # Save subplot in pdf format + # output_format_subplot = "pdf", [[atm_monthly_180x360_aave_mvm]] sets="lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","qbo","diurnal_cycle","zonal_mean_2d_stratosphere", @@ -251,13 +255,13 @@ years = "1985:2014:30", [mpas_analysis] active = True -anomalyRefYear = 1985 +anomalyRefYear = 1850 climo_years = "1985-2014", -enso_years = "1985-2014", +enso_years = "1850-2014", mesh = "IcoswISC30E3r5" parallelTaskCount = 6 shortTermArchive = True -ts_years = "1985-2014", +ts_years = "1850-2014", walltime = "4:00:00" [global_time_series] @@ -266,18 +270,18 @@ walltime = "4:00:00" # atmosphere_only (now just remove the ocean plots when setting plots_original) # plot_names (plot names should now be explicitly set via the plots_atm/ice/lnd/ocn parameters) active = True -climo_years ="1985-2014", experiment_name = "v3.LR.historical_0051" +climo_years ="1985-2014", # Matches mpas_analysis climo_years for dependency tracking +ts_years ="1850-2014", # Matches mpas_analysis ts_years +moc_file = "mocTimeSeries_1850-2014.nc" # Matches mpas_analysis ts_years figstr = "v3.LR.historical_0051" make_viewer = True -moc_file = "mocTimeSeries_1985-2014.nc" plots_atm = "TREFHT" # This will plot in the atm component; it has no effect on the original plots plots_lnd = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR" # Set this to "all" to plot all land variables # plots_original isn't set and so will default to the original 8 plots. ts_num_years = 5 -ts_years ="1985-2014", +years = "1850-2014", # The years to be plotted walltime = "10:00:00" -years = "1985-2014", [ilamb] # This task depends on the e3sm_to_cmip task's atm_monthly_180x360_aave and land_monthly subtasks. From 26a7bc3907dedf48fcc739b6262a3734f31cb5fd Mon Sep 17 00:00:00 2001 From: chengzhuzhang Date: Fri, 30 May 2025 12:10:03 -0500 Subject: [PATCH 2/6] add streamflow --- examples/post.v3.LR.historical.zppy_v3.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/post.v3.LR.historical.zppy_v3.cfg b/examples/post.v3.LR.historical.zppy_v3.cfg index 2963450b..889f6d44 100644 --- a/examples/post.v3.LR.historical.zppy_v3.cfg +++ b/examples/post.v3.LR.historical.zppy_v3.cfg @@ -171,7 +171,7 @@ years = "1985:2014:30", # you can do something like the following: # environment_commands = "source /home/ac.zhang40/y/etc/profile.d/conda.sh; conda activate e3sm_diags_dev" # `e3sm_diags` is largely driven by which e3sm_diags sets are requested: - sets="lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","enso_diags","qbo","diurnal_cycle","zonal_mean_2d_stratosphere","aerosol_aeronet","tropical_subseasonal","tc_analysis", "tropical_subseasonal", + sets="lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","enso_diags","qbo","diurnal_cycle","zonal_mean_2d_stratosphere","aerosol_aeronet","tropical_subseasonal","tc_analysis", "tropical_subseasonal","streamflow", # We can categorize e3sm_diags sets into 6 groups, based on dependencies. # Different e3sm_diags sets require different parameters to be set. # @@ -188,7 +188,7 @@ years = "1985:2014:30", # "tropical_subseasonal" ts_daily_subsection = "atm_daily_180x360_aave" # 5. These sets depend on the ts task's rof_monthly subtask: - # "streamflow" (not requested) + # "streamflow" # 6. These sets depend on the tc_analysis task: # "tc_analysis" # No extra parameters required for this set. From ed5769ded47fe00b8650fd2726799168856f2b97 Mon Sep 17 00:00:00 2001 From: chengzhuzhang Date: Fri, 30 May 2025 12:34:19 -0500 Subject: [PATCH 3/6] fix pre-committing --- examples/post.v3.LR.historical.zppy_v3.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/post.v3.LR.historical.zppy_v3.cfg b/examples/post.v3.LR.historical.zppy_v3.cfg index 889f6d44..7a598897 100644 --- a/examples/post.v3.LR.historical.zppy_v3.cfg +++ b/examples/post.v3.LR.historical.zppy_v3.cfg @@ -255,7 +255,7 @@ years = "1985:2014:30", [mpas_analysis] active = True -anomalyRefYear = 1850 +anomalyRefYear = 1850 climo_years = "1985-2014", enso_years = "1850-2014", mesh = "IcoswISC30E3r5" From 17f2d2c7e8fbd7dddd6e02f2feb8cb4d05c96eb3 Mon Sep 17 00:00:00 2001 From: chengzhuzhang Date: Tue, 21 Oct 2025 20:14:52 -0500 Subject: [PATCH 4/6] update for v3.1.0 --- examples/post.v3.LR.historical.zppy_v3.cfg | 25 ++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/examples/post.v3.LR.historical.zppy_v3.cfg b/examples/post.v3.LR.historical.zppy_v3.cfg index 7a598897..6f88ccf7 100644 --- a/examples/post.v3.LR.historical.zppy_v3.cfg +++ b/examples/post.v3.LR.historical.zppy_v3.cfg @@ -1,20 +1,20 @@ -# This is an example zppy v3.0.0 configuration file for Chrysalis. -# v3.0.0 has several non-backward compatible ("breaking") changes. +# This is an example zppy v3.1.0 configuration file for Chrysalis. +# v3.1.0 has several non-backward compatible ("breaking") changes. # These are described here. -# In particular, there are a total of 5 deprecated parameters. -# (Search for "DEPRECATED" in this file to find them.) -# zppy v3.0.0 is included in E3SM Unified 1.11. +# zppy v3.1.0 is included in E3SM Unified 1.12. [default] # Change these two paths to include your username instead # You can also change these to match your preferred directory structure -output = /lcrc/group/e3sm/ac.zhang40/zppy_example_v3/v3.LR.historical_0051_v3.1 +output = /lcrc/group/e3sm/ac.zhang40/zppy_example_v3.1/v3.LR.historical_0051 www = /lcrc/group/e3sm/public_html/diagnostic_output/ac.zhang40/zppy_example_v3.1 # Other paths input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 # zppy auto-determines and sources latest e3sm-unified on each supported machine with environment_commands commented out. #environment_commands = "source /lcrc/soft/climate/e3sm-unified/load_latest_e3sm_unified_chrysalis.sh" +# For testing Unified rc: +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.12.0rc2_chrysalis.sh" # Other parameters: campaign = "water_cycle" case = v3.LR.historical_0051 @@ -60,7 +60,7 @@ years = "1985:2014:30", # ts_fmt (e.g., `ts_fmt = "cmip"`) active = True walltime = "00:50:00" -years = "1850:2014:5", "1985:2014:30" +years = "1850:2014:5", [[ atm_monthly_180x360_aave ]] # This subtask is a dependency for the e3sm_diags task's atm_monthly_180x360 and atm_monthly_180x360_aave_mvm subtasks. @@ -71,7 +71,7 @@ years = "1850:2014:5", "1985:2014:30" input_files = "eam.h0" input_subdir = "archive/atm/hist" mapping_file = map_ne30pg2_to_cmip6_180x360_aave.20200201.nc - vars = "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,CLDTOT,CLDHGH,CLDMED,CLDLOW,U,ICEFRAC,LANDFRAC,OCNFRAC,PS,CLDICE,CLDLIQ,T,AODDUST,PSL,U10,QREFHT,LHFLX,FLDS,TGCLDIWP,TGCLDCWP,TMQ,FLNSC,FLUTC,FSDS,FSDSC,SOLIN,FSNSC,FSNTOAC,AODABS,AODVIS,AREL,TREFMNAV,TREFMXAV" + vars = "AODABS,AODALL,AODBC,AODDUST,AODPOM,AODSO4,AODSOA,AODSS,AODVIS,AREL,CLDHGH,CLDLOW,CLDMED,CLDTOT,CO_SRF,FLDS,FLNS,FLNSC,FLNT,FLUT,FLUTC,FSDS,FSDSC,FSNS,FSNSC,FSNT,FSNTOA,FSNTOAC,ICEFRAC,LANDFRAC,LHFLX,OCNFRAC,PRECC,PRECL,PRECSC,PRECSL,PS,PSL,QFLX,QREFHT,SCO,SHFLX,SOLIN,TAUX,TAUY,TCO,TGCLDCWP,TGCLDIWP,TMQ,TREFHT,TREFMNAV,TREFMXAV,TROP_P,TS,U10,U,T,O3,CLDICE,CLDLIQ" # Needed for mixed-phase partition: # vars = "LANDFRAC,CLDICE,CLDLIQ,T" @@ -120,8 +120,9 @@ years = "1850:2014:5", "1985:2014:30" input_files = "elm.h0" input_subdir = "archive/lnd/hist" mapping_file = "glb" - vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR" - #vars = "" # This will tell zppy to use all available variables. Note, including all variables will increase run time for [global_time_series] time (e.g., 7 hours for 30 years data). +# vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR" + job_nbr = 50 # This reduces paralllel processes in ncclimo time-series splitting for memory management. + vars = "" # This will tell zppy to use all available variables. [e3sm_to_cmip] # This is a new task in zppy v3.0.0! @@ -277,7 +278,8 @@ moc_file = "mocTimeSeries_1850-2014.nc" # Matches mpas_analysis ts_years figstr = "v3.LR.historical_0051" make_viewer = True plots_atm = "TREFHT" # This will plot in the atm component; it has no effect on the original plots -plots_lnd = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR" # Set this to "all" to plot all land variables +#plots_lnd = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR" # Set this to "all" to plot all land variables +plots_lnd = "all" # plots_original isn't set and so will default to the original 8 plots. ts_num_years = 5 years = "1850-2014", # The years to be plotted @@ -290,4 +292,5 @@ nodes = 1 short_name = 'v3.LR.historical_0051' ts_num_years = 5 walltime = "2:00:00" +cfg = "inclusions/ilamb/cmip.cfg" years = "1985:2014:30" From 0368480fb3063b7a991a15a8f9b7652390373113 Mon Sep 17 00:00:00 2001 From: chengzhuzhang Date: Wed, 22 Oct 2025 12:24:00 -0500 Subject: [PATCH 5/6] inline doc updates --- examples/post.v3.LR.historical.zppy_v3.cfg | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/examples/post.v3.LR.historical.zppy_v3.cfg b/examples/post.v3.LR.historical.zppy_v3.cfg index 6f88ccf7..15da3d44 100644 --- a/examples/post.v3.LR.historical.zppy_v3.cfg +++ b/examples/post.v3.LR.historical.zppy_v3.cfg @@ -1,13 +1,15 @@ # This is an example zppy v3.1.0 configuration file for Chrysalis. -# v3.1.0 has several non-backward compatible ("breaking") changes. -# These are described here. # zppy v3.1.0 is included in E3SM Unified 1.12. +# +# NOTE: This configuration generates approximately 220 tasks/jobs when fully enabled. +# Users should only enable the tasks and time periods they need based on their specific +# analysis requirements to reduce computational load and queue time. [default] # Change these two paths to include your username instead # You can also change these to match your preferred directory structure output = /lcrc/group/e3sm/ac.zhang40/zppy_example_v3.1/v3.LR.historical_0051 -www = /lcrc/group/e3sm/public_html/diagnostic_output/ac.zhang40/zppy_example_v3.1 +www = /lcrc/group/e3sm/public_html/diagnostic_output/zppy_example/v3.1 # Other paths input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 From 738f67039f644a60bdb64119de27fe8bd928891a Mon Sep 17 00:00:00 2001 From: chengzhuzhang Date: Fri, 24 Oct 2025 11:42:40 -0500 Subject: [PATCH 6/6] address review comment --- examples/post.v3.LR.historical.zppy_v3.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/post.v3.LR.historical.zppy_v3.cfg b/examples/post.v3.LR.historical.zppy_v3.cfg index 15da3d44..8e64bc82 100644 --- a/examples/post.v3.LR.historical.zppy_v3.cfg +++ b/examples/post.v3.LR.historical.zppy_v3.cfg @@ -8,15 +8,15 @@ [default] # Change these two paths to include your username instead # You can also change these to match your preferred directory structure -output = /lcrc/group/e3sm/ac.zhang40/zppy_example_v3.1/v3.LR.historical_0051 -www = /lcrc/group/e3sm/public_html/diagnostic_output/zppy_example/v3.1 +output = /lcrc/group/e3sm/ac.zhang40/zppy_example_v3.1.0/v3.LR.historical_0051 +www = /lcrc/group/e3sm/public_html/diagnostic_output/zppy_example/v3.1.0 # Other paths input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 # zppy auto-determines and sources latest e3sm-unified on each supported machine with environment_commands commented out. #environment_commands = "source /lcrc/soft/climate/e3sm-unified/load_latest_e3sm_unified_chrysalis.sh" # For testing Unified rc: -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.12.0rc2_chrysalis.sh" +#environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.12.0rc2_chrysalis.sh" # Other parameters: campaign = "water_cycle" case = v3.LR.historical_0051