Repository: ESMCI/cime

Issue:
skip over namelist vars ending with "input_data" in check_input_data

        modified:   scripts/lib/CIME/case/check_input_data.py

The CAM SD compsets use "met_data_path" to indicate directory path containing input data files.  The change here will cause check_input_data to ignore namelist variables that end in "data_path" as well as "datapath".

Test suite: 

SMS_D_Ln9.f09_f09_mg17.FCSD.cheyenne_intel.cam-outfrq9s
SMS_D_Ln9.f09_f09_mg17.FCts2SD.cheyenne_intel.cam-outfrq9s
SMS_D_Ln9.f09_f09_mg17.FSD.cheyenne_intel.cam-outfrq9s
SMS_D_Ln9.f09_f09_mg17.FWSD.cheyenne_intel.cam-outfrq9s
SMS_D_Ln9.f19_f19_mg17.FW4madSD.cheyenne_intel.cam-outfrq9s
SMS_D_Ln9.f19_f19_mg17.FWmaSD.cheyenne_intel.cam-outfrq9s

Test baseline: 
Test namelist changes: 
Test status: [bit for bit, roundoff, climate changing]

Fixes [CIME Github issue #]

User interface changes?: 

Update gh-pages html (Y/N)?:

Code review: 



Discussion:

Resolving patch:
diff --git a/scripts/lib/CIME/provenance.py b/scripts/lib/CIME/provenance.py
--- a/scripts/lib/CIME/provenance.py
+++ b/scripts/lib/CIME/provenance.py
@@ -170,7 +170,7 @@ def _save_prerun_timing_e3sm(case, lid):
                 run_cmd_no_fail(cmd, arg_stdout=filename, from_dir=full_timing_dir)
                 gzip_existing_file(os.path.join(full_timing_dir, filename))
         elif mach in ["cori-haswell", "cori-knl"]:
-            for cmd, filename in [("sinfo -a -l", "sinfol"), ("sqs -f %s" % job_id, "sqsf_jobid"),
+            for cmd, filename in [("sinfo -a -l", "sinfol"), ("scontrol show jobid %s" % job_id, "sqsf_jobid"),
                                   # ("sqs -f", "sqsf"),
                                   ("squeue -o '%.10i %.15P %.20j %.10u %.7a %.2t %.6D %.8C %.10M %.10l %.20S %.20V'", "squeuef"),
                                   ("squeue -t R -o '%.10i %R'", "squeues")]:


Test patch:
diff --git a/config/e3sm/machines/template.case.test b/config/e3sm/machines/template.case.test
deleted file mode 100755
--- a/config/e3sm/machines/template.case.test
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/env python
-{{ batchdirectives }}
-"""
-This is the system test submit script for CIME. This should only ever be called
-by case.submit when on batch system. This script only exists as a way of providing
-batch directives. Use case.submit from the command line to run your case.
-
-DO NOT RUN THIS SCRIPT MANUALLY
-"""
-import os, sys
-os.chdir( '{{ caseroot }}')
-
-_LIBDIR = os.path.join("{{ cimeroot }}", "scripts", "Tools")
-sys.path.append(_LIBDIR)
-
-from standard_script_setup import *
-
-from CIME.case import Case
-
-import argparse
-
-###############################################################################
-def parse_command_line(args, description):
-###############################################################################
-    parser = argparse.ArgumentParser(
-        usage="""\n{0} [<testname>] [--verbose]
-OR
-{0} --help
-
-\033[1mEXAMPLES:\033[0m
-    \033[1;32m# case.test SMS\033[0m
-    > {0}
-""".format(os.path.basename(args[0])),
-
-description=description,
-
-formatter_class=argparse.ArgumentDefaultsHelpFormatter
-)
-
-    CIME.utils.setup_standard_logging_options(parser)
-
-    parser.add_argument("testname", nargs="?",default=None,
-                        help="Name of the test to run, default is set in TESTCASE in env_test.xml")
-
-    parser.add_argument("--caseroot",
-                        help="Case directory to build")
-
-    parser.add_argument("--reset", action="store_true",
-                        help="Reset the case to its original state as defined by config_tests.xml")
-
-    parser.add_argument("--skip-preview-namelist", action="store_true",
-                        help="Skip calling preview-namelist during case.run")
-
-    args = CIME.utils.parse_args_and_handle_standard_logging_options(args, parser)
-
-    if args.caseroot is not None:
-        os.chdir(args.caseroot)
-
-    return args.caseroot, args.testname, args.reset, args.skip_preview_namelist
-
-###############################################################################
-def _main_func(description):
-###############################################################################
-    sys.argv.extend([] if "ARGS_FOR_SCRIPT" not in os.environ else os.environ["ARGS_FOR_SCRIPT"].split())
-
-    caseroot, testname, reset, skip_pnl = parse_command_line(sys.argv, description)
-    with Case(caseroot, read_only=False) as case:
-        success = case.case_test(testname=testname, reset=reset, skip_pnl=skip_pnl)
-
-    sys.exit(0 if success else 1)
-
-if (__name__ == "__main__"):
-    _main_func(__doc__)
diff --git a/config/e3sm/tests.py b/config/e3sm/tests.py
deleted file mode 100644
--- a/config/e3sm/tests.py
+++ /dev/null
@@ -1,371 +0,0 @@
-# Here are the tests belonging to e3sm suites. Format is
-# <test>.<grid>.<compset>[.<testmod>]
-#
-# suite_name : {
-#     "inherit" : (suite1, suite2, ...), # Optional. Suites to inherit tests from. Default is None. Tuple, list, or str.
-#     "time"    : "HH:MM:SS",            # Optional. Recommended upper-limit on test time.
-#     "share"   : True|False,            # Optional. If True, all tests in this suite share a build. Default is False.
-#     "tests"   : (test1, test2, ...)    # Optional. The list of tests for this suite. See above for format. Tuple, list, or str.
-# }
-
-_TESTS = {
-
-    "e3sm_land_developer" : {
-        "time"  : "0:45:00",
-        "tests" : (
-            "ERS.f19_f19.ICLM45",
-            "ERS.f19_f19.I1850CLM45CN",
-            "ERS.f09_g16.I1850CLM45CN",
-            "ERS.f19_f19.I20TRCLM45CN",
-            "SMS_Ld1.hcru_hcru.I1850CRUCLM45CN",
-            "ERS.f19_g16.I1850CNECACNTBC.clm-eca",
-            "ERS.f19_g16.I1850CNECACTCBC.clm-eca",
-            "SMS_Ly2_P1x1.1x1_smallvilleIA.ICLM45CNCROP.clm-force_netcdf_pio",
-            "ERS_Ld20.f45_f45.ICLM45ED.clm-fates",
-            "ERS.f19_g16.I1850CLM45.clm-betr",
-            "ERS.f19_g16.I1850CLM45.clm-vst",
-            "ERS.f09_g16.I1850CLM45CN.clm-bgcinterface",
-            "ERS.ne11_oQU240.I20TRCLM45",
-            "ERS.f19_g16.I1850CNRDCTCBC.clm-rd",
-            "ERS.f19_g16.I1850GSWCNPECACNTBC.clm-eca_f19_g16_I1850GSWCNPECACNTBC",
-            "ERS.f19_g16.I20TRGSWCNPECACNTBC.clm-eca_f19_g16_I20TRGSWCNPECACNTBC",
-            "ERS.f19_g16.I1850GSWCNPRDCTCBC.clm-ctc_f19_g16_I1850GSWCNPRDCTCBC",
-            "ERS.f19_g16.I20TRGSWCNPRDCTCBC.clm-ctc_f19_g16_I20TRGSWCNPRDCTCBC",
-            "ERS.f09_g16.ICLM45BC",
-            "SMS_Ly2_P1x1.1x1_smallvilleIA.ICLM45CNCROP.clm-lulcc_sville",
-            )
-        },
-
-    "e3sm_atm_developer" : {
-        "inherit" : ("eam_theta_pg2"),
-        "tests"   : (
-            "ERP_Ln9.ne4_ne4.FC5AV1C-L",
-            "SMS_Ln9.ne4_ne4.FC5AV1C-L.cam-outfrq9s",
-            "SMS.ne4_ne4.FC5AV1C-L.cam-cosplite",
-            "SMS_R_Ld5.ne4_ne4.FSCM5A97",
-            "SMS_D_Ln5.ne4_ne4.FC5AV1C-L",
-            "SMS_Ln5.ne4pg2_ne4pg2.FC5AV1C-L"
-            )
-        },
-
-    "e3sm_atm_integration" : {
-        "inherit" : ("eam_preqx", "eam_theta"),
-        "tests" : (
-            "ERP_Ln9.ne4_ne4.F-EAMv1-AQP1",
-            "SMS_Ld1.ne4_ne4.F-EAMv1-AQP1.cam-clubb_only",
-            "ERP_Ln9.ne4_ne4.F-EAMv1-RCEMIP",
-            "PET_Ln5.ne4_ne4.FC5AV1C-L.allactive-mach-pet",
-            "PEM_Ln5.ne4_ne4.FC5AV1C-L",
-            "SMS_D_Ln5.ne4_ne4.FC5AV1C-L.cam-cosplite_nhtfrq5",
-            "SMS_Ln1.ne4_ne4.FC5AV1C-L.cam-chem_pp",
-            "ERS_Ld5.ne4_ne4.FC5AV1C-L.cam-rrtmgp",
-            "ERS_Ld5.ne4_ne4.FC5AV1C-L.cam-gust_param",
-            "REP_Ln5.ne4_ne4.FC5AV1C-L",
-            "SMS_Ld9.ne4pg2_ne4pg2.FC5AV1C-04P2.cam-thetahy_sl_pg2_mass",
-            )
-        },
-
-    #atmopheric tests for extra coverage
-    "e3sm_atm_extra_coverage" : {
-        "tests" : (
-            "SMS_Lm1.ne4_ne4.FC5AV1C-L",
-            "ERS_Ld31.ne4_ne4.FC5AV1C-L",
-            "ERP_Lm3.ne4_ne4.FC5AV1C-L",
-            "SMS_D_Ln5.ne30_ne30.FC5AV1C-L",
-            "ERP_Ln7.ne30_ne30.FC5AV1C-L",
-            "SMS_Ly1.ne4_ne4.FC5AV1C-L",
-            )
-        },
-
-    #atmopheric tests for hi-res
-    "e3sm_atm_hi_res" : {
-        "time" : "01:30:00",
-        "tests" : "SMS.ne120_ne120.FC5AV1C-H01A"
-        },
-
-    #atmopheric tests to mimic low res production runs
-    "e3sm_atm_prod" : {
-        "tests" : (
-            "SMS_Ln5.ne30_ne30.FC5AV1C-L.cam-cosplite",
-            "SMS.ne30_r05_ne30.F20TRC5-CMIP6",
-            )
-        },
-
-    #atmopheric nbfb tests
-    "e3sm_atm_nbfb" : {
-        "tests" : (
-            "PGN_P1x1.ne4_ne4.FC5AV1C-L",
-            "TSC.ne4_ne4.FC5AV1C-L",
-            "MVK_PL.ne4_ne4.FC5AV1C-L",
-            )
-        },
-
-    "e3sm_ocnice_extra_coverage" : {
-        "tests" : (
-            "ERS_P480_Ld5.T62_oEC60to30v3wLI.GMPAS-DIB-IAF-ISMF",
-            "PEM_P480_Ld5.T62_oEC60to30v3wLI.GMPAS-DIB-IAF-ISMF",
-            )
-        },
-
-    "e3sm_developer" : {
-        "inherit" : ("e3sm_land_developer", "e3sm_atm_developer"),
-        "time"    : "0:45:00",
-        "tests"   : (
-            "ERS.f19_g16_rx1.A",
-            "ERS.ne30_g16_rx1.A",
-            "SEQ.f19_g16.X",
-            "ERIO.ne30_g16_rx1.A",
-            "NCK.f19_g16_rx1.A",
-            "SMS.ne30_f19_g16_rx1.A",
-            "ERS_Ld5.T62_oQU120.CMPASO-NYF",
-            "ERS.f09_g16_g.MALISIA",
-            "SMS.T62_oQU120_ais20.MPAS_LISIO_TEST",
-            "SMS.f09_g16_a.IGCLM45_MLI",
-            "SMS_P12x2.ne4_oQU240.A_WCYCL1850.allactive-mach_mods",
-            "SMS_B.ne4_ne4.F-EAMv1-AQP1.cam-hommexx",
-            )
-        },
-
-    "homme_integration" : {
-        "time"    : "0:45:00",
-        "tests"   : (
-            "HOMME_P24.f19_g16_rx1.A",
-            "HOMMEBFB_P24.f19_g16_rx1.A",
-            )
-        },
-
-    "e3sm_integration" : {
-        "inherit" : ("e3sm_developer", "e3sm_atm_integration"),
-        "time"    : "03:00:00",
-        "tests"   : (
-            "ERS.ne11_oQU240.A_WCYCL1850",
-            "SMS_D_Ld1.ne30_oECv3_ICG.A_WCYCL1850S_CMIP6.allactive-v1cmip6",
-            "ERS_Ln9.ne4_ne4.FC5AV1C-L",
-            #"ERT_Ld31.ne16_g37.B1850C5",#add this line back in with the new correct compset
-            "NCK.ne11_oQU240.A_WCYCL1850",
-            "PET.f19_g16.X.allactive-mach-pet",
-            "PET.f45_g37_rx1.A.allactive-mach-pet",
-            "PET_Ln9_PS.ne30_oECv3_ICG.A_WCYCL1850S.allactive-mach-pet",
-            "PEM_Ln9.ne30_oECv3_ICG.A_WCYCL1850S",
-            "ERP_Ld3.ne30_oECv3_ICG.A_WCYCL1850S",
-            "SMS.f09_g16_a.MALI",
-            "SMS_D_Ln5.conusx4v1_conusx4v1.FC5AV1C-L",
-            "SMS.ne30_oECv3.BGCEXP_BCRC_CNPECACNT_1850.clm-bgcexp",
-            "SMS.ne30_oECv3.BGCEXP_BCRC_CNPRDCTC_1850.clm-bgcexp",
-            "SMS_D_Ld1.T62_oEC60to30v3.DTESTM",
-            "SMS_D_Ld1.ne30_r05_oECv3.A_WCYCL1850",
-            "ERS_Ln9_P96x1.ne4pg2_ne4pg2.F-MMF1-TEST.cam-crmout",
-            "ERS_Ln9_P96x1.ne4pg2_ne4pg2.F-MMF1-RCEMIP",
-            "SMS.r05_r05.I1850CLM45CN",
-            )
-        },
-
-    #e3sm tests for extra coverage
-    "e3sm_extra_coverage" : {
-        "inherit" : ("e3sm_atm_extra_coverage", "e3sm_ocnice_extra_coverage"),
-        "tests"   : (
-            "SMS_D_Ln5.enax4v1_enax4v1.FC5AV1C-L",
-            "SMS_D_Ln5.twpx4v1_twpx4v1.FC5AV1C-L",
-            )
-        },
-
-    #e3sm tests for hi-res
-    "e3sm_hi_res" : {
-        "inherit" : "e3sm_atm_hi_res",
-        "tests"   : (
-            "SMS.ne120_oRRS18v3_ICG.A_WCYCL2000_H01AS.cam-cosplite",
-            "SMS.T62_oRRS30to10v3wLI.GMPAS-IAF",
-            )
-        },
-
-    #e3sm tests for RRM grids
-    "e3sm_rrm" : {
-        "tests" : (
-            "SMS_D_Ln5.conusx4v1_conusx4v1.FC5AV1C-L",
-            "SMS_D_Ln5.enax4v1_enax4v1.FC5AV1C-L",
-            "SMS_D_Ln5.twpx4v1_twpx4v1.FC5AV1C-L",
-            )
-        },
-
-    #e3sm MMF tests for development
-    "e3sm_mmf" : {
-        "time" : "02:00:00",
-        "tests" : (
-            # MMF tests
-            "ERP_Ln9_P96x1.ne4_ne4.F-MMF1-TEST.cam-crmout",
-            "ERP_Ln9_P96x1.ne4pg2_ne4pg2.F-MMF2-TEST",
-            "ERP_Ln9_P96x1.ne4_ne4.F-MMF2-ECPP-TEST",
-            "SMS_D_Ln3_P96x1.ne4_ne4.F-MMF1-TEST",
-            "SMS_D_Ln3_P96x1.ne4pg2_ne4pg2.F-MMF2-TEST",
-            # non-MMF tests with RRTMGP
-            "ERP_Ln9.ne4pg2_ne4pg2.FC5AV1C-L.cam-rrtmgp",
-            )
-        },
-
-    #e3sm tests to mimic production runs
-    "e3sm_prod" : {
-        "inherit" : "e3sm_atm_prod",
-        "tests"   : "SMS_Ld2.ne30_oECv3_ICG.A_WCYCL1850S_CMIP6.allactive-v1cmip6"
-        },
-
-    #e3sm tests to mimic BGC production runs
-    "e3sm_bgcprod" : {
-        "tests"   :  (
-               "SMS_Ld2.ne30_oECv3.BGCEXP_BCRC_CNPRDCTC_1850.allactive-v1bgc_1850",
-               "SMS_Ld2.ne30_oECv3.BGCEXP_BCRD_CNPRDCTC_20TR.allactive-v1bgc",
-               "SMS_Ld2.ne30_oECv3_ICG.BGCEXP_BCRC_CNPECACNT_1850S.allactive-v1bgceca_1850",
-               "SMS_Ld2.ne30_oECv3_ICG.BGCEXP_BDRD_CNPECACNT_20TRS.allactive-v1bgceca",
-               )
-        },
-
-    "fates" : {
-        "tests" : (
-            "ERS_Ld9.1x1_brazil.ICLM45ED",
-            "ERS_D_Ld9.1x1_brazil.ICLM45ED",
-            "SMS_D_Lm6.1x1_brazil.ICLM45ED",
-            )
-        },
-
-
-    #atmopheric tests for ftypes with 2 builds only
-    #ftype2 is a default and tested in other suites for preqx
-    # preqx ftype0
-    # preqx ftype1
-    # preqx ftype4
-    # theta-l hy ftype0
-    # theta-l hy ftype1
-    # theta-l hy ftype2
-    # theta-l hy ftype4
-    # theta-l nh ftype0
-    # theta-l nh ftype1
-    # theta-l nh ftype2
-    # theta-l nh ftype4
-    # theta-l hy SL
-    "eam_preqx" : {
-        "share"    : True,
-        "time"     : "01:00:00",
-        "tests"    : (
-                 "SMS.ne4_ne4.FC5AV1C-L.cam-preqx_ftype0",
-                 "SMS.ne4_ne4.FC5AV1C-L.cam-preqx_ftype1",
-                 "SMS.ne4_ne4.FC5AV1C-L.cam-preqx_ftype4",
-                 )
-    },
-    "eam_theta" : {
-        "share"    : True,
-        "time"     : "02:00:00",
-        "tests"    : (
-                 "SMS.ne4_ne4.FC5AV1C-L.cam-thetahy_ftype0",
-                 "SMS.ne4_ne4.FC5AV1C-L.cam-thetahy_ftype1",
-                 "SMS.ne4_ne4.FC5AV1C-L.cam-thetahy_ftype2",
-                 "SMS.ne4_ne4.FC5AV1C-L.cam-thetahy_ftype4",
-                 "SMS.ne4_ne4.FC5AV1C-L.cam-thetanh_ftype0",
-                 "SMS.ne4_ne4.FC5AV1C-L.cam-thetanh_ftype1",
-                 "SMS.ne4_ne4.FC5AV1C-L.cam-thetanh_ftype2",
-                 "SMS.ne4_ne4.FC5AV1C-L.cam-thetanh_ftype4",
-                 "SMS.ne4_ne4.FC5AV1C-L.cam-thetahy_sl",
-                 "ERS.ne4_ne4.FC5AV1C-L.cam-thetahy_ftype2",
-                 "ERS.ne4_ne4.FC5AV1C-L.cam-thetanh_ftype2",
-                 )
-    },
-    "eam_theta_pg2" : {
-        "share"    : True,
-        "time"     : "02:00:00",
-        "tests"    : (
-                 "SMS_Ln5.ne4pg2_ne4pg2.FC5AV1C-L.cam-thetahy_pg2",
-                 "SMS_Ln5.ne4pg2_ne4pg2.FC5AV1C-L.cam-thetahy_sl_pg2",
-                 "ERS_Ln5.ne4pg2_ne4pg2.FC5AV1C-L.cam-thetahy_sl_pg2"
-                 )
-    },
-    "e3sm_bench_hires_g" : {
-        "share"    : True,
-        "time"     : "01:00:00",
-        "tests"    : (
-                 "PFS_P2560.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P2792.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P3072.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P3200.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P4096.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P4800.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P5120.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P5200.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P5584.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P6400.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P7200.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P8192.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P9600.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P11168.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P12000.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P12800.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P16000.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P16384.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P19200.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P21600.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P22400.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P24000.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P25600.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P26000.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P28000.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P28800.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P30000.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P32000.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P36000.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P48000.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P64000.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P96000.T62_oRRS18to6v3.GMPAS-IAF.bench-gmpas_noio",
-                 )
-    },
-    "e3sm_bench_hires_f" : {
-        "time"     : "01:00:00",
-        "tests"    : (
-                 "PFS_P7200.ne120_ne120.FC5AV1C-H01A.cam-bench-noio",
-                 "PFS_P8640.ne120_ne120.FC5AV1C-H01A.cam-bench-noio",
-                 "PFS_P10800.ne120_ne120.FC5AV1C-H01A.cam-bench-noio",
-                 "PFS_P14400.ne120_ne120.FC5AV1C-H01A.cam-bench-noio",
-                 "PFS_P21600.ne120_ne120.FC5AV1C-H01A.cam-bench-noio",
-                 "PFS_P43200.ne120_ne120.FC5AV1C-H01A.cam-bench-noio",
-                 "PFS_P86400.ne120_ne120.FC5AV1C-H01A.cam-bench-noio",
-                 )
-    },
-    "e3sm_bench_hires" : {
-        "inherit" : ("e3sm_bench_hires_g", "e3sm_bench_hires_f"),
-        "time"    : "01:00:00",
-        "tests"   : (
-                 "PFS_PS.ne120_oRRS18v3_ICG.A_WCYCL1950S_CMIP6_HR.bench-wcycl-hires",
-                 "PFS_PM.ne120_oRRS18v3_ICG.A_WCYCL1950S_CMIP6_HR.bench-wcycl-hires",
-                 "PFS_PL.ne120_oRRS18v3_ICG.A_WCYCL1950S_CMIP6_HR.bench-wcycl-hires",
-                 )
-    },
-    "e3sm_bench_lores_g" : {
-        "share"    : True,
-        "time"     : "01:00:00",
-        "tests"    : (
-                 "PFS_P320.T62_oEC60to30v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P480.T62_oEC60to30v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P640.T62_oEC60to30v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P960.T62_oEC60to30v3.GMPAS-IAF.bench-gmpas_noio",
-                 "PFS_P1280.T62_oEC60to30v3.GMPAS-IAF.bench-gmpas_noio",
-                 )
-    },
-    "e3sm_bench_lores_f" : {
-        "time"     : "01:00:00",
-        "tests"    : (
-                 "PFS_P1350.ne30_ne30.FC5AV1C-L.cam-bench-noio",
-                 "PFS_P2700.ne30_ne30.FC5AV1C-L.cam-bench-noio",
-                 "PFS_P5400.ne30_ne30.FC5AV1C-L.cam-bench-noio",
-                 )
-    },
-    "e3sm_bench_lores" : {
-        "inherit" : ("e3sm_bench_lores_g", "e3sm_bench_lores_f"),
-        "time"    : "01:00:00",
-        "tests"   : (
-                 "PFS_PS.ne30_oECv3_ICG.A_WCYCL1850S_CMIP6.bench-wcycl-lores",
-                 "PFS_PM.ne30_oECv3_ICG.A_WCYCL1850S_CMIP6.bench-wcycl-lores",
-                 "PFS_PL.ne30_oECv3_ICG.A_WCYCL1850S_CMIP6.bench-wcycl-lores",
-                 )
-    },
-    "e3sm_bench_all" : {
-        "inherit" : ("e3sm_bench_hires", "e3sm_bench_lores"),
-        "time"    : "01:00:00",
-    },
-
-}
diff --git a/scripts/lib/get_tests.py b/scripts/lib/get_tests.py
--- a/scripts/lib/get_tests.py
+++ b/scripts/lib/get_tests.py
@@ -1,12 +1,13 @@
 import CIME.utils
-from CIME.utils import expect, convert_to_seconds, parse_test_name, get_cime_root, get_model
+from CIME.utils import expect, convert_to_seconds, parse_test_name, get_cime_root
 from CIME.XML.machines import Machines
 import six, sys, os
 
 # Expect that, if a model wants to use python-based test lists, they will have a file
-# config/$model/tests.py , containing a test dictionary called _TESTS
+# $model/cime_config/tests.py , containing a test dictionary called _TESTS. Currently,
+# only E3SM is using this feature.
 
-sys.path.insert(0, os.path.join(get_cime_root(), "config", get_model()))
+sys.path.insert(0, os.path.join(get_cime_root(), "../cime_config"))
 _ALL_TESTS = {}
 try:
     from tests import _TESTS # pylint: disable=import-error
diff --git a/scripts/tests/scripts_regression_tests.py b/scripts/tests/scripts_regression_tests.py
--- a/scripts/tests/scripts_regression_tests.py
+++ b/scripts/tests/scripts_regression_tests.py
@@ -3426,6 +3426,10 @@ def xml_to_tester(self, xml_string):
 class S_TestManageAndQuery(unittest.TestCase):
     """Tests various scripts to manage and query xml files"""
 
+    def setUp(self):
+        if CIME.utils.get_model() == "e3sm":
+            self.skipTest("Skipping XML test management tests. E3SM does not use this.")
+
     def _run_and_assert_query_testlist(self, extra_args=""):
         """Ensure that query_testlist runs successfully with the given extra arguments"""
         files = Files()