Further pcmdi_diags updates

examples/post.v3.LR.amip.0101.cfg

@@ -7,8 +7,8 @@
 # 5. Then, you can run those lines stand-alone.
 [default]
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/AMIP/v3.LR.amip_0101
-output = /lcrc/group/e3sm/ac.forsyth2/zppy_pmp_amip/unique_id_20251007_4/v3.LR.amip_0101
-www = /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_pmp_amip/unique_id_20251007_4
+output = /lcrc/group/e3sm/ac.forsyth2/zppy_pmp_amip/unique_id_<date>/v3.LR.amip_0101
+www = /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_pmp_amip/unique_id_<date>
 campaign = "water_cycle"
 case = v3.LR.amip_0101
 debug = False
@@ -36,15 +36,14 @@ walltime = "00:10:00"
 years = "2005:2015:5"
 
   [[ atm_monthly_180x360_aave ]]
-  cmip_plevdata = "/lcrc/group/e3sm/ac.szhang/acme_scratch/e3sm_project/zppy/zppy/templates/inclusions/e3sm_to_cmip/vrt_remap_plev19.nc"
   input_files = "eam.h0"
   interp_vars = "U,V,T,Z3"
   ts_subsection = "atm_monthly_180x360_aave"
   vars = "ICEFRAC,LANDFRAC,OCNFRAC,PSL,FSNTC,FSNTOAC,SWCF,LWCF,FLUT,FSNT,FSNTOA,FLNT,FLNTC,FSNS,FLNS,FSNS,SHFLX,QFLX,LHFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,U10,QREFHT,TMQ,CLDTOT,CLDHGH,CLDMED,CLDLOW,FLDS,FSDS,TGCLDIWP,TGCLDCWP,TGCLDLWP,FLNSC,FLUTC,FSDSC,SOLIN,FSNSC,AODABS,AODVIS,AODDUST,AREL,TREFMNAV,TREFMXAV,PS,PHIS,U,V,T,Z3"
 
 [pcmdi_diags]
 active = True
-environment_commands_secondary = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi-pcmdi-diags-20251007-test1"
+environment_commands_secondary = "source /lcrc/soft/climate/e3sm-unified/load_latest_e3sm_unified_chrysalis.sh"
 walltime = "4:00:00"
 # Create rules to construct cmip-like datasets with a string constructed as
 # "mip.exp.product.realization", where "."is used as the delimiter (mandatory)
@@ -124,7 +123,7 @@ ts_years = "2005-2014",
   # use subset variables for viewer
   clim_vars = "pr,prw,psl,rlds,rldscs,ua-200,zg-500"
   # use subset regions for viewer
-  clim_regions = "global,ocean,land"
+  clim_regions = "global"
   # use subset modes for viewer
   mova_modes = "NAM,NAO,PNA,NPO,SAM"
   # use subset modes for viewer

examples/post.v3.LR.historical.0101.cfg

@@ -1,7 +1,10 @@
+# Directions to run:
+# 1. Update <output>, <www>, <environment_commands_secondary> below.
+# 2. Run with `zppy -c examples/post.v3.LR.historical.0101.cfg`.
 [default]
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0101
-output = /lcrc/group/e3sm/ac.forsyth2/zppy_pmp_hist/unique_id_20251007_4/v3.LR.amip_0101
-www = /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_pmp_hist/unique_id_20251007_4
+output = /lcrc/group/e3sm/ac.forsyth2/zppy_pmp_hist/unique_id_<date>/v3.LR.hist_0101
+www = /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_pmp_hist/unique_id_<date>
 campaign = "water_cycle"
 case = v3.LR.historical_0101
 debug = False
@@ -29,15 +32,14 @@ walltime = "00:10:00"
 years = "2005:2015:5"
 
   [[ atm_monthly_180x360_aave ]]
-  cmip_plevdata = "/lcrc/group/e3sm/ac.szhang/acme_scratch/e3sm_project/zppy/zppy/templates/inclusions/e3sm_to_cmip/vrt_remap_plev19.nc"
   input_files = "eam.h0"
   interp_vars = "U,V,T,Z3"
   ts_subsection = "atm_monthly_180x360_aave"
   vars = "ICEFRAC,LANDFRAC,OCNFRAC,PSL,FSNTC,FSNTOAC,SWCF,LWCF,FLUT,FSNT,FSNTOA,FLNT,FLNTC,FSNS,FLNS,FSNS,SHFLX,QFLX,LHFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,U10,QREFHT,TMQ,CLDTOT,CLDHGH,CLDMED,CLDLOW,FLDS,FSDS,TGCLDIWP,TGCLDCWP,TGCLDLWP,FLNSC,FLUTC,FSDSC,SOLIN,FSNSC,AODABS,AODVIS,AODDUST,AREL,TREFMNAV,TREFMXAV,PS,PHIS,U,V,T,Z3"
 
 [pcmdi_diags]
 active = True
