Merge pull request #1081 from GEOS-ESM/feature/pchakrab/gwd-to-mapl3

Porting GWD to mapl3

Author: pchakraborty

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 # Anchors in case we need to override the defaults from the orb
-#baselibs_version: &baselibs_version v7.27.0
+#baselibs_version: &baselibs_version v7.33.0
 #bcs_version: &bcs_version v11.6.0
 
 orbs:
@@ -25,32 +25,34 @@ workflows:
           checkout_mapl3_release_branch: true
           persist_workspace: true # 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/spack-ci.yml

@@ -28,6 +28,7 @@ jobs:
           fetch-depth: 1
           filter: blob:none
           repository: GEOS-ESM/GEOSgcm
+          ref: release/MAPL-v3
 
       - name: Set all directories as git safe
         run: |
@@ -50,12 +51,6 @@ jobs:
           mepo clone --partial blobless
           mepo status
 
-      - name: Mepo develop usual suspects
-        run: |
-          ls
-          mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared GEOS_Util
-          mepo status
-
       - name: Debug PR branch
         run: echo "PR is coming from ${{ github.event.pull_request.head.ref }}"
 

.github/workflows/workflow.yml

@@ -45,6 +45,7 @@ jobs:
           fetch-depth: 1
           filter: blob:none
           repository: GEOS-ESM/GEOSgcm
+          ref: release/MAPL-v3
 
       - name: Set all directories as git safe
         run: |
@@ -61,11 +62,6 @@ jobs:
           mepo clone --partial blobless
           mepo status
 
-      - name: Mepo develop usual suspects
-        run: |
-          mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared GEOS_Util
-          mepo status
-
       - name: Debug PR branch
         run: echo "PR is coming from ${{ github.event.pull_request.head.ref }}"
 

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/CMakeLists.txt

@@ -29,12 +29,13 @@ install( FILES ${resource_files}
 esma_add_library (
   ${this}
   SRCS ${srcs}
-  DEPENDENCIES GEOS_Shared MAPL ESMF::ESMF NetCDF::NetCDF_Fortran TYPE SHARED
+  DEPENDENCIES GEOS_Shared MAPL MAPL.generic3g MAPL.geom ESMF::ESMF NetCDF::NetCDF_Fortran TYPE SHARED
   )
 
 mapl_acg (
   ${this} GWD_StateSpecs.rc
   IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS GET_POINTERS DECLARE_POINTERS
+  3g
   )
 
 # CMake has an OpenMP issue with NAG Fortran: https://gitlab.kitware.com/cmake/cmake/-/issues/21280