FireX: Merge with foremodels/master

Author: cxp484

.github/workflows/Line_Endings.yml

@@ -21,7 +21,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Check for CRLF line endings
         run: |

.github/workflows/cmake.yml

@@ -94,7 +94,7 @@ jobs:
         sudo apt-get -y update
         sudo apt-get -y install libopenmpi-dev openmpi-bin
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - run: git config --global --add safe.directory /__w/fds/fds
 
     - name: set linux-gnu compiler
@@ -109,9 +109,9 @@ jobs:
       if: startsWith(matrix.compiler_mpi, 'intel_')
       shell: bash
       run: |
-        echo "CC=mpiicx" >> $GITHUB_ENV
-        echo "CXX=mpiicx" >> $GITHUB_ENV
-        echo "FC=mpiifx" >> $GITHUB_ENV
+        echo "CC=icx" >> $GITHUB_ENV
+        echo "CXX=icpx" >> $GITHUB_ENV
+        echo "FC=ifx" >> $GITHUB_ENV
 
     - name: build fds
       if: endsWith(matrix.compiler_mpi, '_intelmpi')
@@ -156,7 +156,7 @@ jobs:
       # and build configurations
       matrix:
         os:
-          - macos-latest
+          - macos-14
         compiler_mpi:
           - "gnu_openmpi"
         openmp:
@@ -168,10 +168,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: install openmpi
-        run: brew install open-mpi
+        run: brew install gcc@15 open-mpi
 
       - name: set macos gcc
         if: startsWith(matrix.compiler_mpi, 'gnu_')
@@ -180,6 +180,8 @@ jobs:
           echo "CC=gcc-15" >> $GITHUB_ENV
           echo "CXX=g++-15" >> $GITHUB_ENV
           echo "FC=gfortran-15" >> $GITHUB_ENV
+          echo "OMPI_CC=gcc-15" >> $GITHUB_ENV
+          echo "OMPI_CXX=g++-15" >> $GITHUB_ENV
           echo "OMPI_FC=gfortran-15" >> $GITHUB_ENV
           brew install glew gd zlib json-c
 
@@ -188,9 +190,11 @@ jobs:
         shell: bash
         run: |
           echo "CC=icx" >> $GITHUB_ENV
-          echo "CXX=icx" >> $GITHUB_ENV
-          echo "FC=mpiifx" >> $GITHUB_ENV
-          echo "OMPI_FC=mpiifx" >> $GITHUB_ENV
+          echo "CXX=icpx" >> $GITHUB_ENV
+          echo "FC=ifx" >> $GITHUB_ENV
+          echo "OMPI_CC=icx" >> $GITHUB_ENV
+          echo "OMPI_CXX=icpx" >> $GITHUB_ENV
+          echo "OMPI_FC=ifx" >> $GITHUB_ENV
 
       - name: Build
         if: startsWith(matrix.compiler_mpi, 'gnu_')
@@ -242,7 +246,7 @@ jobs:
         shell: cmd
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
       # install oneapi components from web installer based on
       # oneapi-ci/scripts/install_windows.bat

.github/workflows/linux.yml

@@ -39,7 +39,7 @@ jobs:
           mkl
         prune: false       
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: build fds debug
       run: |
@@ -74,7 +74,7 @@ jobs:
           [email protected]
         prune: false  
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: build fds debug
       run: |
         source /opt/intel/oneapi/setvars.sh
@@ -96,7 +96,7 @@ jobs:
     runs-on: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - uses: actions/setup-python@v5
       with:

.github/workflows/osx.yml

@@ -28,16 +28,16 @@ jobs:
     # debug build on osx using gfortran with openmpi
 
     name: osx gnu openmpi
-    runs-on: [macos-latest]
+    runs-on: [macos-14]
     defaults:
       run:
         shell: bash
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: install openmpi
       run: |
-        brew install open-mpi
+        brew install gcc@15 open-mpi
         echo "OMPI_FC=gfortran-15" >> $GITHUB_ENV
 
     - name: build fds debug

.github/workflows/windows.yml