-environment_commands_secondary = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi-pcmdi-diags-20251007-test1"
+environment_commands_secondary = "source /lcrc/soft/climate/e3sm-unified/load_latest_e3sm_unified_chrysalis.sh"
 walltime = "4:00:00"
 # Create rules to construct cmip-like datasets with a string constructed as
 # "mip.exp.product.realization", where "."is used as the delimiter (mandatory)

tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg

@@ -9,10 +9,10 @@ infer_section_parameters = False
 input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_test_20251007_4/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/unique_id_test_20251007_4"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/unique_id"
 years = "1985:1989:2",
 
 [climo]
@@ -26,14 +26,14 @@ walltime = "00:30:00"
   vars = ""
 
   [[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
-  active = False
+  active = True
   frequency = "diurnal_8xdaily"
   input_files = "eam.h3"
   input_subdir = "archive/atm/hist"
   vars = "PRECT"
 
   [[ land_monthly_climo ]]
-  active = False
+  active = True
   frequency = "monthly"
   input_files = "elm.h0"
   input_subdir = "archive/lnd/hist"
@@ -51,14 +51,14 @@ walltime = "00:30:00"
   years = "1985:1995:2", # Need 10 years for pcmdi_diags task
 
   [[ atm_daily_180x360_aave ]]
-  active = False
+  active = True
   frequency = "daily"
   input_files = "eam.h1"
   input_subdir = "archive/atm/hist"
   vars = "PRECT"
 
   [[ rof_monthly ]]
-  active = False
+  active = True
   extra_vars = 'areatotal2'
   frequency = "monthly"
   input_files = "mosart.h0"
@@ -68,15 +68,15 @@ walltime = "00:30:00"
 
   [[ atm_monthly_glb ]]
   # Note global average won't work for 3D variables.
-  active = False
+  active = True
   frequency = "monthly"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
   mapping_file = "glb"
   years = "1985:1995:5",
 
   [[ lnd_monthly_glb ]]
-  active = False
+  active = True
   frequency = "monthly"
   input_files = "elm.h0"
   input_subdir = "archive/lnd/hist"
@@ -99,9 +99,11 @@ ts_num_years=2
 walltime = "00:30:00"
 
   [[ atm_monthly_180x360_aave ]]
-  cmip_plevdata = "/lcrc/group/e3sm/ac.szhang/acme_scratch/e3sm_project/zppy/zppy/templates/inclusions/e3sm_to_cmip/vrt_remap_plev19.nc"
+  cmip_plevdata = "/lcrc/group/e3sm/diagnostics/e3sm_to_cmip_data/maps/vrt_remap_plev19.nc"
+  cmip_vars = "ua, va, ta, wa, zg, hur, tas, ts, psl, ps, sfcWind, huss, pr, prc, prsn, evspsbl, tauu, tauv, hfls, clt, rlus, rsds, rsus, hfss, clivi, clwvi, rlut, rsdt, rsuscs, rsut, rtmt, abs550aer, od550aer, rsdscs, tasmax, tasmin"
   input_files = "eam.h0"
   ts_subsection = "atm_monthly_180x360_aave"
+  vars = "ICEFRAC,LANDFRAC,OCNFRAC,PSL,FSNTC,FSNTOAC,SWCF,LWCF,FLUT,FSNT,FSNTOA,FLNT,FLNTC,FSNS,FLNS,FSNS,SHFLX,QFLX,LHFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,U10,QREFHT,TMQ,CLDTOT,CLDHGH,CLDMED,CLDLOW,FLDS,FSDS,TGCLDIWP,TGCLDCWP,TGCLDLWP,FLNSC,FLUTC,FSDSC,SOLIN,FSNSC,AODABS,AODVIS,AODDUST,AREL,TREFMNAV,TREFMXAV,PS,PHIS,U,V,T,Z3"
   years = "1985:1995:2", # Need 10 years for pcmdi_diags task
 
   [[ land_monthly ]]
@@ -114,11 +116,11 @@ walltime = "00:30:00"
 # walltime = "00:30:00"
 
 [e3sm_diags]
-active = False
+active = True
 climo_diurnal_frequency = "diurnal_8xdaily"
 climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave"
 climo_subsection = "atm_monthly_180x360_aave"
-environment_commands = "source /lcrc/soft/climate/e3sm-unified/load_latest_e3sm_unified_chrysalis.sh"
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8
@@ -170,16 +172,16 @@ tc_obs = "/lcrc/group/e3sm/diagnostics/observations/Atm/tc-analysis/"
   tag = "model_vs_model"
   ts_num_years_ref = 2
   # Reference paths
-  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_test_20251007_4/v3.LR.historical_0051/post/atm/180x360_aave/clim"
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim"
   # mvm streamflow only
   gauges_path = "/lcrc/group/e3sm/diagnostics/observations/Atm/time-series/GSIM/GSIM_catchment_characteristics_all_1km2.csv"
-  reference_data_path_ts_rof = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_test_20251007_4/v3.LR.historical_0051/post/rof/native/ts/monthly"
+  reference_data_path_ts_rof = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/rof/native/ts/monthly"
   # mvm diurnal_cycle only
-  reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_test_20251007_4/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily"
+  reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily"
   # mvm "enso_diags", "qbo", "area_mean_time_series"
-  reference_data_path_ts = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_test_20251007_4/v3.LR.historical_0051/post/atm/180x360_aave/ts/monthly"
+  reference_data_path_ts = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/ts/monthly"
   # mvm tropical_subseasonal only
-  reference_data_path_ts_daily = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_test_20251007_4/v3.LR.historical_0051/post/atm/180x360_aave/ts/daily"
+  reference_data_path_ts_daily = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/ts/daily"
 
   [[ lnd_monthly_mvm_lnd ]]
   # Test model-vs-model using the same files as the reference
@@ -195,10 +197,10 @@ tc_obs = "/lcrc/group/e3sm/diagnostics/observations/Atm/tc-analysis/"
   tag = "model_vs_model"
   ts_num_years_ref = 2
   # Reference paths
-  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_test_20251007_4/v3.LR.historical_0051/post/lnd/180x360_aave/clim"
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/lnd/180x360_aave/clim"
 
 [mpas_analysis]
-active = False
+active = True
 anomalyRefYear = 1985
 climo_years = "1985-1989", "1990-1995",
 enso_years = "1985-1989", "1990-1995",
@@ -211,9 +213,9 @@ ts_years = "1985-1989", "1985-1995",
 walltime = "00:30:00"
 
 [global_time_series]
-active = False
+active = True
 climo_years = "1985-1989", "1990-1995",
-environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi-pcmdi-diags-20251007-test1"
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
 experiment_name = "v3.LR.historical_0051"
 figstr = "v3.LR.historical_0051"
 #moc_file=mocTimeSeries_1985-1995.nc
@@ -297,7 +299,7 @@ years = "1985-1995",
 
 
 [ilamb]
-active = False
+active = True
 e3sm_to_cmip_atm_subsection = "atm_monthly_180x360_aave"
 e3sm_to_cmip_land_subsection = "land_monthly"
 ilamb_obs = "/lcrc/group/e3sm/diagnostics/ilamb_data"
@@ -312,7 +314,7 @@ years = "1985:1989:4"
 
 [pcmdi_diags]
 active = True
-environment_commands_secondary = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi-pcmdi-diags-20251007-test1"
+environment_commands_secondary = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
 walltime = "2:00:00"
 model_name = 'e3sm.historical.v3-LR.0051'
 model_tableID = 'Amon'
@@ -331,10 +333,11 @@ ts_years = "1985-1994",
   ref_final_yr = 1994
   ref_start_yr = 1985
   ref_years = "1985-1994",
+  cmip_vars = "pr,psl,rlut,rsut,rsds,rsdscs,rsdt,rsus,rsuscs,rlus,rtmt,sfcWind,tas,tauu,tauv,ts,ta,ua,va,zg"
   target_grid = "2.5x2.5"
   target_grid_string = "2p5x2p5"
-  clim_vars = "pr,rlut,rtmt,tas,tauu,tauv,ts"
-  clim_regions = "global,ocean,land,NHEX,SHEX,TROPICS"
+  clim_vars = "pr,psl,rsus,rsuscs,rlus,rlut,rsds,rsdscs,rsdt,rsut,sfcWind,tas,tauu,tauv,ts,ta-200,ta-850,ua-200,ua-850,va-200,va-850"
+  clim_regions = "global,ocean,land,Tropics,NHEX,SHEX"
 
   [[ variability_modes_cpl ]]
   active = True
@@ -369,16 +372,16 @@ ts_years = "1985-1994",
   [[ synthetic_plots ]]
   active = True
   current_set = "synthetic_plots" # Can be inferred if needed
-  clim_vars = "pr,rlut,rtmt,tas,tauu,tauv,ts"
-  clim_regions = "global,ocean,land,NHEX,SHEX,TROPICS"
-  mova_modes = "NAM,NAO,PNA,NPO,SAM,PSA1,PSA2"
-  movc_modes = "PDO,NPGO,AMO"
+  clim_vars = "pr,psl,ua-200"
+  clim_regions = "global,ocean,land"
+  mova_modes = "NAM,NAO,PNA,NPO,SAM"
+  movc_modes = "PDO,NPGO"
   clim_viewer = True
-  clim_years = "2005-2014"
+  clim_years = "1985-1994"
   mova_viewer = True
-  mova_years = "2005-2014"
+  mova_years = "1985-1994"
   movc_viewer = True
-  movc_years = "2005-2014"
+  movc_years = "1985-1994"
   enso_viewer = False
   enso_years = ""
   cmip_clim_dir = /lcrc/group/e3sm/diagnostics/pcmdi_data/metrics_data/mean_climate

tests/integration/generated/update_weekly_expected_files_chrysalis.sh

@@ -35,17 +35,17 @@ do
     # Copy output so you don't have to rerun zppy to generate the output.
     if [[ "${test_name,,}" =~ "v2" ]]; then
       # We need the v2 case name
-      cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/unique_id_test_20251007_4/v2.LR.historical_0201 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name}
+      cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/unique_id/v2.LR.historical_0201 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name}
     else
       # We need the v3 case name
