Merge remote-tracking branch 'firemodels/master' into decimal

Author: mcgratta

.github/workflows/linux.yml

@@ -34,9 +34,9 @@ jobs:
     - uses: rscohn2/setup-oneapi@v0
       with:
         components: |
-          ifx
-          impi
-          mkl
+          ifx@2025.2.0
+          impi@2021.16.0
+          mkl@2025.2.0
         prune: false       
 
     - uses: actions/checkout@v5
@@ -98,7 +98,7 @@ jobs:
     steps:
     - uses: actions/checkout@v5
 
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
       with:
         python-version: '3.9'
         cache: 'pip' # caching pip dependencies

.github/workflows/windows.yml

@@ -26,9 +26,9 @@ permissions:
 env:
   # update urls for oneapi packages according to
   # https://github.com/oneapi-src/oneapi-ci/blob/master/.github/workflows/build_all.yml
-  WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/09a8acaf-265f-4460-866c-a3375ed5b4ff/intel-oneapi-base-toolkit-2025.2.0.591_offline.exe
+  WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/f5881e61-dcdc-40f1-9bd9-717081ac623c/intel-oneapi-base-toolkit-2025.2.1.46_offline.exe
   WINDOWS_BASEKIT_COMPONENTS: intel.oneapi.win.mkl.devel
-  WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/3bbdaf75-6728-492e-a18c-be654dae9ee2/intel-oneapi-hpc-toolkit-2025.2.0.576_offline.exe
+  WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e63ac2b4-8a9a-4768-979a-399a8b6299de/intel-oneapi-hpc-toolkit-2025.2.1.46_offline.exe
   WINDOWS_HPCKIT_COMPONENTS: intel.oneapi.win.ifort-compiler:intel.oneapi.win.mpi.devel
 
 

Build/Scripts/set_compilers.sh

@@ -54,7 +54,11 @@ set_compiler_from_env_var COMP_CXX FIREMODELS_CXX set_COMP_CXX
 set_compiler_from_env_var COMP_FC FIREMODELS_FC set_COMP_FC
 
 # Determine compiler list based on build target
-if [[ "$FDS_BUILD_TARGET" == *"osx"* ]]; then
+if [[ "$FDS_BUILD_TARGET" == "ompi_intel"* ]]; then
+    select_compiler_from_system COMP_CC mpicc icx 
+    select_compiler_from_system COMP_CXX mpicxx icpx 
+    select_compiler_from_system COMP_FC mpifort 
+elif [[ "$FDS_BUILD_TARGET" == *"osx"* ]]; then
     select_compiler_from_system COMP_CC mpicc clang gcc
     select_compiler_from_system COMP_CXX mpicxx clang++ g++
     select_compiler_from_system COMP_FC mpifort

Build/makefile

