Update with more recent changes from NCAR fork

.readthedocs.yaml

@@ -0,0 +1,32 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the OS, Python version and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+    # You can also specify other tool versions:
+    # nodejs: "19"
+    # rust: "1.64"
+    # golang: "1.19"
+
+# Build documentation in the "doc/" directory with Sphinx
+sphinx:
+  configuration: doc/conf.py
+
+# Optionally build your docs in additional formats such as PDF and ePub
+# formats:
+#    - pdf
+#    - epub
+
+# Optional but recommended, declare the Python requirements required
+# to build your documentation
+# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+python:
+  install:
+    - requirements: doc/requirements.txt

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.18)
 project(
   ufs_fire_behavior 
   VERSION 0.0.1
-  LANGUAGES Fortran CXX)
+  LANGUAGES Fortran CXX C )
 
 # user defined cmake modules
 list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
@@ -37,14 +37,23 @@ 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 REQUIRED Fortran)
+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)
   find_package(MPI REQUIRED)
   add_compile_definitions(firelib PUBLIC DM_PARALLEL=1)
 endif()
 
+if(OPENMP)
+  find_package(OpenMP REQUIRED)
+  message(STATUS "OpenMP enabled")
+endif()
+
 #------------------------------------------------------------------------------
 # Add source files
 
@@ -55,9 +64,11 @@ list(APPEND _state_files state/state_mod.F90
 
 list(APPEND _share_files share/proj_lc_mod.F90
                          share/datetime_mod.F90
+			 share/emis_mod.F90
 			 share/fuel_mod.F90
 			 share/ros_mod.F90
 			 share/fmc_mod.F90
+			 share/interp_mod.F90
                          share/constants_mod.F90)
 
 # IO
@@ -88,14 +99,31 @@ 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 $<BUILD_INTERFACE:${NetCDF_LIBRARIES}>)
+if(${CMAKE_PROJECT_NAME} STREQUAL "WRF")
+  target_link_libraries(firelib PUBLIC netCDF::netcdff )
+else()
+  target_include_directories(firelib PUBLIC ${NetCDF_INCLUDE_DIRS})
+  target_link_libraries(firelib PUBLIC $<BUILD_INTERFACE:${NetCDF_LIBRARIES}>)
+endif()
+if (DM_PARALLEL)
+  target_link_libraries(firelib PUBLIC $<BUILD_INTERFACE:MPI::MPI_Fortran>)
+endif()
+if(OPENMP)
+  target_link_libraries(firelib PUBLIC $<BUILD_INTERFACE:OpenMP::OpenMP_Fortran>)
+endif()
+set_target_properties( 
+                      firelib
+                      PROPERTIES
+                        Fortran_FORMAT           FREE
+                      )
 
 # configure fire behavior executable
 add_executable(fire_behavior.exe driver/fire_behavior.F90)
 add_dependencies(fire_behavior.exe firelib)
 target_link_libraries(fire_behavior.exe PUBLIC firelib)
-target_link_libraries(fire_behavior.exe PUBLIC NetCDF::NetCDF_Fortran)
+if(NOT ${CMAKE_PROJECT_NAME} STREQUAL "WRF")
+  target_link_libraries(fire_behavior.exe PUBLIC NetCDF::NetCDF_Fortran)
+endif()
 install(TARGETS fire_behavior.exe DESTINATION bin)
 
 if(NUOPC OR ESMX)

cmake/modules/FireBuildSettings.cmake

@@ -1,11 +1,11 @@
 macro(set_fire_defaults)
-  if(DM_PARALLEL STREQUAL "")
+  if("${DM_PARALLEL}" STREQUAL "")
     set(DM_PARALLEL ON)
   endif()
-  if(NUOPC STREQUAL "")
+  if("${NUOPC}" STREQUAL "")
     set(NUOPC OFF)
   endif()
-  if(ESMX STREQUAL "")
+  if("${ESMX}" STREQUAL "")
     set(ESMX OFF)
   endif()
 endmacro()
@@ -14,10 +14,12 @@ function(set_fire_cache)
   set (DM_PARALLEL ${DM_PARALLEL} CACHE BOOL "Turn on MPI build" FORCE)
   set (NUOPC ${NUOPC} CACHE BOOL "Build NUOPC cap" FORCE)
   set (ESMX ${ESMX} CACHE BOOL "Build ESMX application" FORCE)
+  set (OPENMP ${OPENMP} CACHE BOOL "Enable OpenMP parallelization" FORCE)
 endfunction()
 
 function(print_fire_settings)
   message (STATUS "FIRE BEHAVIOR BUILD SETTINGS\n"
+                  "\tOPENMP: ${OPENMP}\n"
                   "\tDM_PARALLEL: ${DM_PARALLEL}\n"
                   "\tNUOPC: ${NUOPC}\n"
 		  "\tESMX:  ${ESMX}")

compile.sh

@@ -23,6 +23,8 @@ usage () {
   printf "      build NUOPC library and module\n"
   printf "  --esmx, -x\n"
   printf "      build ESMX application (includes NUOPC)\n"
+  printf "  --openmp-on\n"
+  printf "      enable OpenMP parallelization\n"
   printf "  --prefix=INSTALL_PREFIX\n"
   printf "      installation prefix\n"
   printf "  --verbose, -v\n"
@@ -81,6 +83,7 @@ VERBOSE=false
 TEST=false
 TEST_NAME=""
 CLEAN=false
+OPENMP=false
 
 #------------------------------------------------------------------------------
 
@@ -129,6 +132,7 @@ while :; do
     --test=?*|-t=?*) TEST=true; TEST_NAME=${1#*=} ;;
     --test=) TEST=true ;;
     --clean) CLEAN=true ;;
+    --openmp-on) OPENMP=true ;;
     --clean=?*) printf "ERROR: $1 argument ignored.\n"; usage; exit 1 ;;
     --clean=) printf "ERROR: $1 argument ignored.\n"; usage; exit 1 ;;
     -?*) printf "ERROR: Unknown option $1\n"; usage; exit 1 ;;
@@ -213,6 +217,11 @@ if [ "${ESMX}" = true ]; then
 else
   CMAKE_SETTINGS+=("-DESMX=OFF")
 fi
+if [ "${OPENMP}" = true ]; then
+  CMAKE_SETTINGS+=("-DOPENMP=ON")
+else
+  CMAKE_SETTINGS+=("-DOPENMP=OFF")
+fi
 cmake -S${FIRE_DIR} -B${BUILD_DIR} ${CMAKE_SETTINGS[@]}
 if [ "$?" !=  "0" ]; then
   echo "$0 Failed: (cmake)"