Merge pull request #412 from GEOS-ESM/feature/deactivate-nonported-mapl3-components

Author: mathomp4

CMakeLists.txt

@@ -2,51 +2,56 @@ esma_check_if_debug()
 
 option(HERMES_LIGHT "Build light-weighted GMAO_shared library" OFF)
 
-esma_add_subdirectories(GEOS_Shared)
+# not yet ported to MAPL3 - only build GMAO_mpeu, GMAO_hermes (light), and GEOS_Shared
+# for FVdycoreCubed_GridComp (needs m_set_eta, m_topo_remap, tropovars)
+# restore full build (and set HERMES_LIGHT OFF) when all components are ported
+set (HERMES_LIGHT ON)
+esma_add_subdirectories(GMAO_mpeu)
 esma_add_subdirectories(GMAO_hermes)
+esma_add_subdirectories(GEOS_Shared)
 
-if ( NOT HERMES_LIGHT )
-
-   esma_add_subdirectories(
-     GMAO_mpeu
-     GMAO_pilgrim
-     GMAO_etc
-     GEOS_Util
-     LANL_Shared
-     GMAO_perllib
-     GMAO_transf
-     GMAO_stoch
-
-     GEOS_Pert
-     GMAO_mfhdf3
-     GMAO_gfioeos
-     GMAO_ods
-     GMAO_psas
-     GMAO_gems
-     GMAO_iret
-     GMAO_pyobs
-     GMAO_radmon
-
-     GMAO_ncdiag
-     arpack
-     pnagpack
-     )
-
-   # Special case - GMAO_gfio is built twice with two different precisions.
-   if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/GMAO_gfio)
-     add_subdirectory (GMAO_gfio GMAO_gfio_r4)
-     add_subdirectory (GMAO_gfio GMAO_gfio_r8)
-     add_dependencies (GMAO_gfio_r4 GMAO_gfio_r8)
-   endif ()
-
-   # the gmao2ioda directory just has scripts we want to install
-   # but we only want to install it if it actually exists (i.e.,
-   # it might be sparsed out in some fixtures
-   if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/gmao2ioda)
-     install(
-       DIRECTORY gmao2ioda
-       DESTINATION bin
-       USE_SOURCE_PERMISSIONS
-     )
-   endif()
-endif()
+# if ( NOT HERMES_LIGHT )
+#
+#    esma_add_subdirectories(
+#      GMAO_mpeu
+#      GMAO_pilgrim
+#      GMAO_etc
+#      GEOS_Util
+#      LANL_Shared
+#      GMAO_perllib
+#      GMAO_transf
+#      GMAO_stoch
+#
+#      GEOS_Pert
+#      GMAO_mfhdf3
+#      GMAO_gfioeos
+#      GMAO_ods
+#      GMAO_psas
+#      GMAO_gems
+#      GMAO_iret
+#      GMAO_pyobs
+#      GMAO_radmon
+#
+#      GMAO_ncdiag
+#      arpack
+#      pnagpack
+#      )
+#
+#    # Special case - GMAO_gfio is built twice with two different precisions.
+#    if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/GMAO_gfio)
+#      add_subdirectory (GMAO_gfio GMAO_gfio_r4)
+#      add_subdirectory (GMAO_gfio GMAO_gfio_r8)
+#      add_dependencies (GMAO_gfio_r4 GMAO_gfio_r8)
+#    endif ()
+#
+#    # the gmao2ioda directory just has scripts we want to install
+#    # but we only want to install it if it actually exists (i.e.,
+#    # it might be sparsed out in some fixtures
+#    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/gmao2ioda)
+#      install(
+#        DIRECTORY gmao2ioda
+#        DESTINATION bin
+#        USE_SOURCE_PERMISSIONS
+#      )
+#    endif()
+# endif()

GMAO_hermes/CMakeLists.txt

@@ -81,9 +81,11 @@ else ()
 
    set (srcs
      m_set_eta.F90 shared_topo_remap.F90
+     # not yet ported to MAPL3 - added for FVdycoreCubed_GridComp (m_topo_remap dependency chain)
+     m_topo_remap.F90 m_dyn.f90 m_const.f90
      )
 
-   esma_add_library(${this} SRCS ${srcs} )
+   esma_add_library(${this} SRCS ${srcs} DEPENDENCIES GMAO_mpeu)
    target_compile_options(${this} PRIVATE ${flags})
 
 endif ()