Skip to content

Check CMAKE_PROJECT_NAME for find_package netcdf #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danrosen25 merged 3 commits into from
Mar 26, 2025
Merged

Check CMAKE_PROJECT_NAME for find_package netcdf #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45b09d9
Check CMAKE_PROJECT_NAME for find_package netcdf
danrosen25 Mar 25, 2025
785b999
Fix standalone and NUOPC tests
danrosen25 Mar 26, 2025
ae8f12b
Add BUILD_INTERFACE condition to link_libraries
danrosen25 Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@ set(CMAKE_Fortran_MODULE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/mod")
install(DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY} DESTINATION ${CMAKE_INSTALL_PREFIX})

# third party libraries
find_package(netCDF-Fortran REQUIRED)
if(${CMAKE_PROJECT_NAME} STREQUAL "WRF")
find_package(netCDF-Fortran REQUIRED)
else()
find_package(NetCDF REQUIRED Fortran)
endif()

# turn on DM_PARALLEL preprocessor directive
if(DM_PARALLEL)
Expand Down Expand Up @@ -90,10 +94,14 @@ list(APPEND _driver_files driver/advance_mod.F90

# configure fire behavior library
add_library(firelib STATIC ${_state_files} ${_share_files} ${_io_files} ${_wrffire_physics} ${_driver_files})
# target_include_directories(firelib PUBLIC ${NetCDF_INCLUDE_DIRS})
target_link_libraries(firelib PUBLIC netCDF::netcdff )
if(${CMAKE_PROJECT_NAME} STREQUAL "WRF")
target_link_libraries(firelib PUBLIC netCDF::netcdff )
else()
target_link_libraries(firelib PUBLIC $<BUILD_INTERFACE:NetCDF::NetCDF_Fortran>)
target_include_directories(firelib PUBLIC ${NetCDF_INCLUDE_DIRS})
endif()
if (DM_PARALLEL)
target_link_libraries( firelib PUBLIC MPI::MPI_Fortran )
target_link_libraries(firelib PUBLIC $<BUILD_INTERFACE:MPI::MPI_Fortran>)
endif()
set_target_properties(
firelib
Expand Down
2 changes: 2 additions & 0 deletions physics/level_set_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,8 @@ subroutine Reinit_level_set (ifts, ifte, jfts, jfte, ifms, ifme, jfms, jfme, &
jfds, jfde, ifts, ifte, jfts, jfte, lfn_s3)

dt_s = 0.01 * dx
dt_s = 0.0001 * dx

! iterate to solve to steady state reinit PDE
! 1 iter each time step is enoguh
do nts = 1, fire_lsm_reinit_iter
Expand Down