Merge pull request #322 from GEOS-ESM/feature/pchakrab/porting-dyncore-to-mapl3

Porting dyncore to mapl3

Author: pchakraborty

.circleci/config.yml

@@ -68,15 +68,18 @@ workflows:
           mepodevelop: false
           checkout_mapl3_release_branch: true
           persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra
-      - ci/run_fv3:
-          name: run-FV3-as-<< matrix.fv_precision >>-on-<< matrix.compiler >>-with-GEOSfvdycore
-          context:
-            - docker-hub-creds
-          matrix:
-            parameters:
-              compiler: [gfortran, ifort]
-              fv_precision: ["R4", "R8"]
-          #baselibs_version: *baselibs_version
-          requires:
-            - build-GEOSfvdycore-as-<< matrix.fv_precision >>-on-<< matrix.compiler >>
-          repo: GEOSfvdycore
+      # We also turn off the FV3 dycore runs for now
+      #############################################################################################
+      # - ci/run_fv3:                                                                             #
+      #     name: run-FV3-as-<< matrix.fv_precision >>-on-<< matrix.compiler >>-with-GEOSfvdycore #
+      #     context:                                                                              #
+      #       - docker-hub-creds                                                                  #
+      #     matrix:                                                                               #
+      #       parameters:                                                                         #
+      #         compiler: [gfortran, ifort]                                                       #
+      #         fv_precision: ["R4", "R8"]                                                        #
+      #     #baselibs_version: *baselibs_version                                                  #
+      #     requires:                                                                             #
+      #       - build-GEOSfvdycore-as-<< matrix.fv_precision >>-on-<< matrix.compiler >>          #
+      #     repo: GEOSfvdycore                                                                    #
+      #############################################################################################

CMakeLists.txt

@@ -104,7 +104,7 @@ if (BUILD_GEOS_GTFV3_INTERFACE)
 
 endif ()
 
-set(dependencies MAPL GFTL_SHARED::gftl-shared-v2 GMAO_hermes GEOS_Shared esmf OpenMP::OpenMP_Fortran)
+set(dependencies MAPL MAPL.generic3g GFTL_SHARED::gftl-shared-v2 GMAO_hermes GEOS_Shared esmf OpenMP::OpenMP_Fortran)
 
 if (BUILD_GEOS_GTFV3_INTERFACE)
   esma_add_library (${this}
@@ -118,10 +118,12 @@ else ()
     SRCS ${srcs}
     SUBCOMPONENTS fvdycore
     DEPENDENCIES ${dependencies}
-    DEPENDENCIES ${GFDL})
+    DEPENDENCIES ${GFDL}
+    TYPE SHARED
+  )
 endif ()
 
-mapl_acg (${this} DynCore_StateSpecs.rc IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS)
+mapl_acg (${this} DynCore_StateSpecs.rc IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS 3g)
 mapl_acg (${this} AdvCore_StateSpecs.rc IMPORT_SPECS EXPORT_SPECS)
 
 if (FV_PRECISION STREQUAL R4)