From 08068ad35e26e4086764734d138c84cbf255b098 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 4 Jun 2026 11:22:38 -0400 Subject: [PATCH 1/5] Update CI - 2026-Jun-04 --- .circleci/config.yml | 9 ++------ .github/workflows/workflow.yml | 41 ++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/workflow.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index 7ace6c3..6f01249 100644 --- a/.circleci/config.yml +++ b/.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) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml new file mode 100644 index 0000000..f638ad8 --- /dev/null +++ b/.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 + From 91bb2630793a7871e969aebb3f6b1d5354c1d7d2 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 21 Aug 2026 14:04:34 -0400 Subject: [PATCH 2/5] Update o720 and o2880 layouts --- MOM6_GEOSPlug/mom6_app/2880x2240/MOM_override | 6 +++--- MOM6_GEOSPlug/mom6_app/720x576/MOM_override | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MOM6_GEOSPlug/mom6_app/2880x2240/MOM_override b/MOM6_GEOSPlug/mom6_app/2880x2240/MOM_override index 60ca27b..e52ee5c 100755 --- a/MOM6_GEOSPlug/mom6_app/2880x2240/MOM_override +++ b/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 = 36, 30 #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 diff --git a/MOM6_GEOSPlug/mom6_app/720x576/MOM_override b/MOM6_GEOSPlug/mom6_app/720x576/MOM_override index df1c3de..c6b06ef 100755 --- a/MOM6_GEOSPlug/mom6_app/720x576/MOM_override +++ b/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 = 45, 24 #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 From 68c3bb2a0fdbefd1e551148afc45f93cac87180c Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 21 Aug 2026 14:41:05 -0400 Subject: [PATCH 3/5] Update o2880 MOM6 layout to 36, 28 --- MOM6_GEOSPlug/mom6_app/2880x2240/MOM_override | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MOM6_GEOSPlug/mom6_app/2880x2240/MOM_override b/MOM6_GEOSPlug/mom6_app/2880x2240/MOM_override index e52ee5c..3b2147d 100755 --- a/MOM6_GEOSPlug/mom6_app/2880x2240/MOM_override +++ b/MOM6_GEOSPlug/mom6_app/2880x2240/MOM_override @@ -1,6 +1,6 @@ ! Blank file in which we can put "overrides" for parameters -LAYOUT = 36, 30 +LAYOUT = 36, 28 #override DT = 450 #override DT_THERM = 450 HFREEZE = 2.0 From 662afe938744886195e592df585e00390afb09c9 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 21 Aug 2026 14:48:25 -0400 Subject: [PATCH 4/5] Update o2880 MOM6 layout to 72, 28 --- MOM6_GEOSPlug/mom6_app/2880x2240/MOM_override | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MOM6_GEOSPlug/mom6_app/2880x2240/MOM_override b/MOM6_GEOSPlug/mom6_app/2880x2240/MOM_override index 3b2147d..7108a52 100755 --- a/MOM6_GEOSPlug/mom6_app/2880x2240/MOM_override +++ b/MOM6_GEOSPlug/mom6_app/2880x2240/MOM_override @@ -1,6 +1,6 @@ ! Blank file in which we can put "overrides" for parameters -LAYOUT = 36, 28 +LAYOUT = 72, 28 #override DT = 450 #override DT_THERM = 450 HFREEZE = 2.0 From 1d4ba6bf1b20b62395485d6e5ff0ad324b0449e3 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 25 Aug 2026 11:37:32 -0400 Subject: [PATCH 5/5] Align MOM6 ocean layouts at 1920 ranks --- MOM6_GEOSPlug/mom6_app/1440x1080/MOM_override | 2 +- MOM6_GEOSPlug/mom6_app/2880x2240/MOM_override | 2 +- MOM6_GEOSPlug/mom6_app/720x576/MOM_override | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MOM6_GEOSPlug/mom6_app/1440x1080/MOM_override b/MOM6_GEOSPlug/mom6_app/1440x1080/MOM_override index df0c0f7..ff86fc9 100755 --- a/MOM6_GEOSPlug/mom6_app/1440x1080/MOM_override +++ b/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 diff --git a/MOM6_GEOSPlug/mom6_app/2880x2240/MOM_override b/MOM6_GEOSPlug/mom6_app/2880x2240/MOM_override index 7108a52..65a6b6b 100755 --- a/MOM6_GEOSPlug/mom6_app/2880x2240/MOM_override +++ b/MOM6_GEOSPlug/mom6_app/2880x2240/MOM_override @@ -1,6 +1,6 @@ ! Blank file in which we can put "overrides" for parameters -LAYOUT = 72, 28 +LAYOUT = 48, 40 #override DT = 450 #override DT_THERM = 450 HFREEZE = 2.0 diff --git a/MOM6_GEOSPlug/mom6_app/720x576/MOM_override b/MOM6_GEOSPlug/mom6_app/720x576/MOM_override index c6b06ef..0928d72 100755 --- a/MOM6_GEOSPlug/mom6_app/720x576/MOM_override +++ b/MOM6_GEOSPlug/mom6_app/720x576/MOM_override @@ -1,6 +1,6 @@ ! Blank file in which we can put "overrides" for parameters -LAYOUT = 45, 24 +LAYOUT = 40, 48 #override DT = 450 #override DT_THERM = 450 HFREEZE = 2.0