@@ -44,7 +44,7 @@ jobs:
         shell: cmd
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
       # install oneapi components from web installer based on
       # oneapi-ci/scripts/install_windows.bat

Manuals/Bibliography/FDS_general.bib

@@ -2996,6 +2996,15 @@ @ARTICLE{Icove:JNAFE2021
   note         = {\href{https://doi.org/10.51501/jotnafe.v38i1.167}{https://doi.org/10.51501/jotnafe.v38i1.167}}
 }
 
+@BOOK{Idelchik:1,
+  author       = {I.E. Idelchik},
+  title        = {Handbook of Hydraulic Resistance},
+  edition      = {3rd},
+  publisher    = {CRC Press},
+  address      = {Boca Raton, Florida},
+  year         = {1994}
+}
+
 @INPROCEEDINGS{Ierardi:1,
   author       = {Ierardi, J.A. and Barnett, J.R.},
   title        = {{A Quantitative Method for Calibrating CFD Model Calculations}},

Manuals/FDS_User_Guide/FDS_User_Guide.tex

@@ -14260,6 +14260,7 @@ \chapter{Error Codes}
 446  \> \ct{SURF REFERENCE_THICKNESS values must increase for each} \> Section~\ref{info:scaled_burning}  \\
      \> \ct{new group of REFERENCE_HEAT_FLUX.} \\
 447  \> \ct{RAMP ... used with REFERENCE_HEAT_FLUX must start at T = 0.} \> Section~\ref{info:scaled_burning}  \\
+448  \> \ct{PROF ... MATL_ID ... not a part of surface type ...} \> Section~\ref{info:solidoutputquantities}  \\
      \>                                                                               \>                          \\
 501 \> \ct{No ID provided ...} \> Section~\ref{info:HVAC}  \\
 502 \> \ct{Invalid TYPE_ID provided ...} \> Section~\ref{info:HVAC}  \\
@@ -14496,6 +14497,7 @@ \chapter{Error Codes}
 951 \> \ct{PROF ... requires an orientation index, IOR.} \> Section~\ref{info:PROF} \\
 952 \> \ct{PROF ... is not valid.} \> Section~\ref{info:PROF} \\
 953 \> \ct{PROF ... requires a PART_ID.} \> Section~\ref{info:PROF} \\
+954 \> \ct{PROF ... MATL_ID ... not found.} \> Section~\ref{info:PROF} \\
     \>                                                                                \>                          \\
 961 \> \ct{CELL_CENTERED not allowed with AGL_SLICE.} \> Section~\ref{info:complex_terrain} \\
 962 \> \ct{BNDF ... CPUA_Z, MPUA_Z, and AMPUA_Z require liquid droplets.} \> Section~\ref{bucket_test_1} \\

Manuals/FDS_Validation_Guide/Heat_Flux_Chapter.tex

@@ -822,18 +822,18 @@ \subsection{TUS Facade Experiments}
 \put(0.91,3.765){\circle{0.05}}
 \end{picture}
 \end{minipage}
-\caption[JIA A 1310 Facade, position of heat flux gauges]{Positions of the heat flux gauges on the exterior wall of the JIS~A~1310 experiments. The wall is 1.82~m wide and 4.095~m tall. The window is 0.91~m wide by 0.91 tall and 0.455~m above the floor.}
+\caption[JIS Facade, position of heat flux gauges]{Positions of the heat flux gauges on the exterior wall of the JIS~A~1310 experiments. The wall is 1.82~m wide and 4.095~m tall. The window is 0.91~m wide by 0.91 tall and 0.455~m above the floor.}
 \label{JIS_Facade_HF_Positions}
 \end{figure}
 
 \newpage
 
 \begin{figure}[p]
 \centering
-\includegraphics[height=2.15in]{SCRIPT_FIGURES/TUS_Facade/JIS_A_1310_5cm_HF_600_kW} \\
-\includegraphics[height=2.15in]{SCRIPT_FIGURES/TUS_Facade/JIS_A_1310_5cm_HF_750_kW} \\
-\includegraphics[height=2.15in]{SCRIPT_FIGURES/TUS_Facade/JIS_A_1310_5cm_HF_900_kW}
-\caption[JIS A 1310 Facade, heat flux]{JIS A 1310 Facade, heat flux. The Height refers to the distance above the top of the window.}
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/TUS_Facade/JIS_facade_HF_600_kW} \\
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/TUS_Facade/JIS_facade_HF_750_kW} \\
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/TUS_Facade/JIS_facade_HF_900_kW}
+\caption[JIS Facade, heat flux]{JIS Facade, heat flux. The Height refers to the distance above the top of the window.}
 \label{JIS_Facade_Heat_Flux}
 \end{figure}
 

