Replace 'use MAPL' with 'use MAPL2' in GEOS_Shared for MAPL→MAPL2→MAPL3 rename

.circleci/config.yml

@@ -21,38 +21,38 @@ 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
-          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)
-      - ci/run_gcm:
-          name: run-GCM-on-<< matrix.compiler >>
-          context:
-            - docker-hub-creds
-          matrix:
-            parameters:
-              compiler: [gfortran, ifort]
-          requires:
-            - build-GEOSgcm-on-<< matrix.compiler >>
-          repo: GEOSgcm
-          #baselibs_version: *baselibs_version
-          #bcs_version: *bcs_version
-
-      # Run Coupled GCM (1 hour, no ExtData)
-      - ci/run_gcm:
-          name: run-coupled-GCM-on-<< matrix.compiler >>
-          context:
-            - docker-hub-creds
-          matrix:
-            parameters:
-              compiler: [ifort]
-          requires:
-            - build-GEOSgcm-on-<< matrix.compiler >>
-          repo: GEOSgcm
-          #baselibs_version: *baselibs_version
-          #bcs_version: *bcs_version
-          gcm_ocean_type: MOM6
-          change_layout: false
+      ######################################################
+      # # Run AMIP GCM (1 hour, no ExtData)                #
+      # - ci/run_gcm:                                      #
+      #     name: run-GCM-on-<< matrix.compiler >>         #
+      #     context:                                       #
+      #       - docker-hub-creds                           #
+      #     matrix:                                        #
+      #       parameters:                                  #
+      #         compiler: [gfortran, ifort]                #
+      #     requires:                                      #
+      #       - build-GEOSgcm-on-<< matrix.compiler >>     #
+      #     repo: GEOSgcm                                  #
+      #     #baselibs_version: *baselibs_version           #
+      #     #bcs_version: *bcs_version                     #
+      #                                                    #
+      # # Run Coupled GCM (1 hour, no ExtData)             #
+      # - ci/run_gcm:                                      #
+      #     name: run-coupled-GCM-on-<< matrix.compiler >> #
+      #     context:                                       #
+      #       - docker-hub-creds                           #
+      #     matrix:                                        #
+      #       parameters:                                  #
+      #         compiler: [ifort]                          #
+      #     requires:                                      #
+      #       - build-GEOSgcm-on-<< matrix.compiler >>     #
+      #     repo: GEOSgcm                                  #
+      #     #baselibs_version: *baselibs_version           #
+      #     #bcs_version: *bcs_version                     #
+      #     gcm_ocean_type: MOM6                           #
+      #     change_layout: false                           #
+      ######################################################

.github/workflows/workflow.yml

@@ -26,7 +26,8 @@ jobs:
       compiler: ${{ matrix.compiler }}
       cmake-build-type: ${{ matrix.build-type }}
       fixture-repo: GEOS-ESM/GEOSgcm
-      fixture-ref: feature/sdrabenh/gcm_v12
+      fixture-ref: release/MAPL-v3
+      run-mepo-develop: false
 
   spack_build:
     uses: GEOS-ESM/CI-workflows/.github/workflows/spack_gcc_build.yml@project/geosgcm
@@ -35,5 +36,10 @@ jobs:
       BUILDCACHE_TOKEN: ${{ secrets.BUILDCACHE_TOKEN }}
     with:
       fixture-repo: GEOS-ESM/GEOSgcm
-      fixture-ref: feature/sdrabenh/gcm_v12
+      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
 

GEOS_Shared/CMakeLists.txt

@@ -8,7 +8,7 @@ set (srcs
   getco2.F90 atmOceanIntLayer.F90
   )
 
-esma_add_library(${this} SRCS ${srcs} DEPENDENCIES MAPL ESMF::ESMF NetCDF::NetCDF_Fortran)
+esma_add_library(${this} SRCS ${srcs} DEPENDENCIES MAPL2 MAPL ESMF::ESMF NetCDF::NetCDF_Fortran)
 
 # special cases
 set_source_files_properties(sphere.F PROPERTIES COMPILE_FLAGS "${FREAL8}")

GEOS_Shared/G3_MPI_Util_Mod.F90

@@ -1,7 +1,7 @@
 #include "unused_dummy.H"
       module G3_MPI_Util_Mod
 
-      use MAPL
+      use MAPL2
       implicit none
 
 ! Define Lattice

GEOS_Shared/GEOS_TopoGet.F90

@@ -14,7 +14,7 @@ module GEOS_TopoGetMod
 ! !USES:
 
   use ESMF
-  use MAPL
+  use MAPL2
 
   implicit none
   private

GEOS_Shared/OVP.F90

@@ -13,7 +13,7 @@ module OVP
 ! !USES:
 
   use ESMF
-  use MAPL
+  use MAPL2
 
   implicit none
   private

GEOS_Shared/atmOceanIntLayer.F90

@@ -2,7 +2,7 @@ module atmOcnIntlayer
 
 ! !USES:
 
-use MAPL
+use MAPL2
 use GEOS_UtilsMod, only: GEOS_QSAT, GEOS_DQSAT
 
 implicit none

GEOS_Shared/condense.F90

@@ -31,7 +31,7 @@ subroutine condensation(T,P,Qv,Ql,SuperSat)
 
   subroutine Iterate(TT,PP,QQ,QC,SuperSat)
 
-    use MAPL, only : QSAT=>MAPL_EQSAT, MAPL_ALHL, MAPL_CP, MAPL_AIRMW, MAPL_RUNIV, MAPL_RDRY, MAPL_RGAS, MAPL_CP
+    use MAPL2, only : QSAT=>MAPL_EQSAT, MAPL_ALHL, MAPL_CP, MAPL_AIRMW, MAPL_RUNIV, MAPL_RDRY, MAPL_RGAS, MAPL_CP
 
     implicit none
 

GEOS_Shared/surfacelayer.F90

@@ -5,7 +5,7 @@ module sfclayer
 
 ! !USES:
 
-use MAPL
+use MAPL2
 use DragCoefficientsMod
 
 implicit none

GEOS_Shared/tropovars.F90

@@ -62,7 +62,7 @@ subroutine tropovars (im,jm,lm,ple,pl,                               &
 !
 !********************************************************************
 
-  use MAPL
+  use MAPL2
 
       implicit none
 

GEOS_Shared/windfix.F90

@@ -6,7 +6,7 @@ subroutine windfix ( ua,va,plea,                            &
                            vintdiva,vintdivb,vintdivc )
 
       use ESMF
-      use MAPL
+      use MAPL2
 
       implicit none