Merge branch 'master' into subset_mesh

.git-blame-ignore-revs

@@ -7,10 +7,34 @@ c5c054819f9d8da9b4e21cd296398bcde27c8151
 129492f828709333fd9d76f964680ee360313257
 3f47819b4e78c09b6156535074da095b27668cc5
 4cd83cb3ee6d85eb909403487abf5eeaf4d98911
+d229b5c6689efc4c2a6cef077515c4ccd5c18ff6
 0aa2957c1f8603c63fa30b11295c06cfddff44a5
 2cdb380febb274478e84cd90945aee93f29fa2e6
 e44dc469439e02e9ee582dab274d890ebdfab104
 565e7bcacbb0bba20ff80d680d8ad769676641c6
 b88e1cd1b28e3609684c79a2ec0e88f26cfc362b
 51c102c5df2e0ef971b5f8eeeb477567899af63a
 7dacad70e74e2ec97f6492d4e7a3cb5dd498bcd7
+b771971e3299c4fa56534b93421f7a2b9c7282fd
+9de88bb57ea9855da408cbec1dc8acb9079eda47
+8bc4688e52ea23ef688e283698f70a44388373eb
+c8bd4c6f98c0b411391b4355da449507db3aab4e
+4ee49e3e516ca7dee5df378f65664f93a7db4415
+0207bc98dd5c75cd69a0e788bc53e41093712f5c
+e4d38681df23ccca0ae29581a45f8362574e0630
+0a5a9e803b56ec1bbd6232eff1c99dbbeef25eb7
+810cb346f05ac1aabfff931ab1a2b7b584add241
+5933b0018f8e29413e30dda9b906370d147bad45
+025d5e7c2e80263717fb029101d65cbbf261c3c4
+a9d96219902cf609636886c7073a84407f450d9a
+d866510188d26d51bcd6d37239283db690af7e82
+0dcd0a3c1abcaffe5529f8d79a6bc34734b195c7
+# Ran SystemTests and python/ctsm through black python formatter
+5364ad66eaceb55dde2d3d598fe4ce37ac83a93c
+8056ae649c1b37f5e10aaaac79005d6e3a8b2380
+0bc3f00115d86d026a977918661c93779b3b19f9
+540b256d1f3382f4619d7b0877c32d54ce5c40b6
+8a168bb0895f4f2421608dd2589398e13a6663e6
+183fc26a6691bbdf87f515dc47924a64be3ced9b
+6fccf682eaf718615407d9bacdd3903b8786a03d
+2500534eb0a83cc3aff94b30fb62e915054030bf

.github/workflows/assign-to-project.yml

@@ -0,0 +1,23 @@
+name: Auto Assign to Project(s)
+
+on:
+  issues:
+    types: [opened, labeled]
+  pull_request:
+    types: [opened, labeled]
+  issue_comment:
+    types: [created]
+
+jobs:
+  assign_high_priority:
+    runs-on: ubuntu-latest
+    name: Assign to High Priority project
+    steps:
+    - name: Assign issues and pull requests with priority-high label to project 25
+      uses: srggrs/assign-one-project-github-action@1.3.1
+      if: |
+        contains(github.event.issue.labels.*.name, 'priority: high') ||
+        contains(github.event.pull_request.labels.*.name, 'priority: high')
+      with:
+        project: 'https://github.com/ESCOMP/CTSM/projects/25'
+        column_name: 'Needs triage'

.github/workflows/black.yml

@@ -16,6 +16,22 @@ jobs:
              # Use options and version identical to the conda environment
              # Using pyproject.toml makes sure this testing is consistent with our python directory testing
              options: "--check --config python/pyproject.toml"
-             src:     "./python"
+             src: "./python"
              # Version should be coordinated with the ctsm_pylib conda environment under the python directory
              version: "22.3.0"
+          # Actions identical to above for each directory and source file we need to check (arrays aren't allowed for src: field)
+        - uses: psf/black@stable
+          with:
+             options: "--check --config python/pyproject.toml"
+             src: "./cime_config/SystemTests"
+             version: "22.3.0"
+        - uses: psf/black@stable
+          with:
+             options: "--check --config python/pyproject.toml"
+             src: "./cime_config/buildlib"
+             version: "22.3.0"
+        - uses: psf/black@stable
+          with:
+             options: "--check --config python/pyproject.toml"
+             src: "./cime_config/buildnml"
+             version: "22.3.0"

Externals.cfg

@@ -8,22 +8,22 @@ required = True
 local_path = components/cism
 protocol = git
 repo_url = https://github.com/ESCOMP/CISM-wrapper
-tag = cismwrap_2_1_95
+tag = cismwrap_2_1_97
 externals = Externals_CISM.cfg
 required = True
 
 [rtm]
 local_path = components/rtm
 protocol = git
 repo_url = https://github.com/ESCOMP/RTM
-tag = rtm1_0_78
+tag = rtm1_0_79
 required = True
 
 [mosart]
 local_path = components/mosart
 protocol = git
 repo_url = https://github.com/ESCOMP/MOSART
-tag = mosart1_0_48
+tag = mosart1_0_49
 required = True
 
 [mizuRoute]
@@ -34,7 +34,7 @@ hash = 34723c2
 required = True
 
 [ccs_config]
-tag = ccs_config_cesm0.0.64
+tag = ccs_config_cesm0.0.92
 protocol = git
 repo_url = https://github.com/ESMCI/ccs_config_cesm.git
 local_path = ccs_config
@@ -44,33 +44,33 @@ required = True
 local_path = cime
 protocol = git
 repo_url = https://github.com/ESMCI/cime
-tag = cime6.0.108
+tag = cime6.0.217_httpsbranch03
 required = True
 
 [cmeps]
-tag = cmeps0.14.21
+tag = cmeps0.14.50
 protocol = git
 repo_url = https://github.com/ESCOMP/CMEPS.git
 local_path = components/cmeps
 required = True
 
 [cdeps]
-tag = cdeps1.0.13
+tag = cdeps1.0.28
 protocol = git
 repo_url = https://github.com/ESCOMP/CDEPS.git
 local_path = components/cdeps
 externals =  Externals_CDEPS.cfg
 required = True
 
 [cpl7]
-tag = cpl77.0.5
+tag = cpl77.0.7
 protocol = git
 repo_url = https://github.com/ESCOMP/CESM_CPL7andDataComps
 local_path = components/cpl7
 required = True
 
 [share]
-tag = share1.0.17
+tag = share1.0.18
 protocol = git
 repo_url = https://github.com/ESCOMP/CESM_share
 local_path = share
@@ -84,7 +84,7 @@ local_path = libraries/mct
 required = True
 
 [parallelio]
-tag = pio2_5_10
+tag = pio2_6_2
 protocol = git
 repo_url = https://github.com/NCAR/ParallelIO
 local_path = libraries/parallelio

Externals_CLM.cfg

@@ -2,7 +2,7 @@
 local_path = src/fates
 protocol = git
 repo_url = https://github.com/NGEET/fates
-tag = sci.1.65.3_api.25.4.0
+tag = sci.1.71.0_api.33.0.0
 required = True
 
 [externals_description]