-      cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/unique_id_test_20251007_4/v3.LR.historical_0051 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name}
+      cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/unique_id/v3.LR.historical_0051 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name}
     fi
 
     # test_bundles.py also needs the bash files transferred.
     # Note that for legacy cfgs, we're only testing test_images.py
     if [[ "${test_name,,}" == "bundles" ]]; then
       mkdir -p /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files
-      cp -r /lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/unique_id_test_20251007_4/v3.LR.historical_0051/post/scripts/bundle*.bash /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files
+      cp -r /lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/unique_id/v3.LR.historical_0051/post/scripts/bundle*.bash /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files
     fi
 
     zppy_top_level=$(pwd)

tests/integration/template_weekly_comprehensive_v3.cfg

@@ -99,9 +99,11 @@ ts_num_years=2
 walltime = "00:30:00"
 
   [[ atm_monthly_180x360_aave ]]
-  cmip_plevdata = "/lcrc/group/e3sm/ac.szhang/acme_scratch/e3sm_project/zppy/zppy/templates/inclusions/e3sm_to_cmip/vrt_remap_plev19.nc"
+  cmip_plevdata = "#expand diagnostics_base_path#/e3sm_to_cmip_data/maps/vrt_remap_plev19.nc"
+  cmip_vars = "ua, va, ta, wa, zg, hur, tas, ts, psl, ps, sfcWind, huss, pr, prc, prsn, evspsbl, tauu, tauv, hfls, clt, rlus, rsds, rsus, hfss, clivi, clwvi, rlut, rsdt, rsuscs, rsut, rtmt, abs550aer, od550aer, rsdscs, tasmax, tasmin"
   input_files = "eam.h0"
   ts_subsection = "atm_monthly_180x360_aave"
