Merge E3SM master into Omega develop

.github/workflows/e3sm-gh-md-linter.yml

@@ -25,7 +25,7 @@ jobs:
       with:
         files: '**/*.md'
         separator: ","
-    - uses: DavidAnson/markdownlint-cli2-action@v19
+    - uses: DavidAnson/markdownlint-cli2-action@v20
       if: steps.changed-files.outputs.any_changed == 'true'
       with:
         config: 'docs/.markdownlint.json'

.github/workflows/eamxx-gh-clang-format.yml

@@ -0,0 +1,42 @@
+name: "eamxx-format"
+
+# if .{cpp,hpp} files are touched in a PR, lint them!
+
+on:
+  pull_request:
+    branches: ["master"]
+    paths:
+      - 'components/eamxx/**/*.cpp'
+      - 'components/eamxx/**/*.hpp'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  clang-format-linter:
+    if: ${{ github.repository == 'E3SM-Project/E3SM' }}
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - uses: tj-actions/changed-files@v46
+      id: changed-files
+      with:
+        files: 'components/eamxx/**/*.{cpp,hpp}'
+        separator: " "
+    # 1. runs clang-format on the files changed by this PR, and returns pass/fail
+    #    error code.
+    # 2. prints the diff to screen (action log), comparing to the changes
+    #    that *would* be made
+    # 3. the E3SM-Project fork of DoozyX/[email protected]
+    #    adds a Step summary to the workflow page, and, on failure, lists the
+    #    files that fail the clang-format test
+    - uses: E3SM-Project/[email protected]
+      with:
+        source: ${{ steps.changed-files.outputs.all_changed_files }}
+        exclude: ''
+        extensions: 'hpp,cpp'
+        clangFormatVersion: 14
+        style: 'file:components/eamxx/.clang-format'

.github/workflows/eamxx-v1-testing.yml

@@ -72,8 +72,10 @@ jobs:
             short_name: ERS_P16_Ln22.ne30pg2_ne30pg2.FIOP-SCREAMv1-DP.eamxx-dpxx-arm97
           - full_name: ERS_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.ghci-snl-cpu_gnu.eamxx-small_kernels--eamxx-output-preset-5
             short_name: ERS_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.eamxx-small_kernels--eamxx-output-preset-5
-          - full_name: SMS_D_Ln5.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.ghci-snl-cpu_gnu.eamxx-mam4xx-all_mam4xx_procs
-            short_name: SMS_D_Ln5.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.eamxx-mam4xx-all_mam4xx_procs
+          - full_name: REP_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.ghci-snl-cpu_gnu
+            short_name: REP_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx
+          - full_name: "ERS.ne4pg2_ne4pg2.F2010-SCREAMv1.ghci-snl-cpu_gnu.eamxx-prod"
+            short_name: ERS.ne4pg2_ne4pg2.F2010-SCREAMv1.eamxx-prod
       fail-fast: false
     name: cpu-gcc / ${{ matrix.test.short_name }}
     steps:

.gitmodules

@@ -22,8 +22,8 @@
 	branch = scorpio_classic
 [submodule "cosp2"]
 	path = components/eam/src/physics/cosp2/external
-	url = [email protected]:bartgol/COSPv2.0.git
-	branch = bartgol/fix-cosp_optical_inputs
+	url = [email protected]:e3sm-project/COSPv2.0.git
+	branch = e3sm-master
 [submodule "cime"]
 	path = cime
 	url = [email protected]:ESMCI/cime.git

README.md

@@ -5,9 +5,9 @@
 Energy Exascale Earth System Model (E3SM)
 ================================================================================
 
-E3SM is a state-of-the-art fully coupled model of the Earth's climate including
+E3SM is a state-of-the-art fully coupled model of the Earth System including
 important biogeochemical and cryospheric processes. It is intended to address
-the most challenging and demanding climate-change research problems and
+the most challenging and demanding earth system research problems and
 Department of Energy mission needs while efficiently using DOE Leadership
 Computing Facilities.