Update submodules and use spack-stack FMS

.gitignore

@@ -183,4 +183,5 @@ install*/
 /sorc/gdas
 /sorc/gdas-utils
 !/bundle/CMakeLists.txt
+!/bundle/fv3-interface.cmake
 /bundle/*

.gitmodules

@@ -49,10 +49,6 @@
   path = sorc/icepack
   url = https://github.com/JCSDA-internal/Icepack.git
   branch = feature/ecbuild-new
-[submodule "sorc/mom6"]
-  path = sorc/mom6
-  url = https://github.com/jcsda-internal/MOM6.git
-  branch = main-ecbuild
 [submodule "sorc/soca"]
   path = sorc/soca
   url = https://github.com/jcsda-internal/soca.git
@@ -73,10 +69,6 @@
   path = sorc/crtm
   url = https://github.com/jcsda/crtm.git
   branch = release/crtm_jedi_v2.4.1
-[submodule "sorc/fms"]
-  path = sorc/fms
-  url = https://github.com/jcsda/fms.git
-  branch = release-stable
 [submodule "sorc/jcb"]
   path = sorc/jcb
   url = https://github.com/noaa-emc/jcb.git

bundle/CMakeLists.txt

@@ -36,6 +36,19 @@ option(BUILD_GDASBUNDLE "Build GDAS Bundle" ON)
 option(CLONE_JCSDADATA "Clone JCSDA test data repositories" OFF)
 option(WORKFLOW_TESTS "Include global-workflow dependent tests" OFF)
 
+# Depend path for non-ecbuild packages
+set(DEPEND_LIB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/Depends)
+list(APPEND CMAKE_PREFIX_PATH ${DEPEND_LIB_ROOT})
+
+# Library path for non-ecbuild packages
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/lib)
+
+include( GNUInstallDirs )
+if(APPLE)
+  list( APPEND CMAKE_INSTALL_RPATH $ENV{llvm_openmp_ROOT}/lib )
+endif()
+list( APPEND CMAKE_INSTALL_RPATH ${CMAKE_CURRENT_BINARY_DIR}/fv3 )
+
 # Initialize bundle
 # -----------------
 ecbuild_bundle_initialize()
@@ -84,8 +97,8 @@ if(BUILD_GDASBUNDLE)
   option(ENABLE_UFO_DATA "Obtain ufo test data from ufo-data repository (vs tarball)" ON)
   ecbuild_bundle( PROJECT ufo SOURCE "../sorc/ufo" )
 
-# FMS and FV3 dynamical core
-  ecbuild_bundle( PROJECT fms SOURCE "../sorc/fms" )
+# FV3 dynamical core
+  include(fv3-interface.cmake)
   ecbuild_bundle( PROJECT fv3 SOURCE "../sorc/fv3" )
 
 # fv3-jedi and associated repositories
@@ -100,7 +113,6 @@ if(BUILD_GDASBUNDLE)
   if ( BUILD_ICEPACK )
     ecbuild_bundle( PROJECT icepack SOURCE "../sorc/icepack" )
   endif()
-  ecbuild_bundle( PROJECT mom6 SOURCE "../sorc/mom6" )
   ecbuild_bundle( PROJECT soca SOURCE "../sorc/soca" )
 
   # Build JEDI/DA or other peripherals

bundle/fv3-interface.cmake

@@ -0,0 +1,18 @@
+# FV3 dycore
+set(OPENMP                ON )
+set(32BIT                 OFF)
+set(DEBUG                 OFF)
+set(MOVING_NEST           OFF)
+set(MULTI_GASES           OFF)
+set(USE_GFSL63            ON )
+set(NO_PHYS               ON )
+set(GFS_PHYS              OFF)
+set(GFS_TYPES             OFF)
+set(use_WRTCOMP           OFF)
+set(INTERNAL_FILE_NML     ON )
+set(ENABLE_QUAD_PRECISION ON )
+
+add_library(fv3dycore IMPORTED SHARED)
+set_target_properties(fv3dycore PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/fv3/libfv3.dylib)
+
+message(WARN "WE ARE USING fv3-interface.cmake")

modulefiles/GDAS/gaea.intel.lua

@@ -43,6 +43,7 @@ load("fftw/3.3.10")
 load("fckit/0.11.0")
 load("fiat/1.2.0")
 load("ectrans/1.2.0")
+load("fms/2023.04")
 load("atlas/0.35.1")
 load("sp/2.5.0")
 load("gsl-lite/0.37.0")

modulefiles/GDAS/hera.intel.lua

@@ -43,6 +43,7 @@ load("fftw/3.3.10")
 load("fckit/0.11.0")
 load("fiat/1.2.0")
 --load("ectrans/1.2.0")
+load("fms/2023.04")
 load("atlas/0.35.1")
 load("sp/2.5.0")
 load("gsl-lite/0.37.0")

modulefiles/GDAS/hercules.intel.lua

@@ -40,6 +40,7 @@ load("fftw/3.3.10")
 load("fckit/0.11.0")
 load("fiat/1.2.0")
 load("ectrans/1.2.0")
+load("fms/2023.04")
 load("atlas/0.35.1")
 load("sp/2.5.0")
 load("gsl-lite/0.37.0")

modulefiles/GDAS/noaacloud.intel.lua

@@ -41,6 +41,7 @@ load("fftw/3.3.10")
 load("fckit/0.11.0")
 load("fiat/1.2.0")
 load("ectrans/1.2.0")
+load("fms/2023.04")
 load("atlas/0.35.1")
 load("sp/2.5.0")
 load("gsl-lite/0.37.0")

modulefiles/GDAS/orion.intel.lua

@@ -40,6 +40,7 @@ load("fftw/3.3.10")
 load("fckit/0.11.0")
 load("fiat/1.2.0")
 load("ectrans/1.2.0")
+load("fms/2023.04")
 load("atlas/0.35.1")
 load("sp/2.5.0")
 load("gsl-lite/0.37.0")

modulefiles/GDAS/wcoss2.intel.lua

@@ -33,13 +33,17 @@ load("nco/5.0.6")
 load("gsl/2.7")
 load("prod_util/2.0.14")
 load("bufr/12.0.1")
+load("fms-C/2023.04")
 
 -- hack for pybind11
 setenv("pybind11_ROOT", "/apps/spack/python/3.8.6/intel/19.1.3.304/pjn2nzkjvqgmjw4hmyz43v5x4jbxjzpk/lib/python3.8/site-packages/pybind11/share/cmake/pybind11")
 
 -- hack for git-lfs
 prepend_path("PATH", "/apps/spack/git-lfs/2.11.0/gcc/11.2.0/m6b6nl5kfqngfteqbggydc7kflxere3s/bin")
 
+-- hack for FMS
+setenv('fms_DIR', '/apps/prod/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.6.0pnetcdf/intel-19.1.3.304/cray-mpich-8.1.12/fms/2023.04/lib/cmake/fms/')
+
 local mpiexec = '/pe/intel/compilers_and_libraries_2020.4.304/linux/mpi/intel64/bin/mpirun'
 local mpinproc = '-n'
 setenv('MPIEXEC_EXEC', mpiexec)