From 8ff7bb0bfbb997e85e5e33d3481bb1e82132423a Mon Sep 17 00:00:00 2001 From: Ming Hu Date: Mon, 19 Aug 2024 06:49:17 -0600 Subject: [PATCH] Sync submodules with the JCSDA/jedi-bundle (#121) This is to address issue #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 --- .gitmodules | 5 ----- bundle/CMakeLists.txt | 2 +- modulefiles/RDAS/hera.intel.lua | 1 + modulefiles/RDAS/hercules.intel.lua | 1 + modulefiles/RDAS/jet.intel.lua | 2 ++ modulefiles/RDAS/orion.intel.lua | 1 + sorc/femps | 2 +- sorc/fms | 1 - sorc/fv3 | 2 +- sorc/fv3-interface.cmake | 18 ++++++++++++++++++ sorc/fv3-jedi | 2 +- sorc/fv3-jedi-lm | 2 +- sorc/gsibec | 2 +- sorc/ioda | 2 +- sorc/iodaconv | 2 +- sorc/jedicmake | 2 +- sorc/mpas-jedi | 2 +- sorc/oops | 2 +- sorc/saber | 2 +- sorc/ufo | 2 +- sorc/vader | 2 +- 21 files changed, 37 insertions(+), 20 deletions(-) delete mode 160000 sorc/fms create mode 100644 sorc/fv3-interface.cmake diff --git a/.gitmodules b/.gitmodules index 03e0ee8..2ced9f4 100644 --- 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 index ff11b5a..85e47a1 100644 --- 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 index b0b486c..7b1aaf1 100644 --- 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 index 67a61da..2f6982e 100644 --- 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 index 26b104e..b97865e 100644 --- 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 index 901a92b..15c088d 100644 --- 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 index cb39681..4f12677 160000 --- a/sorc/femps +++ b/sorc/femps @@ -1 +1 @@ -Subproject commit cb396811eb26380478c4d3f177d95096ed2ddd8f +Subproject commit 4f12677d345e683bf910b5f76f0df120ad27482d diff --git a/sorc/fms b/sorc/fms deleted file mode 160000 index 1f73914..0000000 --- a/sorc/fms +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1f739141ef8b000a0bd75ae8bebfadea340299ba diff --git a/sorc/fv3 b/sorc/fv3 index 61450b4..ab25dc0 160000 --- a/sorc/fv3 +++ b/sorc/fv3 @@ -1 +1 @@ -Subproject commit 61450b4e3e80bb96b26c5f3808ce60b5e5cb4207 +Subproject commit ab25dc09d955271f34ca6a3fa83af1093c85d9f7 diff --git a/sorc/fv3-interface.cmake b/sorc/fv3-interface.cmake new file mode 100644 index 0000000..45e7ad6 --- /dev/null +++ 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 index e9175cb..d3c800b 160000 --- a/sorc/fv3-jedi +++ b/sorc/fv3-jedi @@ -1 +1 @@ -Subproject commit e9175cbf268f82c9b276601b4ea4e0061df81426 +Subproject commit d3c800b82eef8d1eaadcbc07c3cf7a96d8425233 diff --git a/sorc/fv3-jedi-lm b/sorc/fv3-jedi-lm index b9868bd..a6e97d7 160000 --- a/sorc/fv3-jedi-lm +++ b/sorc/fv3-jedi-lm @@ -1 +1 @@ -Subproject commit b9868bd1767733478aa24206525ce3a01fccec80 +Subproject commit a6e97d76ed7c0b2a27cf97512893a93d7e2b44bc diff --git a/sorc/gsibec b/sorc/gsibec index 17823ae..c8ac58d 160000 --- a/sorc/gsibec +++ b/sorc/gsibec @@ -1 +1 @@ -Subproject commit 17823aef706e5d69e373e4c4c5dfadac99d5b800 +Subproject commit c8ac58d9b43eb8f890e565d12c88f1b0579c9ccd diff --git a/sorc/ioda b/sorc/ioda index b205ed6..c7b8760 160000 --- a/sorc/ioda +++ b/sorc/ioda @@ -1 +1 @@ -Subproject commit b205ed6d9bb33cfcf72dcebab8a8a508b8eac670 +Subproject commit c7b8760fc187a9eafb72a466d16fdee284912377 diff --git a/sorc/iodaconv b/sorc/iodaconv index 96a6417..b540ace 160000 --- a/sorc/iodaconv +++ b/sorc/iodaconv @@ -1 +1 @@ -Subproject commit 96a641777509223871192c54ea2c5decf9f1c239 +Subproject commit b540acedafe46ae244f12ad2f8494b585f16bb12 diff --git a/sorc/jedicmake b/sorc/jedicmake index 36fc99b..40d521f 160000 --- a/sorc/jedicmake +++ b/sorc/jedicmake @@ -1 +1 @@ -Subproject commit 36fc99bdff5d3d8835480b37a3dcc75e5f8da256 +Subproject commit 40d521f9a2d796fcbc6234d77abceeffefb8eb7f diff --git a/sorc/mpas-jedi b/sorc/mpas-jedi index d1d4c2b..a1c6099 160000 --- a/sorc/mpas-jedi +++ b/sorc/mpas-jedi @@ -1 +1 @@ -Subproject commit d1d4c2b86db04b942b91b1c0e9ad947fbc822ddf +Subproject commit a1c609973f710d34a9766a5c221bf094e9715087 diff --git a/sorc/oops b/sorc/oops index f02f283..3582013 160000 --- a/sorc/oops +++ b/sorc/oops @@ -1 +1 @@ -Subproject commit f02f283b7c4ea1edae349413964f3edf0f7fab33 +Subproject commit 35820130f3cbbc347abac56f09593a854b130b58 diff --git a/sorc/saber b/sorc/saber index ee4e0ad..0a23f67 160000 --- a/sorc/saber +++ b/sorc/saber @@ -1 +1 @@ -Subproject commit ee4e0ad5e82b48ba3764e1ec668b39065706de57 +Subproject commit 0a23f67cca26e634ff271a371c642823c56fee42 diff --git a/sorc/ufo b/sorc/ufo index 54b44b2..92ccfb2 160000 --- a/sorc/ufo +++ b/sorc/ufo @@ -1 +1 @@ -Subproject commit 54b44b22291a90955c3eb5327ed24ea9e858d4f6 +Subproject commit 92ccfb2abb77b79c635f86c0df2bccf53edd1a40 diff --git a/sorc/vader b/sorc/vader index 6b4acc7..e3457cb 160000 --- a/sorc/vader +++ b/sorc/vader @@ -1 +1 @@ -Subproject commit 6b4acc7108784f40b8fa71a005cc49bf6ce79947 +Subproject commit e3457cba4541bc30b6e0fde0b632bbe81a67861b