@@ -42,8 +42,8 @@ find_package(FMS 2022.04 REQUIRED COMPONENTS R4 R8)
42
42
43
43
# Core JEDI repositories
44
44
# ----------------------
45
- ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda-internal/oops.git" BRANCH feature/letkf-stateset )
46
- #ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda-internal/oops.git" BRANCH bugfix/stateset-fix )
45
+ ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda-internal/oops.git" BRANCH feature/letkf-stateset)
46
+ #ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda-internal/oops.git" BRANCH develop UPDATE )
47
47
ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda-internal/vader.git" BRANCH develop UPDATE )
48
48
ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda-internal/saber.git" BRANCH develop UPDATE )
49
49
@@ -92,6 +92,12 @@ link_directories(${DEPEND_LIB_ROOT}/${CMAKE_INSTALL_LIBDIR})
92
92
# Set variables for UFS clone and build
93
93
# Needed to get correct OpenMP link libraries on macOS
94
94
set (UFS_CMAKE_EXE_LINKER_FLAGS "-L${CMAKE_CURRENT_BINARY_DIR} /${CMAKE_INSTALL_LIBDIR} " )
95
+ find_package (FMS 2023.04 REQUIRED COMPONENTS R4 R8)
96
+ if (FV3_PRECISION MATCHES DOUBLE)
97
+ add_library (fms ALIAS FMS::fms_r8)
98
+ elseif (FV3_PRECISION MATCHES SINGLE)
99
+ add_library (fms ALIAS FMS::fms_r4)
100
+ endif ()
95
101
find_package (OpenMP REQUIRED)
96
102
if (APPLE )
97
103
set (UFS_CMAKE_EXE_LINKER_FLAGS "${UFS_CMAKE_EXE_LINKER_FLAGS} ${OpenMP_libomp_LIBRARY} ${OpenMP_libomp_LIBRARY} " )
@@ -113,8 +119,7 @@ set(UFS_TAG "develop" )
113
119
if (UFS_APP MATCHES "^(NG-GODAS)$" )
114
120
set (patch_command ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR} /patches/ng-godas.patch <SOURCE_DIR> && cd <SOURCE_DIR> && git apply ng-godas.patch)
115
121
else ()
116
- set (patch_command ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR} /patches/ufs-wm.patch ${UFS_SOURCE_DIR} && cd ${UFS_SOURCE_DIR} && git apply ufs-wm.patch)
117
- message ("HEYY!!! patch_command is ${patch_command} " )
122
+ set (patch_command ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR} /patches/ufs-wm.patch <SOURCE_DIR> && cd <SOURCE_DIR> && git apply ufs-wm.patch)
118
123
endif ()
119
124
120
125
ExternalProject_Add(ufs-weather-model
@@ -175,15 +180,14 @@ set_target_properties( fv3atm PROPERTIES IMPORTED_LOCATION ${DEPEND_LIB_ROOT}/${
175
180
set_target_properties ( ccppphys PROPERTIES IMPORTED_LOCATION ${DEPEND_LIB_ROOT} /${CMAKE_INSTALL_LIBDIR} /libccpp_physics.a )
176
181
set_target_properties ( mom6 PROPERTIES IMPORTED_LOCATION ${DEPEND_LIB_ROOT} /${CMAKE_INSTALL_LIBDIR} /libmom6.a )
177
182
178
-
183
+ # Additional dependencies that we can't know about because ufs-weather-model is an external project
184
+ target_link_libraries ( fv3atm INTERFACE fms )
179
185
180
186
ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda-internal/femps.git" TAG 1.3.0 )
181
187
if (UFS_APP MATCHES "^(ATMAERO)$" OR UFS_APP MATCHES "^(S2S)$" OR UFS_APP MATCHES "^(ATM)$" )
182
188
option (ENABLE_FV3_JEDI_DATA "Obtain fv3-jedi test data from fv3-jedi-data repository (vs tarball)" ON )
183
189
ecbuild_bundle( PROJECT fv3-jedi-data GIT "https://github.com/JCSDA-internal/fv3-jedi-data.git" BRANCH feature/letkf-stateset UPDATE )
184
190
ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda-internal/fv3-jedi.git" BRANCH feature/letkf-stateset UPDATE )
185
- # ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda-internal/fv3-jedi.git" BRANCH bugfix/stateset-fix UPDATE )
186
- # ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda-internal/fv3-jedi.git" BRANCH dd0f6660f0f379355fc2b7946b5ddf4740241679)
187
191
elseif (UFS_APP MATCHES "^(NG-GODAS)$" )
188
192
ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" BRANCH feature/ufs_dom_update UPDATE )
189
193
add_dependencies (soca ufs-weather-model)
0 commit comments