Sync submodules with the JCSDA/jedi-bundle (NOAA-EMC#121)

This is to address issue NOAA-EMC#109 . Sync all submodules with JCSDA/jedi-bundle: 1) sync the submodules: fv3 fv3-jedi fv3-jedi-lm femps gsibec ioda mpas-jedi oops saber ufo vader 2) add fv3-interface.cmake 3) remove submodule fms because it needs to be load through model 4) change compile setups for new fv3 model Tested on Hera, Jet and Orion. All compiled successfully. All rrfs test cases are success except for the "rrfs_mpasjedi_2022052619_atms_npp_qc" on JET, which had trouble to find the crtm coefficient. This is an error in the current version of RDAS. The submodule crtm is not synced. Will do it later. --------- Co-authored-by: Guoqing Ge <[email protected]>
SamuelDegelia-NOAA · Aug 19, 2024 · 8ff7bb0 · 8ff7bb0
1 parent 09cbdbe
commit 8ff7bb0
Show file tree

Hide file tree

Showing 21 changed files with 37 additions and 20 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -8,11 +8,6 @@
 	url = https://github.com/jcsda/femps
 	branch = develop
 	ignore = all
-[submodule "sorc/fms"]
-	path = sorc/fms
-	url = https://github.com/jcsda/fms
-	branch = release-stable
-	ignore = all
 [submodule "sorc/fv3"]
 	path = sorc/fv3
 	url = https://github.com/jcsda/GFDL_atmos_cubed_sphere

diff --git a/bundle/CMakeLists.txt b/bundle/CMakeLists.txt
@@ -83,7 +83,7 @@ if(BUILD_RDASBUNDLE)
 
   if(FV3_DYCORE)
     # FMS and FV3 dynamical core
-    ecbuild_bundle( PROJECT fms SOURCE "../sorc/fms" )
+    include(../sorc/fv3-interface.cmake)
     ecbuild_bundle( PROJECT fv3 SOURCE "../sorc/fv3" )
 
     # fv3-jedi and associated repositories

diff --git a/modulefiles/RDAS/hera.intel.lua b/modulefiles/RDAS/hera.intel.lua
@@ -62,6 +62,7 @@ load("json/3.10.5")
 --load("crtm/v2.4_jedi")
 load("rocoto/1.3.6")
 load("prod_util/2.1.1")
+load("fms/2023.04")
 
 load("py-jinja2/3.0.3")
 load("py-netcdf4/1.5.8")

diff --git a/modulefiles/RDAS/hercules.intel.lua b/modulefiles/RDAS/hercules.intel.lua
@@ -68,6 +68,7 @@ unload("py-numpy/1.22.3")
 load("miniconda3/4.6.14")
 load("gdasapp/1.0.0")
 
+load("fms/2023.04")
 -- below is a hack because of cmake finding the wrong python...
 setenv("CONDA_PREFIX", "/work2/noaa/da/python/opt/core/miniconda3/4.6.14/envs/gdasapp/")
 

diff --git a/modulefiles/RDAS/jet.intel.lua b/modulefiles/RDAS/jet.intel.lua
@@ -63,6 +63,8 @@ load("json/3.10.5")
 load("rocoto/1.3.6")
 load("prod_util/2.1.1")
 
+load("fms/2023.04")
+
 load("py-jinja2/3.0.3")
 load("py-netcdf4/1.5.8")
 load("py-pybind11/2.11.0")

diff --git a/modulefiles/RDAS/orion.intel.lua b/modulefiles/RDAS/orion.intel.lua
@@ -67,6 +67,7 @@ unload("py-numpy/1.22.3")
 load("miniconda3/4.6.14")
 load("gdasapp/1.0.0")
 
+load("fms/2023.04")
 -- below is a hack because of cmake finding the wrong python...
 setenv("CONDA_PREFIX", "/work2/noaa/da/python/opt/core/miniconda3/4.6.14/envs/gdasapp/")
 

diff --git a/sorc/femps b/sorc/femps
diff --git a/sorc/fms b/sorc/fms
diff --git a/sorc/fv3 b/sorc/fv3
diff --git a/sorc/fv3-interface.cmake b/sorc/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.${CMAKE_SHARED_LIBRARY_SUFFIX})
+
+message(WARN "WE ARE USING fv3-interface.cmake")
diff --git a/sorc/fv3-jedi b/sorc/fv3-jedi
diff --git a/sorc/fv3-jedi-lm b/sorc/fv3-jedi-lm
diff --git a/sorc/gsibec b/sorc/gsibec
diff --git a/sorc/ioda b/sorc/ioda
diff --git a/sorc/iodaconv b/sorc/iodaconv
diff --git a/sorc/jedicmake b/sorc/jedicmake
diff --git a/sorc/mpas-jedi b/sorc/mpas-jedi
diff --git a/sorc/oops b/sorc/oops
diff --git a/sorc/saber b/sorc/saber
diff --git a/sorc/ufo b/sorc/ufo
diff --git a/sorc/vader b/sorc/vader