+  vars = "ICEFRAC,LANDFRAC,OCNFRAC,PSL,FSNTC,FSNTOAC,SWCF,LWCF,FLUT,FSNT,FSNTOA,FLNT,FLNTC,FSNS,FLNS,FSNS,SHFLX,QFLX,LHFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,U10,QREFHT,TMQ,CLDTOT,CLDHGH,CLDMED,CLDLOW,FLDS,FSDS,TGCLDIWP,TGCLDCWP,TGCLDLWP,FLNSC,FLUTC,FSDSC,SOLIN,FSNSC,AODABS,AODVIS,AODDUST,AREL,TREFMNAV,TREFMXAV,PS,PHIS,U,V,T,Z3"
   years = "1985:1995:2", # Need 10 years for pcmdi_diags task
 
   [[ land_monthly ]]
@@ -331,10 +333,11 @@ ts_years = "1985-1994",
   ref_final_yr = 1994
   ref_start_yr = 1985
   ref_years = "1985-1994",
+  cmip_vars = "pr,psl,rlut,rsut,rsds,rsdscs,rsdt,rsus,rsuscs,rlus,rtmt,sfcWind,tas,tauu,tauv,ts,ta,ua,va,zg"
   target_grid = "2.5x2.5"
   target_grid_string = "2p5x2p5"
