From 45b09d9f8ad3bda7fb3c40e3470e9416293d8f8e Mon Sep 17 00:00:00 2001 From: Daniel Rosen Date: Tue, 25 Mar 2025 17:20:28 -0600 Subject: [PATCH 1/3] Check CMAKE_PROJECT_NAME for find_package netcdf --- CMakeLists.txt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f757600..e070c2e 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,8 +94,12 @@ 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 NetCDF::NetCDF_Fortran) + target_include_directories(firelib PUBLIC ${NetCDF_INCLUDE_DIRS}) +endif() if (DM_PARALLEL) target_link_libraries( firelib PUBLIC MPI::MPI_Fortran ) endif() From 785b99989f702bd526ac85bcf025574159075e41 Mon Sep 17 00:00:00 2001 From: Daniel Rosen Date: Wed, 26 Mar 2025 11:06:52 -0600 Subject: [PATCH 2/3] Fix standalone and NUOPC tests * modify dt_s Co-authored-by: Pedro Jimenez Munoz --- physics/level_set_mod.F90 | 2 ++ 1 file changed, 2 insertions(+) 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 From ae8f12b1bea3bdf5a8a84354d27ae83140e76f75 Mon Sep 17 00:00:00 2001 From: Daniel Rosen Date: Wed, 26 Mar 2025 11:53:08 -0600 Subject: [PATCH 3/3] Add BUILD_INTERFACE condition to link_libraries * removes requirement for ESMX to find NetCDF and MPI targets --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e070c2e..650cb70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,11 +97,11 @@ add_library(firelib STATIC ${_state_files} ${_share_files} ${_io_files} ${_wrffi if(${CMAKE_PROJECT_NAME} STREQUAL "WRF") target_link_libraries(firelib PUBLIC netCDF::netcdff ) else() - target_link_libraries(firelib PUBLIC NetCDF::NetCDF_Fortran) + 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