Merge pull request #97 from mvdebolskiy/rpointers-update-cime

Rpointers update cime

Author: mvdebolskiy

.git-blame-ignore-revs

@@ -1,3 +1,4 @@
 # Migrated code style to Black
 eabf877cbb86b281fdd37a3fa3cc0edf9b8eb874
 321463922724b225988e517da54a18bad90bc316
+6751504adf095d5d034e6406fbb0e914924aecff

.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'

.github/workflows/testing.yml

@@ -76,15 +76,14 @@ jobs:
     timeout-minutes: 2
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: '3.10'
       - name: Runs pre-commit
         run: |
           pip install pre-commit
-
           pre-commit run -a
 
   # Runs unit testing under different python versions.
@@ -98,11 +97,12 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
     strategy:
+      fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10']
+        python-version: ["3.8", "3.10", "3.12"]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run tests
         shell: bash
         env:
@@ -118,6 +118,8 @@ jobs:
           # from 'entrypoint.sh', create and activate new environment
           create_environment ${{ matrix.python-version }}
 
+          pip install -r test-requirements.txt
+
           # GitHub runner home is different than container
           cp -rf /root/.cime /github/home/
 
@@ -151,7 +153,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Cache inputdata
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: /storage/inputdata
           key: inputdata-2
@@ -162,6 +164,8 @@ jobs:
           CIME_DRIVER: ${{ matrix.driver }}
           CIME_TEST_PLATFORM: ubuntu-latest
         run: |
