Skip to content

Commit

Permalink
Merge branch 'jgfouca/update_cime_subm_2024_08_26' (PR #6565)
Browse files Browse the repository at this point in the history
... to 52787427846eec58038ab59664fd9c2706f23513 (which is
jgfouca/e3sm_cime, not latest master, due to a couple things that
needed to be reverted off CIME master).

From cime6.0.248

Changes:
1) Generalize _hists_match for mom6 files
2) support append in config_pes.xml overrides field
3) Add case git: Adds a case interface to git.
   It creates a local git repository when case.setup is
   run and updates that repository with each action that triggers an
   update of the CaseStatus file. Optionally a remote repository can be
   attached by setting CASE_GIT_REPOSITORY to the name of the remote
   repository. DISABLED FOR NOW
4) xmlchange: Add documentation for setting values with commas
5) Remove mct for cesm
6) remove load_balancing_tool, broken and unsupported

Fixes:
1) cprnc: need to make sure the directory exists before linking to it
2) check_lockedfiles call in xmlchange needs quiet=True
3) fixes detection of pfunit_path by making sure it exists
4) Fixes handling cprnc output
5) Fixes creating new environment with specific python version
6) Fixes query_config tool.
  - Adds longname to --grids
  - Fixes duplicate and empty choices
7) Fixes check_lockedfiles call in xmlchange
8) Fix list_e3sm_tests tool

[BFB]
  • Loading branch information
jgfouca committed Sep 5, 2024
2 parents 2111bf9 + 71326bd commit fa92e85
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cime
Submodule cime updated 71 files
+9 −20 .github/workflows/testing.yml
+7 −1 CIME/BuildTools/configure.py
+26 −54 CIME/ParamGen/paramgen.py
+2 −1 CIME/SystemTests/funit.py
+3 −4 CIME/SystemTests/hommebaseclass.py
+4 −4 CIME/SystemTests/mvk.py
+5 −5 CIME/SystemTests/pgn.py
+1 −1 CIME/SystemTests/system_tests_common.py
+4 −4 CIME/SystemTests/tsc.py
+45 −103 CIME/Tools/Makefile
+94 −60 CIME/Tools/list_e3sm_tests
+52 −8 CIME/Tools/xmlchange
+10 −0 CIME/XML/batch.py
+1 −1 CIME/XML/component.py
+22 −0 CIME/XML/compsets.py
+1 −1 CIME/XML/entry_id.py
+3 −5 CIME/XML/env_batch.py
+2 −1 CIME/XML/files.py
+47 −21 CIME/XML/grids.py
+30 −7 CIME/XML/pes.py
+14 −17 CIME/build.py
+5 −4 CIME/build_scripts/buildlib.mpi-serial
+28 −8 CIME/case/case.py
+8 −4 CIME/case/case_cmpgen_namelists.py
+6 −2 CIME/case/case_run.py
+18 −4 CIME/case/case_setup.py
+6 −5 CIME/case/case_st_archive.py
+3 −1 CIME/case/case_submit.py
+2 −1 CIME/case/case_test.py
+1 −1 CIME/code_checker.py
+2 −1 CIME/compare_test_results.py
+13 −1 CIME/config.py
+0 −1 CIME/data/config/cesm/config_files.xml
+77 −0 CIME/data/templates/gitignore.template
+100 −0 CIME/gitinterface.py
+66 −47 CIME/hist_utils.py
+1 −1 CIME/non_py/cprnc
+1 −1 CIME/non_py/src/timing/Makefile
+270 −365 CIME/scripts/query_config.py
+132 −0 CIME/status.py
+1 −2 CIME/test_scheduler.py
+8 −1 CIME/test_status.py
+2 −2 CIME/tests/base.py
+7 −17 CIME/tests/test_sys_create_newcase.py
+1 −1 CIME/tests/test_sys_manage_and_query.py
+25 −3 CIME/tests/test_sys_unittest.py
+1 −1 CIME/tests/test_unit_utils.py
+164 −0 CIME/tests/test_unit_xml_grids.py
+5 −91 CIME/utils.py
+1 −10 CMakeLists.txt
+0 −52 Externals.cfg
+0 −7 Externals_cime.cfg
+19 −74 docker/Dockerfile
+29 −0 docker/cime.yaml
+66 −39 docker/entrypoint.sh
+0 −38 tools/load_balancing_tool/LICENSE.TXT
+0 −13 tools/load_balancing_tool/README
+0 −443 tools/load_balancing_tool/layouts.py
+0 −432 tools/load_balancing_tool/load_balancing_solve.py
+0 −396 tools/load_balancing_tool/load_balancing_submit.py
+0 −388 tools/load_balancing_tool/optimize_model.py
+0 −0 tools/load_balancing_tool/tests/__init__.py
+0 −187 tools/load_balancing_tool/tests/atm_lnd.py
+0 −29 tools/load_balancing_tool/tests/example.json
+0 −335 tools/load_balancing_tool/tests/load_balancing_test.py
+0 −39 tools/load_balancing_tool/tests/test.xml
+0 −187 tools/load_balancing_tool/tests/timing/timing_1
+0 −187 tools/load_balancing_tool/tests/timing/timing_2
+0 −187 tools/load_balancing_tool/tests/timing/timing_3
+3 −3 tools/mapping/gen_mapping_files/runoff_to_ocn/INSTALL
+1 −1 tools/mapping/gen_mapping_files/runoff_to_ocn/tools/makdep.c

0 comments on commit fa92e85

Please sign in to comment.