Skip to content

Commit

Permalink
Merge branch 'NOAA-EMC:develop' into feature/ctest_newcase
Browse files Browse the repository at this point in the history
  • Loading branch information
SamuelDegelia-NOAA authored Sep 3, 2024
2 parents 6b0715a + 1bdd90e commit a8bb246
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions sorc/fv3-interface.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ set(use_WRTCOMP OFF)
set(INTERNAL_FILE_NML ON )
set(ENABLE_QUAD_PRECISION ON )

set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:${CMAKE_CURRENT_BINARY_DIR}/fv3")
add_library(fv3dycore IMPORTED SHARED)
set_target_properties(fv3dycore PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/fv3/libfv3.${CMAKE_SHARED_LIBRARY_SUFFIX})

Expand Down
2 changes: 1 addition & 1 deletion ush/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ case ${MACHINE_ID} in
RDAS_DATA=/scratch1/NCEPDEV/fv3-cam/RDAS_DATA
;;
jet)
RDAS_DATA=/lfs4/BMC/nrtrr/RDAS_DATA
RDAS_DATA=/lfs5/BMC/nrtrr/RDAS_DATA
;;
orion|hercules)
RDAS_DATA=/work/noaa/rtrr/RDAS_DATA
Expand Down

0 comments on commit a8bb246

Please sign in to comment.