Remove cdscan for e3sm_diags

tests/integration/generated/test_debug_chrysalis.cfg

@@ -0,0 +1,149 @@
+[default]
+case = v2.LR.historical_0201
+constraint = ""
+dry_run = "False"
+environment_commands = ""
+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_debug.py
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_debug_output/unique_id/v2.LR.historical_0201"
+partition = "debug"
+qos = "regular"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_debug_www/unique_id"
+
+[climo]
+active = True
+walltime = "00:30:00"
+years = "1850:1854:2", "1850:1854:4",
+
+  [[ atm_monthly_180x360_aave ]]
+  frequency = "monthly"
+  input_files = "eam.h0"
+  input_subdir = "archive/atm/hist"
+  vars = ""
+
+  [[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
+  frequency = "diurnal_8xdaily"
+  input_files = "eam.h4"
+  input_subdir = "archive/atm/hist"
+  vars = "PRECT"
+
+  [[ land_monthly_climo ]]
+  frequency = "monthly"
+  input_files = "elm.h0"
+  input_subdir = "archive/lnd/hist"
+  vars = ""
+
+[ts]
+active = True
+e3sm_to_cmip_environment_commands = ""
+walltime = "00:30:00"
+years = "1850:1854:2",
+
+  [[ atm_monthly_180x360_aave ]]
+  frequency = "monthly"
+  input_files = "eam.h0"
+  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 ]]
+  # Note global average won't work for 3D variables.
+  frequency = "monthly"
+  input_files = "eam.h0"
+  input_subdir = "archive/atm/hist"
+  mapping_file = "glb"
+  years = "1850:1860:5",
+
+  [[ land_monthly ]]
+  e3sm_to_cmip_environment_commands = ""
+  extra_vars = "landfrac"
+  frequency = "monthly"
+  input_files = "elm.h0"
+  input_subdir = "archive/lnd/hist"
+  vars = "LAISHA,LAISUN"
+  ts_fmt = "cmip"
+
+  [[ lnd_monthly_glb ]]
+  frequency = "monthly"
+  input_files = "elm.h0"
+  input_subdir = "archive/lnd/hist"
+  mapping_file = "glb"
+  vars = "LAISHA,LAISUN"
+  years = "1850:1860:5",
+
+  [[ rof_monthly ]]
+  extra_vars = 'areatotal2'
+  frequency = "monthly"
+  input_files = "mosart.h0"
+  input_subdir = "archive/rof/hist"
+  mapping_file = ""
+  vars = "RIVER_DISCHARGE_OVER_LAND_LIQ"
+
+[e3sm_diags]
+active = True
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+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",
+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_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_debug_output/unique_id/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",
+
+  [[ lnd_monthly_mvm_lnd ]]
+  # Test model-vs-model using the same files as the reference
+  climo_subsection = "land_monthly_climo"
+  diff_title = "Difference"
+  #grid = 'native'
+  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_debug_output/unique_id/v2.LR.historical_0201/post/lnd/180x360_aave/clim"
+  run_type = "model_vs_model"
+  sets = "lat_lon_land",
+  short_ref_name = "same simulation"
+  swap_test_ref = False
+  tag = "model_vs_model"
+  ts_num_years_ref = 2

tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg

@@ -81,7 +81,7 @@ years = "1985:1995:5"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_cdat_migrated_sets_chrysalis.cfg

