Merge pull request #15621 from cxp484/FireX

FireX: Merge with firemodels/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@v5
+      - uses: actions/checkout@v6
 
       - 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@v5
+    - uses: actions/checkout@v6
     - run: git config --global --add safe.directory /__w/fds/fds
 
     - name: set linux-gnu compiler
@@ -168,7 +168,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: install openmpi
         run: brew install gcc@15 open-mpi
@@ -246,7 +246,7 @@ jobs:
         shell: cmd
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
       # install oneapi components from web installer based on
       # oneapi-ci/scripts/install_windows.bat

.github/workflows/linux.yml

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

.github/workflows/osx.yml

@@ -34,7 +34,7 @@ jobs:
         shell: bash
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: install openmpi
       run: |
         brew install gcc@15 open-mpi

.github/workflows/windows.yml

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

Manuals/FDS_User_Guide/FDS_User_Guide.tex

@@ -3078,15 +3078,15 @@ \subsection{Multiple Solid Phase Reactions}
 \label{pyrolysis_2}
 \end{figure}
 
-The plot in Fig.~\ref{pyrolysis_2} contains two sets of curves. The solid curves represent the solution of the set of equations computed using a Matlab ODE solver, and the underlying dashed curves are a ``fit'' of the Matlab solution using FDS. The \ct{MATL} line for the solid material contains the following three parameters that define its decomposition:
+The plot in Fig.~\ref{pyrolysis_2} contains two sets of curves. The solid curves represent the solution of the set of equations computed using a numerical ODE solver, and the underlying dashed curves are a ``fit'' of the solution using FDS. The \ct{MATL} line for the solid material contains the following three parameters that define its decomposition:
 \begin{lstlisting}
 &MATL ID                    = '...'
       ...
       REFERENCE_TEMPERATURE = 300.
       PYROLYSIS_RANGE       = 100.
       HEATING_RATE          = 5.   /
 \end{lstlisting}
-The \ct{REFERENCE_TEMPERATURE} is the temperature in $^\circ$C where the mass loss rate is at its peak. The \ct{HEATING_RATE} is the linear temperature rise ($^\circ$C/min) used in the TGA experiment, which is represented here by the Matlab solution. The \ct{PYROLYSIS_RANGE} is the approximate ``width'' of the second red hump in Fig.~\ref{pyrolysis_2}, fit by inspection. That is, the value of 100~$^\circ$C was chosen by trial and error. This is typically how one would choose kinetic parameters in FDS to match a given TGA curve.
+The \ct{REFERENCE_TEMPERATURE} is the temperature in $^\circ$C where the mass loss rate is at its peak. The \ct{HEATING_RATE} is the linear temperature rise ($^\circ$C/min) used in the TGA experiment, which is represented here by the numerical solution. The \ct{PYROLYSIS_RANGE} is the approximate ``width'' of the second red hump in Fig.~\ref{pyrolysis_2}, fit by inspection. That is, the value of 100~$^\circ$C was chosen by trial and error. This is typically how one would choose kinetic parameters in FDS to match a given TGA curve.
 
 
 
@@ -3324,7 +3324,7 @@ \subsubsection{Examples}
 
 \subsection{Delamination of layers}
 \label{info:surf_delamination}
-Delamination (fall-off) of material layers can occur e.g. in glued materials, such as Cross-Laminated Timber (CLT). Two different criteria can be used to enforce a delamination of \ct{SURF} layers: \ct{DELAMINATION\_TMP(NL)} sets the temperature criterion; if the last cell of the layer \ct{NL} exceeds this temperature, all layers from the first to \ct{NL}'th (of this particular wall cell) will be removed. Their mass will simply disappear from the computation, and the following layer will befome the surface of the wall. Similarly, specifying \ct{DELAMINATION\_DENSITY(NL)} will remove the layers 1 to \ct{NL} if the density of the \ct{NL}th layer's last cell decreases below the threshold.
+Delamination (fall-off) of material layers can occur e.g. in glued materials, such as Cross-Laminated Timber (CLT). Two different criteria can be used to enforce a delamination of \ct{SURF} layers: \ct{DELAMINATION_TMP(NL)} sets the temperature criterion; if the last cell of the layer \ct{NL} exceeds this temperature, all layers from the first to \ct{NL}'th (of this particular wall cell) will be removed. Their mass will simply disappear from the computation, and the following layer will befome the surface of the wall. Similarly, specifying \ct{DELAMINATION_DENSITY(NL)} will remove the layers 1 to \ct{NL} if the density of the \ct{NL}th layer's last cell decreases below the threshold.
 
 \newpage