Merge branch 'E3SM-Project:main' into aquaplanet-external-gravity-wave

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    assignees:
+      - "xylar"
+    reviewers:
+      - "xylar"

.github/workflows/build_workflow.yml

@@ -27,11 +27,11 @@ jobs:
 
       - if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
         name: Checkout Code Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
         name: Set up Python 3.10
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 
@@ -60,11 +60,11 @@ jobs:
           paths_ignore: ${{ env.PATHS_IGNORE }}
 
       - if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
         name: Cache Conda
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           # Increase this value to reset cache if conda-dev-spec.template has not changed in the workflow
           CACHE_NUMBER: 0
@@ -88,6 +88,7 @@ jobs:
       - if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
         name: Install polaris
         run: |
+          git config --global url."https://github.com/".insteadOf "[email protected]:"
           ./configure_polaris_envs.py \
             --conda_env_only \
             --env_name polaris_test \

.github/workflows/docs_workflow.yml

@@ -15,13 +15,13 @@ jobs:
         shell: bash -l {0}
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
           fetch-depth: 0
 
       - name: Cache Conda
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           # Increase this value to reset cache if deploy/conda-dev-spec.template has not changed in the workflow
           CACHE_NUMBER: 0
@@ -44,6 +44,7 @@ jobs:
       - if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
         name: Install polaris
         run: |
+          git config --global url."https://github.com/".insteadOf "[email protected]:"
           ./configure_polaris_envs.py \
             --conda_env_only \
             --env_name polaris_test \

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "e3sm_submodules/Omega"]
 	path = e3sm_submodules/Omega
 	url = [email protected]:E3SM-Project/Omega.git
+[submodule "jigsaw-python"]
+	path = jigsaw-python
+	url = [email protected]:dengwirda/jigsaw-python.git

configure_polaris_envs.py

@@ -43,7 +43,12 @@ def setup_install_env(env_name, activate_base, use_local, logger, recreate,
         channels = '--use-local'
     else:
         channels = ''
-    packages = f'progressbar2 jinja2 {mache}'
+    if mache == '':
+        # development mache so include dependencies
+        packages = 'importlib_resources jinja2 lxml packaging progressbar2 ' \
+                   'pyyaml'
+    else:
+        packages = f'jinja2 {mache} packaging progressbar2'
     if recreate or not os.path.exists(env_path):
         print('Setting up a conda environment for installing polaris\n')
         commands = f'{activate_base} && ' \
@@ -114,7 +119,8 @@ def main():
                    f'git clone -b {args.mache_branch} ' \
                    f'[email protected]:{args.mache_fork}.git mache && ' \
                    f'cd mache && ' \
-                   f'python -m pip install .'
+                   f'conda install -y --file spec-file.txt && ' \
+                   f'python -m pip install --no-deps .'
 
         check_call(commands, logger=logger)
 

deploy/albany_supported.txt

@@ -4,5 +4,9 @@ anvil, gnu, openmpi
 chicoma-cpu, gnu, mpich
 chrysalis, gnu, openmpi
 compy, gnu, openmpi
+frontier, gnu, mpich
+frontier, gnugpu, mpich
+frontier, crayclang, mpich
+frontier, crayclanggpu, mpich
 pm-cpu, gnu, mpich
 morpheus, gnu, openmpi