@@ -355,7 +355,7 @@ ompi_gnu_linux : obj = fds_ompi_gnu_linux
 ompi_gnu_linux : setup $(obj_mpi)
 	$(FCOMPL) $(FFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
 
-ompi_gnu_linux_db : FFLAGS = -O0 -std=f2018 -ggdb -Wall -Werror -Wunused-parameter -Wcharacter-truncation -Wno-target-lifetime -fcheck=all -fbacktrace -ffpe-trap=invalid,zero,overflow -frecursive -ffpe-summary=none -fall-intrinsics -fbounds-check $(GITINFOGNU) $(FFLAGSMKL) $(GFORTRAN_OPTIONS) $(FFLAGS_HYPRE) $(FFLAGS_SUNDIALS)
+ompi_gnu_linux_db : FFLAGS = -O0 -std=f2018 -ggdb -finit-real=snan -finit-integer=-999999 -Wall -Werror -Wunused-parameter -Wcharacter-truncation -Wno-target-lifetime -fcheck=all -fbacktrace -ffpe-trap=invalid,zero,overflow -frecursive -ffpe-summary=none -fall-intrinsics -fbounds-check $(GITINFOGNU) $(FFLAGSMKL) $(GFORTRAN_OPTIONS) $(FFLAGS_HYPRE) $(FFLAGS_SUNDIALS)
 ompi_gnu_linux_db : LFLAGSMKL = $(LFLAGSMKL_GNU_OPENMP) $(LFLAGS_HYPRE) $(LFLAGS_SUNDIALS)
 ompi_gnu_linux_db : FCOMPL = $(COMP_FC)
 ompi_gnu_linux_db : FOPENMPFLAGS = -fopenmp

Manuals/Bibliography/FDS_general.bib

@@ -4068,6 +4068,17 @@ @ARTICLE{Mawhinney:FT2012
   year         = {2012}
 }
 
+@ARTICLE{McCaffrey:1976,
+	author      = {B.J. McCaffrey and G. Heskestad},
+	title       = {{A Robust Bidirectional Low-Velocity Probe
+	for Flame and Fire Application}},
+	journal     = {Combustion and Flame},
+	volume      = {26},
+	number      = {},
+	pages       = {125-127},
+	year        = {1976},
+}
+
 @TECHREPORT{McCaffrey:NBSIR_79-1910,
   author       = {McCaffrey, B.J.},
   title        = {{Purely Buoyant Diffusion Flames: Some Experimental Results}},

Manuals/Bibliography/commoncommands.tex

@@ -44,6 +44,7 @@
 \usepackage{geometry}
 \usepackage{relsize}
 \usepackage{longtable}
+\usepackage{xltabular}
 \usepackage{lscape}
 \usepackage{booktabs}
 \usepackage{colortbl}

Manuals/FDS_User_Guide/FDS_User_Guide.tex

@@ -2314,10 +2314,10 @@ \section{Ekman Layers (\texorpdfstring{\ct{ekman_}}{ekman\_})}
 
 \begin{figure}[ht]
    \centering
-   \includegraphics[height=2.2in]{../FDS_Validation_Guide/SCRIPT_FIGURES/Schoenberg_Ekman_Layers/ekman_neutral_winds}
+   \includegraphics[height=2.2in]{SCRIPT_FIGURES/ekman_neutral_winds}
    \begin{tabular*}{\textwidth}{l@{\extracolsep{\fill}}r}
-      \includegraphics[height=2.2in]{../FDS_Validation_Guide/SCRIPT_FIGURES/Schoenberg_Ekman_Layers/ekman_stable_winds} &
-      \includegraphics[height=2.2in]{../FDS_Validation_Guide/SCRIPT_FIGURES/Schoenberg_Ekman_Layers/ekman_unstable_winds}
+      \includegraphics[height=2.2in]{SCRIPT_FIGURES/ekman_stable_winds} &
+      \includegraphics[height=2.2in]{SCRIPT_FIGURES/ekman_unstable_winds}
    \end{tabular*}
    \caption[Schoenberg Ekman Layers]{\label{fig:ekman_layers} Comparison Ekman layer profiles for neutral (top), stable (bottom-left), and unstable (bottom-right) atmospheric boundary layers with the simulation results of Schoenberg \cite{Schoenberg:2004}.}
 \end{figure}

Manuals/FDS_Validation_Guide/SCRIPT_FIGURES/Schoenberg_Ekman_Layers/.gitignore

@@ -928,13 +928,14 @@ SUBROUTINE CVODE_SERIAL(CC,ZZ_0, TMP_IN, TMP_UNMIX, PR_IN, ZETA0, TAU_MIX, CELL_
 END IF
 
 ! SET MAX ORDER
-MAXORD_C = 5
-IF (IS_EXPONENT_LT_1) MAXORD_C = 1
-IERR_C = FCVODESETMAXORD(CVODE_MEM, MAXORD_C)
-IF (IERR_C /= 0) THEN
-   WRITE(LU_ERR,*) 'ERROR IN FCVODESETMAXORD, IERR = ', IERR_C, '; HALTING'
-   STOP 1
-END IF
+IF (CVODE_ORDER > 0) THEN
+   MAXORD_C = CVODE_ORDER
+   IERR_C = FCVODESETMAXORD(CVODE_MEM, MAXORD_C)
+   IF (IERR_C /= 0) THEN
+      WRITE(LU_ERR,*) 'ERROR IN FCVODESETMAXORD, IERR = ', IERR_C, '; HALTING'
+      STOP 1
+   END IF
+ENDIF
 
 ! SET ERROR HANDLER
 IERR_C = FCVODESETERRHANDLERFN(CVODE_MEM, C_FUNLOC(FDS_CVODE_ERR_HANDLER), C_NULL_PTR)