Skip to content

Commit 5787ee0

Browse files
committed
Merge branch 'develop' into feature/letkf-stateset
2 parents fd26a36 + 5a32f15 commit 5787ee0

File tree

2 files changed

+14
-20
lines changed

2 files changed

+14
-20
lines changed

.github/workflows/ubuntu-ci-x86_64.yaml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@ defaults:
1414
run:
1515
shell: bash
1616

17+
env:
18+
JEDI_ENV: /home/ubuntu/ufs-bundle/jedi-run
19+
1720
jobs:
1821
test-ufs-bundle:
1922
runs-on: [ubuntu-ci-c6a-x86_64]
2023

2124
steps:
2225
- name: cleanup
2326
if: ${{ github.event_name == 'schedule' }}
24-
env:
25-
JEDI_ENV: /home/ubuntu/ufs-bundle/jedi_run
2627
run: |
2728
# Remove and prepare run directory
2829
rm -fr ${JEDI_ENV}
@@ -65,8 +66,6 @@ jobs:
6566
# *DH
6667

6768
- name: create-env-setup-script
68-
env:
69-
JEDI_ENV: /home/ubuntu/ufs-bundle/jedi_run
7069
run: |
7170
# In run directory
7271
cd ${JEDI_ENV}
@@ -109,7 +108,6 @@ jobs:
109108
110109
- name: clone-bundle
111110
env:
112-
JEDI_ENV: /home/ubuntu/ufs-bundle/jedi_run
113111
UFS_BUNDLE_BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
114112
run: |
115113
# In run directory
@@ -132,8 +130,6 @@ jobs:
132130
### DO WE REALLY NEED THIS ??? rm -fr build-*
133131
134132
- name: build-atm
135-
env:
136-
JEDI_ENV: /home/ubuntu/ufs-bundle/jedi_run
137133
run: |
138134
# In run directory
139135
cd ${JEDI_ENV}
@@ -153,8 +149,6 @@ jobs:
153149
ctest -V -R ufs_
154150
155151
- name: build-atmaero
156-
env:
157-
JEDI_ENV: /home/ubuntu/ufs-bundle/jedi_run
158152
run: |
159153
# In run directory
160154
cd ${JEDI_ENV}
@@ -169,8 +163,6 @@ jobs:
169163
make -j8
170164
171165
- name: build-ng-godas
172-
env:
173-
JEDI_ENV: /home/ubuntu/ufs-bundle/jedi_run
174166
run: |
175167
# In run directory
176168
cd ${JEDI_ENV}
@@ -185,8 +177,6 @@ jobs:
185177
make -j8
186178
187179
- name: build-s2s
188-
env:
189-
JEDI_ENV: /home/ubuntu/ufs-bundle/jedi_run
190180
run: |
191181
# In run directory
192182
cd ${JEDI_ENV}

CMakeLists.txt

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ find_package(FMS 2022.04 REQUIRED COMPONENTS R4 R8)
4242

4343
# Core JEDI repositories
4444
# ----------------------
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 )
4747
ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda-internal/vader.git" BRANCH develop UPDATE )
4848
ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda-internal/saber.git" BRANCH develop UPDATE )
4949

@@ -92,6 +92,12 @@ link_directories(${DEPEND_LIB_ROOT}/${CMAKE_INSTALL_LIBDIR})
9292
# Set variables for UFS clone and build
9393
# Needed to get correct OpenMP link libraries on macOS
9494
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()
95101
find_package(OpenMP REQUIRED)
96102
if(APPLE)
97103
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" )
113119
if(UFS_APP MATCHES "^(NG-GODAS)$")
114120
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)
115121
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)
118123
endif()
119124

120125
ExternalProject_Add(ufs-weather-model
@@ -175,15 +180,14 @@ set_target_properties( fv3atm PROPERTIES IMPORTED_LOCATION ${DEPEND_LIB_ROOT}/${
175180
set_target_properties( ccppphys PROPERTIES IMPORTED_LOCATION ${DEPEND_LIB_ROOT}/${CMAKE_INSTALL_LIBDIR}/libccpp_physics.a )
176181
set_target_properties( mom6 PROPERTIES IMPORTED_LOCATION ${DEPEND_LIB_ROOT}/${CMAKE_INSTALL_LIBDIR}/libmom6.a )
177182

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 )
179185

180186
ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda-internal/femps.git" TAG 1.3.0 )
181187
if(UFS_APP MATCHES "^(ATMAERO)$" OR UFS_APP MATCHES "^(S2S)$" OR UFS_APP MATCHES "^(ATM)$")
182188
option(ENABLE_FV3_JEDI_DATA "Obtain fv3-jedi test data from fv3-jedi-data repository (vs tarball)" ON)
183189
ecbuild_bundle( PROJECT fv3-jedi-data GIT "https://github.com/JCSDA-internal/fv3-jedi-data.git" BRANCH feature/letkf-stateset UPDATE )
184190
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)
187191
elseif(UFS_APP MATCHES "^(NG-GODAS)$")
188192
ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" BRANCH feature/ufs_dom_update UPDATE )
189193
add_dependencies(soca ufs-weather-model)

0 commit comments

Comments
 (0)