Manuals/FDS_Verification_Guide/FDS_Verification_Guide.tex

@@ -1596,6 +1596,31 @@ \subsection{1-D Flow in a Tunnel (\texorpdfstring{\ct{tunnel_linear_cp}}{tunnel\
 \label{tunnel_linear_cp_plots}
 \end{figure}
 
+\FloatBarrier
+
+
+\section{Discharge Coefficient}
+\label{thick_orifice}
+
+A useful way to assess the way the model handles velocity boundary conditions at corners is to examine flows through an orifice. Consider a 2~m square duct with a 1~m square orifice. The orifice is $l=0.4$~m wide and has a hydraulic diameter $D_{\rm h}=1$~m. A uniform flow of $w_1=0.5$~m/s is pushed through the duct. According to an empirical correlation presented in Diagram~4-15 of the Handbook of Hydraulic Resistance by Idelchik~\cite{Idelchik:1}, the pressure rise behind the orifice is given by
+\be
+   \Delta p = \frac{1}{2} \zeta_1 \, \rho \, w_1^2 \approx 4.09 \; \mbox{Pa}
+\ee
+where $\zeta_1=27.4$ and the density of air is $\rho=1.195$~kg/m$^3$. Figure~\ref{fig:thick_orifice} displays the pressure along the duct, where the flow is from left to right.
+
+\begin{figure}[!ht]
+\centering
+\includegraphics[height=2.2in]{SCRIPT_FIGURES/thick_orifice}
+\caption[Results of the \ct{thick_orifice} case]{Pressure rise behind an square, thick orifice in a duct.}
+\label{fig:thick_orifice}
+\end{figure}
+
+
+
+
+
+
+
 \chapter{Turbulence}
 
 

Source/ccib.f90

@@ -56,7 +56,8 @@ MODULE CC_SCALARS
 REAL(EB), ALLOCATABLE, DIMENSION(:)  :: F_Z, RZ_Z, RZ_ZS, P_0_CV, TMP_0_CV, RHO_0_CV, ZCEN_CV
 REAL(EB), ALLOCATABLE, DIMENSION(:,:):: F_Z0, RZ_Z0
 
-REAL(EB), DIMENSION(0:3,0:3,0:3) :: U_TEMP,Z_TEMP,F_TEMP
+REAL(EB), DIMENSION(0:3,0:3,0:3) :: U_TEMP,F_TEMP
+REAL(EB), DIMENSION(-1:3,-1:3,-1:3) :: Z_TEMP
 
 ! Types of interpolation:
 INTEGER, PARAMETER :: CC_LINEAR_INTERPOLATION    = 1
@@ -11269,7 +11270,7 @@ SUBROUTINE CC_DENSITY(T,DT)
       ! Store RHO*ZZ values at step n:
       IF (.NOT.ALLOCATED(MESHES(NM)%RHO_ZZN)) ALLOCATE(MESHES(NM)%RHO_ZZN(0:IBP1,0:JBP1,0:KBP1,N_TOTAL_SCALARS))
       DO N=1,N_TOTAL_SCALARS
-         MESHES(NM)%RHO_ZZN(:,:,:,N) = RHO(:,:,:)*ZZ(:,:,:,N)
+         MESHES(NM)%RHO_ZZN(0:IBP1,0:JBP1,0:KBP1,N) = RHO(0:IBP1,0:JBP1,0:KBP1)*ZZ(0:IBP1,0:JBP1,0:KBP1,N)
       ENDDO
 
       ! Second cut-cells, these variables being filled are only used for exporting to slices and applying Boundary