-  clim_vars = "pr,rlut,rtmt,tas,tauu,tauv,ts"
-  clim_regions = "global,ocean,land,NHEX,SHEX,TROPICS"
+  clim_vars = "pr,psl,rsus,rsuscs,rlus,rlut,rsds,rsdscs,rsdt,rsut,sfcWind,tas,tauu,tauv,ts,ta-200,ta-850,ua-200,ua-850,va-200,va-850"
+  clim_regions = "global,ocean,land,Tropics,NHEX,SHEX"
 
   [[ variability_modes_cpl ]]
   active = True
@@ -369,16 +372,16 @@ ts_years = "1985-1994",
   [[ synthetic_plots ]]
   active = True
   current_set = "synthetic_plots" # Can be inferred if needed
-  clim_vars = "pr,rlut,rtmt,tas,tauu,tauv,ts"
-  clim_regions = "global,ocean,land,NHEX,SHEX,TROPICS"
-  mova_modes = "NAM,NAO,PNA,NPO,SAM,PSA1,PSA2"
-  movc_modes = "PDO,NPGO,AMO"
+  clim_vars = "pr,psl,ua-200"
+  clim_regions = "global,ocean,land"
+  mova_modes = "NAM,NAO,PNA,NPO,SAM"
+  movc_modes = "PDO,NPGO"
   clim_viewer = True
-  clim_years = "2005-2014"
+  clim_years = "1985-1994"
   mova_viewer = True
-  mova_years = "2005-2014"
+  mova_years = "1985-1994"
   movc_viewer = True
-  movc_years = "2005-2014"
+  movc_years = "1985-1994"
   enso_viewer = False
   enso_years = ""
   cmip_clim_dir = #expand diagnostics_base_path#/pcmdi_data/metrics_data/mean_climate

tests/integration/utils.py

@@ -12,16 +12,25 @@
 # pytest tests/integration/test_*.py
 
 TEST_SPECIFICS: Dict[str, Any] = {
-    "diags_environment_commands": "source /lcrc/soft/climate/e3sm-unified/load_latest_e3sm_unified_chrysalis.sh",
-    "global_time_series_environment_commands": "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi-pcmdi-diags-20251007-test1",
-    "pcmdi_diags_environment_commands": "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi-pcmdi-diags-20251007-test1",
+    "diags_environment_commands": "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>",
+    "global_time_series_environment_commands": "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>",
+    "pcmdi_diags_environment_commands": "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>",
     "cfgs_to_run": [
+        "weekly_bundles",
+        "weekly_comprehensive_v2",
         "weekly_comprehensive_v3",
+        "weekly_legacy_3.0.0_bundles",
+        "weekly_legacy_3.0.0_comprehensive_v2",
+        "weekly_legacy_3.0.0_comprehensive_v3",
     ],
     "tasks_to_run": [
+        "e3sm_diags",
+        "mpas_analysis",
+        "global_time_series",
+        "ilamb",
         "pcmdi_diags",
     ],
-    "unique_id": "unique_id_test_20251007_4",
+    "unique_id": "unique_id",
 }
 
 # Multi-machine testing #########################################################

zppy/e3sm_to_cmip.py

@@ -39,7 +39,7 @@ def e3sm_to_cmip(config: ConfigObj, script_dir: str, existing_bundles, job_ids_f
         check_parameters_for_bash(c)
         c["cmor_tables_prefix"] = c["diagnostics_base_path"]
         if c["component"] == "atm":
-            default_cmip_plevdata = f"{c['diagnostics_base_path']}/vrt_remap_plev19.nc"
+            default_cmip_plevdata = f"{c['diagnostics_base_path']}/e3sm_to_cmip_data/maps/vrt_remap_plev19.nc"
             set_value_of_parameter_if_undefined(
                 c,
                 "cmip_plevdata",

zppy/pcmdi_diags.py

@@ -135,9 +135,11 @@ def pcmdi_diags(config, script_dir, existing_bundles, job_ids_file):
                     c["ts_num_years"],
                 )
             else:
-                add_pcmdi_dependencies(c, dependencies, script_dir)
                 if i < len(year_sets) - 1:
                     continue
+                else:
+                    # only need to add dependency once
+                    add_pcmdi_dependencies(c, dependencies, script_dir)
 
             c["dependencies"] = dependencies
             write_settings_file(settings_file, c, s)