Merge develop into main for release

.circleci/config.yml

@@ -1,14 +1,12 @@
 version: 2.1
 
 # Anchors in case we need to override the defaults from the orb
-
-#baselibs_version: &baselibs_version v8.5.0
+#baselibs_version: &baselibs_version v8.32.0
 #bcs_version: &bcs_version v12.0.0
 
 orbs:
   ci: geos-esm/circleci-tools@5
 
-
 workflows:
   build-test:
     jobs:
@@ -23,10 +21,7 @@ workflows:
           #baselibs_version: *baselibs_version
           repo: GEOSgcm
           checkout_fixture: true
-          # V12 code uses a special branch for now.
-          fixture_branch: feature/sdrabenh/gcm_v12
-          # We comment out this as it will "undo" the fixture_branch
-          #mepodevelop: true
+          mepodevelop: true
           persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra
 
       # Run AMIP GCM (1 hour, no ExtData)

.github/workflows/workflow.yml

@@ -0,0 +1,41 @@
+name: Build Tests
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+    # Do not run if the only files changed cannot affect the build
+    paths-ignore:
+      - "**.md"
+      - "**.pro"
+      - "**.sh"
+      - "**.perl"
+      - ".github/CODEOWNERS"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/develop' }}
+
+jobs:
+  build_gcm:
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: [ifort, gfortran-15, ifx]
+        build-type: [Debug]
+    uses: GEOS-ESM/CI-workflows/.github/workflows/geosgcm_build_tests.yml@project/geosgcm
+    with:
+      compiler: ${{ matrix.compiler }}
+      cmake-build-type: ${{ matrix.build-type }}
+      fixture-repo: GEOS-ESM/GEOSgcm
+      run-mepo-develop: true
+
+  spack_build:
+    uses: GEOS-ESM/CI-workflows/.github/workflows/spack_gcc_build.yml@project/geosgcm
+    secrets:
+      BUILDCACHE_USERNAME: ${{ secrets.BUILDCACHE_USERNAME }}
+      BUILDCACHE_TOKEN: ${{ secrets.BUILDCACHE_TOKEN }}
+    with:
+      fixture-repo: GEOS-ESM/GEOSgcm
+      run-mepo-develop: true
+      load-fms: true
+

MOM6_GEOSPlug/mom6_app/1440x1080/MOM_override

@@ -1,6 +1,6 @@
 ! Blank file in which we can put "overrides" for parameters
 
-LAYOUT = 36, 30
+LAYOUT = 48, 40
 #override DT = 450
 #override DT_THERM = 450
 HFREEZE = 2.0

MOM6_GEOSPlug/mom6_app/2880x2240/MOM_override

@@ -1,6 +1,6 @@
 ! Blank file in which we can put "overrides" for parameters
 
-LAYOUT = 36, 20
+LAYOUT = 48, 40
 #override DT = 450
 #override DT_THERM = 450
 HFREEZE = 2.0
@@ -69,9 +69,9 @@ RESTART_CHECKSUMS_REQUIRED = False
 
 !! Updates for MLD  !! SK
 
-#override FOX_KEMPER_ML_RESTRAT_COEF = 1.0 
+#override FOX_KEMPER_ML_RESTRAT_COEF = 1.0
 #override MLE_FRONT_LENGTH = 500.0
-#override MLE%USE_BODNER23 = True 
+#override MLE%USE_BODNER23 = True
 #override MLE%CR = 0.038
 #override MLE%BLD_DECAYING_TFILTER = 8.64E+04
 #override MLE%MLD_DECAYING_TFILTER = 2.592E+06

MOM6_GEOSPlug/mom6_app/720x576/MOM_override

@@ -1,6 +1,6 @@
 ! Blank file in which we can put "overrides" for parameters
 
-LAYOUT = 24, 24
+LAYOUT = 40, 48
 #override DT = 450
 #override DT_THERM = 450
 HFREEZE = 2.0
@@ -69,9 +69,9 @@ RESTART_CHECKSUMS_REQUIRED = False
 
 !! Updates for MLD  !! SK
 
-#override FOX_KEMPER_ML_RESTRAT_COEF = 1.0 
+#override FOX_KEMPER_ML_RESTRAT_COEF = 1.0
 #override MLE_FRONT_LENGTH = 500.0
-#override MLE%USE_BODNER23 = True 
+#override MLE%USE_BODNER23 = True
 #override MLE%CR = 0.038
 #override MLE%BLD_DECAYING_TFILTER = 8.64E+04
 #override MLE%MLD_DECAYING_TFILTER = 2.592E+06