Merge branch 'release/MAPL-v3' into feature/MAPL3-adapt-step

Author: tclune

.circleci/config.yml

@@ -21,9 +21,9 @@ workflows:
           #baselibs_version: *baselibs_version
           repo: GEOSgcm
           checkout_fixture: true
-          mepodevelop: true
-          checkout_mapl3_release_branch: true
-          persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra
+          mepodevelop: false
+          fixture_branch: release/MAPL-v3
+          persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra
 
       ######################################################
       # # Run AMIP GCM (1 hour, no ExtData)                #

.github/workflows/push-to-develop.yml

@@ -14,6 +14,7 @@ jobs:
         uses: actions/checkout@v5
         with:
           fetch-depth: 0
+          filter: blob:none
       - name: Run the action
         uses: devops-infra/[email protected]
         with:

.github/workflows/workflow.yml

@@ -19,14 +19,19 @@ jobs:
   build_gcm:
     strategy:
       matrix:
-        compiler: [ifort, gfortran-14, gfortran-15]
+        #compiler: [ifort, gfortran-14, gfortran-15]
+        # We remove ifort because for some reason, MAPL3 + ifort + Github CI
+        # is running out of space on the device. For now, CircleCI will
+        # continue to test ifort.
+        compiler: [gfortran-14, gfortran-15]
         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
       fixture-ref: release/MAPL-v3
+      run-mepo-develop: false
 
   spack_build:
     uses: GEOS-ESM/CI-workflows/.github/workflows/spack_gcc_build.yml@project/geosgcm
@@ -36,3 +41,9 @@ jobs:
     with:
       fixture-repo: GEOS-ESM/GEOSgcm
       fixture-ref: release/MAPL-v3
+      run-mepo-develop: false
+      patch-esmf: true
+      # There is some weird issue with spack builds and the install step with
+      # MAPL 3. For now, turn off as we don't need to *run* GEOS.
+      run-install: false
+

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/GEOS_GwdGridComp.F90

@@ -225,9 +225,8 @@ subroutine Initialize ( GC, IMPORT, EXPORT, CLOCK, RC )
       ! Local derived type aliases
 
       type(ESMF_Grid) :: grid
-      integer                             :: IM, JM !, dims_(3)
-      real, allocatable, dimension(:,:)       :: LONS
-      real, allocatable, dimension(:,:)       :: LATS
+      integer :: IM, JM !, dims_(3)
+      real, allocatable :: lats(:,:), lons(:,:)
 
       character(len=:), allocatable :: GRIDNAME
       character(len=4)           :: imchar
@@ -463,8 +462,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
       !real                                :: effgworo, effgwbkg
       !real                                :: CDMBGWD1, CDMBGWD2
       !real                                :: bgstressmax
-      real, allocatable, dimension(:,:)       :: LONS
-      real, allocatable, dimension(:,:)       :: LATS
+      real, allocatable, dimension(:,:)   :: LATS, LONS
       ! Rayleigh friction parameters
 
       REAL                                :: H0, HH, Z1, TAU1
@@ -503,6 +501,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
       ! Grid info
       call MAPL_GridCompGet(gc, grid=grid, num_levels=LM, _RC)
       call MAPL_GridGetCoordinates(grid, longitudes=lons, latitudes=lats, _RC)
+      call MAPL_GridGet(grid, im=IM, jm=JM, _RC)
 
       ! call ESMF_ClockGetAlarm(clock,