Compy zppy dev with rc9 packages

tests/integration/generated/test_bundles_compy.cfg

@@ -1,7 +1,8 @@
 [default]
 case = v2.LR.historical_0201
 constraint = ""
-environment_commands = ""
+dry_run = "False"
+environment_commands = "source /share/apps/E3SM/conda_envs/test_e3sm_unified_1.9.0rc9_compy.sh"
 input = "/compyfs/fors729/E3SMv2/v2.LR.historical_0201"
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"

tests/integration/generated/test_complete_run_compy.cfg

@@ -1,7 +1,8 @@
 [default]
 case = v2.LR.historical_0201
 constraint = ""
-environment_commands = ""
+dry_run = "False"
+environment_commands = "source /share/apps/E3SM/conda_envs/test_e3sm_unified_1.9.0rc9_compy.sh"
 input = "/compyfs/fors729//E3SMv2/v2.LR.historical_0201"
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
@@ -34,29 +35,14 @@ years = "1850:1854:2",
   frequency = "monthly"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
-  ts_fmt = "cmip"
+  #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"
-  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"
-  ts_fmt = "cmip"
-
   [[ rof_monthly ]]
   extra_vars = 'areatotal2'
   frequency = "monthly"
@@ -65,12 +51,6 @@ years = "1850:1854:2",
   mapping_file = ""
   vars = "RIVER_DISCHARGE_OVER_LAND_LIQ"
 
-[tc_analysis]
-active = True
-scratch = "/qfs/people/fors729/"
-walltime = "00:30:00"
-years = "1850:1854:2",
-
 [e3sm_diags]
 active = True
 grid = '180x360_aave'
@@ -90,65 +70,3 @@ years = "1850:1854:2", "1850:1854:4",
   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 = "03:00:00"
-
-  [[ atm_monthly_180x360_aave_environment_commands ]]
-  environment_commands = "source /qfs/people/fors729/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_dev_20220722"
-  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 = "slurm"
-  qos = "regular"
-  ref_final_yr = 1851
-  ref_name = "v2.LR.historical_0201"
-  ref_start_yr = 1850
-  ref_years = "1850-1851",
-  reference_data_path = "/compyfs/fors729/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 = "03: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 = "slurm"
-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",

tests/integration/utils.py

@@ -158,9 +158,9 @@ def get_compy_expansions(config):
         "bundles_walltime": "02:00:00",
         "constraint": "",
         # To run this test, replace conda environment with your e3sm_diags dev environment
-        "diags_environment_commands": "source /qfs/people/fors729/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_dev_20220722",
+        "diags_environment_commands": "source /qfs/people/fors729/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_dev_20230807",
         "diags_walltime": "03:00:00",
-        "environment_commands_test": "source /share/apps/E3SM/conda_envs/test_e3sm_unified_1.8.0rc6_compy.sh",
+        "environment_commands_test": "source /share/apps/E3SM/conda_envs/test_e3sm_unified_1.9.0rc9_compy.sh",
         "expected_dir": "/compyfs/www/zppy_test_resources/",
         "partition_long": "slurm",
         "partition_short": "short",