diff --git a/CMakeLists.txt b/CMakeLists.txt index f757600..650cb70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) @@ -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 $) + 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 $) endif() set_target_properties( firelib diff --git a/physics/level_set_mod.F90 b/physics/level_set_mod.F90 index 1b4d727..2f52545 100644 --- a/physics/level_set_mod.F90 +++ b/physics/level_set_mod.F90 @@ -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