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

Author: cxp484

CMakeLists.txt

@@ -136,7 +136,7 @@ elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "Intel" OR CMAKE_Fortran_COMPILER_ID S
     endif()
     # When compiling with Intel and not on Windows apply -no-wrap-margin.
     if (NOT(WIN32))
-        target_compile_definitions(fds PRIVATE -no-wrap-margin)
+        target_compile_options(fds PRIVATE -no-wrap-margin)
     endif()
 endif()
 

Manuals/Bibliography/commoncommands.tex

@@ -32,10 +32,11 @@
 %\pgfplotsset{compat=1.7}
 \usepackage{tocloft}
 \usepackage{color}
-\usepackage{amsmath}
 \definecolor{linknavy}{rgb}{0,0,0.50196}
 \definecolor{linkred}{rgb}{1,0,0}
 \definecolor{linkblue}{rgb}{0,0,1}
+\usepackage{amsmath}
+\usepackage{cancel}
 \usepackage{float}
 \usepackage{caption}
 \usepackage{pict2e}
@@ -65,6 +66,7 @@
 
 \newcommand{\nopart}{\expandafter\def\csname Parent-1\endcsname{}} % To fix table of contents in pdf.
 \newcommand{\ct}[1]{\lstinline{#1}}
+\newcommand{\tct}[1]{\lstinline[basicstyle=\scriptsize\ttfamily]!#1!}
 
 \usepackage{siunitx}
 

Manuals/FDS_Technical_Reference_Guide/Appendices.tex

@@ -557,9 +557,9 @@ \subsection{Iterative Procedure for Updating Velocity}
    \be
       \left| u_I^* - u_0^* \right| < 0.5 \, \delta x
    \ee
-    and the default convergence criteria for the pressure, $p=\rho(\cH-|\bu|^2/2)$, is
+    and the default convergence criteria for the pressure, $p=\rho(\cH-|\bu|^2/2)$, is derived by taking the divergence of Eq.~(\ref{momeq}) and separating out the baroclinic pressure terms:
    \be
-      \left| \nabla \cdot (p^k-p^{k-1}) \nabla (1/\rho) \right|<20/\dx^2
+       \left| \nabla \cdot (p^k-p^{k-1}) \nabla (1/\rho) \right| \equiv \left| \nabla \cdot \left( \frac{\partial \bu}{\partial t} + \bF_{\rm A} +  \nabla \frac{|\bu|^2}{2} + \frac{1}{\rho} \nabla p^k \right)  \right| < 20/\dx^2
    \ee
    If the criteria are not met, return to Step~\ref{step3}.
 \end{enumerate}

Manuals/FDS_Technical_Reference_Guide/Momentum_Chapter.tex

@@ -7943,32 +7943,41 @@ \chapter{Installation Testing}
 \end{enumerate}
 
 \begin{landscape}
-\centering
-\captionof{table}[FDS Installation Test Suite]{FDS Installation Test Suite. Details of each case may be found in the listed section or reference. Note that the light blue colored links refer to the FDS User's Guide.} \label{tbl:installation_test}
-\footnotesize
-\begin{tabular}{|l|c|l|l|l|}
-\hline
-Folder                  & Reference                       & Input File                                 & FDS Output File                                  & Expected Results File \\ \hline \hline
-Controls                & \ref{UG-activate_vents}         & activate\_vents.fds                        & activate\_vents\_ctrl.csv                        & activate\_vents.csv \\ \hline
-Pressure\_Effects       & \ref{isentropic2}               & isentropic2.fds                            & isentropic2\_devc.csv                           & isentropic2.csv \\ \hline
-Energy\_Budget          & \ref{energy_budget_tmix}        & energy\_budget\_tmix.fds                   & energy\_budget\_tmix\_devc.csv                   & energy\_budget\_tmix.csv \\ \hline
-Energy\_Budget          & \ref{energy_budget_walls}       & energy\_budget\_cold\_walls.fds            & energy\_budget\_cold\_walls\_hrr.csv             & energy\_budget\_cold\_walls.csv \\ \hline
-Fires                   & \ref{UG-spray_burner}           & spray\_burner.fds                          & spray\_burner\_hrr.csv                           & spray\_burner.csv \\ \hline
-Heat\_Transfer          & \ref{heat_conduction_kc}        & heat\_conduction\_kc.fds                   & heat\_conduction\_kc\_devc.csv                   & heat\_conduction\_kc.csv \\ \hline
-HVAC                    & \ref{ashrae7}                   & ashrae7\_table.fds                         & ashrae7\_table\_devc.csv                         & ashrae7\_exp.csv \\ \hline
-Pressure\_Solver        & \ref{UG-duct_flow}              & duct\_flow.fds                             & duct\_flow\_devc.csv                             & duct\_flow.csv \\ \hline
-Pressure\_Solver        & \ref{UG-duct_flow}              & duct\_flow\_uglmat.fds                     & duct\_flow\_uglmat\_devc.csv                     & duct\_flow.csv \\ \hline
-Pyrolysis               & \ref{enthalpy}                  & enthalpy.fds                               & enthalpy\_devc.csv                               & enthalpy.csv \\ \hline
-Pyrolysis               & \ref{shrink_swell}              & shrink\_swell.fds                          & shrink\_swell\_devc.csv                          & shrink\_swell.csv \\ \hline
-Radiation               & \ref{radiation_shield}          & radiation\_shield.fds                      & radiation\_shield\_devc.csv                      & radiation\_shield.csv \\ \hline
-Species                 & \ref{mixing_reactions}          & reactionrate\_EDC\_1step\_CH4\_nonmix.fds  & reactionrate\_EDC\_1step\_CH4\_nonmix\_devc.csv  & reactionrate\_EDC\_1step\_CH4\_nonmix\_spec.csv \\ \hline
-Species                 & \ref{finite_rate_reactions}     & reactionrate\_arrhenius\_2order\_1step.fds & reactionrate\_arrhenius\_2order\_1step\_devc.csv & reactionrate\_arrhenius\_2order\_1step\_soln.csv \\ \hline
-Sprinklers\_and\_Sprays & \ref{water_evaporation_1}       & water\_evaporation\_1.fds                  & water\_evaporation\_1\_devc.csv                  & water\_evaporation\_1.csv \\ \hline
-Sprinklers\_and\_Sprays & \ref{particle_drag}             & particle\_drag\_U50\_N16.fds               & particle\_drag\_U50\_N16\_devc.csv               & particle\_drag\_U50\_N16.csv \\ \hline
 
-\end{tabular}
+\scriptsize
+\begin{xltabular}{9in}{|p{1.4in}|X|p{2.1in}|p{2.1in}|p{2.1in}|}
+\caption[FDS Installation Test Suite]{FDS Installation Test Suite. Details of each case may be found in the listed section or reference. Note that the light blue colored links refer to the FDS User's Guide.}
+\label{tbl:installation_test} \\
+\hline
+Folder                      & Reference                     & Input File                                   & FDS Output File                                    & Expected Results File                              \\ 
+\hline \hline
+\endfirsthead
+\caption[]{FDS Installation Test (continued).} \\
+\hline
+Folder                      & Reference                     & Input File                                   & FDS Output File                                    & Expected Results File                              \\
+\hline \hline
+\endhead
+\tct{Controls}              & \ref{UG-activate_vents}      & \tct{activate_vents.fds}                      & \tct{activate_vents_ctrl.csv}                      & \tct{activate_vents.csv}                           \\ \hline
+\tct{Energy_Budget}         & \ref{energy_budget_tmix}     & \tct{energy_budget_tmix.fds}                  & \tct{energy_budget_tmix_devc.csv}                  & \tct{energy_budget_tmix.csv}                       \\ \hline
+\tct{Energy_Budget}         & \ref{energy_budget_walls}    & \tct{energy_budget_cold_walls.fds}            & \tct{energy_budget_cold_walls_hrr.csv}             & \tct{energy_budget_cold_walls.csv}                 \\ \hline
+\tct{Fires}                 & \ref{UG-spray_burner}        & \tct{spray_burner.fds}                        & \tct{spray_burner_hrr.csv}                         & \tct{spray_burner.csv}                             \\ \hline
+\tct{Heat_Transfer}         & \ref{heat_conduction_kc}     & \tct{heat_conduction_kc.fds}                  & \tct{heat_conduction_kc_devc.csv}                  & \tct{heat_conduction_kc.csv}                       \\ \hline
+\tct{HVAC}                  & \ref{ashrae7}                & \tct{ashrae7_table.fds}                       & \tct{ashrae7_table_devc.csv}                       & \tct{ashrae7_exp.csv}                              \\ \hline
+\tct{Pressure_Effects}      & \ref{isentropic2}            & \tct{isentropic2.fds}                         & \tct{isentropic2_devc.csv}                         & \tct{isentropic2.csv}                              \\ \hline
+\tct{Pressure_Solver}       & \ref{UG-duct_flow}           & \tct{duct_flow.fds}                           & \tct{duct_flow_devc.csv}                           & \tct{duct_flow.csv}                                \\ \hline
+\tct{Pressure_Solver}       & \ref{UG-duct_flow}           & \tct{duct_flow_uglmat.fds}                    & \tct{duct_flow_uglmat_devc.csv}                    & \tct{duct_flow.csv}                                \\ \hline
+\tct{Pyrolysis}             & \ref{enthalpy}               & \tct{enthalpy.fds}                            & \tct{enthalpy_devc.csv}                            & \tct{enthalpy.csv}                                 \\ \hline
+\tct{Pyrolysis}             & \ref{shrink_swell}           & \tct{shrink_swell.fds}                        & \tct{shrink_swell_devc.csv}                        & \tct{shrink_swell.csv}                             \\ \hline
+\tct{Radiation}             & \ref{radiation_shield}       & \tct{radiation_shield.fds}                    & \tct{radiation_shield_devc.csv}                    & \tct{radiation_shield.csv}                         \\ \hline
+\tct{Species}               & \ref{mixing_reactions}       & \tct{reactionrate_EDC_1step_CH4_nonmix.fds}   & \tct{reactionrate_EDC_1step_CH4_nonmix_devc.csv}   & \tct{reactionrate_EDC_1step_CH4_nonmix_spec.csv}   \\ \hline
+\tct{Species}               & \ref{finite_rate_reactions}  & \tct{reactionrate_arrhenius_2order_1step.fds} & \tct{reactionrate_arrhenius_2order_1step_devc.csv} & \tct{reactionrate_arrhenius_2order_1step_soln.csv} \\ \hline
+\tct{Sprinklers_and_Sprays} & \ref{water_evaporation_1}    & \tct{water_evaporation_1.fds}                 & \tct{water_evaporation_1_devc.csv}                 & \tct{water_evaporation_1.csv}                      \\ \hline
+\tct{Sprinklers_and_Sprays} & \ref{particle_drag}          & \tct{particle_drag_U50_N16.fds}               & \tct{particle_drag_U50_N16_devc.csv}               & \tct{particle_drag_U50_N16.csv}                    \\ \hline
+\end{xltabular}
 \end{landscape}
 
+\normalsize
+
 % Unstructured geometry Appendix:
 
 \ifcompgeom

Manuals/FDS_User_Guide/FDS_User_Guide.tex

@@ -1189,18 +1189,36 @@ SUBROUTINE CALC_AFT_REAC_AND_PROD(ZZ,ZZ_REAC,ZZ_PROD)
 REAL(EB), INTENT(IN) :: ZZ(N_TRACKED_SPECIES)
 REAL(EB), INTENT(OUT) :: ZZ_REAC(N_TRACKED_SPECIES),ZZ_PROD(N_TRACKED_SPECIES)
 REAL(EB) :: EQUIV, X,Y,Z,A,B,C,D,E, SUM_ZZ
-
+REAL(EB) :: ZZ_MASS, ZZ_FUEL_O2_MASS
+REAL(EB) :: REAC_MASS, PROD_MASS, FUEL_MASS, O2_MASS, CO2_MASS, H2O_MASS
+INTEGER :: NS
 
 CALL CALC_EQUIV_RATIO(ZZ(1:N_TRACKED_SPECIES), EQUIV)
 IF (SIM_MODE /= DNS_MODE .AND. USE_MIXED_ZN_AFT_TMP) THEN
    EQUIV = MAX(1.0_EB,EQUIV)
 ENDIF
 
-! Based on CxHyOz + a(O2+3.76N2) = bCO2 + cH2O + dCxHyOz + eO2 + 3.76aN2
+! Adjust for diluents
+ZZ_FUEL_O2_MASS = 0.0_EB
+ZZ_MASS = SUM(ZZ(1:N_TRACKED_SPECIES))
+ZZ_REAC(1:N_TRACKED_SPECIES) = ZZ(1:N_TRACKED_SPECIES)
+ZZ_PROD(1:N_TRACKED_SPECIES) = ZZ(1:N_TRACKED_SPECIES)
+DO NS=1, N_TRACKED_SPECIES
+   IF (SPECIES_MIXTURE(NS)%OXR > 0.0_EB) THEN ! FUEL
+      ZZ_REAC(NS) = 0.0_EB
+      ZZ_PROD(NS) = 0.0_EB
+      ZZ_FUEL_O2_MASS = ZZ_FUEL_O2_MASS + ZZ(NS)
+   ENDIF   
+ENDDO
+ZZ_REAC(I_O2) = 0.0_EB
+ZZ_PROD(I_O2) = 0.0_EB
+ZZ_FUEL_O2_MASS = ZZ_FUEL_O2_MASS + ZZ(I_O2)
+
+! Based on CxHyOz + aO2 = bCO2 + cH2O + dCxHyOz + eO2 
 X=SPECIES_MIXTURE(I_FUEL)%ATOMS(6) !C
 Y=SPECIES_MIXTURE(I_FUEL)%ATOMS(1) !H
 Z=SPECIES_MIXTURE(I_FUEL)%ATOMS(8) !O
-A=0.5_EB*((2.0_EB*X+0.5_EB*Y)/EQUIV -Z)
+A=0.5_EB*((2.0_EB*X+0.5_EB*Y)/EQUIV -Z) ! a is a function of equivalence ratio
 IF(ABS(EQUIV - 1.0_EB) <1E-3_EB) THEN ! Stoich
    B = X
    C = 0.5_EB*Y
@@ -1219,25 +1237,29 @@ SUBROUTINE CALC_AFT_REAC_AND_PROD(ZZ,ZZ_REAC,ZZ_PROD)
 ENDIF
 
 ! Setup reactants
-ZZ_REAC = 0.0_EB
-ZZ_REAC(I_FUEL)=1._EB*SPECIES_MIXTURE(I_FUEL)%MW
-ZZ_REAC(I_O2)=A*SPECIES_MIXTURE(I_O2)%MW
-ZZ_REAC(I_N2)=3.76*A*SPECIES_MIXTURE(I_N2)%MW
+FUEL_MASS = 1._EB*SPECIES_MIXTURE(I_FUEL)%MW
+O2_MASS = A*SPECIES_MIXTURE(I_O2)%MW
+REAC_MASS = FUEL_MASS+O2_MASS
+ZZ_REAC(I_FUEL)=FUEL_MASS/REAC_MASS*ZZ_FUEL_O2_MASS
+ZZ_REAC(I_O2)=O2_MASS/REAC_MASS*ZZ_FUEL_O2_MASS
 SUM_ZZ=SUM(ZZ_REAC)
 ZZ_REAC = ZZ_REAC/SUM_ZZ
 
 ! Setup products
-ZZ_PROD = 0.0_EB
-ZZ_PROD(I_CO2)=B*SPECIES_MIXTURE(I_CO2)%MW
-ZZ_PROD(I_H2O)=C*SPECIES_MIXTURE(I_H2O)%MW
-ZZ_PROD(I_FUEL)=D*SPECIES_MIXTURE(I_FUEL)%MW
-ZZ_PROD(I_O2)=E*SPECIES_MIXTURE(I_O2)%MW
-ZZ_PROD(I_N2)=3.76_EB*A*SPECIES_MIXTURE(I_N2)%MW
+CO2_MASS = B*SPECIES_MIXTURE(I_CO2)%MW
+H2O_MASS = C*SPECIES_MIXTURE(I_H2O)%MW
+FUEL_MASS = D*SPECIES_MIXTURE(I_FUEL)%MW
+O2_MASS = E*SPECIES_MIXTURE(I_O2)%MW
+PROD_MASS = CO2_MASS+H2O_MASS+FUEL_MASS+O2_MASS
+ZZ_PROD(I_CO2)=ZZ_PROD(I_CO2)+CO2_MASS/PROD_MASS*ZZ_FUEL_O2_MASS
+ZZ_PROD(I_H2O)=ZZ_PROD(I_H2O)+H2O_MASS/PROD_MASS*ZZ_FUEL_O2_MASS
+ZZ_PROD(I_FUEL)=FUEL_MASS/PROD_MASS*ZZ_FUEL_O2_MASS
+ZZ_PROD(I_O2)=O2_MASS/PROD_MASS*ZZ_FUEL_O2_MASS
 SUM_ZZ=SUM(ZZ_PROD)
 ZZ_PROD = ZZ_PROD/SUM_ZZ
 
-
 END SUBROUTINE CALC_AFT_REAC_AND_PROD
+
 #endif
 
 SUBROUTINE CHECK_AUTO_IGNITION(EXTINCT,TMP_IN,AIT,IIC,JJC,KKC,REAC_INDEX)

Manuals/FDS_Verification_Guide/FDS_Verification_Guide.tex

@@ -20,7 +20,7 @@
         return
     end
     M = importdata(filename,',',2);
-    j = find(strcmp(M.colheaders,'"clock time"'));
+    j = find(strcmp(M.colheaders,'clock time'));
     time64(i) = M.data(end,j);
 end
 time64 = time64/time64(1) * 100;
@@ -32,7 +32,7 @@
         return
     end
     M = importdata(filename,',',2);
-    j = find(strcmp(M.colheaders,'"clock time"'));
+    j = find(strcmp(M.colheaders,'clock time'));
     time128(i) = M.data(end,j);
 end
 time128 = time128/time128(1) * 100;

Source/fire.f90

@@ -38,7 +38,7 @@
     fid = fopen(Statistics_Tex_Output, 'wt');
     % Generate table header information in .tex file
     fprintf(fid, '%s\n', '\scriptsize');
-    fprintf(fid, '%s\n', '\begin{longtable}[c]{@{\extracolsep{\fill}}|l|c|c|c|c|c|c|c|c|c|}');
+    fprintf(fid, '%s\n', '\begin{longtable}{|p{2.5in}|l|p{1in}|l|p{1in}|l|l|l|l|l|}');
     fprintf(fid, '%s\n', '\hline');
     fprintf(fid, '%s\n', 'Case Name & Section & Expected & Expected & Predicted & Predicted & Type of & Error & Error     & Within    \\');
     fprintf(fid, '%s\n', '          &         & Quantity & Value    & Quantity  & Value     & Error   &       & Tolerance & Tol.      \\ \hline \hline');
@@ -54,15 +54,15 @@
     [rows, cols] = size(output_stats);
     m = sortrows(output_stats(2:rows,:),1);
     for i_row = 1:rows-1
-        case_name = strrep(m{i_row, 3}, '_', '\_');
+        case_name = ['\lstinline[basicstyle=\scriptsize\ttfamily]!',m{i_row,3},'!'];
         if m{i_row,14}(1:14)=='FDS_User_Guide'
            case_name_section = ['\ref{UG-',m{i_row,3},'}'];
         else
            case_name_section = ['\ref{',m{i_row,3},'}'];
         end
-        expected_quantity = strrep(m{i_row, 5}, '_', '\_');
+        expected_quantity = ['\lstinline[basicstyle=\scriptsize\ttfamily]!',m{i_row,5},'!'];
         expected_value = m{i_row, 6};
-        predicted_quantity = strrep(m{i_row, 7}, '_', '\_');
+        predicted_quantity = ['\lstinline[basicstyle=\scriptsize\ttfamily]!',m{i_row, 7},'!'];
         predicted_value = m{i_row, 8};
         error_type = strrep(m{i_row,10}, ' Error', '');
         error_val = str2num(m{i_row,11});

Utilities/Matlab/scripts/openmp_timing_benchmarks.m

@@ -1,7 +1,7 @@
 &HEAD CHID='JH_FRA_compartment_01', TITLE='FRA 1:4 Compartment Door Only Inert'/
 &TIME T_END=720.0, /
 
-&CATF OTHER_FILES='common.fds' /
+&CATF OTHER_FILES='common.txt' /
 
 
 &SURF ID='PROP_BURNER', RGB=188,0,0, HRRPUA=1777.7778, RAMP_Q='PROP_BURNER_RAMP_Q', TMP_FRONT=400, /
@@ -17,7 +17,7 @@
 &RAMP ID='PROP_BURNER_RAMP_Q', T=600.0, F=1.0/
 &RAMP ID='PROP_BURNER_RAMP_Q', T=601.0, F=0.0/
 
-&CATF OTHER_FILES='props.fds' /
-&CATF OTHER_FILES='quarterscale.fds' /
+&CATF OTHER_FILES='props.txt' /
+&CATF OTHER_FILES='quarterscale.txt' /
 
 &TAIL /