Merge branch 'master' into add_postprocessing_env_file

Author: mnlevy1981

.github/workflows/docs.yml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: 'gh-pages'
           fetch-depth: 0
@@ -64,17 +64,17 @@ jobs:
     name: Build and deploy documentation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           lfs: true
       - name: Install python 3.x
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
       # https://github.com/actions/cache/blob/main/examples.md#python---pip
       - name: Cache pip
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('doc/requirements.txt') }}
@@ -91,7 +91,7 @@ jobs:
         if: |
           github.event_name == 'pull_request' &&
           github.event.pull_request.head.repo.full_name == github.repository
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           publish_dir: './_build/html'

CIME/Tools/case.setup

@@ -72,6 +72,12 @@ def parse_command_line(args, description):
         "Use should use this if you have local modifications to these files that you want to keep.",
     )
 
+    parser.add_argument(
+        "--disable-git",
+        action="store_true",
+        help="Disable the interface to git, this will result in reduced provenance for your case.",
+    )
+
     parser.add_argument(
         "-N",
         "--non-local",
@@ -88,18 +94,31 @@ def parse_command_line(args, description):
         args.test_mode,
         args.reset,
         args.keep,
+        args.disable_git,
         args.non_local,
     )
 
 
 ###############################################################################
 def _main_func(description):
     ###############################################################################
-    caseroot, clean, test_mode, reset, keep, non_local = parse_command_line(
-        sys.argv, description
-    )
+    (
+        caseroot,
+        clean,
+        test_mode,
+        reset,
+        keep,
+        disable_git,
+        non_local,
+    ) = parse_command_line(sys.argv, description)
     with Case(caseroot, read_only=False, record=True, non_local=non_local) as case:
-        case.case_setup(clean=clean, test_mode=test_mode, reset=reset, keep=keep)
+        case.case_setup(
+            clean=clean,
+            test_mode=test_mode,
+            reset=reset,
+            keep=keep,
+            disable_git=disable_git,
+        )
 
 
 if __name__ == "__main__":

CIME/XML/env_mach_specific.py

@@ -6,7 +6,7 @@
 from CIME.XML.env_base import EnvBase
 from CIME import utils
 from CIME.utils import transform_vars, get_cime_root
-import string, resource
+import string, resource, platform
 from collections import OrderedDict
 
 logger = logging.getLogger(__name__)
@@ -151,6 +151,10 @@ def load_env(self, case, force_method=None, job=None, verbose=False):
     def _get_resources_for_case(self, case):
         resource_nodes = self.get_children("resource_limits")
         if resource_nodes is not None:
+            expect(
+                platform.system() != "Darwin",
+                "Mac OS does not support setting resource limits",
+            )
             nodes = self._compute_resource_actions(resource_nodes, case)
             for name, val in nodes:
                 attr = getattr(resource, name)

CIME/case/case_setup.py

@@ -521,7 +521,9 @@ def _case_setup_impl(
 
 
 ###############################################################################
-def case_setup(self, clean=False, test_mode=False, reset=False, keep=None):
+def case_setup(
+    self, clean=False, test_mode=False, reset=False, keep=None, disable_git=False
+):
     ###############################################################################
     caseroot, casebaseid = self.get_value("CASEROOT"), self.get_value("CASEBASEID")
     phase = "setup.clean" if clean else "case.setup"
@@ -565,7 +567,8 @@ def case_setup(self, clean=False, test_mode=False, reset=False, keep=None):
             caseroot=caseroot,
             is_batch=is_batch,
         )
-        self._create_case_repo(caseroot)
+        if not disable_git and not reset:
+            self._create_case_repo(caseroot)
 
 
 def _create_case_repo(self, caseroot):

CIME/non_py/cprnc

@@ -512,7 +512,7 @@ def test_cime_case_test_walltime_mgmt_8(self):
         # Frontier has 56 MAX_MPITASKS_PER_NODE so 5600 should require 100 nodes
         # which should land us in 6 hour queue
         test_name = "SMS_P5600.f19_g16_rx1.A"
-        machine, compiler = "frontier", "gnu"
+        machine, compiler = "frontier", "craygnu"
         casedir = self._create_test(
             [
                 "--no-setup",
@@ -530,7 +530,7 @@ def test_cime_case_test_walltime_mgmt_8(self):
             "./xmlquery JOB_WALLCLOCK_TIME -N --subgroup=case.test --value",
             from_dir=casedir,
         )
-        self.assertEqual(result, "06:00:00")
+        self.assertEqual(result, "12:00:00")
 
         result = self.run_cmd_assert_result(
             "./xmlquery JOB_QUEUE -N --subgroup=case.test --value", from_dir=casedir