+          pip install -r test-requirements.txt
+
           export CIME_REMOTE=https://github.com/${{ github.event.pull_request.head.repo.full_name || github.repository }}
           export CIME_BRANCH=${GITHUB_HEAD_REF:-${GITHUB_REF##*/}}
 
@@ -195,7 +199,7 @@ jobs:
         # https://docs.github.com/en/actions/managing-workflow-runs/downloading-workflow-artifacts
       - name: Upload testing logs
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: testing-logs-${{ github.run_number }}-${{ matrix.model }}-${{ matrix.driver }}
           path: /testing-logs-${{ github.run_number}}-${{ matrix.model }}-${{ matrix.driver }}.tar.gz

CIME/SystemTests/eri.py

@@ -1,6 +1,7 @@
 """
 CIME ERI test  This class inherits from SystemTestsCommon
 """
+
 from CIME.XML.standard_module_setup import *
 from CIME.utils import safe_copy
 from CIME.SystemTests.system_tests_common import SystemTestsCommon
@@ -34,8 +35,8 @@ def _helper(dout_sr, refdate, refsec, rundir):
             os.mkdir(rundir)
         elif os.path.exists(dst):
             os.remove(dst)
-
-        os.symlink(item, dst)
+        if not "rpointer" in item:
+            os.symlink(item, dst)
 
     for item in glob.glob("{}/*rpointer*".format(rest_path)):
         safe_copy(item, rundir)
@@ -83,7 +84,7 @@ def run_phase(self):
         start_1 = run_startdate
 
         stop_n2 = stop_n - stop_n1
-        rest_n2 = int(stop_n2 / 2 + 1)
+
         hist_n = stop_n2
 
         start_1_year, start_1_month, start_1_day = [
@@ -93,10 +94,28 @@ def run_phase(self):
         start_2 = "{:04d}-{:02d}-{:02d}".format(
             start_2_year, start_1_month, start_1_day
         )
+        rest_n2 = self._set_restart_interval(
+            stop_n=stop_n2,
+            stop_option=stop_option,
+            startdate=start_2,
+            starttime=start_tod,
+        )
 
         stop_n3 = stop_n2 - rest_n2
-        rest_n3 = int(stop_n3 / 2 + 1)
 
+        ninst = self._case.get_value("NINST")
+        drvrest = "rpointer.cpl"
+        if ninst is not None and ninst > 1:
+            drvrest += "_0001"
+        drvrest += self._rest_time
+        self._set_drv_restart_pointer(drvrest)
+
+        rest_n3 = self._set_restart_interval(
+            stop_n=stop_n3,
+            stop_option=stop_option,
+            startdate=start_2,
+            starttime=start_tod,
+        )
         stop_n4 = stop_n3 - rest_n3
 
         expect(stop_n4 >= 1 and stop_n1 >= 1, "Run length too short")
@@ -223,8 +242,10 @@ def run_phase(self):
         self._case.set_value("GET_REFCASE", False)
         self._case.set_value("CONTINUE_RUN", False)
         self._case.set_value("STOP_N", stop_n3)
-        self._case.set_value("REST_OPTION", stop_option)
-        self._case.set_value("REST_N", rest_n3)
+        self._set_restart_interval(
+            stop_n=stop_n3, startdate=refdate_3, starttime=refsec_3
+        )
+
         self._case.set_value("HIST_OPTION", stop_option)
         self._case.set_value("HIST_N", stop_n2)
         self._case.set_value("DOUT_S", False)
@@ -266,6 +287,12 @@ def run_phase(self):
         self._case.set_value("DOUT_S", False)
         self._case.set_value("HIST_OPTION", stop_option)
         self._case.set_value("HIST_N", hist_n)
+        drvrest = "rpointer.cpl"
+        if ninst is not None and ninst > 1:
+            drvrest += "_0001"
+        drvrest += self._rest_time
+
+        self._set_drv_restart_pointer(drvrest)
         self._case.flush()
 
         # do the restart run (short term archiving is off)

CIME/SystemTests/err.py

@@ -5,7 +5,7 @@
 import glob, os
 from CIME.XML.standard_module_setup import *
 from CIME.SystemTests.restart_tests import RestartTest
-from CIME.utils import ls_sorted_by_mtime, safe_copy
+from CIME.utils import safe_copy
 
 logger = logging.getLogger(__name__)
 
@@ -35,12 +35,11 @@ def _case_two_setup(self):
 
     def _case_two_custom_prerun_action(self):
         dout_s_root = self._case1.get_value("DOUT_S_ROOT")
-        rest_root = os.path.abspath(os.path.join(dout_s_root, "rest"))
-        restart_list = ls_sorted_by_mtime(rest_root)
-        expect(len(restart_list) >= 1, "No restart files found in {}".format(rest_root))
-        self._case.restore_from_archive(
-            rest_dir=os.path.join(rest_root, restart_list[0])
-        )
+        self._drv_restart_pointer = self._case2.get_value("DRV_RESTART_POINTER")
+        resttime = self._drv_restart_pointer[-16:]
+        rest_root = os.path.abspath(os.path.join(dout_s_root, "rest", resttime))
+        expect(os.path.isdir(rest_root), "None such directory {}".format(rest_root))
+        self._case.restore_from_archive(rest_dir=rest_root)
 
     def _case_two_custom_postrun_action(self):
         # Link back to original case1 name

CIME/SystemTests/ers.py

@@ -17,6 +17,9 @@ def __init__(self, case, **kwargs):
 
     def _ers_first_phase(self):
         self._rest_n = self._set_restart_interval()
+        # set_restart_interval can change case settings that buildnmls may depend on
+        # so ensure buildnmls will not be skipped during case_run
+        self._skip_pnl = False
         self.run_indv()
 
     def _ers_second_phase(self):
@@ -36,7 +39,13 @@ def _ers_second_phase(self):
                 pfile,
                 os.path.join(os.path.dirname(pfile), "run1." + os.path.basename(pfile)),
             )
+        ninst = self._case.get_value("NINST")
+        drvrest = "rpointer.cpl"
+        if ninst is not None and ninst > 1:
+            drvrest += "_0001"
+        drvrest += self._rest_time
 
+        self._set_drv_restart_pointer(drvrest)
         self._case.set_value("HIST_N", stop_n)
         self._case.set_value("STOP_N", stop_new)
         self._case.set_value("CONTINUE_RUN", True)