clean up programs etc related to regrid.pl

.circleci/config.yml

@@ -1,11 +1,11 @@
 version: 2.1
 
 # Anchors in case we need to override the defaults from the orb
-#baselibs_version: &baselibs_version v7.27.0
-#bcs_version: &bcs_version v11.6.0
+#baselibs_version: &baselibs_version v8.14.0
+#bcs_version: &bcs_version v12.0.0
 
 orbs:
-  ci: geos-esm/circleci-tools@4
+  ci: geos-esm/circleci-tools@5
 
 workflows:
   build-test:
@@ -21,7 +21,10 @@ workflows:
           #baselibs_version: *baselibs_version
           repo: GEOSgcm
           checkout_fixture: true
-          mepodevelop: 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
           persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra
 
       # Run AMIP GCM (1 hour, no ExtData)

.github/workflows/spack-ci.yml

@@ -28,6 +28,7 @@ jobs:
           fetch-depth: 1
           filter: blob:none
           repository: GEOS-ESM/GEOSgcm
+          ref: feature/sdrabenh/gcm_v12
 
       - name: Set all directories as git safe
         run: |
@@ -107,7 +108,7 @@ jobs:
         run: |
           spack clean -m
           spack -e spack-env install --add --no-check-signature --use-buildcache only \
-            esmf gftl gftl-shared fargparse pflogger pfunit yafyaml ecbuild udunits openblas
+            esmf gftl gftl-shared fargparse pflogger pfunit yafyaml ecbuild udunits openblas fms
 
       - name: Build with Cmake
         shell: spack-bash {0}

.github/workflows/workflow.yml

@@ -21,7 +21,7 @@ jobs:
     if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')"
     runs-on: ubuntu-24.04
     container:
-      image: gmao/ubuntu24-geos-env:v7.33.0-intelmpi_2021.13-ifort_2021.13
+      image: gmao/ubuntu24-geos-env:v8.14.0-intelmpi_2021.13-ifort_2021.13
       # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495
       # It seems like we might not need secrets on GitHub Actions which is good for forked
       # pull requests
@@ -45,6 +45,7 @@ jobs:
           fetch-depth: 1
           filter: blob:none
           repository: GEOS-ESM/GEOSgcm
+          ref: feature/sdrabenh/gcm_v12
 
       - name: Set all directories as git safe
         run: |

CMakeLists.txt

@@ -9,11 +9,12 @@ set (alldirs
   )
 
 option(BUILD_WITH_GIGATRAJ "Build GEOSgcm with Gigatraj" OFF)
-
 if (BUILD_WITH_GIGATRAJ)
   list(APPEND alldirs GEOSgigatraj_GridComp)
 endif()
 
+option(BUILD_WITH_PYMLINC "Build pyMLINC interface" OFF)
+
 if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/GEOS_GcmGridComp.F90)
 
  ecbuild_declare_project()
@@ -23,6 +24,7 @@ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/GEOS_GcmGridComp.F90)
     DEPENDENCIES MAPL ESMF::ESMF)
 
   target_compile_definitions (${this} PRIVATE $<$<BOOL:${BUILD_WITH_GIGATRAJ}>:HAS_GIGATRAJ>)
+  target_compile_definitions (${this} PRIVATE $<$<BOOL:${BUILD_WITH_PYMLINC}>:HAS_PYMLINC>)
 
   ecbuild_install_project( NAME GEOSgcm_GridComp)