@@ -0,0 +1,125 @@
+[default]
+case = "v3.LR.historical_0051"
+constraint = ""
+dry_run = "False"
+environment_commands = ""
+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_min_case_e3sm_diags_cdat_migrated_output/unique_id/v3.LR.historical_0051"
+partition = "debug"
+qos = "regular"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_cdat_migrated_www/unique_id"
+years = "1985:1989:2",
+
+[climo]
+active = True
+walltime = "00:30:00"
+
+  [[ atm_monthly_180x360_aave ]]
+  frequency = "monthly"
+  input_files = "eam.h0"
+  input_subdir = "archive/atm/hist"
+  vars = ""
+
+  [[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
+  frequency = "diurnal_8xdaily"
+  input_files = "eam.h3"
+  input_subdir = "archive/atm/hist"
+  vars = "PRECT"
+
+  [[ land_monthly_climo ]]
+  frequency = "monthly"
+  input_files = "elm.h0"
+  input_subdir = "archive/lnd/hist"
+  mapping_file = "map_r05_to_cmip6_180x360_aave.20231110.nc"
+  vars = ""
+
+[ts]
+active = True
+e3sm_to_cmip_environment_commands = ""
+walltime = "00:30:00"
+
+  [[ atm_monthly_180x360_aave ]]
+  frequency = "monthly"
+  input_files = "eam.h0"
+  input_subdir = "archive/atm/hist"
+  ts_fmt = "cmip"
+
+  [[ rof_monthly ]]
+  extra_vars = 'areatotal2'
+  frequency = "monthly"
+  input_files = "mosart.h0"
+  input_subdir = "archive/rof/hist"
+  mapping_file = ""
+  vars = "RIVER_DISCHARGE_OVER_LAND_LIQ"
+
+  [[ land_monthly ]]
+  extra_vars = "landfrac"
+  frequency = "monthly"
+  input_files = "elm.h0"
+  input_subdir = "archive/lnd/hist"
+  mapping_file = "map_r05_to_cmip6_180x360_aave.20231110.nc"
+  ts_fmt = "cmip"
+  vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
+
+[tc_analysis]
+active = True
+scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_weekly_comprehensive_v3_scratch/unique_id/v3.LR.historical_0051"
+walltime = "00:30:00"
+
+[e3sm_diags]
+active = True
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
+grid = '180x360_aave'
+multiprocessing = True
+num_workers = 8
+partition = "compute"
+qos = "regular"
+ref_final_yr = 1986
+ref_start_yr = 1985
+ref_years = "1985-1986",
+# Also lat_lon_land for mvm
+sets="lat_lon","lat_lon_river","cosp_histogram","zonal_mean_xy","zonal_mean_2d","zonal_mean_2d_stratosphere","aerosol_aeronet","polar","meridional_mean_2d","area_mean_time_series","aerosol_budget","annual_cycle_zonal_mean","diurnal_cycle",
+short_name = "v3.LR.historical_0051"
+ts_num_years = 2
+walltime = "5:00:00"
+years = "1987:1989:2"
+
+  [[ atm_monthly_180x360_aave ]]
+  climo_diurnal_frequency = "diurnal_8xdaily"
+  climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave"
+  climo_subsection = "atm_monthly_180x360_aave"
+  dc_obs_climo = '/lcrc/group/e3sm/public_html/e3sm_diags_test_data/unit_test_complete_run/obs/climatology'
+
+  [[ 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_name = "v3.LR.historical_0051"
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_cdat_migrated_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim"
+  run_type = "model_vs_model"
+  short_ref_name = "same simulation"
+  swap_test_ref = False
+  tag = "model_vs_model"
+  ts_num_years_ref = 2
+  ts_subsection = "atm_monthly_180x360_aave"
+
+  [[ lnd_monthly_mvm_lnd ]]
+ # Test model-vs-model using the same files as the reference
+  climo_subsection = "land_monthly_climo"
+  diff_title = "Difference"
+  partition = "compute"
+  qos = "regular"
+  ref_name = "v3.LR.historical_0051"
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_cdat_migrated_output/unique_id/v3.LR.historical_0051/post/lnd/180x360_aave/clim"
+  run_type = "model_vs_model"
+  sets = "lat_lon_land",
+  short_ref_name = "same simulation"
+  swap_test_ref = False
+  tag = "model_vs_model"
+  ts_num_years_ref = 2

tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg

@@ -24,7 +24,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg

@@ -24,7 +24,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg

@@ -25,7 +25,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg

@@ -25,7 +25,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg

@@ -24,7 +24,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg

@@ -24,7 +24,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg

@@ -24,7 +24,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg

@@ -27,7 +27,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_2_chrysalis.cfg

@@ -27,7 +27,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg

@@ -19,7 +19,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg

@@ -19,7 +19,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg

@@ -25,7 +25,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8