Merge pull request #14858 from cxp484/FireX

FireX: Merge with firemodels/master

Author: cxp484

.github/workflows/cmake.yml

@@ -177,10 +177,10 @@ jobs:
         if: startsWith(matrix.compiler_mpi, 'gnu_')
         shell: bash
         run: |
-          echo "CC=gcc-14" >> $GITHUB_ENV
-          echo "CXX=g++-14" >> $GITHUB_ENV
-          echo "FC=gfortran-14" >> $GITHUB_ENV
-          echo "OMPI_FC=gfortran-14" >> $GITHUB_ENV
+          echo "CC=gcc-15" >> $GITHUB_ENV
+          echo "CXX=g++-15" >> $GITHUB_ENV
+          echo "FC=gfortran-15" >> $GITHUB_ENV
+          echo "OMPI_FC=gfortran-15" >> $GITHUB_ENV
           brew install glew gd zlib json-c
 
       - name: set macos intel

.github/workflows/osx.yml

@@ -38,7 +38,7 @@ jobs:
     - name: install openmpi
       run: |
         brew install open-mpi
-        echo "OMPI_FC=gfortran-14" >> $GITHUB_ENV
+        echo "OMPI_FC=gfortran-15" >> $GITHUB_ENV
 
     - name: build fds debug
       run: |

Source/ccib.f90

@@ -7453,7 +7453,7 @@ SUBROUTINE INIT_CUTCELL_DATA(T,DT,FIRST_CALL)
    WHERE(FCVAR(0:IBP1,0:JBP1,0:KBP1,CC_FGSC,JAXIS)==CC_SOLID) V(0:IBP1,0:JBP1,0:KBP1) = 0._EB
    WHERE(FCVAR(0:IBP1,0:JBP1,0:KBP1,CC_FGSC,KAXIS)==CC_SOLID) W(0:IBP1,0:JBP1,0:KBP1) = 0._EB
    US = U; VS = V; WS = W
-   
+
    ! External mesh CFACEs initialize P1 BCs:
    DO ICF=1,N_EXTERNAL_CFACE_CELLS+N_INTWALL_CFACE_CELLS
       CFA  => CFACE(ICF)
@@ -21128,6 +21128,7 @@ SUBROUTINE GET_GASPHASE_REGRCFACES_DATA
    DO ICC=1,M%N_CUTCELL_MESH
       CC => CUT_CELL(ICC); IJK(IAXIS:KAXIS) = CC%IJK(IAXIS:KAXIS)
       DO JCC=1,CC%NCELL
+         IF(CC%UNKZ(JCC) < 1) CYCLE
          ! Loop faces and test:
          DO IFC=1,CC%CCELEM(1,JCC)
             IFACE = CC%CCELEM(IFC+1,JCC)
@@ -21420,6 +21421,7 @@ SUBROUTINE GET_GASPHASE_REGRCFACES_DATA
    DO ICC=1,M%N_CUTCELL_MESH
       CC => CUT_CELL(ICC); IJK(IAXIS:KAXIS) = CC%IJK(IAXIS:KAXIS)
       DO JCC=1,CC%NCELL
+         IF(CC%UNKZ(JCC) < 1) CYCLE
          ! Loop faces and test:
          IFC_LOOP : DO IFC=1,CC%CCELEM(1,JCC)
             IFACE = CC%CCELEM(IFC+1,JCC)

Validation/UL_NIST_Vents/FDS_Input_Files/UL_NIST_Vents_Test_1.fds

@@ -4,9 +4,6 @@
 
 &TIME T_END=4500.0, TIME_SHRINK_FACTOR=3. /
 
-&MISC SIMULATION_MODE='SVLES', TMPA=20. /
-
-
 &DUMP DT_DEVC=15., SIG_FIGS=4, SIG_FIGS_EXP=2 /
 
 &REAC FUEL='METHANE' /

Validation/UL_NIST_Vents/FDS_Input_Files/UL_NIST_Vents_Test_2.fds

@@ -4,9 +4,6 @@
 
 &TIME T_END=1800.0, TIME_SHRINK_FACTOR=3. /
 
-&MISC SIMULATION_MODE='SVLES', TMPA=20. /
-
-
 &DUMP DT_DEVC=15., SIG_FIGS=4, SIG_FIGS_EXP=2 /
 
 &REAC FUEL='METHANE' /

Validation/UL_NIST_Vents/FDS_Input_Files/UL_NIST_Vents_Test_3.fds

@@ -4,9 +4,6 @@
 
 &TIME T_END=2400.0, TIME_SHRINK_FACTOR=3. /
 
-&MISC SIMULATION_MODE='SVLES', TMPA=20. /
-
-
 &DUMP DT_DEVC=15., SIG_FIGS=4, SIG_FIGS_EXP=2 /
 
 &REAC FUEL='METHANE' /

Validation/UL_NIST_Vents/FDS_Input_Files/UL_NIST_Vents_Test_4.fds

@@ -4,9 +4,6 @@
 
 &TIME T_END=4800.0, TIME_SHRINK_FACTOR=3. /
 
-&MISC SIMULATION_MODE='SVLES', TMPA=20. /
-
-
 &DUMP DT_DEVC=15., SIG_FIGS=4, SIG_FIGS_EXP=2 /
 
 &REAC FUEL='METHANE' /