diff --git a/Manuals/Bibliography/FDS_general.bib b/Manuals/Bibliography/FDS_general.bib index 4a56b04825e..eabfb76997b 100644 --- a/Manuals/Bibliography/FDS_general.bib +++ b/Manuals/Bibliography/FDS_general.bib @@ -3470,6 +3470,16 @@ @ARTICLE{Lautenberger:FSJ volume = {41}, } +@TECHREPORT{Leventon:NIST_TN_2282, + author = {I. Leventon and M. Heck and K. McGrattan and M. Bundy and R. Davis}, + title = {{The Impact of Material Composition on Ignitability and Fire Growth. Volume 1: Full-Scale Burning Behavior of Combustible Solids Commonly Found in Nuclear Power Plants}}, + institution = {National Institute of Standards and Technology}, + year = {2024}, + type = {NIST Technical Note}, + number = {6196-1}, + address = {Gaithersburg, Maryland} +} + @BOOK{Leveque:1, author = {Leveque, R. J.}, title = {Finite Volume Methods for Hyperbolic Problems}, diff --git a/Manuals/FDS_User_Guide/FDS_User_Guide.tex b/Manuals/FDS_User_Guide/FDS_User_Guide.tex index 3f9b8ce5377..7c76a14f1e0 100644 --- a/Manuals/FDS_User_Guide/FDS_User_Guide.tex +++ b/Manuals/FDS_User_Guide/FDS_User_Guide.tex @@ -3998,6 +3998,46 @@ \subsection{Specified Flow vs. Unspecified Flow} In the second approach, one or more ducts have flows that are not specified, in this case FDS must solve for the pressures at either end of the duct to determine the flow through the duct. As one example, if a tee has three ducts and only one of the ducts has a specified flow, then FDS will use the relative pressure drops along the two other ducts to determine the flow. If no \ct{LOSS} inputs are given, then FDS may not correctly solve for the flow. As another example, losses in the HVAC network limit how quickly flow in the ducts can change over time. If there is a single duct connecting two rooms with no \ct{LOSS} inputs given, then small pressure changes can lead to large changes in duct velocity and increase the risk of a numerical instability. If you specify an HVAC network where flow is being solved for by FDS, then you must provided \ct{LOSS} inputs for each possible flow path. FDS will perform a check at startup and return an error message if it finds insufficient losses have been specified; however, this check may not discover all cases. +\subsection{HVAC and Unstructured Geometry} +\label{info:hvac_geom} + +Assigning either a normal HVAC node or a localized leakage HVAC to a GEOM is done using \ct{SURF}. Using the simple example from Section~\ref{info:GEOM_Basics}, an HVAC node named \ct{'MY NODE'} is assigned to the first face by defining a \ct{SURF} with \ct{NODE_ID='MY NODE'}. No other boundary conditions should be set on the \ct{SURF} other than a color or texture. On the node \ct{HVAC} input set \ct{GEOM=T} to indicate FDS needs to look for a \ct{GEOM} and not a \ct{VENT} for the node: + +\begin{lstlisting} + &SURF ID='NODE SURF',NODE_ID='MY NODE'/ + &GEOM ID='My Solid' + SURF_ID='NODE SURF','INERT' + VERTS= -1.0, -1.0, 0.0, + 1.0, -1.0, 0.0, + 0.0, 1.0, 0.0, + 0.0, 0.0, 1.0, + FACES= 1,3,2, 2, + 1,4,3, 1, + 3,4,2, 1, + 2,4,1, 0 / + &HVAC ID='MY NODE',TYPE_ID='NODE',GEOM=T,..../ +\end{lstlisting} + +The \ct{SURF} input \ct{NODE_ID} can only be applied to complex geometry. It cannot be used for \ct{OBST} or \ct{VENT}. While more than one \ct{GEOM} and more than one face of a \ct{GEOM} can use the same node, the same node cannot be shared by both a \ct{VENT} and a \ct{GEOM}. + +To apply localized leakage to \ct{GEOM}, the process is similar. \ct{NODE_ID} on \ct{SURF} is still used to link faces of \ct{GEOM} to the localized leakage. The input for the localized leakage changes slightly. The inputs \ct{VENT_ID} and \ct{VENT2_ID} use \ct{GEOM} and \ct{GEOM2} to determine if the respective \ct{ID} is attached to a \ct{VENT} or a \ct{GEOM}. For example, to attach the second vent for a localized leakage path: + +\begin{lstlisting} + &SURF ID='LEAK SURF',NODE_ID='LEAK OUT'/ + &GEOM ID='My Solid' + SURF_ID='LEAK SURF','INERT' + VERTS= -1.0, -1.0, 0.0, + 1.0, -1.0, 0.0, + 0.0, 1.0, 0.0, + 0.0, 0.0, 1.0, + FACES= 1,3,2, 2, + 1,4,3, 1, + 3,4,2, 1, + 2,4,1, 0 / + &HVAC ID='MY LEAK',TYPE_ID='LEAK',VENT_ID='LEAK IN',VENT2_ID='LEAK OUT',GEOM2=T,AREA=0.01/ +\end{lstlisting} + +Here the use of \ct{GEOM2=T} indicates that \ct{VENT2_ID} is a \ct{NODE_ID} on \ct{SURF}. \newpage @@ -7138,7 +7178,7 @@ \subsection{Solid Phase} \label{char_reaction} {\rm Char} + \nu_{\rm O_2, char} \, {\rm O_2} \rightarrow (1+ \nu_{\rm O_2,char} - \nu_{\rm ash}) \, {\rm CO_2} + \nu_{\rm ash} \, {\rm Ash} \ee -$M$ is the vegetation {\em moisture content} or {\em moisture fraction} determined on a dry weight basis, specified with \ct{MOISTURE_FRACTION} on the \ct{SURF} line. $\nu_{\rm char}$ is the mass fraction of Dry Vegetation that is converted to char during pyrolysis, specified with the parameter \ct{NU_MATL} on the \ct{MATL} line that describes the Dry Vegetation. The character string \ct{MATL_ID} on the same \ct{MATL} line indicates the name of the char. $\nu_{\rm O_2,char}$ is the mass of oxygen consumed per unit mass of char oxidized. $\nu_{\rm ash}$ is the mass fraction of char that is converted to ash during char oxidation, specified by \ct{NU_MATL} on the \ct{MATL} line describing the char. +$M$ is the vegetation {\em moisture content} or {\em moisture fraction} determined on a dry weight basis, specified with \ct{MOISTURE_CONTENT} on the \ct{SURF} line. $\nu_{\rm char}$ is the mass fraction of Dry Vegetation that is converted to char during pyrolysis, specified with the parameter \ct{NU_MATL} on the \ct{MATL} line that describes the Dry Vegetation. The character string \ct{MATL_ID} on the same \ct{MATL} line indicates the name of the char. $\nu_{\rm O_2,char}$ is the mass of oxygen consumed per unit mass of char oxidized. $\nu_{\rm ash}$ is the mass fraction of char that is converted to ash during char oxidation, specified by \ct{NU_MATL} on the \ct{MATL} line describing the char. It is assumed that the Dry Vegetation in Eq.~(\ref{pyr_reac}) is 47~\% (by mass) carbon~\cite{Ma:BGS2018} with an effective organic component C$_{3.4}$H$_{6.2}$O$_{2.5}$~\cite{Ritchie:1}. In general, it is assumed that char may be comprised of more than pure carbon and is defined as $\mathrm{C_{x'}O_{z'}A}$ in Eq.~\ref{char_chemistry}. In the specific case where char is composed of pure carbon which reacts completely with O$_2$ to form CO$_2$ then $\nu_{\rm O_2,char}=2.67$ and $\nu_{\rm ash}=0$. A full discussion of the composition of the Char and Fuel Gas is given in Sec.~\ref{veg_pyrolysis_gas_phase}. @@ -7397,12 +7437,12 @@ \section{Lagrangian Particle Model} \begin{lstlisting} &SURF ID = 'wet vegetation' MATL_ID = 'dry pine' - MOISTURE_FRACTION = 0.25 + MOISTURE_CONTENT = 0.25 SURFACE_VOLUME_RATIO = 8000. LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' / \end{lstlisting} -The needle is composed of two materials---\ct{'dry pine'} and \ct{'MOISTURE'}. Following the convention used in forestry, the moisture content is expressed via the \ct{MOISTURE_FRACTION}, which is the mass of moisture divided by the mass of {\em dry} vegetation. Do not confuse this with the mass fraction of moisture, $Y_{\rm m}$, which is related to the moisture fraction, $M$, via +The needle is composed of two materials---\ct{'dry pine'} and \ct{'MOISTURE'}. Following the convention used in forestry, the moisture content is expressed via the \ct{MOISTURE_CONTENT}, which is the mass of moisture divided by the mass of {\em dry} vegetation. Do not confuse this with the mass fraction of moisture, $Y_{\rm m}$, which is related to the moisture fraction, $M$, via \be Y_{\rm m} = \frac{M}{1+M} \ee @@ -7424,7 +7464,7 @@ \section{Lagrangian Particle Model} CONDUCTIVITY = 1.0 SPECIFIC_HEAT = 1.6 / \end{lstlisting} -Note that if you specify a \ct{MOISTURE_FRACTION} on the \ct{SURF} line, FDS will automatically add a \ct{MATL} line for \ct{'MOISTURE'} as it is written in Fig.~\ref{vege_inputs}. FDS will also alter the \ct{DENSITY} of the dry vegetation, in this case \ct{'dry pine'}, so that the size and wood content of the particle do not change when moisture is added. The modified density of the ``dry'' vegetation, $\tilde{\rho}_{\rm d}$, is given by: +Note that if you specify a \ct{MOISTURE_CONTENT} on the \ct{SURF} line, FDS will automatically add a \ct{MATL} line for \ct{'MOISTURE'} as it is written in Fig.~\ref{vege_inputs}. FDS will also alter the \ct{DENSITY} of the dry vegetation, in this case \ct{'dry pine'}, so that the size and wood content of the particle do not change when moisture is added. The modified density of the ``dry'' vegetation, $\tilde{\rho}_{\rm d}$, is given by: \be \tilde{\rho}_{\rm d} = \frac{\rho_{\rm d}} {1-\frac{\rho_{\rm d}}{\rho_{\rm m}} M } \ee @@ -7437,7 +7477,7 @@ \section{Lagrangian Particle Model} &INIT PART_ID='pine needles', XB=0.,1.,0.,1.,0.,1., N_PARTICLES=1000, MASS_PER_VOLUME=0.8, DRY=T / \end{lstlisting} -This line inserts 1000 Lagrangian particles representing pine needles randomly within a unit cube. The \ct{MASS_PER_VOLUME} is the mass (kg) of solid needles divided by the volume (m$^3$) they occupy, sometimes called the ``bulk density.'' The parameter \ct{DRY=T} means that if you have specified a \ct{MOISTURE_FRACTION} on the \ct{SURF} line that describes the vegetation, then the actual mass per volume of wet vegetation is +This line inserts 1000 Lagrangian particles representing pine needles randomly within a unit cube. The \ct{MASS_PER_VOLUME} is the mass (kg) of solid needles divided by the volume (m$^3$) they occupy, sometimes called the ``bulk density.'' The parameter \ct{DRY=T} means that if you have specified a \ct{MOISTURE_CONTENT} on the \ct{SURF} line that describes the vegetation, then the actual mass per volume of wet vegetation is \be m_{\rm w}''' = m_{\rm d}''' \, (1+M) \ee @@ -7546,12 +7586,12 @@ \section{Boundary Fuel Model} &SURF ID = 'Ground Vegetation' MATL_ID(1,1) = 'Dry Vegetation' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.218 + MOISTURE_CONTENT(1) = 0.218 SURFACE_VOLUME_RATIO(1) = 3092. MASS_PER_VOLUME(1) = 5. THICKNESS(1:2) = 0.076,0.1 / \end{lstlisting} -The presence of the parameter \ct{MASS_PER_VOLUME} automatically triggers the Boundary Fuel Model. Note that its argument of 1 refers to the first layer; the second layer being \ct{Soil}. If you specify \ct{MOISTURE_FRACTION}, FDS will automatically add a \ct{MATL} line for \ct{'MOISTURE'}. +The presence of the parameter \ct{MASS_PER_VOLUME} automatically triggers the Boundary Fuel Model. Note that its argument of 1 refers to the first layer; the second layer being \ct{Soil}. If you specify \ct{MOISTURE_CONTENT}, FDS will automatically add a \ct{MATL} line for \ct{'MOISTURE'}. The drag exerted on the wind flowing through the vegetation is imposed as a force term in the gas phase grid cell adjacent to the boundary: \be @@ -11841,6 +11881,7 @@ \chapter{Alphabetical List of Input Parameters} % ignorenamelistkw: /PART/DEBUG, /PART/EMBER_SNAG_FACTOR % ignorenamelistkw: /REAC/C, /REAC/H, /REAC/O, /REAC/N, /REAC/FORMULA, % ignorenamelistkw: /SLCF/DEBUG, /SLCF/RLE_MIN, /SLCF/RLE_MAX, /SLCF/SLICETYPE +% ignorenamelistkw: /SURF/MOISTURE_FRACTION % ignorenamelistkw: /TIME/RAMP_DT % ignore keywords that appear on any namelist @@ -12418,6 +12459,8 @@ \section{\texorpdfstring{{\tt HVAC}}{HVAC} (HVAC System Definition)} \ct{FAN_ID} & Character & Section~\ref{info:HVACduct} & & \\ \hline \ct{FILTER_ID} & Character & Section~\ref{info:HVACnode} & & \\ \hline \ct{FIXED_Q} & Real & Section~\ref{info:HVACaircoil} & kW & \\ \hline +\ct{GEOM} & Logical & Section~\ref{info:hvac_geom} & & \ct{F} \\ \hline +\ct{GEOM2} & Logical & Section~\ref{info:hvac_geom} & & \ct{F} \\ \hline \ct{ID} & Character & Section~\ref{info:HVAC} & & \\ \hline \ct{LEAK_ENTHALPY} & Logical & Section~\ref{info:local_leakage} & & \ct{F} \\ \hline \ct{LEAK_PRESSURE_EXPONENT}& Real & Section~\ref{info:Leaks} & & 0.5 \\ \hline @@ -13545,12 +13588,13 @@ \section{\texorpdfstring{{\tt SURF}}{SURF} (Surface Properties)} \ct{MINIMUM_LAYER_THICKNESS} & Real & Section~\ref{info:solid_phase_stability} & m & 1.E-4 \\ \hline \ct{MINIMUM_SCALING_HEAT_FLUX} & Real & Section~\ref{info:scaled_burning} & \si{kW/m^2} & 0 \\ \hline \ct{MLRPUA} & Real & Section~\ref{info:gas_burner} & \si{kg/(m^2.s)} & \\ \hline -\ct{MOISTURE_FRACTION(:)} & Real Array & Section~\ref{info:vegetation} & & 0. \\ \hline +\ct{MOISTURE_CONTENT(:)} & Real Array & Section~\ref{info:vegetation} & & 0. \\ \hline \ct{N_LAYER_CELLS_MAX(:)} & Integer Array & Section~\ref{info:solid_phase_stability} & & 1000 \\ \hline \ct{NEAR_WALL_EDDY_VISCOSITY} & Real & Section~\ref{info:LES} & m$^2$/s & \\ \hline \ct{NEAR_WALL_TURBULENCE_MODEL} & Character & Section~\ref{info:LES} & & \\ \hline \ct{NET_HEAT_FLUX} & Real & Section~\ref{info:convection} & \unit{kW/m^2} & \\ \hline \ct{NO_SLIP} & Logical & Section~\ref{info:WALL_MODEL} & & \ct{F} \\ \hline +\ct{NODE_ID} & Character & Section~\ref{info:hvac_geom} & & \\ \hline \ct{NPPC} & Integer & Section~\ref{info:particle_flux} & & 1 \\ \hline \ct{NUSSELT_C0} & Real & Section~\ref{info:convection} & & \\ \hline \ct{NUSSELT_C1} & Real & Section~\ref{info:convection} & & \\ \hline @@ -14044,7 +14088,7 @@ \chapter{Error Codes} 300 \> \ct{N_LAYER_CELLS_MAX should be at least ... for ...} \> Section~\ref{info:solid_phase_stability} \\ 301 \> \ct{SURF line must have an ID.} \> Section~\ref{info:SURF} \\ 302 \> \ct{SURF ID ... is used more than once.} \> Section~\ref{info:SURF} \\ -303 \> \ct{MOISTURE_FRACTION on SURF ... exceeds theoretical limit.} \> Section~\ref{info:vegetation} \\ +303 \> \ct{MOISTURE_CONTENT on SURF ... exceeds theoretical limit.} \> Section~\ref{info:vegetation} \\ 304 \> \ct{SURF ... One layer only for TGA_ANALYSIS=T.} \> Section~\ref{info:TGA_DSC_MCC} \\ 305 \> \ct{SURF ... indicates a level set simulation ...} \> Section~\ref{info:level_set} \\ 306 \> \ct{SURF ... cannot have a specified flux and a MATL_ID.} \> Section~\ref{info:MASS_FLUX} \\ diff --git a/Manuals/FDS_Validation_Guide/Burning_Rate_Chapter.tex b/Manuals/FDS_Validation_Guide/Burning_Rate_Chapter.tex index 58130e6a085..fadd772831f 100644 --- a/Manuals/FDS_Validation_Guide/Burning_Rate_Chapter.tex +++ b/Manuals/FDS_Validation_Guide/Burning_Rate_Chapter.tex @@ -1364,10 +1364,12 @@ \subsection{NIST/NRC Parallel Panel Experiments} The figures below contain predictions of the burning rate of various plastics in a parallel panel apparatus described in Sec.~\ref{NIST_NRC_Parallel_Panels_Description}. \begin{figure}[!ht] -\centering -\includegraphics[height=2.15in]{SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/PMMA_60_kW} \\ +\begin{tabular*}{\textwidth}{l@{\extracolsep{\fill}}r} +\includegraphics[height=2.15in]{SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/PMMA_60_kW} & \includegraphics[height=2.15in]{SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/PBT_60_kW} \\ -\includegraphics[height=2.15in]{SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/PVC_60_kW} +\includegraphics[height=2.15in]{SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/PVC_60_kW} & +\includegraphics[height=2.15in]{SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/WRC_60_kW} +\end{tabular*} \caption[NIST/NRC Parallel Panels experiments]{NIST/NRC Parallel Panels experiments.} \label{NIST_NRC_PP_HRR} \end{figure} diff --git a/Manuals/FDS_Validation_Guide/Experiment_Chapter.tex b/Manuals/FDS_Validation_Guide/Experiment_Chapter.tex index 34bef5c513d..d59b7494d8a 100644 --- a/Manuals/FDS_Validation_Guide/Experiment_Chapter.tex +++ b/Manuals/FDS_Validation_Guide/Experiment_Chapter.tex @@ -2037,7 +2037,7 @@ \subsubsection{Modeling Notes} \section{NIST/NRC Parallel Panel Experiments} \label{NIST_NRC_Parallel_Panels_Description} -As part of a Nuclear Regulatory Commission (NRC) research project to assess fire behavior in electrical enclosures, rate of spread and heat release rate measurements were made on various plastics lining a parallel panel apparatus. The panels were 0.6~m (2~ft) wide, 2.4~m (8~ft) tall, and separated by 0.3~m (1~ft). A 60~kW propane sand burner was positioned at the base of the two panels. Plastics tested to date include PMMA, PVC, and PBT, cut into 6.4~mm (0.25~in) thick panels. A sketch of the apparatus, originally developed by Factory Mutual, is shown in Fig.~\ref{Parallel_Panel_Sketch}. +As part of a Nuclear Regulatory Commission (NRC) research project to assess fire behavior in electrical enclosures, rate of spread and heat release rate measurements were made on various materials lining a parallel panel apparatus~\cite{Leventon:NIST_TN_2282}. The panels were 0.6~m (2~ft) wide, 2.4~m (8~ft) tall, and separated by 0.3~m (1~ft). A 60~kW propane sand burner was positioned at the base of the two panels. A sketch of the apparatus, originally developed by Factory Mutual, is shown in Fig.~\ref{Parallel_Panel_Sketch}. The Parallel Panel experiment involving black PMMA is part of the suite of cases contributed to the MaCFP (Measurements and Computation of Fire Phenomena) working group of the IAFSS. Its properties are listed in Section~\ref{NIST_Polymers_Properties}. diff --git a/Manuals/FDS_Verification_Guide/FDS_Verification_Guide.tex b/Manuals/FDS_Verification_Guide/FDS_Verification_Guide.tex index d602050bbb6..5807b618a64 100644 --- a/Manuals/FDS_Verification_Guide/FDS_Verification_Guide.tex +++ b/Manuals/FDS_Verification_Guide/FDS_Verification_Guide.tex @@ -6903,7 +6903,7 @@ \subsection{Leak Pressure Exponent (\texorpdfstring{\ct{HVAC\_leak\_exponent}}{H The first verification case involves three 1000~m$^3$ compartments that have 0.01~m$^2$ of leakage to the ambient. Each compartment is supplied with 0.16~m$^3$/s of inlet flow. The first compartment has the default values for the exponent and reference pressure, the second changes the exponent to 0.6, and the third third changes exponent and the reference pressure respectively to 0.6 and 10~Pa. The expected leakage velocities for these conditions are 160~m/s, 11.8~m/s, and 12.8~m/s. Note in the left plot of Fig.~\ref{leak_exponent_fig} that the velocities are negative because the FDS output for the leakage velocity is from the lower numbered pressure zone (in this case ambient) to the higher number (inside the compartment). Negative velocity indicates flow from inside to outside as expected. -The second case involves a steel enclosure with four localized leaks, two near the bottom and two near the top. The air flow into the compartment is ramped up slowly, and the right hand plot of Fig.~\ref{leak_exponent_fig} shows the ideal and predicted relationship between the volume flow and compartment pressure. In this case, $C_{\rm d}=0.61$, $n=0.6$, $\Delta p_{\rm ref}=1$~Pa, and $A_{\rm L,ref}=0.18$ at each of the four ``cracks.'' +The second case involves a steel e nclosure with four localized leaks, two near the bottom and two near the top. The air flow into the compartment is ramped up slowly, and the right hand plot of Fig.~\ref{leak_exponent_fig} shows the ideal and predicted relationship between the volume flow and compartment pressure. In this case, $C_{\rm d}=0.61$, $n=0.6$, $\Delta p_{\rm ref}=1$~Pa, and $A_{\rm L,ref}=0.18$ at each of the four ``cracks.'' \begin{figure}[ht] \includegraphics[height=2.2in]{SCRIPT_FIGURES/HVAC_leak_exponent} @@ -6914,6 +6914,23 @@ \subsection{Leak Pressure Exponent (\texorpdfstring{\ct{HVAC\_leak\_exponent}}{H \FloatBarrier +\section{Complex Geometry (\texorpdfstring{\ct{HVAC\_geom} and \ct{leak\_geom}} {HVAC\_geom and leak\_geom})} +Two verification cases demonstrate the usage of HVAC for complex geometry. + +\label{HVAC_geom} +In the first verification case (\ct{HVAC\_geom}), two, sealed, 1~m$^3$ compartments are separated by a common wall. An HVAC duct defined with \ct{GEOM} connects the two compartments and is given a duct velocity of 2~m/s. Two meshes are defined that divide the compartments along their centerline such that the \ct{GEOM} duct lies in each mesh. HVAC ducts are added to connect the other two ends of the compartments to ambient. The ducts have the same area as the \ct{GEOM} duct. At steady-state, all duct velocities should be the same. + +\label{leak_geom} +In the second verification case (\ct{leak\_geom}), three, sealed, 1~m$^3$ compartments are defined in a row, separated by common walls. The left domain boundary is \ct{OPEN} with one grid cell before the start of the left compartment. The left side of the left compartment has a leak path that is a \ct{VENT} on the \ct{OPEN} side and a \ct{GEOM} inside the compartment. It is defined as four grid cells and given the leak area of a single grid cell. The right side of the left compartment has two leak paths connecting to the left side of the middle compartment. One path is defined with two \ct{VENT} inputs and the other with two \ct{GEOM} inputs. These are each defined with two grid cells and given half of the area of the first leak path. The right side of the middle compartment is connected to the left side of the right compartment with a leak path that is a \ct{GEOM} in the middle compartment and a \ct{VENT} in the right. It has the size and leak area as the first leak path. Combined these leak paths represent all combinations of \ct{VENT} and \ct{GEOM}. The right side of the right compartment has a single grid cell exhaust \ct{VENT}. At steady-state all four leak paths should have the same velocity. + +\begin{figure}[ht] + \includegraphics[height=2.2in]{SCRIPT_FIGURES/HVAC_geom} + \includegraphics[height=2.2in]{SCRIPT_FIGURES/leak_geom} + \caption[The HVAC + complex geometry cases]{(Left) Results of the \ct{HVAC\_geom} case. (Right) Results of the \ct{leak\_geom} case.} + \label{HVAC_geom_fig} +\end{figure} + +\FloatBarrier \section{ASHRAE Sample Problem 7\\(\texorpdfstring{\ct{ashrae\_7\_fixed\_flow}}{ashrae\_7\_fixed\_flow}, \texorpdfstring{\ct{ashrae\_7\_quadratic}}{ashrae\_7\_quadratic}, \texorpdfstring{\ct{ashrae\_7\_table}}{ashrae\_7\_table})} \label{ashrae7} diff --git a/Source/func.f90 b/Source/func.f90 index 4079d070bbd..2c9b640b4e4 100644 --- a/Source/func.f90 +++ b/Source/func.f90 @@ -3919,7 +3919,7 @@ SUBROUTINE PACK_CFACE(NM,OS,CFA,SURF_INDEX,RC,IC,LC,UNPACK_IT,COUNT_ONLY,CHECK_B ! Assign integer pointers and values IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC),CFA%SURF_INDEX,UNPACK_IT) -IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC),CFA%VENT_INDEX,UNPACK_IT) +IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC),CFA%NODE_INDEX,UNPACK_IT) IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC),CFA%BOUNDARY_TYPE,UNPACK_IT) IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC),CFA%CUT_FACE_IND1,UNPACK_IT) IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC),CFA%CUT_FACE_IND2,UNPACK_IT) @@ -4377,6 +4377,7 @@ SUBROUTINE PACK_BOUNDARY_PROP2(NM,IC,RC,OS,B2_INDEX,UNPACK_IT,COUNT_ONLY) RC=RC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(RC),B2%Y_PLUS,UNPACK_IT) RC=RC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(RC),B2%Z_STAR,UNPACK_IT) RC=RC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(RC),B2%PHI_LS,UNPACK_IT) +RC=RC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(RC),B2%TAU_LS,UNPACK_IT) RC=RC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(RC),B2%WORK1,UNPACK_IT) RC=RC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(RC),B2%WORK2,UNPACK_IT) RC=RC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(RC),B2%WORK3,UNPACK_IT) diff --git a/Source/geom.f90 b/Source/geom.f90 index 2c01d6265e1..eea51478dd1 100644 --- a/Source/geom.f90 +++ b/Source/geom.f90 @@ -4331,42 +4331,39 @@ SUBROUTINE GET_EXT_INB_CUTFACES_TO_CFACE CALL POINT_TO_MESH(NM) ! ! Currently : Modify CFACE SURF_INDEX with VENT information: This needs more development. - IF(TERRAIN_CASE) THEN - VENT_LOOP : DO IVENT=1,MESHES(NM)%N_VENT - VT => VENTS(IVENT) - IF(.NOT.VT%GEOM) CYCLE VENT_LOOP ! Do not apply vent to Geometries. - - ! This test is a simplified test for VENTS changing the CFACE SURF_ID to VENT SURF_ID for all CFACEs whose - ! centroid locations lay within the frame of the IOR grid aligned VENT: - ADDMAT = 0._EB; - SELECT CASE(ABS(VT%IOR)) - CASE(IAXIS) - ADDMAT(IAXIS,LOW_IND) = -(XF_MAX-XS_MIN) ! -DX(VT%I1) Set normal size to 2 times domain size. - ADDMAT(IAXIS,HIGH_IND) = (XF_MAX-XS_MIN) ! DX(VT%I2) XF_MAX, etc. defined in cons.f90. - CASE(JAXIS) - ADDMAT(JAXIS,LOW_IND) = -(YF_MAX-YS_MIN) ! -DY(VT%J1) - ADDMAT(JAXIS,HIGH_IND) = (YF_MAX-YS_MIN) ! DY(VT%J2) - CASE(KAXIS) - ADDMAT(KAXIS,LOW_IND) = -(ZF_MAX-ZS_MIN) ! -DZ(VT%K1) - ADDMAT(KAXIS,HIGH_IND) = (ZF_MAX-ZS_MIN) ! DZ(VT%K2) - CASE DEFAULT - CYCLE VENT_LOOP - END SELECT - ! CFACE Loop to modify SURF_INDEX in INTERNAL_CFACE_CELLS: - CFACE_LOOP_2 : DO CFACE_INDEX_LOCAL=INTERNAL_CFACE_CELLS_LB+1,INTERNAL_CFACE_CELLS_LB+N_INTERNAL_CFACE_CELLS - CFA => CFACE(CFACE_INDEX_LOCAL) - BC => BOUNDARY_COORD(CFA%BC_INDEX) - IF (BC%X < X(VT%I1)+ADDMAT(IAXIS,LOW_IND )) CYCLE CFACE_LOOP_2 - IF (BC%X > X(VT%I2)+ADDMAT(IAXIS,HIGH_IND)) CYCLE CFACE_LOOP_2 - IF (BC%Y < Y(VT%J1)+ADDMAT(JAXIS,LOW_IND )) CYCLE CFACE_LOOP_2 - IF (BC%Y > Y(VT%J2)+ADDMAT(JAXIS,HIGH_IND)) CYCLE CFACE_LOOP_2 - IF (BC%Z < Z(VT%K1)+ADDMAT(KAXIS,LOW_IND )) CYCLE CFACE_LOOP_2 - IF (BC%Z > Z(VT%K2)+ADDMAT(KAXIS,HIGH_IND)) CYCLE CFACE_LOOP_2 - CFA%VENT_INDEX = IVENT - CFA%SURF_INDEX = VT%SURF_INDEX - ENDDO CFACE_LOOP_2 - ENDDO VENT_LOOP - ENDIF + + VENT_LOOP : DO IVENT=1,MESHES(NM)%N_VENT + VT => VENTS(IVENT) + IF(.NOT.VT%GEOM) CYCLE VENT_LOOP ! Do not apply vent to Geometries. + + ! This test is a simplified test for VENTS changing the CFACE SURF_ID to VENT SURF_ID for all CFACEs whose + ! centroid locations lay within the frame of the IOR grid aligned VENT: + ADDMAT = 0._EB; + SELECT CASE(ABS(VT%IOR)) + CASE(IAXIS) + ADDMAT(IAXIS,LOW_IND) = -(XF_MAX-XS_MIN) ! -DX(VT%I1) Set normal size to 2 times domain size. + ADDMAT(IAXIS,HIGH_IND) = (XF_MAX-XS_MIN) ! DX(VT%I2) XF_MAX, etc. defined in cons.f90. + CASE(JAXIS) + ADDMAT(JAXIS,LOW_IND) = -(YF_MAX-YS_MIN) ! -DY(VT%J1) + ADDMAT(JAXIS,HIGH_IND) = (YF_MAX-YS_MIN) ! DY(VT%J2) + CASE(KAXIS) + ADDMAT(KAXIS,LOW_IND) = -(ZF_MAX-ZS_MIN) ! -DZ(VT%K1) + ADDMAT(KAXIS,HIGH_IND) = (ZF_MAX-ZS_MIN) ! DZ(VT%K2) + END SELECT + ! CFACE Loop to modify SURF_INDEX in INTERNAL_CFACE_CELLS: + CFACE_LOOP_2 : DO CFACE_INDEX_LOCAL=INTERNAL_CFACE_CELLS_LB+1,INTERNAL_CFACE_CELLS_LB+N_INTERNAL_CFACE_CELLS + CFA => CFACE(CFACE_INDEX_LOCAL) + BC => BOUNDARY_COORD(CFA%BC_INDEX) + IF (BC%X < X(VT%I1)+ADDMAT(IAXIS,LOW_IND )) CYCLE CFACE_LOOP_2 + IF (BC%X > X(VT%I2)+ADDMAT(IAXIS,HIGH_IND)) CYCLE CFACE_LOOP_2 + IF (BC%Y < Y(VT%J1)+ADDMAT(JAXIS,LOW_IND )) CYCLE CFACE_LOOP_2 + IF (BC%Y > Y(VT%J2)+ADDMAT(JAXIS,HIGH_IND)) CYCLE CFACE_LOOP_2 + IF (BC%Z < Z(VT%K1)+ADDMAT(KAXIS,LOW_IND )) CYCLE CFACE_LOOP_2 + IF (BC%Z > Z(VT%K2)+ADDMAT(KAXIS,HIGH_IND)) CYCLE CFACE_LOOP_2 + CFA%VENT_INDEX = IVENT + CFA%SURF_INDEX = VT%SURF_INDEX + ENDDO CFACE_LOOP_2 + ENDDO VENT_LOOP ENDDO MESH_LOOP_2 ! - At this pont all final values of SURF_INDEX have been given to CFACEs. @@ -8881,6 +8878,8 @@ SUBROUTINE INIT_CFACE_CELL(NM,ICF,IFACE,CFACE_INDEX,SURF_INDEX,STAGE_FLG,IS_INB, B1 => M%BOUNDARY_PROP1(CFA%B1_INDEX) CFA%SURF_INDEX = SURF_INDEX + CFA%NODE_INDEX = SURFACE(SURF_INDEX)%NODE_INDEX + B1%NODE_INDEX = CFA%NODE_INDEX BC%X = CF%XYZCEN(IAXIS,IFACE) BC%Y = CF%XYZCEN(JAXIS,IFACE) @@ -8894,10 +8893,6 @@ SUBROUTINE INIT_CFACE_CELL(NM,ICF,IFACE,CFACE_INDEX,SURF_INDEX,STAGE_FLG,IS_INB, INS_INB_COND_1 : IF (IS_INB) THEN B1%VEL_ERR_NEW=CF%VEL(IFACE) - 0._EB ! Assumes zero velocity of solid. - IBOD = CF%BODTRI(1,IFACE) - IWSEL = CF%BODTRI(2,IFACE) - CFA%VENT_INDEX = GEOMETRY(IBOD)%VENTS(IWSEL) - ! Normal to cut-face: V2(IAXIS:KAXIS) = CF%XYZVERT(IAXIS:KAXIS,CF%CFELEM(2,IFACE))-CF%XYZCEN(IAXIS:KAXIS,IFACE) V3(IAXIS:KAXIS) = CF%XYZVERT(IAXIS:KAXIS,CF%CFELEM(3,IFACE))-CF%XYZCEN(IAXIS:KAXIS,IFACE) @@ -8905,6 +8900,8 @@ SUBROUTINE INIT_CFACE_CELL(NM,ICF,IFACE,CFACE_INDEX,SURF_INDEX,STAGE_FLG,IS_INB, IF(NORM2(BC%NVEC)>TWO_EPSILON_EB .AND. CF%CFACE_ORIGIN(IFACE)==BLOCKED_SPLIT_CELL) THEN BC%NVEC(IAXIS:KAXIS) = BC%NVEC(IAXIS:KAXIS)/NORM2(BC%NVEC) ELSE + IBOD =CF%BODTRI(1,IFACE) + IWSEL=CF%BODTRI(2,IFACE) BC%NVEC(IAXIS:KAXIS) = GEOMETRY(IBOD)%FACES_NORMAL(IAXIS:KAXIS,IWSEL) ENDIF X1AXIS = MAXLOC(ABS(BC%NVEC(IAXIS:KAXIS)),DIM=1) @@ -8937,6 +8934,7 @@ SUBROUTINE INIT_CFACE_CELL(NM,ICF,IFACE,CFACE_INDEX,SURF_INDEX,STAGE_FLG,IS_INB, ! External mesh boundary CFACES inherit the underlaying WALL type. CFA%BOUNDARY_TYPE = WC%BOUNDARY_TYPE + CFA%NODE_INDEX = SURFACE(WC%SURF_INDEX)%NODE_INDEX CFA%VENT_INDEX = WC%VENT_INDEX BC%II = WC_BC%II @@ -22194,10 +22192,10 @@ SUBROUTINE READ_GEOM CHARACTER(LABEL_LENGTH) :: ID,MATL_ID,TEXTURE_MAPPING, & DEVC_ID,CTRL_ID,SURF_IDS(3),SURF_ID6(6),MOVE_ID CHARACTER(MESSAGE_LENGTH) :: BUFFER,FN_BINGEOM,BINARY_FILE -CHARACTER(LABEL_LENGTH), ALLOCATABLE, DIMENSION(:) :: SURF_ID,VENT_ID +CHARACTER(LABEL_LENGTH), ALLOCATABLE, DIMENSION(:) :: SURF_ID REAL(EB), ALLOCATABLE, DIMENSION(:) :: ZVALS,TFACES REAL(EB), ALLOCATABLE, TARGET, DIMENSION(:) :: VERTS,VERTS_AUX -INTEGER, ALLOCATABLE, DIMENSION(:) :: SURF_ID_IND,VENT_ID_IND,POLY +INTEGER, ALLOCATABLE, DIMENSION(:) :: SURF_ID_IND,POLY INTEGER, ALLOCATABLE, TARGET, DIMENSION(:) :: FACES,FACES_AUX,VOLUS,OFACES,SURFS,SURFS2 LOGICAL, ALLOCATABLE, DIMENSION(:) :: IS_EXTERNAL @@ -22212,7 +22210,7 @@ SUBROUTINE READ_GEOM GEOM_TYPE,NXB,IJK(3),N_LEVELS,N_LAT,N_LONG,SPHERE_TYPE,BOXVERTLIST(8),NI,NIJ,IVOL,SORT_FACES,II,II1,II2,II3,& X1AXIS,NNN,CYLINDER_NSEG_THETA,CYLINDER_NSEG_AXIS,CYL_FIND(LOW_IND:HIGH_IND,1:3),CELL_BLOCK_IOR -LOGICAL :: HAVE_SURF,HAVE_VENT,HAVE_MATL,IN_LIST,SURF_INDEX_PER_FACE,BNDF_GEOM,LOGTEST +LOGICAL :: HAVE_SURF,HAVE_MATL,IN_LIST,SURF_INDEX_PER_FACE,BNDF_GEOM,LOGTEST REAL(EB), POINTER, DIMENSION(:) :: V1,V2,V3,V4 INTEGER, POINTER, DIMENSION(:) :: FACEI,FACEJ,FACE_FROM,FACE_TO,VOL TYPE(MESH_TYPE), POINTER :: M @@ -22255,7 +22253,7 @@ SUBROUTINE READ_GEOM CYLINDER_RADIUS,CYLINDER_LENGTH,CYLINDER_NSEG_THETA,CYLINDER_NSEG_AXIS,& EXTRUDE,EXTEND_TERRAIN,FACES,ID,IJK,IS_TERRAIN,MOVE_ID,N_LAT,N_LEVELS,N_LONG,POLY,& RGB,SPHERE_ORIGIN,SPHERE_RADIUS,SPHERE_TYPE,SURF_ID,SURF_IDS,SURF_ID6,& - TEXTURE_MAPPING,TEXTURE_ORIGIN,TEXTURE_SCALE,TRANSPARENCY,VENT_ID,& + TEXTURE_MAPPING,TEXTURE_ORIGIN,TEXTURE_SCALE,TRANSPARENCY,& VERTS,XB,ZMIN,ZVALS,ZVAL_HORIZON ! first pass - count number of &GEOM lines. @@ -23346,8 +23344,6 @@ SUBROUTINE READ_GEOM ENDDO ALLOCATE(G%SURF_ID(1:N_SURF_ID)) G%SURF_ID(1:N_SURF_ID) = SURF_ID(1:N_SURF_ID) - ALLOCATE(G%VENT_ID(1:N_SURF_ID)) - G%VENT_ID(1:N_SURF_ID) = VENT_ID(1:N_SURF_ID) ! Now find correspondence with SURFACE(N)%ID: IF (ALLOCATED(SURF_ID_IND)) DEALLOCATE(SURF_ID_IND) @@ -23364,41 +23360,12 @@ SUBROUTINE READ_GEOM IF(.NOT.IN_LIST) THEN WRITE(MESSAGE,'(A,I4,3A)') 'ERROR(716): problem with GEOM, the surface ID(',I,') =',& TRIM(SURF_ID(I)),' is not defined.' - CALL SHUTDOWN(MESSAGE) + CALL SHUTDOWN(MESSAGE); RETURN ENDIF ENDDO ENDIF G%HAVE_SURF = HAVE_SURF - ! Look for non-'null' VENTS: - HAVE_VENT=.FALSE. - DO I = 1, MAX_SURF_IDS - IF (TRIM(VENT_ID(I))=='null') CYCLE - HAVE_VENT=.TRUE. - ENDDO - G%HAVE_VENT = HAVE_VENT - - IF(HAVE_VENT) THEN - ! Build single VENT_ID index list: - IF (ALLOCATED(VENT_ID_IND)) DEALLOCATE(VENT_ID_IND); ALLOCATE(VENT_ID_IND(0:MAX_SURF_IDS)); VENT_ID_IND = 0 - DO I = 1, MAX_SURF_IDS ! Here we run over the GEOM local vent array max range. - IF (TRIM(VENT_ID(I))=='null') CYCLE ! Cycle if undefined vent, its VENT_ID_IND(I)=0. - ! Get VENT Index: - IN_LIST = .FALSE. - DO J = 1, N_VENT - IF (TRIM(VENT_ID(I))/=TRIM(VENTS(J)%ID)) CYCLE - VENT_ID_IND(I)=J - IN_LIST = .TRUE. - EXIT - ENDDO - IF(.NOT.IN_LIST) THEN - WRITE(MESSAGE,'(A,I4,3A)') 'ERROR(735): problem with GEOM, the vent ID(',I,') =',& - TRIM(VENT_ID(I)),' is not defined.' - CALL SHUTDOWN(MESSAGE) - ENDIF - ENDDO - ENDIF - IF (MATL_ID=='null') THEN HAVE_MATL = .FALSE. ENDIF @@ -23691,10 +23658,6 @@ SUBROUTINE READ_GEOM ALLOCATE(G%SURFS(N_FACES),STAT=IZERO) CALL ChkMemErr('READ_GEOM','G%SURFS',IZERO) - ALLOCATE(G%VENTS(N_FACES),STAT=IZERO) - CALL ChkMemErr('READ_GEOM','G%VENTS',IZERO) - G%VENTS = 0 - PER_FACE_IF: IF (SURF_INDEX_PER_FACE) THEN DO I=1,N_FACES IF ( SURFS(I) <= 0 ) THEN @@ -23702,10 +23665,6 @@ SUBROUTINE READ_GEOM ELSE G%SURFS(I) = SURF_ID_IND(SURFS(I)) ENDIF - IF (HAVE_VENT) THEN - G%VENTS(I) = VENT_ID_IND(SURFS(I)) ! Uses SURF index in local numeration from FACES input. - IF(G%VENTS(I)>0) G%SURFS(I) = VENTS(G%VENTS(I))%SURF_INDEX ! Change SURF to apply to the vent surface. - ENDIF ENDDO DEALLOCATE(SURF_ID_IND) ELSE @@ -23732,26 +23691,10 @@ SUBROUTINE READ_GEOM IF (SURF_ID6(4)==SURFACE(NNN)%ID .AND. NVECI(2)> TWO_EPSILON_EB) G%SURFS(I) = NNN ! Y2 IF (SURF_ID6(5)==SURFACE(NNN)%ID .AND. NVECI(3)<-TWO_EPSILON_EB) G%SURFS(I) = NNN ! Z1 IF (SURF_ID6(6)==SURFACE(NNN)%ID .AND. NVECI(3)> TWO_EPSILON_EB) G%SURFS(I) = NNN ! Z2 - IF (HAVE_VENT) THEN - IF (SURF_ID(1)==SURFACE(NNN)%ID .AND. ANY(ABS(NVECI(:))>TWO_EPSILON_EB)) G%VENTS(I)=VENT_ID_IND(1) !all sides - IF (SURF_IDS(2)==SURFACE(NNN)%ID .AND. (ABS(NVECI(1))>TWO_EPSILON_EB .OR. ABS(NVECI(2))>TWO_EPSILON_EB) ) & - G%VENTS(I) = VENT_ID_IND(2) ! sides - IF (SURF_IDS(1)==SURFACE(NNN)%ID .AND. NVECI(3)> TWO_EPSILON_EB) G%VENTS(I) = VENT_ID_IND(1) ! top - IF (SURF_IDS(3)==SURFACE(NNN)%ID .AND. NVECI(3)<-TWO_EPSILON_EB) G%VENTS(I) = VENT_ID_IND(3) ! bottom - IF (SURF_ID6(1)==SURFACE(NNN)%ID .AND. NVECI(1)<-TWO_EPSILON_EB) G%VENTS(I) = VENT_ID_IND(1) ! X1 - IF (SURF_ID6(2)==SURFACE(NNN)%ID .AND. NVECI(1)> TWO_EPSILON_EB) G%VENTS(I) = VENT_ID_IND(2) ! X2 - IF (SURF_ID6(3)==SURFACE(NNN)%ID .AND. NVECI(2)<-TWO_EPSILON_EB) G%VENTS(I) = VENT_ID_IND(3) ! Y1 - IF (SURF_ID6(4)==SURFACE(NNN)%ID .AND. NVECI(2)> TWO_EPSILON_EB) G%VENTS(I) = VENT_ID_IND(4) ! Y2 - IF (SURF_ID6(5)==SURFACE(NNN)%ID .AND. NVECI(3)<-TWO_EPSILON_EB) G%VENTS(I) = VENT_ID_IND(5) ! Z1 - IF (SURF_ID6(6)==SURFACE(NNN)%ID .AND. NVECI(3)> TWO_EPSILON_EB) G%VENTS(I) = VENT_ID_IND(6) ! Z2 - - IF(G%VENTS(I)>0) G%SURFS(I) = VENTS(G%VENTS(I))%SURF_INDEX ! Change SURF to apply to the vent surface. - ENDIF ENDDO SURF_LOOP ENDDO FACE_LOOP ENDIF BOX_TYPE_IF ENDIF PER_FACE_IF - IF(HAVE_VENT) DEALLOCATE(VENT_ID_IND) ! Test for Unsupported surfaces: DO I=1,N_FACES @@ -23822,6 +23765,16 @@ SUBROUTINE READ_GEOM G%GEOM_BOX(HIGH_IND,X1AXIS) = MAX(G%GEOM_BOX(HIGH_IND,X1AXIS),G%VERTS(MAX_DIM*(IVERT-1)+X1AXIS)) ENDDO ENDDO + + ! Check for duct nodes + + DO J = 1,G%N_FACES + IF (SURFACE(G%SURFS(J))%NODE_ID/='null') THEN + G%HAVE_NODE = .TRUE. + EXIT + ENDIF + ENDDO + ENDDO IF(ALLOCATED(VOLUS)) DEALLOCATE(VOLUS) @@ -23836,6 +23789,7 @@ SUBROUTINE READ_GEOM IF( (T_END-T_BEGIN) < TWO_EPSILON_EB) RETURN CC_IBM = .TRUE. + ! If unstructured projection defined set Pressure solver on unstructured grid. IF (PRES_FLAG/=UGLMAT_FLAG) THEN PRES_METHOD = 'ULMAT' @@ -24333,10 +24287,6 @@ SUBROUTINE ALLOCATE_BUFFERS ALLOCATE(SURF_ID(MAX_SURF_IDS+1),STAT=IZERO) CALL ChkMemErr('ALLOCATE_BUFFERS','SURF_ID',IZERO) -IF(ALLOCATED(VENT_ID)) DEALLOCATE(VENT_ID) -ALLOCATE(VENT_ID(MAX_SURF_IDS+1),STAT=IZERO) -CALL ChkMemErr('ALLOCATE_BUFFERS','VENT_ID',IZERO) - IF(ALLOCATED(ZVALS)) DEALLOCATE(ZVALS) ALLOCATE(ZVALS(MAX_ZVALS+1),STAT=IZERO) CALL ChkMemErr('ALLOCATE_BUFFERS','ZVALS',IZERO) @@ -24371,7 +24321,6 @@ SUBROUTINE SET_GEOM_DEFAULTS ZMIN=ZS_MIN WRITE(ID,'(A,I0)') 'geom_',N SURF_ID(:)='null' - VENT_ID(:)='null' SURF_IDS = 'null' SURF_ID6 = 'null' MATL_ID = 'null' diff --git a/Source/hvac.f90 b/Source/hvac.f90 index 7a87fcf371f..63171bb2197 100644 --- a/Source/hvac.f90 +++ b/Source/hvac.f90 @@ -38,7 +38,7 @@ MODULE HVAC_ROUTINES LOGICAL :: DUCT_NODE_INIT !< Flag indicating duct nodes have been initialized LOGICAL :: TRANSPORT_PARTICLES !< Flag indicating particles should be transferred across a localized leak path -PUBLIC HVAC_CALC,READ_HVAC,PROC_HVAC,HVAC_BC_IN,FIND_NETWORKS,COLLAPSE_HVAC_BC,SET_INIT_HVAC,INIT_DUCT_NODE +PUBLIC HVAC_CALC,READ_HVAC,PROC_HVAC,HVAC_BC_IN,FIND_NETWORKS,COLLAPSE_HVAC_BC,SET_INIT_HVAC,INIT_DUCT_NODE,LEAKAGE_HVAC REAL(EB),PUBLIC, ALLOCATABLE, DIMENSION(:):: NODE_AREA_EX !< Contain sum of area over all MESHES of all VENTs assigned to each NODE REAL(EB),PUBLIC, ALLOCATABLE, DIMENSION(:):: NODE_TMP_EX @@ -118,6 +118,8 @@ SUBROUTINE READ_HVAC LOGICAL :: DAMPER !< Flag indicating that a damper is present in a DUCT. LOGICAL :: REVERSE !< Flag indicating that a specfied flow or FAN in a DUCT is from the second to the first node. LOGICAL :: AMBIENT !< Flag indicating a DUCTNODE is connected to the ambient. +LOGICAL :: GEOM !< Flag indicating a DUCTNODE or LEAKAGE VENT_ID is connected to GEOM. +LOGICAL :: GEOM2 !< Flag indicating LEAKAGE VENT2_ID is connected to GEOM. LOGICAL :: LEAK_ENTHALPY !< Flag indicating that the boundary condition for a LEAKAGE duct should preserve enthalpy. LOGICAL :: INITIALIZED_HVAC_MASS_TRANSPORT !< Flag indicating DUCTs with N_CELLS>1 have been initiazed. LOGICAL :: DUCT_QUANTITY_DEFINED=.FALSE. !< Flag indicating a DUCT_QUANTITY list has alreayd been defined @@ -144,7 +146,7 @@ SUBROUTINE READ_HVAC TYPE(HVAC_QUANTITY_TYPE), POINTER :: HQT !< Pointer to a DUCT_ or NODE_QUANTITY_ARRAY NAMELIST /HVAC/ AIRCOIL_ID,AMBIENT,AREA,CLEAN_LOSS,COOLANT_SPECIFIC_HEAT,COOLANT_MASS_FLOW,COOLANT_TEMPERATURE,CTRL_ID,& DAMPER,DEBUG,DEVC_ID,DIAMETER,DISCHARGE_COEFFICIENT,DUCT_ID,& - EFFICIENCY,FAN_ID,FILTER_ID,FIXED_Q,ID,LEAK_ENTHALPY,LEAK_PRESSURE_EXPONENT,LEAK_REFERENCE_PRESSURE,& + EFFICIENCY,FAN_ID,FILTER_ID,FIXED_Q,GEOM,GEOM2,ID,LEAK_ENTHALPY,LEAK_PRESSURE_EXPONENT,LEAK_REFERENCE_PRESSURE,& LENGTH,LOADING,LOADING_MULTIPLIER,LOSS,& MASS_FLOW,MAX_FLOW,MAX_PRESSURE,N_CELLS,NETWORK_ID,NODE_ID,PERIMETER,QUANTITY,QUANTITY_SPEC_ID,& RAMP_ID,RAMP_LOSS,REVERSE,ROUGHNESS,ROUND,SPEC_ID,SQUARE,TAU_AC,TAU_FAN,TAU_VF,TRANSPORT_PARTICLES,& @@ -428,18 +430,24 @@ SUBROUTINE READ_HVAC CALL SHUTDOWN(MESSAGE); RETURN ENDIF DN%VENT_ID = VENT_ID + DN%GEOM = GEOM + IF (DN%VENT .AND. DN%GEOM) THEN + WRITE(MESSAGE,'(A,A,A,A)') 'ERROR(yyy): Problem with ductnode:',TRIM(DN%ID), & + ', cannot assign to both VENT and GEOM.' + CALL SHUTDOWN(MESSAGE); RETURN + ENDIF DN%READ_IN = .TRUE. IF (TRIM(VENT_ID)/='null') DN%VENT=.TRUE. ! Set temporary node elevation for vents so WIND can establish T and P RAMPs - IF (DN%VENT .AND. XYZ(3) <-1.E9) XYZ(3) = ZS_MIN - IF (.NOT. DN%VENT .AND. XYZ(3)<-1.E9) THEN + IF ((DN%VENT .OR. DN%GEOM).AND. XYZ(3) <-1.E9) XYZ(3) = ZS_MIN + IF (.NOT. (DN%VENT .OR. DN%GEOM) .AND. XYZ(3)<-1.E9) THEN WRITE(MESSAGE,'(A,A,A,I5)') 'ERROR(514): Ambient or internal ductnode requires an elevation, XYZ(3). Ductnode ID:',& TRIM(DN%ID),', HVAC line number:',NN CALL SHUTDOWN(MESSAGE); RETURN ENDIF DN%XYZ = XYZ - IF (ALL(DN%XYZ>-1.E9) .OR. DN%VENT) DN%SPECIFIED_XYZ = .TRUE. - IF (.NOT. DN%VENT) THEN + IF (ALL(DN%XYZ>-1.E9) .OR. DN%VENT .OR. DN%GEOM) DN%SPECIFIED_XYZ = .TRUE. + IF (.NOT. (DN%VENT .OR. DN%GEOM)) THEN IF (DN%XYZ(1) <=-1.E9_EB) DN%XYZ(1) = XS_MIN IF (DN%XYZ(2) <=-1.E9_EB) DN%XYZ(2) = YS_MIN ENDIF @@ -448,13 +456,13 @@ SUBROUTINE READ_HVAC IF (NODE_DUCT_A(I_DUCTNODE,ND) == 'null') EXIT DN%N_DUCTS=ND ENDDO - IF (DN%N_DUCTS == 1 .AND. .NOT. AMBIENT .AND. VENT_ID=='null') THEN + IF (DN%N_DUCTS == 1 .AND. .NOT. GEOM .AND. .NOT. AMBIENT .AND. VENT_ID=='null') THEN WRITE(MESSAGE,'(A,A,A,I5)') 'ERROR(515): Non-AMBIENT or non VENT-connected ductnode must have >=2 ducts. Ductnode ID:',& TRIM(DN%ID),', HVAC line number:',NN CALL SHUTDOWN(MESSAGE); RETURN ENDIF - IF (DN%N_DUCTS >= 2 .AND. (AMBIENT .OR. VENT_ID/='null')) THEN - WRITE(MESSAGE,'(A,A,A,I5)') 'ERROR(516): AMBIENT or VENT-connected ductnode must have 1 duct. Ductnode ID:',& + IF (DN%N_DUCTS >= 2 .AND. (AMBIENT .OR. GEOM .OR. VENT_ID/='null')) THEN + WRITE(MESSAGE,'(A,A,A,I5)') 'ERROR(516): AMBIENT, GEOM, or VENT-connected ductnode must have 1 duct. Ductnode ID:',& TRIM(DN%ID),', HVAC line number:',NN CALL SHUTDOWN(MESSAGE); RETURN ENDIF @@ -583,12 +591,21 @@ SUBROUTINE READ_HVAC WRITE(MESSAGE,'(A,I5)') 'ERROR(527): Localized leakage has no ID, HVAC line number:',NN CALL SHUTDOWN(MESSAGE); RETURN ENDIF - DN%VENT_ID = VENT_ID - DN%VENT=.TRUE. + IF (GEOM) THEN + DN%GEOM = .TRUE. + IF (TRIM(DN%VENT_ID)=='AMBIENT') THEN + WRITE(MESSAGE,'(A,A,A,I5)') 'ERROR(yyy): VENT_ID for leakage cannot be AMBIENT if GEOM is set. Leak ID:',TRIM(ID),& + ', HVAC line number:',NN + CALL SHUTDOWN(MESSAGE); RETURN + ENDIF + ELSE + DN%VENT_ID = VENT_ID + DN%VENT=.TRUE. + ENDIF DN%NETWORK_ID='LEAK' DN%READ_IN = .FALSE. DN%TRANSPORT_PARTICLES = TRANSPORT_PARTICLES - IF (TRIM(DN%VENT_ID)=='null') THEN + IF (TRIM(DN%VENT_ID)=='null' .AND. .NOT. GEOM) THEN WRITE(MESSAGE,'(A,A,A,I5)') 'ERROR(528): Leakage path must have VENT_ID defined. Leak ID:',TRIM(ID),& ', HVAC line number:',NN CALL SHUTDOWN(MESSAGE); RETURN @@ -607,12 +624,22 @@ SUBROUTINE READ_HVAC NODE_FILTER_A(I_DUCTNODE) = 'null' DN => DUCTNODE(I_DUCTNODE) DN%ID = VENT2_ID - DN%VENT_ID = VENT2_ID + IF (GEOM2) THEN + DN%GEOM = .TRUE. + IF (TRIM(DN%VENT_ID)=='AMBIENT') THEN + WRITE(MESSAGE,'(A,A,A,I5)') 'ERROR(yyy): VENT2_ID for leakage cannot be AMBIENT if GEOM2 is set. Leak ID:',& + TRIM(ID),', HVAC line number:',NN + CALL SHUTDOWN(MESSAGE); RETURN + ENDIF + ELSE + DN%VENT_ID = VENT2_ID + DN%VENT=.TRUE. + ENDIF DN%VENT=.TRUE. DN%NETWORK_ID='LEAK' DN%READ_IN = .FALSE. DN%TRANSPORT_PARTICLES = TRANSPORT_PARTICLES - IF (TRIM(VENT2_ID)=='null') THEN + IF (TRIM(VENT2_ID)=='null' .AND. .NOT. GEOM2) THEN WRITE(MESSAGE,'(A,A,A,I2)') 'ERROR(530): Leakage path must have VENT2_ID defined. Leak ID:',TRIM(ID),& ', HVAC line number:',NN CALL SHUTDOWN(MESSAGE); RETURN @@ -741,6 +768,8 @@ SUBROUTINE SET_HVAC_DEFAULTS FAN_ID = 'null' FIXED_Q = -1.E10_EB FILTER_ID = 'null' +GEOM = .FALSE. +GEOM2 = .FALSE. LEAK_ENTHALPY = .FALSE. LEAK_PRESSURE_EXPONENT = 0.5_EB LEAK_REFERENCE_PRESSURE = 4._EB @@ -793,20 +822,21 @@ SUBROUTINE PROC_HVAC #else USE MPI_F08 #endif -INTEGER :: N,ND,ND2,NM,NN,NF,NV,IERR +INTEGER :: N,ND,ND2,NM,NN,NF,NV,IERR,NG,FI(3) REAL(EB) :: TNOW !< Current CPU time (s) used in computing length of time spent in HVAC routines. REAL(EB) :: ZZ_GET(1:N_TRACKED_SPECIES) !< Species mass fraction array +REAL(EB) :: CF_AREA(N_DUCTNODES),CF_X(N_DUCTNODES),CF_Y(N_DUCTNODES),CF_Z(N_DUCTNODES),AREA,X,Y,Z,XYZ_F(3,3) LOGICAL :: FOUND !< Flag indicating search loop has found the HVAC component assocaited with an ID LOGICAL :: DUMMY = .FALSE. !< Dummy flag TYPE (LAGRANGIAN_PARTICLE_CLASS_TYPE),DIMENSION(:), POINTER:: TEMPALLOC TYPE(DUCTNODE_TYPE), POINTER :: DN TYPE(DUCT_TYPE), POINTER :: DU TYPE(SURFACE_TYPE), POINTER :: SF +TYPE(GEOMETRY_TYPE), POINTER :: G TNOW=CURRENT_TIME() IF (.NOT. HVAC_SOLVE) RETURN -IF (LEAK_DUCTS > 0) CALL LEAKAGE_HVAC DUCT_LOOP: DO ND = 1, N_DUCTS DU => DUCT(ND) @@ -960,8 +990,6 @@ SUBROUTINE PROC_HVAC ! If the duct node has a VENT associated with it, find it IF (DN%VENT_ID /= 'null') THEN - ALLOCATE(DN%IN_MESH(NMESHES)) - DN%IN_MESH=.FALSE. FOUND = .FALSE. MESH_LOOP: DO NM = 1, NMESHES IF (PROCESS(NM)/=MY_RANK) CYCLE MESH_LOOP ! Only search meshes controlled by the current MPI process @@ -1004,7 +1032,6 @@ SUBROUTINE PROC_HVAC CALL SHUTDOWN(MESSAGE,PROCESS_0_ONLY=.FALSE.) ENDIF ENDIF - DN%IN_MESH(NM) = .TRUE. MESHES(NM)%VENTS(NV)%NODE_INDEX=NN ! Sets node to VENT center based on XB. This value will be used for Smokeview visualization. These values ! will be modified as needed during the run to reflect the actual area of the VENT that is visible. @@ -1014,10 +1041,11 @@ SUBROUTINE PROC_HVAC EXIT NODE_VENT_LOOP ENDIF ENDDO NODE_VENT_LOOP + IF (.NOT. FOUND) DN%XYZ = -1.E11_EB ENDDO MESH_LOOP - - ! Check if any MPI process has FOUND the VENT + + ! Check if any MPI process has FOUND the VENT IF (N_MPI_PROCESSES>1) CALL MPI_ALLREDUCE(MPI_IN_PLACE,STOP_STATUS,INTEGER_ONE,MPI_INTEGER,MPI_MAX,MPI_COMM_WORLD,IERR) @@ -1033,21 +1061,67 @@ SUBROUTINE PROC_HVAC CALL MPI_ALLREDUCE(MPI_IN_PLACE,DN%XYZ(3),INTEGER_ONE,MPI_DOUBLE_PRECISION,MPI_MAX,MPI_COMM_WORLD,IERR) ENDIF - IF (DN%VENT .AND. DN%AMBIENT) THEN - WRITE(MESSAGE,'(A,I5,A,A)') 'ERROR(546): DuctnodeE cannot be AMBIENT and have an assigned VENT_ID. Ductnode:',NN,& +ENDDO NODE_LOOP + +GEOM_IF: IF (N_GEOMETRY > 0 .AND. ANY(SURFACE%NODE_INDEX>0)) THEN + CF_AREA = 0._EB + CF_X = 0._EB + CF_Y = 0._EB + CF_Z = 0._EB + NODE_GEOM_LOOP: DO NG=1,N_GEOMETRY + G=>GEOMETRY(NG) + IF (.NOT. G%HAVE_NODE) CYCLE + FACES_LOOP: DO NF=1,G%N_FACES + SF=>SURFACE(G%SURFS(NF)) + IF (SF%NODE_INDEX==0) CYCLE FACES_LOOP + FI(1:3) = G%FACES((NF-1)*3+1:(NF-1)*3+3) + XYZ_F(1,1:3) = G%VERTS((FI(1)-1)*3+1:(FI(1)-1)*3+3) + XYZ_F(2,1:3) = G%VERTS((FI(2)-1)*3+1:(FI(2)-1)*3+3) + XYZ_F(3,1:3) = G%VERTS((FI(3)-1)*3+1:(FI(3)-1)*3+3) + AREA = SQRT(((XYZ_F(2,2)-XYZ_F(1,2))*(XYZ_F(3,3)-XYZ_F(1,3))-(XYZ_F(2,3)-XYZ_F(1,3))*(XYZ_F(3,2)-XYZ_F(1,2)))**2 + & + ((XYZ_F(2,3)-XYZ_F(1,3))*(XYZ_F(3,1)-XYZ_F(1,1))-(XYZ_F(2,1)-XYZ_F(1,1))*(XYZ_F(3,3)-XYZ_F(1,3)))**2 + & + ((XYZ_F(2,1)-XYZ_F(1,1))*(XYZ_F(3,2)-XYZ_F(3,1))-(XYZ_F(2,2)-XYZ_F(1,2))*(XYZ_F(3,1)-XYZ_F(1,1)))**2) * 0.5_EB + X = SUM(XYZ_F(:,1))*ONTH + Y = SUM(XYZ_F(:,2))*ONTH + Z = SUM(XYZ_F(:,3))*ONTH + CF_AREA(SF%NODE_INDEX) = CF_AREA(SF%NODE_INDEX) + AREA + CF_X(SF%NODE_INDEX) = CF_X(SF%NODE_INDEX) + X*AREA + CF_Y(SF%NODE_INDEX) = CF_Y(SF%NODE_INDEX) + Y*AREA + CF_Z(SF%NODE_INDEX) = CF_Z(SF%NODE_INDEX) + Z*AREA + ENDDO FACES_LOOP + ENDDO NODE_GEOM_LOOP +ENDIF GEOM_IF + +NODE_LOOP_2: DO NN=1,N_DUCTNODES + DN=> DUCTNODE(NN) + IF (DN%LEAKAGE) CYCLE NODE_LOOP_2 + IF (DN%N_DUCTS==1 .AND. .NOT. (DN%VENT .OR. DN%AMBIENT .OR. DN%GEOM) ) THEN + WRITE(MESSAGE,'(A,I5,A,A)') 'ERROR(547): Internal ductnode must have at least two attached ducts. Ductnode:',NN,& ', Ductnode ID:',TRIM(DN%ID) CALL SHUTDOWN(MESSAGE); RETURN ENDIF - IF (DN%N_DUCTS == 1 .AND. .NOT. DN%VENT .AND. .NOT. DN%AMBIENT) THEN - WRITE(MESSAGE,'(A,I5,A,A)') 'ERROR(547): Internal ductnode must have at least two attached ducts. Ductnode:',NN,& + IF (DN%N_DUCTS> 1 .AND. (DN%AMBIENT .OR. DN%VENT .OR. DN%GEOM) ) THEN + WRITE(MESSAGE,'(A,I5,A,A)') 'ERROR(548): External ductnode can only have one attached duct. Ductnode:',NN,& ', Ductnode ID:',TRIM(DN%ID) CALL SHUTDOWN(MESSAGE); RETURN ENDIF - IF (DN%N_DUCTS> 1 .AND. (DN%AMBIENT .OR. DN%VENT) ) THEN - WRITE(MESSAGE,'(A,I5,A,A)') 'ERROR(548): External ductnode can only have one attached duct. Ductnode:',NN,& + IF ((DN%VENT .OR. DN%GEOM) .AND. DN%AMBIENT) THEN + WRITE(MESSAGE,'(A,I5,A,A)') 'ERROR(546): Ductnode cannot be AMBIENT and have an assigned VENT_ID or GEOM. Ductnode:',NN,& ', Ductnode ID:',TRIM(DN%ID) CALL SHUTDOWN(MESSAGE); RETURN ENDIF + + IF (DN%GEOM) THEN + IF (CF_AREA(NN) < TWO_EPSILON_EB) THEN + WRITE(MESSAGE,'(A,I5,A,A,A)') 'ERROR(yyy): Ductnode:',NN,', Ductnode ID:',TRIM(DN%ID),& + ' defined with GEOM had no CFACE found.' + CALL SHUTDOWN(MESSAGE); RETURN + ENDIF + DN%XYZ(1) = CF_X(NN)/CF_AREA(NN) + DN%XYZ(2) = CF_Y(NN)/CF_AREA(NN) + DN%XYZ(3) = CF_Z(NN)/CF_AREA(NN) + ENDIF + ALLOCATE(DN%DUCT_INDEX(DN%N_DUCTS)) ALLOCATE(DN%DIR(DN%N_DUCTS)) DN%DUCT_INDEX = -1 @@ -1095,7 +1169,7 @@ SUBROUTINE PROC_HVAC DN%FILTER_LOADING(1:N_TRACKED_SPECIES,3) = FILTER(DN%FILTER_INDEX)%INITIAL_LOADING(1:N_TRACKED_SPECIES) ENDIF -ENDDO NODE_LOOP +ENDDO NODE_LOOP_2 !Temp arrays for input processing IF (ALLOCATED(DUCT_NODE_A)) DEALLOCATE(DUCT_NODE_A) @@ -1239,7 +1313,7 @@ SUBROUTINE INIT_DUCT_NODE DN%RHO = RHOA ENDIF DN%P_OLD = DN%P - IF (DN%VENT) DN%P = -1.E10_EB + IF (DN%VENT .OR. DN%GEOM) DN%P = -1.E10_EB ZZ_GET(1:N_TRACKED_SPECIES) = DN%ZZ_V(1:N_TRACKED_SPECIES) CALL GET_ENTHALPY(ZZ_GET,DN%CP,DN%TMP) DN%CP = DN%CP / DN%TMP @@ -1451,7 +1525,7 @@ SUBROUTINE MATRIX_SOLVE(NNE) ENDDO DO NN = 1,NE%N_DUCTNODES DN=>DUCTNODE(NE%NODE_INDEX(NN)) - IF (DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE) CYCLE + IF (DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE .OR. DN%GEOM) CYCLE DN%P = RHS(NE%MATRIX_INDEX(NE%N_DUCTS+NN)) ENDDO @@ -1514,7 +1588,7 @@ SUBROUTINE HVAC_UPDATE(NNE,DT) N_UPDATED = .FALSE. DO NN = 1,DR%N_DUCTNODES DN=>DUCTNODE(DR%NODE_INDEX(NN)) - IF ((DN%VENT .OR. DN%AMBIENT) .AND. & + IF ((DN%VENT .OR. DN%AMBIENT .OR. DN%GEOM) .AND. & DN%DIR(1)*DUCT(DN%DUCT_INDEX(1))%VEL(NEW) <= 0._EB) N_UPDATED(DR%NODE_INDEX(NN)) = .TRUE. IF (DN%N_DUCTS==2) THEN IF (ABS(DUCT(DN%DUCT_INDEX(1))%VEL(NEW)) < TWO_EPSILON_EB .AND. & @@ -1646,7 +1720,7 @@ SUBROUTINE HVAC_UPDATE(NNE,DT) ENDIF ENDDO DUCT_NODE_LOOP_1 - IF (DN%VENT) THEN + IF (DN%VENT .OR. DN%GEOM) THEN DN%E_SUM = DN%E_SUM + ETOT*DT_MT DN%ZZ_SUM = DN%ZZ_SUM + ZZTOT*DT_MT ENDIF @@ -1673,7 +1747,7 @@ SUBROUTINE HVAC_UPDATE(NNE,DT) DO NN = 1,DR%N_DUCTNODES DN=>DUCTNODE(DR%NODE_INDEX(NN)) - IF (.NOT. DN%VENT) CYCLE + IF (.NOT. (DN%VENT .OR. DN%GEOM)) CYCLE DU => DUCT(DN%DUCT_INDEX(1)) IF (DN%DIR(1)*DU%VEL(NEW) <= 0._EB) CYCLE MTOT = ABS(DU%VEL(NEW))*DU%AREA*DU%RHO_D*DT @@ -1700,7 +1774,7 @@ SUBROUTINE HVAC_UPDATE(NNE,DT) CYCLE ENDIF ENDIF - IF ((DN%LEAKAGE .OR. DN%VENT .OR. DN%AMBIENT) .AND. & + IF ((DN%LEAKAGE .OR. DN%VENT .OR. DN%AMBIENT .OR. DN%GEOM) .AND. & DN%DIR(1)*DUCT(DN%DUCT_INDEX(1))%VEL(NEW) <= 0._EB) N_UPDATED(NE%NODE_INDEX(NN)) = .TRUE. IF (DN%N_DUCTS==2) THEN IF (ABS(DUCT(DN%DUCT_INDEX(1))%VEL(NEW)) < TWO_EPSILON_EB .AND. & @@ -1812,7 +1886,7 @@ SUBROUTINE RHSNODE(NETWORK_INDEX) NE => NETWORK(NETWORK_INDEX) DO NN = 1, NE%N_DUCTNODES DN => DUCTNODE(NE%NODE_INDEX(NN)) - IF (DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE) CYCLE + IF (DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE .OR. DN%GEOM) CYCLE ARRAYLOC = NE%MATRIX_INDEX(NE%N_DUCTS+DUCTNODE_NE(NE%NODE_INDEX(NN))) DO ND = 1,DN%N_DUCTS DU => DUCT(DN%DUCT_INDEX(ND)) @@ -1839,7 +1913,7 @@ SUBROUTINE LHSNODE(NETWORK_INDEX) NE => NETWORK(NETWORK_INDEX) DO NN = 1, NE%N_DUCTNODES DN => DUCTNODE(NE%NODE_INDEX(NN)) - IF (DN%VENT .OR. DN%LEAKAGE .OR. DN%AMBIENT) CYCLE + IF (DN%VENT .OR. DN%LEAKAGE .OR. DN%AMBIENT .OR. DN%GEOM) CYCLE ARRAYLOC1 = NE%MATRIX_INDEX(NE%N_DUCTS+DUCTNODE_NE(NE%NODE_INDEX(NN))) DO ND = 1,DN%N_DUCTS DU => DUCT(DN%DUCT_INDEX(ND)) @@ -1922,9 +1996,9 @@ SUBROUTINE RHSDUCT(NETWORK_INDEX) DN=>DUCTNODE(DU%NODE_INDEX(1)) IF (DN%AMBIENT) THEN HEAD = HEAD + DN%P - ELSEIF (DN%VENT .OR. DN%LEAKAGE) THEN + ELSEIF (DN%VENT .OR. DN%LEAKAGE .OR. DN%GEOM) THEN HEAD = HEAD + DN%P - IF (DN%VENT .AND. HVAC_LOCAL_PRESSURE) & + IF ((DN%VENT .OR. DN%GEOM) .AND. HVAC_LOCAL_PRESSURE) & HEAD = HEAD - DN%DIR(1) * DU%RHO_D * DU%VEL(OLD) * DU%AREA / NODE_AREA_EX(DU%NODE_INDEX(1)) / (GAMMA * DT_HV) IF (N_ZONE > 0) THEN IPZ = DN%ZONE_INDEX @@ -1935,9 +2009,9 @@ SUBROUTINE RHSDUCT(NETWORK_INDEX) DN=>DUCTNODE(DU%NODE_INDEX(2)) IF (DN%AMBIENT) THEN HEAD = HEAD - DN%P - ELSEIF (DN%VENT .OR. DN%LEAKAGE) THEN + ELSEIF (DN%VENT .OR. DN%LEAKAGE .OR. DN%GEOM) THEN HEAD = HEAD - DN%P - IF (DN%VENT .AND. HVAC_LOCAL_PRESSURE) & + IF ((DN%VENT .OR. DN%GEOM) .AND. HVAC_LOCAL_PRESSURE) & HEAD = HEAD + DN%DIR(1) * DU%RHO_D * DU%VEL(OLD) * DU%AREA / NODE_AREA_EX(DU%NODE_INDEX(2)) / (GAMMA * DT_HV) IF (N_ZONE > 0) THEN IPZ = DN%ZONE_INDEX @@ -1982,7 +2056,7 @@ SUBROUTINE LHSDUCT(NETWORK_INDEX) ARRAYLOC1 = NE%MATRIX_INDEX(DUCT_NE(NE%DUCT_INDEX(ND))) LHS(ARRAYLOC1,ARRAYLOC1) = 1._EB+0.5_EB*DT_HV*DU%TOTAL_LOSS/DU%LENGTH*ABS(DU%VEL(PREVIOUS)+DU%VEL(GUESS)) DN=>DUCTNODE(DU%NODE_INDEX(1)) - IF (.NOT. DN%VENT) THEN + IF (.NOT. (DN%VENT .OR. DN%GEOM)) THEN IF (.NOT. DN%AMBIENT .AND. .NOT. DN%LEAKAGE) THEN ARRAYLOC2 = NE%MATRIX_INDEX(NE%N_DUCTS+DUCTNODE_NE(DU%NODE_INDEX(1))) LHS(ARRAYLOC1,ARRAYLOC2) = -DT_HV/(DU%RHO_D*DU%LENGTH) @@ -2016,7 +2090,7 @@ SUBROUTINE LHSDUCT(NETWORK_INDEX) ENDIF ENDIF DN=>DUCTNODE(DU%NODE_INDEX(2)) - IF (.NOT. DN%VENT) THEN + IF (.NOT. (DN%VENT .OR. DN%GEOM)) THEN IF (.NOT. DN%AMBIENT .AND. .NOT. DN%LEAKAGE) THEN ARRAYLOC2 = NE%MATRIX_INDEX(NE%N_DUCTS+DUCTNODE_NE(DU%NODE_INDEX(2))) LHS(ARRAYLOC1,ARRAYLOC2) = DT_HV/(DU%RHO_D*DU%LENGTH) @@ -2226,13 +2300,13 @@ SUBROUTINE HVAC_BC_IN(NM) ENDDO WALL_LOOP WALL_FLAG = .FALSE. + CFACE_LOOP: DO ICF=INTERNAL_CFACE_CELLS_LB+1,INTERNAL_CFACE_CELLS_LB+N_INTERNAL_CFACE_CELLS CFA => CFACE(ICF) B1 => BOUNDARY_PROP1(CFA%B1_INDEX) BC => BOUNDARY_COORD(CFA%BC_INDEX) SF => SURFACE(CFA%SURF_INDEX) NODE_INDEX => B1%NODE_INDEX - VENT_INDEX => CFA%VENT_INDEX ! Reset indices to zero in case of adding an OSBT NODE_INDEX = 0 CALL INITIALIZE_HVAC @@ -2251,11 +2325,11 @@ SUBROUTINE INITIALIZE_HVAC ZONE_LEAK_IF: IF (ALL(SF%LEAK_PATH < 0)) THEN - IF (VENT_INDEX == 0) RETURN - IF (VENTS(VENT_INDEX)%NODE_INDEX < 0) RETURN - NODE_INDEX = VENTS(VENT_INDEX)%NODE_INDEX IF (WALL_FLAG) THEN + IF (VENT_INDEX == 0) RETURN + IF (VENTS(VENT_INDEX)%NODE_INDEX < 0) RETURN + NODE_INDEX = VENTS(VENT_INDEX)%NODE_INDEX IF (WC%OBST_INDEX > 0) THEN IF (OBSTRUCTION(WC%OBST_INDEX)%REMOVABLE) THEN ERROR_FLAG = .TRUE. @@ -2264,6 +2338,9 @@ SUBROUTINE INITIALIZE_HVAC CALL SHUTDOWN(MESSAGE,PROCESS_0_ONLY=.FALSE.); RETURN ENDIF ENDIF + ELSE + NODE_INDEX = CFA%NODE_INDEX + IF (NODE_INDEX<=0) RETURN ENDIF IOR = BC%IOR @@ -2501,7 +2578,7 @@ SUBROUTINE DETERMINE_FIXED_ELEMENTS(T,CHANGE) NODE_LOOP: DO NN = 1, N_DUCTNODES DN=>DUCTNODE(NN) - IF (DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE) CYCLE NODE_LOOP + IF (DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE .OR. DN%GEOM) CYCLE NODE_LOOP COUNTER = 0 VOLUME_FLOW = 0._EB ZERO_AREA = .FALSE. @@ -2686,7 +2763,7 @@ SUBROUTINE SETUP_SOLUTION_POINTERS ENDDO DO NN=1,NE%N_DUCTNODES DN=>DUCTNODE(NE%NODE_INDEX(NN)) - IF (DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE) CYCLE + IF (DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE .OR. DN%GEOM) CYCLE COUNTER = COUNTER + 1 NE%MATRIX_INDEX(NE%N_DUCTS+NN)=COUNTER ENDDO @@ -2740,7 +2817,7 @@ SUBROUTINE UPDATE_LOSS(T,DT,NNE) ENDIF ENDIF - NODECLASS: IF (DN%VENT .OR. DN%AMBIENT) THEN + NODECLASS: IF (DN%VENT .OR. DN%AMBIENT .OR. DN%GEOM) THEN ! If node is an external node loss is simply based on inflow or outflow or half loss if no flow IF (DUCT(DN%DUCT_INDEX(1))%AREA < TWO_EPSILON_EB .OR. DUCT(DN%DUCT_INDEX(1))%LOCALIZED_LEAKAGE) CYCLE IF(DUCT(DN%DUCT_INDEX(1))%VEL(PREVIOUS)*DN%DIR(1) > 1.E-6_EB) THEN @@ -2904,7 +2981,7 @@ SUBROUTINE SET_DONOR(NNE) NODELOOP: DO NN=1,NE%N_DUCTNODES DN=>DUCTNODE(NE%NODE_INDEX(NN)) - IF(DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE) THEN + IF(DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE .OR. DN%GEOM) THEN DN%RHO= DN%RHO_V DN%TMP= DN%TMP_V DN%ZZ = DN%ZZ_V @@ -2984,7 +3061,7 @@ SUBROUTINE CONVERGENCE_CHECK(NNE) ! Check node mass conservation convergence DO NN=1,NE%N_DUCTNODES DN => DUCTNODE(NE%NODE_INDEX(NN)) - IF (DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE) CYCLE + IF (DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE .OR. DN%GEOM) CYCLE MSUM = 0._EB MTOT = 0._EB COUNT = 0 @@ -3032,7 +3109,7 @@ SUBROUTINE COLLAPSE_HVAC_BC(T) IF (CONNECTED_ZONES(0,DN%ZONE_INDEX)>0) DN%ZONE_INDEX = 0 ENDIF - INTERNAL_NODE_IF: IF (((DN%VENT .OR. DN%LEAKAGE) .AND. .NOT. DN%AMBIENT) .OR. & + INTERNAL_NODE_IF: IF (((DN%VENT .OR. DN%LEAKAGE .OR. DN%GEOM) .AND. .NOT. DN%AMBIENT) .OR. & (DN%AMBIENT .AND. NODE_AREA(NN) > 0._EB)) THEN ZZ_GET = 0._EB AREA = NODE_AREA(NN) @@ -3145,7 +3222,7 @@ SUBROUTINE SET_INIT_HVAC DO NN=1,N_DUCTNODES DN=>DUCTNODE(NN) - IF (.NOT. DN%VENT .AND. .NOT. DN%LEAKAGE) CYCLE + IF (.NOT. (DN%VENT .OR. DN%LEAKAGE .OR. DN%GEOM)) CYCLE DN%CP = DN%CP_V DN%TMP = DN%TMP_V DN%RHO = DN%RHO_V @@ -3260,11 +3337,15 @@ END SUBROUTINE SET_INIT_HVAC_MASS_TRANSPORT SUBROUTINE LEAKAGE_HVAC USE PHYSICAL_FUNCTIONS, ONLY: GET_ENTHALPY -REAL(EB) :: ZZ_GET(1:N_TRACKED_SPECIES),HGAS +REAL(EB) :: ZZ_GET(1:N_TRACKED_SPECIES),HGAS,TNOW INTEGER :: I_DUCT,I_DUCTNODE,NZ1,NZ2 TYPE (DUCTNODE_TYPE), POINTER:: DN1,DN2 TYPE (DUCT_TYPE), POINTER:: DU +IF (LEAK_DUCTS==0) RETURN + +TNOW=CURRENT_TIME() + I_DUCT = N_DUCTS - LEAK_DUCTS I_DUCTNODE = N_DUCTNODES - 2 * LEAK_DUCTS @@ -3329,6 +3410,8 @@ SUBROUTINE LEAKAGE_HVAC ENDDO ENDDO +T_USED(13)=T_USED(13)+CURRENT_TIME()-TNOW + END SUBROUTINE LEAKAGE_HVAC !> \brief Updates filter loading and filter flow loss @@ -4366,12 +4449,12 @@ SUBROUTINE RHSDUCT_QFAN(DUCTRUN_INDEX,NF,T) RGZ = 0._EB DN=>DUCTNODE(DU%NODE_INDEX(1)) IF (DN%DUCTRUN_M_INDEX <=0) HEAD = DN%P - IF (DN%VENT .AND. HVAC_LOCAL_PRESSURE) & + IF ((DN%VENT .OR. DN%GEOM) .AND. HVAC_LOCAL_PRESSURE) & HEAD = HEAD - DN%DIR(1) * DR%RHO_D(ND,NF) * DU%VEL(OLD) * DU%AREA / NODE_AREA_EX(DU%NODE_INDEX(1)) / (GAMMA * DT_QF) XYZ = DN%XYZ DN=>DUCTNODE(DU%NODE_INDEX(2)) IF (DN%DUCTRUN_M_INDEX <=0) HEAD = HEAD - DN%P - IF (DN%VENT .AND. HVAC_LOCAL_PRESSURE) & + IF ((DN%VENT .OR. DN%GEOM) .AND. HVAC_LOCAL_PRESSURE) & HEAD = HEAD + DN%DIR(1) * DR%RHO_D(ND,NF) * DU%VEL(OLD) * DU%AREA / NODE_AREA_EX(DU%NODE_INDEX(2)) / (GAMMA * DT_QF) XYZ = DN%XYZ - XYZ IF (.NOT. DU%LEAKAGE) THEN @@ -4418,10 +4501,12 @@ SUBROUTINE LHSDUCT_QFAN(DUCTRUN_INDEX,NF) LHS(ND,ND) = 1._EB+0.5_EB*DT_QF*DR%LOSS(ND,NF)/DU%LENGTH*ABS(DR%VEL(ND,NF,PREVIOUS)+DR%VEL(ND,NF,GUESS)) DN=>DUCTNODE(DU%NODE_INDEX(1)) IF (DN%DUCTRUN_M_INDEX > 0) LHS(ND,DR%N_M_DUCTS + DN%DUCTRUN_M_INDEX) = -DT_QF/(DR%RHO_D(ND,NF)*DU%LENGTH) - IF (DN%VENT .AND. HVAC_LOCAL_PRESSURE) LHS(ND,ND) = LHS(ND,ND)-DN%DIR(1)*DU%AREA/(DU%LENGTH*GAMMA*NODE_AREA_EX(DU%NODE_INDEX(1))) + IF ((DN%VENT .OR. DN%GEOM) .AND. HVAC_LOCAL_PRESSURE) & + LHS(ND,ND) = LHS(ND,ND)-DN%DIR(1)*DU%AREA/(DU%LENGTH*GAMMA*NODE_AREA_EX(DU%NODE_INDEX(1))) DN=>DUCTNODE(DU%NODE_INDEX(2)) IF (DN%DUCTRUN_M_INDEX > 0) LHS(ND,DR%N_M_DUCTS + DN%DUCTRUN_M_INDEX) = DT_QF/(DR%RHO_D(ND,NF)*DU%LENGTH) - IF (DN%VENT .AND. HVAC_LOCAL_PRESSURE) LHS(ND,ND) = LHS(ND,ND)+DN%DIR(1)*DU%AREA/(DU%LENGTH*GAMMA*NODE_AREA_EX(DU%NODE_INDEX(2))) + IF ((DN%VENT .OR. DN%GEOM) .AND. HVAC_LOCAL_PRESSURE) & + LHS(ND,ND) = LHS(ND,ND)+DN%DIR(1)*DU%AREA/(DU%LENGTH*GAMMA*NODE_AREA_EX(DU%NODE_INDEX(2))) ENDDO DUCT_LOOP END SUBROUTINE LHSDUCT_QFAN @@ -4475,7 +4560,7 @@ SUBROUTINE CONVERGENCE_CHECK_QFAN(DUCTRUN_INDEX,NF) ! Check node mass conservation convergence DO NN=1,DR%N_M_DUCTNODES DN => DUCTNODE(DR%NODE_INDEX(NN)) - IF (DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE) CYCLE + IF (DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE .OR. DN%GEOM) CYCLE MSUM = 0._EB MTOT = 0._EB COUNT = 0 @@ -4595,7 +4680,7 @@ SUBROUTINE UPDATE_LOSS_QFAN(T,DUCTRUN_INDEX,NF) ENDIF ENDIF - NODECLASS: IF(DN%VENT .OR. DN%AMBIENT) THEN + NODECLASS: IF(DN%VENT .OR. DN%AMBIENT .OR. DN%GEOM) THEN ! If node is an external node loss is simply based on inflow or outflow or half loss if no flow IF (DUCT(DN%DUCT_INDEX(1))%AREA < TWO_EPSILON_EB .OR. DUCT(DN%DUCT_INDEX(1))%LOCALIZED_LEAKAGE) CYCLE D_INDEX = DUCT(DN%DUCT_INDEX(1))%DUCTRUN_INDEX @@ -4754,7 +4839,7 @@ SUBROUTINE SET_DONOR_QFAN(DUCTRUN_INDEX,NF) ENDIF DN=>DUCTNODE(NN) - IF(DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE) THEN + IF(DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE .OR. DN%GEOM) THEN DR%RHO_D(ND,NF) = DN%RHO_V DR%TMP_D(ND,NF) = DN%TMP_V DR%CP_D(ND,NF) = DN%CP_V @@ -4767,7 +4852,7 @@ SUBROUTINE SET_DONOR_QFAN(DUCTRUN_INDEX,NF) ENDIF ELSE DN=>DUCTNODE(DU%NODE_INDEX(1)) - IF(DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE) THEN + IF(DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE .OR. DN%GEOM) THEN DR%RHO_D(ND,NF) = 0.5_EB*DN%RHO_V DR%TMP_D(ND,NF) = 0.5_EB*DN%TMP_V DR%CP_D(ND,NF) = 0.5_EB*DN%CP_V @@ -4779,7 +4864,7 @@ SUBROUTINE SET_DONOR_QFAN(DUCTRUN_INDEX,NF) DR%ZZ_D(ND,NF,:) = 0.5_EB*DR%ZZ_N(DN%DUCTRUN_INDEX,NF,:) ENDIF DN=>DUCTNODE(DU%NODE_INDEX(2)) - IF(DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE) THEN + IF(DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE .OR. DN%GEOM) THEN DR%RHO_D(ND,NF) = DR%RHO_D(ND,NF) + 0.5_EB*DN%RHO_V DR%TMP_D(ND,NF) = DR%TMP_D(ND,NF) + 0.5_EB*DN%TMP_V DR%CP_D(ND,NF) = DR%CP_D(ND,NF) + 0.5_EB*DN%CP_V @@ -4836,7 +4921,7 @@ SUBROUTINE HVAC_UPDATE_QFAN(DUCTRUN_INDEX,NF) IF (DVEL > TWO_EPSILON_EB) NN = DU%NODE_INDEX(1) IF (DVEL < TWO_EPSILON_EB) NN = DU%NODE_INDEX(2) DN => DUCTNODE(NN) - IF (DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE) THEN !VENT node we can update the DR node first then the duct + IF (DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE .OR. DN%GEOM) THEN !VENT node we can update the DR node first then the duct N_UPDATED(NN) = .TRUE. DR%RHO_N(DN%DUCTRUN_INDEX,NF) = DN%RHO_V DR%TMP_N(DN%DUCTRUN_INDEX,NF) = DN%TMP_V @@ -4858,7 +4943,7 @@ SUBROUTINE HVAC_UPDATE_QFAN(DUCTRUN_INDEX,NF) N_UPDATED(DU%NODE_INDEX(2)) = .TRUE. IF (N_UPDATED(DU%NODE_INDEX(1)) .AND. N_UPDATED(DU%NODE_INDEX(2))) THEN DN => DUCTNODE(DU%NODE_INDEX(1)) - IF (DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE) THEN + IF (DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE .OR. DN%GEOM) THEN DR%RHO_N(DN%DUCTRUN_INDEX,NF) = 0.5_EB*DN%RHO_V DR%TMP_N(DN%DUCTRUN_INDEX,NF) = 0.5_EB*DN%TMP_V DR%CP_N(DN%DUCTRUN_INDEX,NF) = 0.5_EB*DN%CP_V @@ -4870,7 +4955,7 @@ SUBROUTINE HVAC_UPDATE_QFAN(DUCTRUN_INDEX,NF) DR%ZZ_D(DU%DUCTRUN_INDEX,NF,:) = 0.5_EB*DR%ZZ_N(DN%DUCTRUN_INDEX,NF,:) ENDIF DN => DUCTNODE(DU%NODE_INDEX(2)) - IF (DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE) THEN + IF (DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE .OR. DN%GEOM) THEN DR%RHO_N(DN%DUCTRUN_INDEX,NF) = DR%RHO_N(DN%DUCTRUN_INDEX,NF) + 0.5_EB*DN%RHO_V DR%TMP_N(DN%DUCTRUN_INDEX,NF) = DR%TMP_N(DN%DUCTRUN_INDEX,NF) + 0.5_EB*DN%TMP_V DR%CP_N(DN%DUCTRUN_INDEX,NF) = DR%CP_N(DN%DUCTRUN_INDEX,NF) + 0.5_EB*DN%CP_V diff --git a/Source/main.f90 b/Source/main.f90 index 37d8e5c2266..5ee63d01b30 100644 --- a/Source/main.f90 +++ b/Source/main.f90 @@ -207,6 +207,8 @@ PROGRAM FDS ENDDO IF (MY_RANK==0 .AND. VERBOSE) CALL VERBOSE_PRINTOUT('Completed INITIALIZE_WALL_ARRAY') +CALL PROC_HVAC + ! Write the Smokeview (.smv) file using parallel MPI writes IF (WRITE_SMV) THEN diff --git a/Source/mesh.f90 b/Source/mesh.f90 index 1ea23f4f95f..df64a82b0b8 100644 --- a/Source/mesh.f90 +++ b/Source/mesh.f90 @@ -341,7 +341,7 @@ MODULE MESH_VARIABLES REAL(EB), ALLOCATABLE, DIMENSION(:,:) :: FLUX0_LS,FLUX1_LS,PHI_LS,PHI1_LS,ROS_BACKU, & ROS_HEAD,ROS_FLANK,WIND_EXP, & SR_X_LS,SR_Y_LS,U_LS,V_LS,Z_LS,DZTDX,DZTDY,MAG_ZT, & - PHI_WS,UMF,THETA_ELPS,PHI_S,PHI_S_X,PHI_S_Y,PHI_W,LS_WORK1,LS_WORK2 + PHI_WS,UMF,THETA_ELPS,PHI_S_X,PHI_S_Y,PHI_W,LS_WORK1,LS_WORK2 END TYPE MESH_TYPE @@ -483,7 +483,7 @@ MODULE MESH_POINTERS REAL(EB), POINTER, DIMENSION(:,:) :: FLUX0_LS,FLUX1_LS,PHI_LS,PHI1_LS,ROS_BACKU, & ROS_HEAD,ROS_FLANK,WIND_EXP, & SR_X_LS,SR_Y_LS,U_LS,V_LS,Z_LS,DZTDX,DZTDY,MAG_ZT, & - PHI_WS,UMF,THETA_ELPS,PHI_S,PHI_S_X,PHI_S_Y,PHI_W,LS_WORK1,LS_WORK2 + PHI_WS,UMF,THETA_ELPS,PHI_S_X,PHI_S_Y,PHI_W,LS_WORK1,LS_WORK2 CHARACTER(200), POINTER, DIMENSION(:) :: UNIQUE_SLICE_NAMES,ALL_SLICE_NAMES,ALL_SLICE_QUANTITIES INTEGER, POINTER, DIMENSION(:) :: ALL_SLICE_TOPOLOGIES LOGICAL, POINTER, DIMENSION(:) :: EMPTY_UNIQUE_SLICE, UNIQUE_SLICE_IS_SL3D @@ -887,7 +887,6 @@ SUBROUTINE POINT_TO_MESH(NM) PHI_WS => M%PHI_WS UMF => M%UMF THETA_ELPS => M%THETA_ELPS -PHI_S => M%PHI_S PHI_S_X => M%PHI_S_X PHI_S_Y => M%PHI_S_Y PHI_W => M%PHI_W diff --git a/Source/part.f90 b/Source/part.f90 index 56c054c32f3..ab5f5f95f62 100644 --- a/Source/part.f90 +++ b/Source/part.f90 @@ -933,7 +933,7 @@ SUBROUTINE INSERT_VOLUMETRIC_PARTICLES USE MEMORY_FUNCTIONS, ONLY: ALLOCATE_STORAGE INTEGER :: IIP,N_INSERT,I1,J1,K1,I2,J2,K2,N,N_PARTICLES_INSERT,ND,ICC,IFACE,INDCF,I_RAND,N_INSERT_CELLS REAL(EB) :: XC1,XC2,YC1,YC2,ZC1,ZC2,X0,Y0,Z0,RR,RRI,HH,INSERT_VOLUME,INPUT_VOLUME,VOLUME_SPLIT_FACTOR,LP_X,LP_Y,LP_Z,RAMP_FACTOR,& - IN_X1,IN_X2,IN_Y1,IN_Y2,IN_Z1,IN_Z2,IN_X0,IN_Y0,IN_Z0,VCX,VCY,VCZ,MOIST_FRAC,FILLED_VOLUME,DIST,DIST_MIN,& + IN_X1,IN_X2,IN_Y1,IN_Y2,IN_Z1,IN_Z2,IN_X0,IN_Y0,IN_Z0,VCX,VCY,VCZ,MOIST_CONT,FILLED_VOLUME,DIST,DIST_MIN,& P_VECTOR(3),P_VECTOR_MIN(3),NVEC_MIN(3) LOGICAL :: CC_VALID TYPE (CC_CUTFACE_TYPE), POINTER :: CF @@ -994,8 +994,8 @@ SUBROUTINE INSERT_VOLUMETRIC_PARTICLES READ(LU_VEG_IN) IN%MASS_PER_VOLUME ! Adjust with multiplier IN%MASS_PER_VOLUME = MAX(0._EB,IN%BULK_DENSITY_FACTOR)*IN%MASS_PER_VOLUME - MOIST_FRAC=SURFACE(LAGRANGIAN_PARTICLE_CLASS(IN%PART_INDEX)%SURF_INDEX)%MOISTURE_FRACTION(1) - IF (MOIST_FRAC>=0._EB) IN%MASS_PER_VOLUME = IN%MASS_PER_VOLUME*(1._EB+MOIST_FRAC) + MOIST_CONT=SURFACE(LAGRANGIAN_PARTICLE_CLASS(IN%PART_INDEX)%SURF_INDEX)%MOISTURE_CONTENT(1) + IF (MOIST_CONT>=0._EB) IN%MASS_PER_VOLUME = IN%MASS_PER_VOLUME*(1._EB+MOIST_CONT) ENDIF ! Apply coordinate offset if needed diff --git a/Source/pres.f90 b/Source/pres.f90 index e44b29dd15d..bb9b0413940 100644 --- a/Source/pres.f90 +++ b/Source/pres.f90 @@ -3111,11 +3111,15 @@ MODULE GLOBMAT_SOLVER REAL(EB), SAVE :: CYL_FCT ! Pressure zone loops index: -INTEGER :: IPZ +INTEGER :: IPZ, N_ZONE_GLOBMAT ! Handle for ZONE_SOLVER array entries: TYPE(ZONE_SOLVE_TYPE), POINTER :: ZSL +! Matrix types: +INTEGER, PARAMETER :: SYMM_INDEFINITE =-2 +INTEGER, PARAMETER :: SYMM_POSITIVE_DEFINITE= 2 + !#define SINGLE_PRECISION_PSN_SOLVE ! Timing variable: @@ -3182,7 +3186,7 @@ SUBROUTINE GLMAT_SOLVER(T,DT) CALL GET_PRES_CFACE_BCS(NM,T,DT) ENDDO -IPZ_LOOP : DO IPZ=0,N_ZONE +IPZ_LOOP : DO IPZ=0,N_ZONE_GLOBMAT ZSL => ZONE_SOLVE(IPZ) @@ -3200,7 +3204,7 @@ SUBROUTINE GLMAT_SOLVER(T,DT) CALL GET_FH_FROM_PRHS_AND_BCS(NM,DT,CYL_FCT,UNKH,ZSL%NUNKH_LOCAL,IPZ,ZSL%F_H) ENDDO MESH_LOOP_1 - IF (ZSL%MTYPE==-2) THEN + IF (ZSL%MTYPE==SYMM_INDEFINITE) THEN SUM_FH = 0._EB; MEAN_FH = 0._EB WHOLE_DOM_IF1 : IF(.NOT.PRES_ON_WHOLE_DOMAIN) THEN ! Sum source F_H by Pressure Zone: @@ -3278,6 +3282,7 @@ SUBROUTINE GLMAT_SOLVER(T,DT) CASE(HYPRE_FLAG) LIBRARY_SELECT #ifdef WITH_HYPRE + IF (ZSL%MTYPE==SYMM_INDEFINITE .AND. ZSL%UPPER_ROW==ZSL%NUNKH_TOTAL) ZSL%F_H(MAX(ZSL%NUNKH_LOCAL,1)) = 0._EB ! Solve the system using HYPRE: CALL HYPRE_IJVECTORSETVALUES(ZSL%HYPRE_ZSL%F_H, ZSL%NUNKH_LOCAL_RS, ZSL%HYPRE_ZSL%INDICES, ZSL%F_H, HYPRE_IERR) CALL HYPRE_IJVECTORASSEMBLE(ZSL%HYPRE_ZSL%F_H, HYPRE_IERR) @@ -3323,7 +3328,7 @@ SUBROUTINE GLMAT_SOLVER(T,DT) ENDIF DEALLOCATE(DISPL) - IF (ZSL%MTYPE==-2) THEN + IF (ZSL%MTYPE==SYMM_INDEFINITE) THEN SUM_XH = 0._EB; MEAN_XH = 0._EB WHOLE_DOM_IF2 : IF(.NOT.PRES_ON_WHOLE_DOMAIN) THEN ! Sum H by Pressure Zone: @@ -3492,6 +3497,9 @@ SUBROUTINE GLMAT_SOLVER_SETUP(STAGE_FLAG) #endif #endif +N_ZONE_GLOBMAT = N_ZONE +IF(PRES_ON_WHOLE_DOMAIN) N_ZONE_GLOBMAT = 0 + SELECT CASE(STAGE_FLAG) CASE(1) @@ -4041,7 +4049,7 @@ SUBROUTINE GET_H_MATRIX_LUDCMP INTEGER, ALLOCATABLE, DIMENSION(:,:) :: MB_FACTOR #endif #ifdef WITH_HYPRE -INTEGER :: ONEV(1) +INTEGER :: ONEV(1), END_ROW REAL(EB) :: ZEROV(1) #endif !.. All other variables @@ -4092,7 +4100,7 @@ SUBROUTINE GET_H_MATRIX_LUDCMP #endif END SELECT -IPZ_LOOP : DO IPZ=0,N_ZONE +IPZ_LOOP : DO IPZ=0,N_ZONE_GLOBMAT ZSL => ZONE_SOLVE(IPZ); IF(ZSL%NUNKH_TOTAL==0) CYCLE @@ -4294,21 +4302,49 @@ SUBROUTINE GET_H_MATRIX_LUDCMP CASE(HYPRE_FLAG) LIBRARY_SELECT #ifdef WITH_HYPRE - IF (ALLOCATED(ZSL%HYPRE_ZSL%INDICES)) DEALLOCATE(ZSL%HYPRE_ZSL%INDICES) ALLOCATE( ZSL%HYPRE_ZSL%INDICES(MAX(1,ZSL%NUNKH_LOCAL_RS)) ) - CALL HYPRE_IJMATRIXCREATE(MPI_COMM_RS_MASTERS, ZSL%LOWER_ROW-1, ZSL%UPPER_ROW-1,& - ZSL%LOWER_ROW-1, ZSL%UPPER_ROW-1, ZSL%HYPRE_ZSL%A_H, HYPRE_IERR) - CALL HYPRE_IJMATRIXSETOBJECTTYPE(ZSL%HYPRE_ZSL%A_H, HYPRE_PARCSR, HYPRE_IERR) - CALL HYPRE_IJMATRIXINITIALIZE_V2(ZSL%HYPRE_ZSL%A_H, HYPRE_MEMORY_HOST, HYPRE_IERR) - IF(ZSL%NUNKH_LOCAL_RS > 0) THEN - ZSL%JD_MAT_H = ZSL%JD_MAT_H - 1 - DO IROW=1,ZSL%NUNKH_LOCAL_RS + CALL HYPRE_IJMATRIXCREATE(MPI_COMM_WORLD,ZSL%LOWER_ROW-1,ZSL%UPPER_ROW-1,& + ZSL%LOWER_ROW-1,ZSL%UPPER_ROW-1,ZSL%HYPRE_ZSL%A_H,HYPRE_IERR) + CALL HYPRE_IJMATRIXSETOBJECTTYPE(ZSL%HYPRE_ZSL%A_H,HYPRE_PARCSR,HYPRE_IERR) + CALL HYPRE_IJMATRIXINITIALIZE(ZSL%HYPRE_ZSL%A_H,HYPRE_IERR) + IF (ZSL%MTYPE==SYMM_INDEFINITE) THEN + IF(ZSL%NUNKH_TOTAL==1) THEN ! Single unknown, zero coefficient matrix (1,1). Set coefficient to 1. + IF(ZSL%NUNKH_LOCAL==1) THEN + ZSL%NNZ_D_MAT_H(1) = 1 + DEALLOCATE(ZSL%JD_MAT_H); ALLOCATE(ZSL%JD_MAT_H(1,1)); ZSL%JD_MAT_H(1,1) = 1 + DEALLOCATE(ZSL%D_MAT_H ); ALLOCATE(ZSL%D_MAT_H(1,1) ); ZSL%D_MAT_H(1,1) = 1._EB + ENDIF + ELSE ! More than one unknown + IF(ZSL%UPPER_ROW==ZSL%NUNKH_TOTAL) THEN + END_ROW = ZSL%NUNKH_LOCAL-1 + ELSE + END_ROW = ZSL%NUNKH_LOCAL + ENDIF + ! Rows 1 to ZM%NUNKH-1, last column, set all to zero: + DO IROW=1,END_ROW + DO JCOL=1,ZSL%NNZ_D_MAT_H(IROW) + IF ( ZSL%JD_MAT_H(JCOL,IROW) /= ZSL%NUNKH_TOTAL ) CYCLE ! Make zero matrix entries in last column. + ZSL%D_MAT_H(JCOL,IROW) = 0._EB + ENDDO + ENDDO + ! Last row, all zeros except the diagonal that keeps diagonal number: + IF(ZSL%UPPER_ROW==ZSL%NUNKH_TOTAL) THEN + IROW = ZSL%NUNKH_LOCAL + DO JCOL=1,ZSL%NNZ_D_MAT_H(IROW) + IF ( ZSL%JD_MAT_H(JCOL,IROW) /= ZSL%NUNKH_TOTAL ) ZSL%D_MAT_H(JCOL,IROW) = 0._EB + ENDDO + ENDIF + ENDIF + ENDIF + IF(ZSL%NUNKH_LOCAL > 0) THEN + ZSL%JD_MAT_H = ZSL%JD_MAT_H - 1 + DO IROW=1,ZSL%NUNKH_LOCAL ZSL%HYPRE_ZSL%INDICES(IROW)=ZSL%LOWER_ROW+IROW-2 CALL HYPRE_IJMATRIXSETVALUES(ZSL%HYPRE_ZSL%A_H, 1, ZSL%NNZ_D_MAT_H(IROW), ZSL%HYPRE_ZSL%INDICES(IROW), & ZSL%JD_MAT_H(1:ZSL%NNZ_D_MAT_H(IROW),IROW), ZSL%D_MAT_H(1:ZSL%NNZ_D_MAT_H(IROW),IROW), HYPRE_IERR) - ENDDO + ENDDO ELSE ZSL%HYPRE_ZSL%INDICES(1)=ZSL%LOWER_ROW-1 ONEV(1) = 1; ZEROV(1) = 0._EB @@ -4455,7 +4491,7 @@ SUBROUTINE GET_BCS_H_MATRIX REAL(EB), POINTER, DIMENSION(:,:) :: D_MAT_HP INTEGER :: H_MAT_IVEC -IPZ_LOOP : DO IPZ=0,N_ZONE +IPZ_LOOP : DO IPZ=0,N_ZONE_GLOBMAT ZSL => ZONE_SOLVE(IPZ) ! Allocate D_MAT_H: @@ -4529,9 +4565,9 @@ SUBROUTINE GET_BCS_H_MATRIX ! Here all reduce with sum among MPI processes: IF (N_MPI_PROCESSES > 1) CALL MPI_ALLREDUCE(MPI_IN_PLACE,H_MAT_IVEC,1,MPI_INTEGER,MPI_SUM,MPI_COMM_WORLD,IERR) IF ( H_MAT_IVEC > 0 ) THEN - ZSL%MTYPE = 2 ! At least one Dirichlet BC, matrix positive definite. + ZSL%MTYPE = SYMM_POSITIVE_DEFINITE ! At least one Dirichlet BC, matrix positive definite. ELSE - ZSL%MTYPE =-2 ! Indefinite. + ZSL%MTYPE = SYMM_INDEFINITE ! Indefinite. ENDIF ENDDO IPZ_LOOP @@ -4561,7 +4597,7 @@ SUBROUTINE GET_H_MATRIX INTEGER :: WC_JD(1:2,1:2) LOGICAL :: FLG -IPZ_LOOP : DO IPZ=0,N_ZONE +IPZ_LOOP : DO IPZ=0,N_ZONE_GLOBMAT ZSL => ZONE_SOLVE(IPZ) @@ -4786,7 +4822,7 @@ SUBROUTINE GET_MATRIXGRAPH_H_WHLDOM ENDDO ! Now Loop by Pressure Zone: -IPZ_LOOP : DO IPZ=0,N_ZONE +IPZ_LOOP : DO IPZ=0,N_ZONE_GLOBMAT ZSL => ZONE_SOLVE(IPZ) ZSL%NUNKH_LOCAL = SUM(ZSL%NUNKH_LOC(LOWER_MESH_INDEX:UPPER_MESH_INDEX)) @@ -5196,14 +5232,14 @@ SUBROUTINE GET_MATRIX_INDEXES_H ! Initialize unknown numbers for H: MESHES(NM)%CCVAR(:,:,:,UNKH) = IS_UNDEFINED ! Select the parent zone as the first in the row - DO IPZ=0,N_ZONE + DO IPZ=0,N_ZONE_GLOBMAT ZSL => ZONE_SOLVE(IPZ) IF(.NOT.PRES_ON_WHOLE_DOMAIN) & ZSL%CONNECTED_ZONE_PARENT = MINLOC(CONNECTED_ZONES(IPZ,:), DIM=1, MASK=CONNECTED_ZONES(IPZ,:)/=0) - 1 ENDDO ENDDO -PRES_ZONE_LOOP : DO IPZ=0,N_ZONE +PRES_ZONE_LOOP : DO IPZ=0,N_ZONE_GLOBMAT ZSL => ZONE_SOLVE(IPZ) @@ -5563,7 +5599,7 @@ SUBROUTINE FINISH_GLMAT_SOLVER ! Finalize Pardiso: PHASE = -1 -DO IPZ=0,N_ZONE +DO IPZ=0,N_ZONE_GLOBMAT ZSL => ZONE_SOLVE(IPZ); IF(ZSL%NUNKH_TOTAL==0) CYCLE ! Finalize Cluster Sparse Solver: IF (UGLMAT_SOLVER_LIBRARY==MKL_CPARDISO_FLAG) THEN diff --git a/Source/read.f90 b/Source/read.f90 index ff2ad8cdca9..1ee688d443b 100644 --- a/Source/read.f90 +++ b/Source/read.f90 @@ -16,7 +16,7 @@ MODULE READ_INPUT USE MEMORY_FUNCTIONS, ONLY: ChkMemErr,REALLOCATE2D,REALLOCATE USE COMP_FUNCTIONS, ONLY: GET_INPUT_FILE USE MISC_FUNCTIONS, ONLY: SEARCH_CONTROLLER,WRITE_SUMMARY_INFO,GET_RAMP_INDEX,GET_SPEC_OR_SMIX_INDEX -USE HVAC_ROUTINES, ONLY: READ_HVAC,PROC_HVAC +USE HVAC_ROUTINES, ONLY: READ_HVAC,LEAKAGE_HVAC USE COMPLEX_GEOMETRY, ONLY: READ_GEOM #ifdef WITHOUT_MPIF08 USE MPI @@ -150,7 +150,7 @@ SUBROUTINE READ_DATA(DT) CALL PROC_REAC_2 ; CALL CHECK_STOP_STATUS ; IF (STOP_STATUS/=NO_STOP) RETURN CALL PROC_MATL ; CALL CHECK_STOP_STATUS ; IF (STOP_STATUS/=NO_STOP) RETURN CALL PROC_SURF_2 ; CALL CHECK_STOP_STATUS ; IF (STOP_STATUS/=NO_STOP) RETURN -CALL PROC_HVAC ; CALL CHECK_STOP_STATUS ; IF (STOP_STATUS/=NO_STOP) RETURN +IF (HVAC_SOLVE) CALL LEAKAGE_HVAC ; CALL CHECK_STOP_STATUS ; IF (STOP_STATUS/=NO_STOP) RETURN CALL READ_CLIP ; CALL CHECK_STOP_STATUS ; IF (STOP_STATUS/=NO_STOP) RETURN CALL PROC_WALL ; CALL CHECK_STOP_STATUS ; IF (STOP_STATUS/=NO_STOP) RETURN CALL PROC_PART ; CALL CHECK_STOP_STATUS ; IF (STOP_STATUS/=NO_STOP) RETURN @@ -7108,11 +7108,12 @@ SUBROUTINE READ_MATL ! Add reserved materials if necessary -N_MATL_RESERVED = 3 +N_MATL_RESERVED = 4 ALLOCATE(SEARCH_PHRASE(N_MATL_RESERVED)) ; ALLOCATE(MATL_NAME_RESERVED(N_MATL_RESERVED)) SEARCH_PHRASE(1) = 'MOISTURE_FRACTION' ; MATL_NAME_RESERVED(1) = 'MOISTURE' SEARCH_PHRASE(2) = 'VARIABLE_THICKNESS' ; MATL_NAME_RESERVED(2) = 'MATERIAL PLACEHOLDER' SEARCH_PHRASE(3) = 'HT3D' ; MATL_NAME_RESERVED(3) = 'MATERIAL PLACEHOLDER' +SEARCH_PHRASE(4) = 'MOISTURE_CONTENT' ; MATL_NAME_RESERVED(4) = 'MOISTURE' DO NN=1,N_MATL_RESERVED CALL SEARCH_INPUT_FILE(LU_INPUT,TRIM(SEARCH_PHRASE(NN)),FOUND) @@ -7894,7 +7895,7 @@ SUBROUTINE READ_SURF(QUICK_READ) CHARACTER(LABEL_LENGTH), DIMENSION(10) :: INIT_IDS LOGICAL :: ADIABATIC,BURN_AWAY,FREE_SLIP,NO_SLIP,CONVERT_VOLUME_TO_MASS,HORIZONTAL,DIRICHLET_FRONT,DIRICHLET_BACK, BLOWING, & INERT_Q_REF,ALLOW_UNDERSIDE_PARTICLES,ALLOW_SURFACE_PARTICLES -CHARACTER(LABEL_LENGTH) :: TEXTURE_MAP,HEAT_TRANSFER_MODEL,LEAK_PATH_ID(2) +CHARACTER(LABEL_LENGTH) :: TEXTURE_MAP,HEAT_TRANSFER_MODEL,LEAK_PATH_ID(2),NODE_ID CHARACTER(25) :: COLOR REAL(EB) :: TAU_Q,TAU_V,TAU_T,TAU_MF(MAX_SPECIES),HRRPUA,MLRPUA,TEXTURE_WIDTH,TEXTURE_HEIGHT,VEL_T(2),& TAU_EF,E_COEFFICIENT,VOLUME_FLOW,& @@ -7908,9 +7909,8 @@ SUBROUTINE READ_SURF(QUICK_READ) HEAT_TRANSFER_COEFFICIENT,HEAT_TRANSFER_COEFFICIENT_BACK,HEAT_TRANSFER_COEFFICIENT_SIGMA,& TAU_PART,EMISSIVITY,EMISSIVITY_BACK,SPREAD_RATE,XYZ(3),MINIMUM_LAYER_THICKNESS(MAX_LAYERS),& VEL_GRAD,MASS_FRACTION(MAX_SPECIES),MASS_TRANSFER_COEFFICIENT,NUSSELT_C0,NUSSELT_C1,NUSSELT_C2,NUSSELT_M,& - PARTICLE_SURFACE_DENSITY,& - MOISTURE_FRACTION(MAX_LAYERS),SURFACE_VOLUME_RATIO(MAX_LAYERS),MASS_PER_VOLUME(MAX_LAYERS),SHAPE_FACTOR,& - SUM_D,REMESH_RATIO,& + PARTICLE_SURFACE_DENSITY,MOISTURE_CONTENT(MAX_LAYERS),MOISTURE_FRACTION(MAX_LAYERS),& + SURFACE_VOLUME_RATIO(MAX_LAYERS),MASS_PER_VOLUME(MAX_LAYERS),SHAPE_FACTOR,SUM_D,REMESH_RATIO,& DRAG_COEFFICIENT,MINIMUM_BURNOUT_TIME,DELTA_TMP_MAX,BURN_DURATION,& REFERENCE_HEAT_FLUX(MAX_QDOTPP_REF),REFERENCE_HEAT_FLUX_TIME_INTERVAL,MINIMUM_SCALING_HEAT_FLUX,& MAXIMUM_SCALING_HEAT_FLUX,REFERENCE_THICKNESS(MAX_QDOTPP_REF),& @@ -7941,9 +7941,9 @@ SUBROUTINE READ_SURF(QUICK_READ) LEAK_PATH,LEAK_PATH_ID,LENGTH,MASS_FLUX,MASS_FLUX_TOTAL,MASS_FLUX_VAR,MASS_FRACTION,& MASS_TRANSFER_COEFFICIENT, & MATL_ID,MATL_MASS_FRACTION,MASS_PER_VOLUME,MCC_CONVERSION_FACTOR,MINIMUM_BURNOUT_TIME,& - MINIMUM_LAYER_THICKNESS,MLRPUA,MOISTURE_FRACTION,& + MINIMUM_LAYER_THICKNESS,MLRPUA,MOISTURE_CONTENT,MOISTURE_FRACTION,& N_LAYER_CELLS_MAX,NEAR_WALL_EDDY_VISCOSITY,NEAR_WALL_TURBULENCE_MODEL,NET_HEAT_FLUX,& - NO_SLIP,NPPC,NUSSELT_C0,NUSSELT_C1,NUSSELT_C2,NUSSELT_M,& + NO_SLIP,NODE_ID,NPPC,NUSSELT_C0,NUSSELT_C1,NUSSELT_C2,NUSSELT_M,& PARTICLE_EXTRACTION_VELOCITY,PARTICLE_MASS_FLUX,PARTICLE_SURFACE_DENSITY,PART_ID,& PLE,PROFILE,RADIUS,RAMP_EF,RAMP_HEAT_TRANSFER_COEFFICIENT,RAMP_HEAT_TRANSFER_COEFFICIENT_BACK,RAMP_IHS,RAMP_MF,& RAMP_PART,RAMP_Q,RAMP_T,RAMP_T_I,RAMP_TMP_BACK,RAMP_TMP_GAS_BACK,RAMP_TMP_GAS_FRONT,& @@ -8078,6 +8078,10 @@ SUBROUTINE READ_SURF(QUICK_READ) SURF_DEFAULT = TRIM(ID) ENDIF + ! Backward compatibility for MOISTURE_FRACTION + + IF (ANY(MOISTURE_FRACTION>=0._EB)) MOISTURE_CONTENT = MOISTURE_FRACTION + ! Specify a dummy material for a VARIABLE_THICKNESS or HT3D surface unless the user has also specified a mass flux, in which ! case throw an error. If no mass flux is specified, the material properties will be changed later. @@ -8120,11 +8124,11 @@ SUBROUTINE READ_SURF(QUICK_READ) SF%PACKING_RATIO(:) = 0._EB SF%SURFACE_VOLUME_RATIO(:) = SURFACE_VOLUME_RATIO(:) - SF%MOISTURE_FRACTION(:) = MOISTURE_FRACTION(:) + SF%MOISTURE_CONTENT(:) = MOISTURE_CONTENT(:) SF%SHAPE_FACTOR = SHAPE_FACTOR SF%DRAG_COEFFICIENT = DRAG_COEFFICIENT - IF (ANY(MOISTURE_FRACTION>TWO_EPSILON_EB) .OR. & + IF (ANY(MOISTURE_CONTENT>TWO_EPSILON_EB) .OR. & ANY(MASS_PER_VOLUME>TWO_EPSILON_EB) .OR. & ANY(SF%SURFACE_VOLUME_RATIO>TWO_EPSILON_EB)) THEN @@ -8152,18 +8156,18 @@ SUBROUTINE READ_SURF(QUICK_READ) ! If MOISTURE is added, create adjustment to density of dry fuel component - IF (MOISTURE_FRACTION(NL)>TWO_EPSILON_EB) THEN + IF (MOISTURE_CONTENT(NL)>TWO_EPSILON_EB) THEN DO NN=1,MAX_MATERIALS IF (MATL_ID(NL,NN) == 'null') EXIT IF (MATL_MASS_FRACTION(NL,NN)0._EB) THEN + IF (MOISTURE_CONTENT(NL)>0._EB) THEN MATL_ID(NL,NN) = 'MOISTURE' - MATL_MASS_FRACTION(NL,NN) = MOISTURE_FRACTION(NL)/(1._EB+MOISTURE_FRACTION(NL)) + MATL_MASS_FRACTION(NL,NN) = MOISTURE_CONTENT(NL)/(1._EB+MOISTURE_CONTENT(NL)) MATL_MASS_FRACTION(NL,1:NN-1) = MATL_MASS_FRACTION(NL,1:NN-1)*(1._EB-MATL_MASS_FRACTION(NL,NN)) ENDIF @@ -8618,6 +8622,7 @@ SUBROUTINE READ_SURF(QUICK_READ) CALL GET_RAMP_INDEX(RAMP_HEAT_TRANSFER_COEFFICIENT,'TIME',SF%RAMP_H_FIXED_INDEX) IF (RAMP_HEAT_TRANSFER_COEFFICIENT_BACK/='null') & CALL GET_RAMP_INDEX(RAMP_HEAT_TRANSFER_COEFFICIENT,'TIME',SF%RAMP_H_FIXED_B_INDEX) + SF%NODE_ID = NODE_ID SF%NUSSELT_C0 = NUSSELT_C0 SF%NUSSELT_C1 = NUSSELT_C1 SF%NUSSELT_C2 = NUSSELT_C2 @@ -9097,11 +9102,13 @@ SUBROUTINE SET_SURF_DEFAULTS MINIMUM_BURNOUT_TIME = 1.E6_EB MINIMUM_LAYER_THICKNESS = -1.E-6_EB ! The absolute value is the default, m MLRPUA = 0._EB -MOISTURE_FRACTION = 0._EB +MOISTURE_CONTENT = 0._EB +MOISTURE_FRACTION = -1._EB ! This variable is kept for backward compatibility N_LAYER_CELLS_MAX = 999 NEAR_WALL_TURBULENCE_MODEL = 'null' NEAR_WALL_EDDY_VISCOSITY = -1._EB NO_SLIP = .FALSE. +NODE_ID = 'null' NPPC = 1 NUSSELT_C0 = -1._EB NUSSELT_C1 = -1._EB @@ -9210,7 +9217,7 @@ END SUBROUTINE READ_SURF SUBROUTINE PROC_SURF_1 -INTEGER :: N,NR,ILPC +INTEGER :: N,NN,NR,ILPC TYPE (LAGRANGIAN_PARTICLE_CLASS_TYPE), POINTER :: LPC PROCESS_SURF_LOOP: DO N=0,N_SURF @@ -9293,6 +9300,19 @@ SUBROUTINE PROC_SURF_1 ENDIF ENDDO + IF (SF%NODE_ID/='null') THEN + DO NN=1,N_DUCTNODES + IF (DUCTNODE(NN)%ID==SF%NODE_ID) THEN + SF%NODE_INDEX = NN + EXIT + ENDIF + ENDDO + IF (SF%NODE_INDEX==0) THEN + WRITE(MESSAGE,'(A,A,A)') 'ERROR(xxx): SURF ',TRIM(SF%ID),' NODE_ID does not exist' + CALL SHUTDOWN(MESSAGE) ; RETURN + ENDIF + ENDIF + ENDDO PROCESS_SURF_LOOP ! If a particle class uses a SURF line, make sure the SURF ID exists @@ -9715,7 +9735,7 @@ SUBROUTINE PROC_SURF_2 SF%SPECIES_BC_INDEX = INFLOW_OUTFLOW_MASS_FLUX SF%VELOCITY_BC_INDEX = INTERPOLATED_VELOCITY_BC ENDIF - IF (N==HVAC_SURF_INDEX) THEN + IF (N==HVAC_SURF_INDEX .OR. SF%NODE_ID/='null') THEN SF%THERMAL_BC_INDEX = HVAC_BOUNDARY SF%SPECIES_BC_INDEX = HVAC_BOUNDARY SF%EMISSIVITY = 1._EB @@ -9975,7 +9995,7 @@ SUBROUTINE READ_PRES #ifndef WITH_MKL #ifdef WITH_HYPRE IF (PRES_FLAG==ULMAT_FLAG ) ULMAT_SOLVER_LIBRARY =HYPRE_FLAG -IF (PRES_FLAG==UGLMAT_FLAG) UGLMAT_SOLVER_LIBRARY=HYPRE_FLAG +IF (PRES_FLAG==UGLMAT_FLAG .OR. PRES_FLAG==GLMAT_FLAG) UGLMAT_SOLVER_LIBRARY=HYPRE_FLAG #endif #endif #ifndef WITH_HYPRE @@ -11160,6 +11180,13 @@ SUBROUTINE READ_OBST(QUICK_READ) IF (SURF_ID6(6) ==SURFACE(NNN)%ID) OB%SURF_INDEX( 3) = NNN ENDDO + DO NNN=-3,3 + IF (SURFACE(OB%SURF_INDEX(NNN))%NODE_ID/='null') THEN + WRITE(MESSAGE,'(A,A,A)') 'ERROR(xxx): OBST_ID ',TRIM(ID),' cannot have a SURF with NODE_ID.' + CALL SHUTDOWN(MESSAGE,PROCESS_0_ONLY=.FALSE.) ; RETURN + ENDIF + ENDDO + ! If the obstruction is assigned a SURF with 3-D heat transfer (HT3D), adjust the nominal layer thickness for this ! surface. Storage arrays for WALL and THIN_WALL are based on the maximum thickness. ! Also, look for thin obstructions that could off-gas so that certain arrays can be allocated. @@ -12304,6 +12331,10 @@ SUBROUTINE READ_VENT DO NNN=0,N_SURF IF (SURF_ID==SURFACE(NNN)%ID) VT%SURF_INDEX = NNN ENDDO + IF (SURFACE(VT%SURF_INDEX)%NODE_ID /='null') THEN + WRITE(MESSAGE,'(3A)') 'ERROR(812): VENT ',TRIM(ID),' Use SURF_ID HVAC instead of NODE_ID.' + CALL SHUTDOWN(MESSAGE,PROCESS_0_ONLY=.FALSE.) ; RETURN + ENDIF IF (SURF_ID=='OPEN') VT%TYPE_INDICATOR = 2 IF (SURF_ID=='MIRROR' .OR. SURF_ID=='PERIODIC') VT%TYPE_INDICATOR = -2 @@ -12312,11 +12343,11 @@ SUBROUTINE READ_VENT IF (SURF_ID=='PERIODIC FLOW ONLY') VT%SURF_INDEX = PERIODIC_FLOW_ONLY_SURF_INDEX VT%BOUNDARY_TYPE = SOLID_BOUNDARY - IF (VT%SURF_INDEX==OPEN_SURF_INDEX) VT%BOUNDARY_TYPE = OPEN_BOUNDARY - IF (VT%SURF_INDEX==MIRROR_SURF_INDEX) VT%BOUNDARY_TYPE = MIRROR_BOUNDARY - IF (VT%SURF_INDEX==PERIODIC_SURF_INDEX) VT%BOUNDARY_TYPE = PERIODIC_BOUNDARY - IF (VT%SURF_INDEX==PERIODIC_FLOW_ONLY_SURF_INDEX) VT%BOUNDARY_TYPE = PERIODIC_BOUNDARY - IF (VT%SURF_INDEX==HVAC_SURF_INDEX) VT%BOUNDARY_TYPE = HVAC_BOUNDARY + IF (VT%SURF_INDEX==OPEN_SURF_INDEX) VT%BOUNDARY_TYPE = OPEN_BOUNDARY + IF (VT%SURF_INDEX==MIRROR_SURF_INDEX) VT%BOUNDARY_TYPE = MIRROR_BOUNDARY + IF (VT%SURF_INDEX==PERIODIC_SURF_INDEX) VT%BOUNDARY_TYPE = PERIODIC_BOUNDARY + IF (VT%SURF_INDEX==PERIODIC_FLOW_ONLY_SURF_INDEX) VT%BOUNDARY_TYPE = PERIODIC_BOUNDARY + IF (VT%SURF_INDEX==HVAC_SURF_INDEX .OR. SURFACE(VT%SURF_INDEX)%NODE_ID/='null') VT%BOUNDARY_TYPE = HVAC_BOUNDARY VT%IOR = IOR VT%ORDINAL = N_EXPLICIT @@ -12531,7 +12562,7 @@ SUBROUTINE READ_VENT ENDDO ENDIF - IF (VT%IOR==0 .AND. .NOT.VT%GEOM) THEN + IF (VT%IOR==0 .AND. .NOT. VT%GEOM) THEN WRITE(MESSAGE,'(3A)') 'ERROR(818): VENT ',TRIM(VT%ID),' requires an orientation index, IOR.' CALL SHUTDOWN(MESSAGE,PROCESS_0_ONLY=.FALSE.) ; RETURN ENDIF @@ -13353,7 +13384,7 @@ END SUBROUTINE READ_INIT SUBROUTINE PROC_INIT INTEGER :: NN -REAL(EB) :: MOIST_FRAC +REAL(EB) :: MOIST_CONT TYPE (LAGRANGIAN_PARTICLE_CLASS_TYPE), POINTER :: LPC TYPE (INITIALIZATION_TYPE), POINTER :: IN @@ -13369,10 +13400,10 @@ SUBROUTINE PROC_INIT LPC%POROUS_VOLUME_FRACTION = IN%MASS_PER_VOLUME / LPC%DENSITY ENDIF IF (LPC%SURF_INDEX>0) THEN - MOIST_FRAC = SURFACE(LPC%SURF_INDEX)%MOISTURE_FRACTION(1) - IF (MOIST_FRAC>TWO_EPSILON_EB .AND. IN%DRY) THEN - IN%MASS_PER_TIME = IN%MASS_PER_TIME *(1._EB+MOIST_FRAC) - IN%MASS_PER_VOLUME = IN%MASS_PER_VOLUME*(1._EB+MOIST_FRAC) + MOIST_CONT = SURFACE(LPC%SURF_INDEX)%MOISTURE_CONTENT(1) + IF (MOIST_CONT>TWO_EPSILON_EB .AND. IN%DRY) THEN + IN%MASS_PER_TIME = IN%MASS_PER_TIME *(1._EB+MOIST_CONT) + IN%MASS_PER_VOLUME = IN%MASS_PER_VOLUME*(1._EB+MOIST_CONT) ENDIF ENDIF ENDIF diff --git a/Source/type.f90 b/Source/type.f90 index 0acfc0db1cc..f0e6ecae472 100644 --- a/Source/type.f90 +++ b/Source/type.f90 @@ -123,6 +123,7 @@ MODULE TYPES INTEGER :: DRAG_LAW=1 !< Code indicating type of drag law INTEGER :: DEVC_INDEX=0 !< Index of device that governs this class of particles INTEGER :: CTRL_INDEX=0 !< Index of controller that governs this class of particles + INTEGER :: NODE_INDEX=0 !< Index of ductnode for surface INTEGER :: ORIENTATION_INDEX=0 !< Starting position of the particle class orientation vector within the master array INTEGER :: N_ORIENTATION !< Number of orientations (directions) corresponding to this class of particles INTEGER :: Z_INDEX=-1 !< Species mixture index for this class @@ -350,6 +351,7 @@ MODULE TYPES REAL(EB) :: Y_PLUS=1._EB !< Dimensionless boundary layer thickness unit REAL(EB) :: Z_STAR=1._EB !< Dimensionless boundary layer unit REAL(EB) :: PHI_LS=-1._EB !< Level Set value for output only + REAL(EB) :: TAU_LS=-1._EB !< Level Set HRR ramp characteristic time REAL(EB) :: WORK1=0._EB !< Work array REAL(EB) :: WORK2=0._EB !< Work array REAL(EB) :: WORK3=0._EB !< Work array @@ -934,6 +936,7 @@ MODULE TYPES INTEGER :: N_LPC=0 !< Number of particle classes emitted by the surface INTEGER :: N_CONE_CURVES=0 !< Total number of time vs. heat release rate curves specified for the S-pyro model INTEGER :: N_MATL !< Total number of unique materials over all layers + INTEGER :: NODE_INDEX=0 !< Ductnode index INTEGER, DIMENSION(30) :: ONE_D_REALS_ARRAY_SIZE=0,ONE_D_INTEGERS_ARRAY_SIZE=0,ONE_D_LOGICALS_ARRAY_SIZE=0 INTEGER, ALLOCATABLE, DIMENSION(:) :: N_LAYER_CELLS !< Number of wall cells per material layer INTEGER, ALLOCATABLE, DIMENSION(:) :: LAYER_INDEX !< The layer each wall cell belongs to @@ -954,16 +957,17 @@ MODULE TYPES REAL(EB), ALLOCATABLE, DIMENSION(:) :: MIN_DIFFUSIVITY REAL(EB), ALLOCATABLE, DIMENSION(:) :: HEAT_SOURCE REAL(EB), ALLOCATABLE, DIMENSION(:) :: LAYER_THICKNESS - REAL(EB), ALLOCATABLE, DIMENSION(:) :: MIN_LAYER_THICKNESS ! Smallest layer size before layer is removed (m) + REAL(EB), ALLOCATABLE, DIMENSION(:) :: MIN_LAYER_THICKNESS !< Smallest layer size before layer is removed (m) LOGICAL, ALLOCATABLE, DIMENSION(:) :: HT3D_LAYER REAL(EB), ALLOCATABLE, DIMENSION(:) :: CELL_SIZE_FACTOR - REAL(EB), ALLOCATABLE, DIMENSION(:) :: CELL_SIZE !< Specified constant cell size (m) + REAL(EB), ALLOCATABLE, DIMENSION(:) :: CELL_SIZE !< Specified constant cell size (m) REAL(EB), ALLOCATABLE, DIMENSION(:) :: STRETCH_FACTOR REAL(EB), DIMENSION(MAX_LAYERS) :: LAYER_DENSITY,& - MOISTURE_FRACTION,SURFACE_VOLUME_RATIO,PACKING_RATIO,KAPPA_S=-1._EB,RENODE_DELTA_T + MOISTURE_CONTENT,SURFACE_VOLUME_RATIO,PACKING_RATIO,KAPPA_S=-1._EB,RENODE_DELTA_T REAL(EB), DIMENSION(MAX_LAYERS,MAX_MATERIALS) :: DENSITY_ADJUST_FACTOR=1._EB,RHO_S CHARACTER(LABEL_LENGTH), ALLOCATABLE, DIMENSION(:) :: MATL_NAME CHARACTER(LABEL_LENGTH), DIMENSION(MAX_LAYERS,MAX_MATERIALS) :: MATL_ID + CHARACTER(LABEL_LENGTH) :: NODE_ID='null' !< ID of a duct node REAL(EB), DIMENSION(MAX_LAYERS,MAX_MATERIALS) :: MATL_MASS_FRACTION LOGICAL :: BURN_AWAY,ADIABATIC,USER_DEFINED=.TRUE., & FREE_SLIP=.FALSE.,NO_SLIP=.FALSE.,SPECIFIED_NORMAL_VELOCITY=.FALSE.,SPECIFIED_TANGENTIAL_VELOCITY=.FALSE., & @@ -1142,8 +1146,8 @@ MODULE TYPES CHARACTER(LABEL_LENGTH) :: ID,MATL_ID,DEVC_ID,MOVE_ID CHARACTER(LABEL_LENGTH), ALLOCATABLE, DIMENSION(:) :: SURF_ID,VENT_ID CHARACTER(LABEL_LENGTH) :: GEOC_FILENAME='null',TEXTURE_MAPPING - LOGICAL :: COMPONENT_ONLY,IS_DYNAMIC=.TRUE.,HAVE_SURF,HAVE_VENT,HAVE_MATL,HIDDEN,REMOVEABLE,SHOW_BNDF=.TRUE., & - READ_BINARY=.FALSE.,IS_TERRAIN=.FALSE. + LOGICAL :: COMPONENT_ONLY,IS_DYNAMIC=.TRUE.,HAVE_SURF,HAVE_MATL,HIDDEN,REMOVEABLE,SHOW_BNDF=.TRUE., & + READ_BINARY=.FALSE.,IS_TERRAIN=.FALSE.,HAVE_NODE=.FALSE. INTEGER :: N_VERTS_BASE,N_FACES_BASE,N_VOLUS_BASE,N_VERTS,N_EDGES,N_FACES,N_VOLUS,NSUB_GEOMS,GEOM_TYPE,IJK(3),N_LEVELS,& DEVC_INDEX=-1,CTRL_INDEX=-1,PROP_INDEX=-1,DEVC_INDEX_O=-1,CTRL_INDEX_O=-1,MATL_INDEX=-1,& CYLINDER_NSEG_THETA,CYLINDER_NSEG_AXIS,CELL_BLOCK_IOR=0 @@ -1335,6 +1339,7 @@ MODULE TYPES INTEGER :: B2_INDEX=0 !< Derived type carrying most of the surface boundary conditions INTEGER :: BR_INDEX=0 !< Derived type carrying angular-specific radiation intensities INTEGER :: SURF_INDEX=0 + INTEGER :: NODE_INDEX=0 INTEGER :: VENT_INDEX=0 INTEGER :: BOUNDARY_TYPE=0 INTEGER :: CUT_FACE_IND1=-11 !< First index pointing to CUT_FACE array for this CFACE. @@ -1877,10 +1882,10 @@ MODULE TYPES LOGICAL :: AMBIENT = .FALSE. !< Node is connected to the ambient LOGICAL :: LEAKAGE=.FALSE. !< Node is being used for leakage LOGICAL :: VENT=.FALSE. !< Node has an attached vent + LOGICAL :: GEOM=.FALSE. !< Node has an attached GEOM LOGICAL :: HMT_FILTER=.FALSE. !< Filter is in mass transport ductrun LOGICAL :: TRANSPORT_PARTICLES=.FALSE. !< Particles will be transported through the vent attached to the node LOGICAL :: SPECIFIED_XYZ=.FALSE. !< Node has explicit XYZ. - LOGICAL, ALLOCATABLE, DIMENSION(:) :: IN_MESH !< (i) Flag indicating node is present in mesh i END TYPE DUCTNODE_TYPE TYPE (DUCTNODE_TYPE), DIMENSION(:), ALLOCATABLE, TARGET :: DUCTNODE diff --git a/Source/vege.f90 b/Source/vege.f90 index c6b1ed16887..bfcfca46510 100644 --- a/Source/vege.f90 +++ b/Source/vege.f90 @@ -156,7 +156,7 @@ SUBROUTINE INITIALIZE_LEVEL_SET_FIRESPREAD_2(NM,MODE) INTEGER, INTENT(IN) :: NM,MODE INTEGER :: I,IM1,IM2,IIG,IP1,IP2,J,JJG,JM1,JP1 -REAL(EB) :: DZT_DUM,G_EAST,G_WEST,G_SOUTH,G_NORTH +REAL(EB) :: DZT_DUM,DZTDX_DUM,DZTDY_DUM,G_EAST,G_WEST,G_SOUTH,G_NORTH T_NOW = CURRENT_TIME() @@ -218,7 +218,6 @@ SUBROUTINE INITIALIZE_LEVEL_SET_FIRESPREAD_2(NM,MODE) ! Rothermel 'Phi' factors for effects of Wind and Slope on ROS ALLOCATE(M%PHI_WS(IBAR,JBAR)) ; CALL ChkMemErr('VEGE:LEVEL SET','PHI_W',IZERO) ; PHI_WS => M%PHI_WS ; PHI_WS = 0.0_EB -ALLOCATE(M%PHI_S(IBAR,JBAR)) ; CALL ChkMemErr('VEGE:LEVEL SET','PHI_S',IZERO) ; PHI_S => M%PHI_S ALLOCATE(M%PHI_S_X(IBAR,JBAR)) ; CALL ChkMemErr('VEGE:LEVEL SET','PHI_S_X',IZERO) ; PHI_S_X => M%PHI_S_X ALLOCATE(M%PHI_S_Y(IBAR,JBAR)) ; CALL ChkMemErr('VEGE:LEVEL SET','PHI_S_Y',IZERO) ; PHI_S_Y => M%PHI_S_Y @@ -296,16 +295,19 @@ SUBROUTINE INITIALIZE_LEVEL_SET_FIRESPREAD_2(NM,MODE) E_ROTH = 0.715_EB * EXP(-0.01094_EB * SF%VEG_LSET_SIGMA) BETA_OP_ROTH = 0.20395_EB * (SF%VEG_LSET_SIGMA**(-0.8189_EB))! Optimum packing ratio - ! Limit effect to slope lte 80 degrees. Phi_s_x,y are slope factors (Rothermel model) - - DZT_DUM = MIN(5.67_EB,ABS(DZTDX(IIG,JJG))) ! 5.67 ~ tan 80 deg - PHI_S_X(IIG,JJG) = 5.275_EB * ((SF%VEG_LSET_BETA)**(-0.3_EB)) * DZT_DUM**2 - PHI_S_X(IIG,JJG) = SIGN(PHI_S_X(IIG,JJG),DZTDX(IIG,JJG)) - DZT_DUM = MIN(1.73_EB,ABS(DZTDY(IIG,JJG))) ! 1.73 ~ tan 60 deg - PHI_S_Y(IIG,JJG) = 5.275_EB * ((SF%VEG_LSET_BETA)**(-0.3_EB)) * DZT_DUM**2 - PHI_S_Y(IIG,JJG) = SIGN(PHI_S_Y(IIG,JJG),DZTDY(IIG,JJG)) + ! Slope vector + DZTDX_DUM = DZTDX(IIG,JJG) + DZTDY_DUM = DZTDY(IIG,JJG) + DZT_DUM = SQRT(DZTDX_DUM**2._EB+DZTDY_DUM**2._EB) + ! Limit effect to slope lte 80 degrees + IF (DZT_DUM>5.67_EB) THEN + DZTDX_DUM = DZTDX_DUM * 5.67_EB/DZT_DUM + DZTDY_DUM = DZTDY_DUM * 5.67_EB/DZT_DUM + DZT_DUM = 5.67_EB + ENDIF - PHI_S(IIG,JJG) = SQRT(PHI_S_X(IIG,JJG)**2 + PHI_S_Y(IIG,JJG)**2) + PHI_S_X(IIG,JJG) = 5.275_EB * ((SF%VEG_LSET_BETA)**(-0.3_EB)) * DZTDX_DUM * DZT_DUM + PHI_S_Y(IIG,JJG) = 5.275_EB * ((SF%VEG_LSET_BETA)**(-0.3_EB)) * DZTDY_DUM * DZT_DUM ENDIF IF_ELLIPSE @@ -332,8 +334,8 @@ SUBROUTINE LEVEL_SET_FIRESPREAD(T,DT,NM) REAL(EB), INTENT(IN) :: T,DT INTEGER :: IIG,IW,JJG,IC,OUTPUT_INDEX INTEGER :: KDUM,KWIND,ICF,IKT -REAL(EB) :: UMF_TMP,PHX,PHY,MAG_PHI,PHI_W_X,PHI_W_Y,UMF_X,UMF_Y,UMAG,ROS_MAG,UMF_MAG,WIND_FACTOR,& - SIN_THETA,COS_THETA,THETA,ZWIND(2),U_Z(2),V_Z(2),REF_WIND_HEIGHT +REAL(EB) :: UMF_TMP,PHX,PHY,MAG_PHI,PHI_S,PHI_W_X,PHI_W_Y,UMF_X,UMF_Y,UMAG,ROS_MAG,UMF_MAG,& + WIND_FACTOR,SIN_THETA,COS_THETA,THETA,ZWIND(2),U_Z(2),V_Z(2),REF_WIND_HEIGHT T_NOW = CURRENT_TIME() @@ -464,7 +466,9 @@ SUBROUTINE LEVEL_SET_FIRESPREAD(T,DT,NM) ! Include Rothermel slope factor - IF (PHI_S(IIG,JJG) > 0.0_EB) THEN + PHI_S = SQRT(PHI_S_X(IIG,JJG)+PHI_S_Y(IIG,JJG)) + + IF (PHI_S > 0.0_EB) THEN PHX = PHI_W_X + PHI_S_X(IIG,JJG) PHY = PHI_W_Y + PHI_S_Y(IIG,JJG) @@ -487,13 +491,11 @@ SUBROUTINE LEVEL_SET_FIRESPREAD(T,DT,NM) ! 0.3048 ~= 1/3.281 ! if phi_s < 0 then a complex value (NaN) results. Using abs(phi_s) and sign function to correct. - UMF_TMP = (((ABS(PHI_S_X(IIG,JJG)) * (SF%VEG_LSET_BETA / BETA_OP_ROTH)**E_ROTH)/C_ROTH)**(1/B_ROTH))*0.3048 - UMF_TMP = SIGN(UMF_TMP,PHI_S_X(IIG,JJG)) - UMF_X = UMF_X + UMF_TMP + UMF_TMP = & + 0.3048_EB/PHI_S*(((SF%VEG_LSET_BETA / BETA_OP_ROTH)**E_ROTH)*PHI_S/C_ROTH)**(1._EB/B_ROTH) - UMF_TMP = (((ABS(PHI_S_Y(IIG,JJG)) * (SF%VEG_LSET_BETA / BETA_OP_ROTH)**E_ROTH)/C_ROTH)**(1/B_ROTH))*0.3048 - UMF_TMP = SIGN(UMF_TMP,PHI_S_Y(IIG,JJG)) - UMF_Y = UMF_Y + UMF_TMP + UMF_X = UMF_X + UMF_TMP*PHI_S_X(IIG,JJG) + UMF_Y = UMF_Y + UMF_TMP*PHI_S_Y(IIG,JJG) ELSE @@ -553,18 +555,18 @@ SUBROUTINE LEVEL_SET_FIRESPREAD(T,DT,NM) WC => WALL(IW) B1 => BOUNDARY_PROP1(WC%B1_INDEX) OUTPUT_INDEX = IW - IF (PHI_LS(IIG,JJG)>=0._EB .AND. B1%T_IGN>9.E5_EB) CALL IGNITE_GRID_CELL B2 => BOUNDARY_PROP2(WC%B2_INDEX) B2%PHI_LS = PHI_LS(IIG,JJG) + IF (PHI_LS(IIG,JJG)>=0._EB .AND. B1%T_IGN>9.E5_EB) CALL IGNITE_GRID_CELL ELSE DO IW=1,CUT_FACE(ICF)%NFACE ! All CC_INBOUNDARY CFACES on this cell. CFA => CFACE(CUT_FACE(ICF)%CFACE_INDEX(IW)) B1 => BOUNDARY_PROP1(CFA%B1_INDEX) OUTPUT_INDEX = CUT_FACE(ICF)%CFACE_INDEX(IW) - & INTERNAL_CFACE_CELLS_LB+N_EXTERNAL_WALL_CELLS+N_INTERNAL_WALL_CELLS - IF (PHI_LS(IIG,JJG)>=0._EB .AND. B1%T_IGN>9.E5_EB) CALL IGNITE_GRID_CELL B2 => BOUNDARY_PROP2(CFA%B2_INDEX) B2%PHI_LS = PHI_LS(IIG,JJG) + IF (PHI_LS(IIG,JJG)>=0._EB .AND. B1%T_IGN>9.E5_EB) CALL IGNITE_GRID_CELL ENDDO ENDIF ENDDO @@ -581,9 +583,9 @@ SUBROUTINE LEVEL_SET_FIRESPREAD(T,DT,NM) WC => WALL(IW) B1 => BOUNDARY_PROP1(WC%B1_INDEX) OUTPUT_INDEX = IW - IF (PHI_LS(IIG,JJG)>=0._EB .AND. B1%T_IGN>9.E5_EB) CALL IGNITE_GRID_CELL B2 => BOUNDARY_PROP2(WC%B2_INDEX) B2%PHI_LS = PHI_LS(IIG,JJG) + IF (PHI_LS(IIG,JJG)>=0._EB .AND. B1%T_IGN>9.E5_EB) CALL IGNITE_GRID_CELL ENDDO ENDDO ENDIF @@ -598,10 +600,10 @@ SUBROUTINE LEVEL_SET_FIRESPREAD(T,DT,NM) SUBROUTINE IGNITE_GRID_CELL -REAL(EB) :: CROSSING_DISTANCE +REAL(EB) :: CROSSING_DISTANCE,FIRE_DEPTH,TAU_2 B1%T_IGN = T -ROS_MAG = MAX(0.01_EB,SQRT(SR_X_LS(IIG,JJG)**2 + SR_Y_LS(IIG,JJG)**2)) ! Rate Of Spread magnitude +ROS_MAG = MAX(0.0001_EB,SQRT(SR_X_LS(IIG,JJG)**2 + SR_Y_LS(IIG,JJG)**2)) ! Rate Of Spread magnitude IF (ABS(SR_X_LS(IIG,JJG))= CROSSING_DISTANCE) THEN + ! tau_1 + B2%TAU_LS = CROSSING_DISTANCE/ROS_MAG + ! tau_2 + TAU_2 = (FIRE_DEPTH - CROSSING_DISTANCE)/ROS_MAG +ELSE + ! tau_1 + B2%TAU_LS = FIRE_DEPTH/ROS_MAG + ! tau_2 + TAU_2 = (CROSSING_DISTANCE - FIRE_DEPTH)/ROS_MAG +ENDIF + +B1%BURN_DURATION = 2._EB*B2%TAU_LS + TAU_2 +! Adjust mass flux to conserve total energy output IF (LEVEL_SET_COUPLED_FIRE) B1%AREA_ADJUST = B1%AREA_ADJUST * & - B1%BURN_DURATION/(B1%BURN_DURATION - TWTH*SF%RAMP(REACTION(1)%FUEL_SMIX_INDEX)%TAU) + SF%BURN_DURATION/(B2%TAU_LS+TAU_2) IF (STORE_LS_SPREAD_RATE) LS_SPREAD_RATE(OUTPUT_INDEX) = SQRT(SR_X_LS(IIG,JJG)**2 + SR_Y_LS(IIG,JJG)**2) diff --git a/Source/wall.f90 b/Source/wall.f90 index 69b59582c60..4e35f097416 100644 --- a/Source/wall.f90 +++ b/Source/wall.f90 @@ -1329,6 +1329,15 @@ SUBROUTINE CALCULATE_ZZ_F(T,DT,WALL_INDEX,CFACE_INDEX,PARTICLE_INDEX) B1%M_DOT_G_PP_ACTUAL(N) = 0._EB ENDIF ENDIF + ! Trapezoidal HRR curve for level set spread + ELSEIF (SF%VEG_LSET_SPREAD) THEN + IF (TSI <= B2%TAU_LS) THEN + B1%M_DOT_G_PP_ACTUAL(N) = TSI/B2%TAU_LS*SF%MASS_FLUX(N) + ELSEIF (TSI <= B1%BURN_DURATION-B2%TAU_LS) THEN + B1%M_DOT_G_PP_ACTUAL(N) = SF%MASS_FLUX(N) + ELSE + B1%M_DOT_G_PP_ACTUAL(N) = (1-(TSI-B1%BURN_DURATION+B2%TAU_LS)/B2%TAU_LS)*SF%MASS_FLUX(N) + ENDIF ELSE B1%M_DOT_G_PP_ACTUAL(N) = EVALUATE_RAMP(TSI,SF%RAMP(N)%INDEX,TAU=SF%RAMP(N)%TAU)*SF%MASS_FLUX(N) ENDIF diff --git a/Utilities/Matlab/FDS_validation_dataplot_inputs.csv b/Utilities/Matlab/FDS_validation_dataplot_inputs.csv index fcc5b583985..ce800ef84ca 100644 --- a/Utilities/Matlab/FDS_validation_dataplot_inputs.csv +++ b/Utilities/Matlab/FDS_validation_dataplot_inputs.csv @@ -6929,11 +6929,18 @@ d,NIST FSE 2008,NIST_FSE_2008/ISOToluene29.csv,1,2,Time,HRR2,Exp (HRR2),k-,0,100 d,NIST FSE 2008,NIST_FSE_2008/ISOPropanol30.csv,1,2,Time,HRR2,Exp (HRR2),k-,0,10000,,0,10000,-10000,10000,0,NIST_FSE_2008/ISOPropanol30_hrr.csv,2,3,Time,HRR,FDS (HRR),k--,0,10000,,0,10000,-10000,10000,0,"HRR, ISOPropanol30",Time (min),HRR (kW),0,40,60,0,3000,1,no,0.05 0.90,NorthEast,,1,NIST_FSE_2008/ISOPropanol30_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NIST_FSE_2008/ISOPropanol30_HRR,0,max,0,NIST FSE 2008,k*,k,TeX d,NIST FSE 2008,NIST_FSE_2008/ISONG32.csv,1,2,Time,HRR2,Exp (HRR2),k-,0,10000,,0,10000,-10000,10000,0,NIST_FSE_2008/ISONG32_hrr.csv,2,3,Time,HRR,FDS (HRR),k--,0,10000,,0,10000,-10000,10000,0,"HRR, ISONG32",Time (min),HRR (kW),0,30,60,0,3000,1,no,0.05 0.90,NorthEast,,1,NIST_FSE_2008/ISONG32_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NIST_FSE_2008/ISONG32_HRR,0,max,0,NIST FSE 2008,k*,k,TeX s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -d,NIST/NRC Parallel Panels,NIST_NRC_Parallel_Panels/Test7_PMMA_R6.csv,1,3,Time,HRR,Exp,k-,0,10000,,0,10000,-10000,10000,0,NIST_NRC_Parallel_Panels/PMMA_60_kW_4_cm_hrr.csv,2,3,Time,HRR,FDS 4 cm,k:,0,10000,,0,10000,-10000,10000,0,"Parallel Panels, PMMA",Time (min),Heat Release Rate (kW),0,20,60,0,4000,1,no,0.05 0.90,East,,1,NIST_NRC_Parallel_Panels/PMMA_60_kW_4_cm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/PMMA_60_kW,0,max,0,NIST/NRC Parallel Panels,rs,r,TeX -f,NIST/NRC Parallel Panels,NIST_NRC_Parallel_Panels/Test7_PMMA_R6.csv,1,3,Time,HRR,blank,blank,0,10000,,0,10000,-10000,10000,0,NIST_NRC_Parallel_Panels/PMMA_60_kW_2_cm_hrr.csv,2,3,Time,HRR,FDS 2 cm,k-.,0,10000,,0,10000,-10000,10000,0,"Parallel Panels, PMMA",Time (min),Heat Release Rate (kW),0,20,60,0,4000,1,no,0.05 0.90,East,,1,NIST_NRC_Parallel_Panels/PMMA_60_kW_2_cm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/PMMA_60_kW,0,max,0,NIST/NRC Parallel Panels,rs,r,TeX -f,NIST/NRC Parallel Panels,NIST_NRC_Parallel_Panels/Test7_PMMA_R6.csv,1,3,Time,HRR,blank,blank,0,10000,,0,10000,-10000,10000,0,NIST_NRC_Parallel_Panels/PMMA_60_kW_1_cm_hrr.csv,2,3,Time,HRR,FDS 1 cm,k--,0,10000,,0,10000,-10000,10000,0,"Parallel Panels, PMMA",Time (min),Heat Release Rate (kW),0,20,60,0,4000,1,no,0.05 0.90,East,,1,NIST_NRC_Parallel_Panels/PMMA_60_kW_1_cm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/PMMA_60_kW,0,max,0,NIST/NRC Parallel Panels,rs,r,TeX -d,NIST/NRC Parallel Panels,NIST_NRC_Parallel_Panels/Test11_PVC_R1.csv,1,3,Time,HRR,Exp (HRR),k-,0,10000,,0,10000,-10000,10000,0,NIST_NRC_Parallel_Panels/PVC_60_kW_hrr.csv,2,3,Time,HRR,FDS (HRR),k--,0,10000,,0,10000,-10000,10000,0,"Parallel Panels, PVC",Time (min),Heat Release Rate (kW),0,20,60,0,1000,1,no,0.05 0.90,East,,1,NIST_NRC_Parallel_Panels/PVC_60_kW_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/PVC_60_kW,0,max,0,NIST/NRC Parallel Panels,rs,r,TeX -d,NIST/NRC Parallel Panels,NIST_NRC_Parallel_Panels/Test12_PBT_R1.csv,1,3,Time,HRR,Exp (HRR),k-,0,10000,,0,10000,-10000,10000,0,NIST_NRC_Parallel_Panels/PBT_60_kW_hrr.csv,2,3,Time,HRR,FDS (HRR),k--,0,10000,,0,10000,-10000,10000,0,"Parallel Panels, PBT",Time (min),Heat Release Rate (kW),0,20,60,0,4000,1,no,0.05 0.90,East,,1,NIST_NRC_Parallel_Panels/PBT_60_kW_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/PBT_60_kW,0,max,0,NIST/NRC Parallel Panels,rs,r,TeX +d,NIST/NRC Parallel Panels,NIST_NRC_Parallel_Panels/Test4_PMMA_R4.csv,1,3,Time,HRR,Exp (R4),k-,0,10000,,0,10000,-10000,10000,0,NIST_NRC_Parallel_Panels/PMMA_60_kW_1_cm_hrr.csv,2,3,Time,HRR,FDS (1 cm),r-,0,10000,,0,10000,-10000,10000,0,"Parallel Panels, PMMA",Time (min),Heat Release Rate (kW),0,20,60,0,4000,1,no,0.05 0.90,East,,1,NIST_NRC_Parallel_Panels/PMMA_60_kW_1_cm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/PMMA_60_kW,Heat Release Rate,max_1_1,0,NIST/NRC Parallel Panels,rs,r,TeX +f,NIST/NRC Parallel Panels,NIST_NRC_Parallel_Panels/Test5_PMMA_R5.csv,1,3,Time,HRR,Exp (R5),k--,0,10000,,0,10000,-10000,10000,0,NIST_NRC_Parallel_Panels/PMMA_60_kW_2_cm_hrr.csv,2,3,Time,HRR,FDS (2 cm),g-.,0,10000,,0,10000,-10000,10000,0,"Parallel Panels, PMMA",Time (min),Heat Release Rate (kW),0,20,60,0,4000,1,no,0.05 0.90,East,,1,NIST_NRC_Parallel_Panels/PMMA_60_kW_2_cm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/PMMA_60_kW,Heat Release Rate,max_1_1,0,NIST/NRC Parallel Panels,rs,r,TeX +f,NIST/NRC Parallel Panels,NIST_NRC_Parallel_Panels/Test7_PMMA_R6.csv,1,3,Time,HRR,Exp (R6),k-.,0,10000,,0,10000,-10000,10000,0,NIST_NRC_Parallel_Panels/PMMA_60_kW_4_cm_hrr.csv,2,3,Time,HRR,FDS (4 cm),m-,0,10000,,0,10000,-10000,10000,0,"Parallel Panels, PMMA",Time (min),Heat Release Rate (kW),0,20,60,0,4000,1,no,0.05 0.90,East,,1,NIST_NRC_Parallel_Panels/PMMA_60_kW_4_cm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/PMMA_60_kW,Heat Release Rate,max_1_1,0,NIST/NRC Parallel Panels,rs,r,TeX +d,NIST/NRC Parallel Panels,NIST_NRC_Parallel_Panels/Test11_PVC_R1.csv,1,3,Time,HRR,Exp (R1),k-,0,10000,,0,10000,-10000,10000,0,NIST_NRC_Parallel_Panels/PVC_1_cm_cat_hrr.csv,2,3,Time,HRR,FDS (1 cm),r-,0,10000,,0,10000,-10000,10000,0,"Parallel Panels, PVC",Time (min),Heat Release Rate (kW),0,20,60,0,1000,1,no,0.05 0.90,East,,1,NIST_NRC_Parallel_Panels/PVC_2_cm_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/PVC_60_kW,Heat Release Rate,max_1_1,0,NIST/NRC Parallel Panels,rs,r,TeX +f,NIST/NRC Parallel Panels,NIST_NRC_Parallel_Panels/Test13_PVC_R2.csv,1,3,Time,HRR,Exp (R2),k--,0,10000,,0,10000,-10000,10000,0,NIST_NRC_Parallel_Panels/PVC_2_cm_cat_hrr.csv,2,3,Time,HRR,FDS (2 cm),g-,0,10000,,0,10000,-10000,10000,0,"Parallel Panels, PVC",Time (min),Heat Release Rate (kW),0,20,60,0,1000,1,no,0.05 0.90,East,,1,NIST_NRC_Parallel_Panels/PVC_2_cm_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/PVC_60_kW,Heat Release Rate,max_1_1,0,NIST/NRC Parallel Panels,rs,r,TeX +f,NIST/NRC Parallel Panels,NIST_NRC_Parallel_Panels/Test13_PVC_R2.csv,1,3,Time,HRR,blank,blank,0,10000,,0,10000,-10000,10000,0,NIST_NRC_Parallel_Panels/PVC_4_cm_cat_hrr.csv,2,3,Time,HRR,FDS (4 cm),m-,0,10000,,0,10000,-10000,10000,0,"Parallel Panels, PVC",Time (min),Heat Release Rate (kW),0,20,60,0,1000,1,no,0.05 0.90,East,,1,NIST_NRC_Parallel_Panels/PVC_2_cm_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/PVC_60_kW,Heat Release Rate,max_1_1,0,NIST/NRC Parallel Panels,rs,r,TeX +d,NIST/NRC Parallel Panels,NIST_NRC_Parallel_Panels/Test12_PBT_R1.csv,1,3,Time,HRR,Exp (R1),k-,0,10000,,0,10000,-10000,10000,0,NIST_NRC_Parallel_Panels/PBT_1_cm_cat_hrr.csv,2,3,Time,HRR,FDS (1 cm),r-,0,10000,,0,10000,-10000,10000,0,"Parallel Panels, PBT",Time (min),Heat Release Rate (kW),0,20,60,0,4000,1,no,0.05 0.90,East,,1,NIST_NRC_Parallel_Panels/PBT_2_cm_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/PBT_60_kW,Heat Release Rate,max_1_1,0,NIST/NRC Parallel Panels,rs,r,TeX +f,NIST/NRC Parallel Panels,NIST_NRC_Parallel_Panels/Test12_PBT_R1.csv,1,3,Time,HRR,blank,blank,0,10000,,0,10000,-10000,10000,0,NIST_NRC_Parallel_Panels/PBT_2_cm_cat_hrr.csv,2,3,Time,HRR,FDS (2 cm),g-,0,10000,,0,10000,-10000,10000,0,"Parallel Panels, PBT",Time (min),Heat Release Rate (kW),0,20,60,0,4000,1,no,0.05 0.90,East,,1,NIST_NRC_Parallel_Panels/PBT_2_cm_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/PBT_60_kW,Heat Release Rate,max_1_1,0,NIST/NRC Parallel Panels,rs,r,TeX +f,NIST/NRC Parallel Panels,NIST_NRC_Parallel_Panels/Test12_PBT_R1.csv,1,3,Time,HRR,blank,blank,0,10000,,0,10000,-10000,10000,0,NIST_NRC_Parallel_Panels/PBT_4_cm_cat_hrr.csv,2,3,Time,HRR,FDS (4 cm),m-,0,10000,,0,10000,-10000,10000,0,"Parallel Panels, PBT",Time (min),Heat Release Rate (kW),0,20,60,0,4000,1,no,0.05 0.90,East,,1,NIST_NRC_Parallel_Panels/PBT_2_cm_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/PBT_60_kW,Heat Release Rate,max_1_1,0,NIST/NRC Parallel Panels,rs,r,TeX +d,NIST/NRC Parallel Panels,NIST_NRC_Parallel_Panels/Test22_RedCedar_R2.csv,1,3,Time,HRR,Exp (R2),k-,0,10000,,0,10000,-10000,10000,0,NIST_NRC_Parallel_Panels/WRC_1_cm_cat_hrr.csv,2,3,Time,HRR,FDS (1 cm),r-,0,10000,,0,10000,-10000,10000,0,"Parallel Panels, W. Red Cedar",Time (min),Heat Release Rate (kW),0,10,60,0,500,1,no,0.05 0.90,NorthEast,,1,NIST_NRC_Parallel_Panels/WRC_1_cm_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/WRC_60_kW,Heat Release Rate,max_1_1,0,NIST/NRC Parallel Panels,rs,r,TeX +f,NIST/NRC Parallel Panels,NIST_NRC_Parallel_Panels/Test43_RedCedar_R3.csv,1,3,Time,HRR,Exp (R3),k--,0,10000,,0,10000,-10000,10000,0,NIST_NRC_Parallel_Panels/WRC_2_cm_cat_hrr.csv,2,3,Time,HRR,FDS (2 cm),g-,0,10000,,0,10000,-10000,10000,0,"Parallel Panels, W. Red Cedar",Time (min),Heat Release Rate (kW),0,10,60,0,500,1,no,0.05 0.90,NorthEast,,1,NIST_NRC_Parallel_Panels/WRC_1_cm_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/WRC_60_kW,Heat Release Rate,max_1_1,0,NIST/NRC Parallel Panels,rs,r,TeX +f,NIST/NRC Parallel Panels,NIST_NRC_Parallel_Panels/Test65_RedCedar_R4.csv,1,3,Time,HRR,Exp (R4),k-.,0,10000,,0,10000,-10000,10000,0,NIST_NRC_Parallel_Panels/WRC_4_cm_cat_hrr.csv,2,3,Time,HRR,FDS (4 cm),m-,0,10000,,0,10000,-10000,10000,0,"Parallel Panels, W. Red Cedar",Time (min),Heat Release Rate (kW),0,10,60,0,500,1,no,0.05 0.90,NorthEast,,1,NIST_NRC_Parallel_Panels/WRC_1_cm_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NIST_NRC_Parallel_Panels/WRC_60_kW,Heat Release Rate,max_1_1,0,NIST/NRC Parallel Panels,rs,r,TeX s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, d,NIST/NRC Transient Combustibles,NIST_NRC_Transient_Combustibles/Multiple_Items_Test_1.csv,1,2,Time(s),HRR(kW),Exp (HRR),k-,0,10000,,0,10000,-10000,10000,0,NIST_NRC_Transient_Combustibles/box_1x1x1_cat_hrr.csv,2,3,Time,HRR,FDS (HRR),k--,0,10000,,0,10000,-10000,10000,0,Test 1: Single Box,Time (min),HRR (kW),0,60,60,0,600,1,no,0.05 0.90,NorthEast,,1,NIST_NRC_Transient_Combustibles/box_1x1x1_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NIST_NRC_Transient_Combustibles/box_1x1x1_HRR,Heat Release Rate,max,0,NIST/NRC Transient Combustibles,m>,m,TeX d,NIST/NRC Transient Combustibles,NIST_NRC_Transient_Combustibles/Multiple_Items_Test_2.csv,1,2,Time(s),HRR(kW),Exp (HRR),k-,0,10000,,0,10000,-10000,10000,0,NIST_NRC_Transient_Combustibles/box_2x1x1_cat_hrr.csv,2,3,Time,HRR,FDS (HRR),k--,0,10000,,0,10000,-10000,10000,0,Test 2: Two Boxes,Time (min),HRR (kW),0,60,60,0,1500,1,no,0.05 0.90,NorthEast,,1,NIST_NRC_Transient_Combustibles/box_2x1x1_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NIST_NRC_Transient_Combustibles/box_2x1x1_HRR,Heat Release Rate,max,0,NIST/NRC Transient Combustibles,m>,m,TeX diff --git a/Utilities/Matlab/FDS_verification_dataplot_inputs.csv b/Utilities/Matlab/FDS_verification_dataplot_inputs.csv index 52ea0fe41a5..374318a5c08 100644 --- a/Utilities/Matlab/FDS_verification_dataplot_inputs.csv +++ b/Utilities/Matlab/FDS_verification_dataplot_inputs.csv @@ -377,6 +377,8 @@ d,HVAC_mass_transport_energy,HVAC/HVAC_mass_transport_energy_git.txt,HVAC/HVAC_m d,HVAC_mass_transport_energy,HVAC/HVAC_mass_transport_energy_git.txt,HVAC/HVAC_mass_transport_energy_ideal.csv,1,2,Time,Ideal Delta P,Ideal \Delta p,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,HVAC/HVAC_mass_transport_energy_devc.csv,2,3,Time,FDS Delta P,FDS \Delta p,k-,0,100000,,20,40,-1.00E+09,1.00E+09,0,Pressure difference (HVAC\_mass\_transport\_energy),Time (s),Pressure (Pa),0,40,1,0.6,1.2,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/HVAC_mass_transport_energy_p,Relative Error,mean,0.01,HVAC,kd,k,TeX d,HVAC_tee_loss_1,HVAC/HVAC_tee_loss_1_git.txt,HVAC/HVAC_flow_loss_ideal.csv,1,2,Time,Ideal 1 m/s|Ideal 2 m/s|Ideal 3 m/s,Ideal 1 m/s|Ideal 2 m/s|Ideal 3 m/s,ro|bo|ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,HVAC/HVAC_tee_loss_1_devc.csv,2,3,Time,FDS 1 m/s duct|FDS 2 m/s duct|FDS 3 m/s duct,FDS 1 m/s|FDS 2 m/s|FDS 3 m/s,r-|b-|k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Velocities (HVAC\_tee\_loss\_1),Time (s),Velocity (m/s),0,10,1,0,5,1,no,0.40 0.90,NorthWest,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/HVAC_tee_loss_1,Relative Error,end,0.01,HVAC,kd,k,TeX d,HVAC_tee_loss_2,HVAC/HVAC_tee_loss_2_git.txt,HVAC/HVAC_tee_loss_2_ideal.csv,1,2,Time,Ideal 1.5 m/s A|Ideal 1.5 m/s B|Ideal 3 m/s,Ideal 1.5 m/s A|Ideal 1.5 m/s B|Ideal 3 m/s,ro|bo|ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,HVAC/HVAC_tee_loss_2_devc.csv,2,3,Time,E 1|E 2|S 1,FDS 1.5 m/s A|FDS 1.5 m/s B|FDS 3 m/s,r-|b-|k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Velocities (HVAC\_tee\_loss\_2),Time (s),Velocity (m/s),0,10,1,0,5,1,no,0.40 0.90,NorthWest,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/HVAC_tee_loss_2,Relative Error,end,0.01,HVAC,kd,k,TeX +d,leak_geom,HVAC/leak_geom_git.txt,HVAC/leak_geom.csv,1,2,Time,V,Ideal,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,HVAC/leak_geom_devc.csv,2,3,Time,L|C|C V|R,FDS Left|FDS Geom Center|FDS Vent Center|FDS Right,r-|b-|k-|g-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Velocities (HVAC\_tee\_loss\_2),Time (s),Velocity (m/s),0,5,1,0,0.15,1,no,0.40 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/leak_geom,Relative Error,end,0.01,HVAC,kd,k,TeX +d,HVAC_geom,HVAC/HVAC_geom_git.txt,HVAC/HVAC_geom.csv,1,2,Time,V,Ideal,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,HVAC/HVAC_geom_devc.csv,2,3,Time,L|LR|R,FDS Left In|FDS Left to Right |FDS Right Out,r-|b-|k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Velocities (HVAC\_tee\_loss\_2),Time (s),Velocity (m/s),0,5,1,0,2.5,1,no,0.40 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/HVAC_geom,Relative Error,end,0.01,HVAC,kd,k,TeX d,ignition_delay,Chemistry/ign_delay_Methane_grimech30_T900K_Phi0p6_cat_git.txt,Chemistry/cantera_ignition_delay.csv,1,2,Time1,TMP1,Cantera,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Chemistry/ign_delay_Methane_grimech30_T900K_Phi0p6_cat_devc.csv,2,3,Time,TMP,FDS,b-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,ignition\_delay; T=626.85 °C,Time (s),Temperature (°C),0,10,1,550,3000,1,no,0.05 0.90,NorthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/ign_delay_Methane_grimech30_900_0p6_TMP,Relative Error,area,0.02,Chemistry,b*,b,TeX d,ignition_delay,Chemistry/ign_delay_Methane_grimech30_T900K_Phi0p6_cat_git.txt,Chemistry/cantera_ignition_delay.csv,1,2,Time1,OH1,Cantera,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Chemistry/ign_delay_Methane_grimech30_T900K_Phi0p6_cat_devc.csv,2,3,Time,OH,FDS,b-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,ignition\_delay; T=626.85 °C,Time (s),OH Mass Fraction,0,10,1,0,0.02,1,no,0.05 0.90,NorthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/ign_delay_Methane_grimech30_900_0p6_OH,Relative Error,area,0.02,Chemistry,b*,b,TeX d,ignition_delay,Chemistry/ign_delay_Methane_grimech30_T1000K_Phi0p6_cat_git.txt,Chemistry/cantera_ignition_delay.csv,1,2,Time2,TMP2,Cantera,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Chemistry/ign_delay_Methane_grimech30_T1000K_Phi0p6_cat_devc.csv,2,3,Time,TMP,FDS,b-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,ignition\_delay; T=726.85 °C,Time (s),Temperature (°C),0,2,1,550,3000,1,no,0.05 0.90,NorthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/ign_delay_Methane_grimech30_1000_0p6_TMP,Relative Error,area,0.02,Chemistry,b*,b,TeX @@ -817,4 +819,4 @@ f,anca-couce,Pyrolysis/anca-couce-fig2_2p5K_git.txt,Pyrolysis/Anca-Couce-fig1.cs f,anca-couce,Pyrolysis/anca-couce-fig2_2p5K_git.txt,Pyrolysis/Anca-Couce-fig1.csv,1,2,2.5K/min TMP,2.5K/min MLR,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pyrolysis/anca-couce-fig2_2p5K_cat_tga.csv,2,3,Temp,LIGNIN MLR,LIGNIN,k:,0,100000,,0,100000,-1.00E+09,1.00E+09,0,0% O_2 (3C Wood Pyrolysis),Temperature (°C),Normalized Mass Loss Rate (1/s),200,550,1,0,3.20E-03,1,no,0.05 0.90,East,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/anca_couce_fig2_2p5K,N/A,max,0.1,pine wood TGA,kd,k,TeX s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, g,sphere_leak,Complex_Geometry/sphere_leak_git.txt,Complex_Geometry/sphere_leak.csv,1,2,Time,Pressure,Exact,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Complex_Geometry/sphere_leak_devc.csv,2,3,Time,Pressure,FDS,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure Rise (sphere\_leak),Time (s),Pressure (Pa),0,100,1,0,5000,1,no,0.05 0.90,SouthEast,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/sphere_leak,Relative Error,max,0.05,Pressure Effects,k+,k,TeX -d,sphere_radiate,Complex_Geometry/sphere_radiate_git.txt,Complex_Geometry/sphere_radiate.csv,1,2,Time,HF,Exact,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Complex_Geometry/sphere_radiate_devc.csv,2,3,Time,HF1,FDS,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Heat Flux (sphere\_radiate),Time (s),Heat Flux (kW/m²),0,0.01,1,0,8,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/sphere_radiate,Relative Error,max,0.07,Radiation,bs,b,TeX \ No newline at end of file +d,sphere_radiate,Complex_Geometry/sphere_radiate_git.txt,Complex_Geometry/sphere_radiate.csv,1,2,Time,HF,Exact,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Complex_Geometry/sphere_radiate_devc.csv,2,3,Time,HF1,FDS,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Heat Flux (sphere\_radiate),Time (s),Heat Flux (kW/m²),0,0.01,1,0,8,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/sphere_radiate,Relative Error,max,0.07,Radiation,bs,b,TeX diff --git a/Utilities/Matlab/scripts/level_set_ellipse.m b/Utilities/Matlab/scripts/level_set_ellipse.m index 43adfcc482c..f33f883ca67 100644 --- a/Utilities/Matlab/scripts/level_set_ellipse.m +++ b/Utilities/Matlab/scripts/level_set_ellipse.m @@ -163,7 +163,7 @@ end max_err = max(error_table{:,2:end}(:)); -if max_err>.15 +if max_err>.2 display(['Matlab Warning: LS_ellipse is out of tolerance. Max error = ',num2str(max_err)]) end @@ -218,8 +218,9 @@ function [phi_s_x,phi_s_y] = slope_adj(dzdx,dzdy) beta=0.01; % packing ratio (-), FDS default % Rothermel optimum packing ratio - phi_s_x = sign(dzdx)*5.275*beta^-0.3*dzdx^2; - phi_s_y = sign(dzdy)*5.275*beta^-0.3*dzdy^2; + dzds = sqrt(dzdx^2+dzdy^2); + phi_s_x = 5.275*beta^-0.3*dzdx*dzds; + phi_s_y = 5.275*beta^-0.3*dzdy*dzds; end % calculate virtual wind vector for slope @@ -233,7 +234,13 @@ C = 7.47*exp(-0.8711*sigma.^0.55); B = 0.15988*sigma.^0.54; E = 0.715*exp(-0.01094*sigma); + phi_s=sqrt(phi_s_x^2+phi_s_y^2); + if (phi_s>0) + uv_tmp = 0.3048/phi_s*(phi_s/C*beta_ratio^E)^(1/B); + else + uv_tmp = 0; + end % divide by 60 to maintain units of m/s elsewhere - u_virtual = 0.3048*(phi_s_x/C*beta_ratio^E)^(1/B)/60; - v_virtual = 0.3048*(phi_s_y/C*beta_ratio^E)^(1/B)/60; + u_virtual = uv_tmp*phi_s_x/60; + v_virtual = uv_tmp*phi_s_y/60; end diff --git a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064.fds b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064.fds index ac003bd1e28..cfcf5c7a9b9 100644 --- a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064.fds +++ b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064.fds @@ -47,7 +47,7 @@ &SURF ID = 'wet vegetation' MATL_ID(1,1:1) = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.063 + MOISTURE_CONTENT = 0.063 SURFACE_VOLUME_RATIO = 9770. LENGTH = 0.20 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064_BFM.fds b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064_BFM.fds index 7a0528f4596..aa67342158a 100644 --- a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064_BFM.fds +++ b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064_BFM.fds @@ -46,7 +46,7 @@ MATL_ID(1,1:1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'DIRT' THICKNESS(1:2) = 0.21,0.10 - MOISTURE_FRACTION(1) = 0.063 + MOISTURE_CONTENT(1) = 0.063 MASS_PER_VOLUME(1) = 1.33 DRAG_COEFFICIENT = 2.8 SURFACE_VOLUME_RATIO(1) = 9770. / diff --git a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064_BFM_crude.fds b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064_BFM_crude.fds index 3d3ddae63ad..33a9f70231b 100644 --- a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064_BFM_crude.fds +++ b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064_BFM_crude.fds @@ -46,7 +46,7 @@ MATL_ID(1,1:1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'DIRT' THICKNESS(1:2) = 0.21,0.10 - MOISTURE_FRACTION(1) = 0.063 + MOISTURE_CONTENT(1) = 0.063 MASS_PER_VOLUME(1) = 1.33 DRAG_COEFFICIENT = 2.8 SURFACE_VOLUME_RATIO(1) = 9770. / diff --git a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064_BFM_fine.fds b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064_BFM_fine.fds index 80f85ad1e3f..0a2ea99a77e 100644 --- a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064_BFM_fine.fds +++ b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064_BFM_fine.fds @@ -46,7 +46,7 @@ MATL_ID(1,1:1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'DIRT' THICKNESS(1:2) = 0.21,0.10 - MOISTURE_FRACTION(1) = 0.063 + MOISTURE_CONTENT(1) = 0.063 MASS_PER_VOLUME(1) = 1.33 DRAG_COEFFICIENT = 2.8 SURFACE_VOLUME_RATIO(1) = 9770. / diff --git a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064_crude.fds b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064_crude.fds index b0a71860a50..328d86d5d53 100644 --- a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064_crude.fds +++ b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064_crude.fds @@ -47,7 +47,7 @@ &SURF ID = 'wet vegetation' MATL_ID(1,1:1) = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.063 + MOISTURE_CONTENT = 0.063 SURFACE_VOLUME_RATIO = 9770. LENGTH = 0.20 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064_fine.fds b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064_fine.fds index e81cd364455..7de7749ec32 100644 --- a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064_fine.fds +++ b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_C064_fine.fds @@ -47,7 +47,7 @@ &SURF ID = 'wet vegetation' MATL_ID(1,1:1) = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.063 + MOISTURE_CONTENT = 0.063 SURFACE_VOLUME_RATIO = 9770. LENGTH = 0.20 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19.fds b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19.fds index e1de20feeca..0ac590cdd26 100644 --- a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19.fds +++ b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19.fds @@ -49,7 +49,7 @@ &SURF ID = 'wet vegetation' MATL_ID(1,1:1) = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.058 + MOISTURE_CONTENT = 0.058 SURFACE_VOLUME_RATIO = 12240. LENGTH = 0.20 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19_BFM.fds b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19_BFM.fds index da9f65180de..dd8f2e9e226 100644 --- a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19_BFM.fds +++ b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19_BFM.fds @@ -48,7 +48,7 @@ MATL_ID(1,1:1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'DIRT' THICKNESS(1:2) = 0.51,0.10 - MOISTURE_FRACTION(1) = 0.058 + MOISTURE_CONTENT(1) = 0.058 MASS_PER_VOLUME(1) = 0.6144 DRAG_COEFFICIENT = 2.8 SURFACE_VOLUME_RATIO(1) = 12240. / diff --git a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19_BFM_crude.fds b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19_BFM_crude.fds index 4a8c34aaedb..968df1327c2 100644 --- a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19_BFM_crude.fds +++ b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19_BFM_crude.fds @@ -48,7 +48,7 @@ MATL_ID(1,1:1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'DIRT' THICKNESS(1:2) = 0.51,0.10 - MOISTURE_FRACTION(1) = 0.058 + MOISTURE_CONTENT(1) = 0.058 MASS_PER_VOLUME(1) = 0.6144 DRAG_COEFFICIENT = 2.8 SURFACE_VOLUME_RATIO(1) = 12240. / diff --git a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19_BFM_fine.fds b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19_BFM_fine.fds index 76d15cd2839..105d3677508 100644 --- a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19_BFM_fine.fds +++ b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19_BFM_fine.fds @@ -48,7 +48,7 @@ MATL_ID(1,1:1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'DIRT' THICKNESS(1:2) = 0.51,0.10 - MOISTURE_FRACTION(1) = 0.058 + MOISTURE_CONTENT(1) = 0.058 MASS_PER_VOLUME(1) = 0.6144 DRAG_COEFFICIENT = 2.8 SURFACE_VOLUME_RATIO(1) = 12240. / diff --git a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19_crude.fds b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19_crude.fds index 31692eafb7e..a822aefb60b 100644 --- a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19_crude.fds +++ b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19_crude.fds @@ -49,7 +49,7 @@ &SURF ID = 'wet vegetation' MATL_ID(1,1:1) = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.058 + MOISTURE_CONTENT = 0.058 SURFACE_VOLUME_RATIO = 12240. LENGTH = 0.20 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19_fine.fds b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19_fine.fds index 28bad15fce3..3cc85614daa 100644 --- a/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19_fine.fds +++ b/Validation/CSIRO_Grassland_Fires/FDS_Input_Files/Case_F19_fine.fds @@ -49,7 +49,7 @@ &SURF ID = 'wet vegetation' MATL_ID(1,1:1) = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.058 + MOISTURE_CONTENT = 0.058 SURFACE_VOLUME_RATIO = 12240. LENGTH = 0.20 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/Heil_post_13ms.fds b/Validation/Crown_Fires/FDS_Input_Files/Heil_post_13ms.fds index 46fab1e3d65..3473acfedd7 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/Heil_post_13ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/Heil_post_13ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/Heil_post_2ms.fds b/Validation/Crown_Fires/FDS_Input_Files/Heil_post_2ms.fds index 3e1ca27e1b1..9ad887433ba 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/Heil_post_2ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/Heil_post_2ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/Heil_post_4ms.fds b/Validation/Crown_Fires/FDS_Input_Files/Heil_post_4ms.fds index 00440c306b7..e3fe19e8f16 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/Heil_post_4ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/Heil_post_4ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/Heil_post_9ms.fds b/Validation/Crown_Fires/FDS_Input_Files/Heil_post_9ms.fds index 5b2bc619861..995151bfeaa 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/Heil_post_9ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/Heil_post_9ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/Heil_pre_13ms.fds b/Validation/Crown_Fires/FDS_Input_Files/Heil_pre_13ms.fds index 33cad01dba7..c31e36983c1 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/Heil_pre_13ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/Heil_pre_13ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/Heil_pre_2ms.fds b/Validation/Crown_Fires/FDS_Input_Files/Heil_pre_2ms.fds index 3015cff2e1f..9fc97b4bef8 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/Heil_pre_2ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/Heil_pre_2ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/Heil_pre_4ms.fds b/Validation/Crown_Fires/FDS_Input_Files/Heil_pre_4ms.fds index 980ed78346a..d53d7a37c65 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/Heil_pre_4ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/Heil_pre_4ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/Heil_pre_9ms.fds b/Validation/Crown_Fires/FDS_Input_Files/Heil_pre_9ms.fds index eb9b9c1c4af..622bb3367dd 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/Heil_pre_9ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/Heil_pre_9ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/Pike1_post_13ms.fds b/Validation/Crown_Fires/FDS_Input_Files/Pike1_post_13ms.fds index b4236f4bda6..46171c29b58 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/Pike1_post_13ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/Pike1_post_13ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/Pike1_post_2ms.fds b/Validation/Crown_Fires/FDS_Input_Files/Pike1_post_2ms.fds index d9f73d6e274..a6de76e40f7 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/Pike1_post_2ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/Pike1_post_2ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/Pike1_post_4ms.fds b/Validation/Crown_Fires/FDS_Input_Files/Pike1_post_4ms.fds index 9942fa6681c..c76701bb1db 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/Pike1_post_4ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/Pike1_post_4ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/Pike1_post_9ms.fds b/Validation/Crown_Fires/FDS_Input_Files/Pike1_post_9ms.fds index 1bf19acc146..9e00f777c3b 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/Pike1_post_9ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/Pike1_post_9ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/Pike1_pre_13ms.fds b/Validation/Crown_Fires/FDS_Input_Files/Pike1_pre_13ms.fds index b67d8049537..95f19bac442 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/Pike1_pre_13ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/Pike1_pre_13ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/Pike1_pre_2ms.fds b/Validation/Crown_Fires/FDS_Input_Files/Pike1_pre_2ms.fds index d0d047c0fa3..83d0055836d 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/Pike1_pre_2ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/Pike1_pre_2ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/Pike1_pre_4ms.fds b/Validation/Crown_Fires/FDS_Input_Files/Pike1_pre_4ms.fds index bce71c51fc8..4d638eb703c 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/Pike1_pre_4ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/Pike1_pre_4ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/Pike1_pre_9ms.fds b/Validation/Crown_Fires/FDS_Input_Files/Pike1_pre_9ms.fds index 471b1474045..9ab66aef7b9 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/Pike1_pre_9ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/Pike1_pre_9ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/RedF_post_13ms.fds b/Validation/Crown_Fires/FDS_Input_Files/RedF_post_13ms.fds index 797d2342524..5ef72548cb5 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/RedF_post_13ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/RedF_post_13ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/RedF_post_2ms.fds b/Validation/Crown_Fires/FDS_Input_Files/RedF_post_2ms.fds index c4ad40bd7de..fbce7667c9c 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/RedF_post_2ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/RedF_post_2ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/RedF_post_4ms.fds b/Validation/Crown_Fires/FDS_Input_Files/RedF_post_4ms.fds index a32432f7513..450f2d6f762 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/RedF_post_4ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/RedF_post_4ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/RedF_post_9ms.fds b/Validation/Crown_Fires/FDS_Input_Files/RedF_post_9ms.fds index 38e0647a583..a4d5abe1fd2 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/RedF_post_9ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/RedF_post_9ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/RedF_pre_13ms.fds b/Validation/Crown_Fires/FDS_Input_Files/RedF_pre_13ms.fds index 37026d489b0..f9ad53060d0 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/RedF_pre_13ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/RedF_pre_13ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/RedF_pre_2ms.fds b/Validation/Crown_Fires/FDS_Input_Files/RedF_pre_2ms.fds index d9518394f2a..a9e59ca8ac9 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/RedF_pre_2ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/RedF_pre_2ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/RedF_pre_4ms.fds b/Validation/Crown_Fires/FDS_Input_Files/RedF_pre_4ms.fds index ec92cc0f966..a444780ba0f 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/RedF_pre_4ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/RedF_pre_4ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/RedF_pre_9ms.fds b/Validation/Crown_Fires/FDS_Input_Files/RedF_pre_9ms.fds index 6c22ac17660..e37cb523a45 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/RedF_pre_9ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/RedF_pre_9ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/UNC_post_13ms.fds b/Validation/Crown_Fires/FDS_Input_Files/UNC_post_13ms.fds index af215cc02c9..c0b3aebe121 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/UNC_post_13ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/UNC_post_13ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/UNC_post_2ms.fds b/Validation/Crown_Fires/FDS_Input_Files/UNC_post_2ms.fds index 1e77f74c124..b2a3e820bae 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/UNC_post_2ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/UNC_post_2ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/UNC_post_4ms.fds b/Validation/Crown_Fires/FDS_Input_Files/UNC_post_4ms.fds index 4d89773ab8f..07fd8f8ca64 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/UNC_post_4ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/UNC_post_4ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/UNC_post_9ms.fds b/Validation/Crown_Fires/FDS_Input_Files/UNC_post_9ms.fds index 4d44eb603f2..e3397cb8a95 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/UNC_post_9ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/UNC_post_9ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/UNC_pre_13ms.fds b/Validation/Crown_Fires/FDS_Input_Files/UNC_pre_13ms.fds index b1cfe84167a..ffdd5c6a481 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/UNC_pre_13ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/UNC_pre_13ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/UNC_pre_2ms.fds b/Validation/Crown_Fires/FDS_Input_Files/UNC_pre_2ms.fds index 72182e47ad7..c68958128a1 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/UNC_pre_2ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/UNC_pre_2ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/UNC_pre_4ms.fds b/Validation/Crown_Fires/FDS_Input_Files/UNC_pre_4ms.fds index d5139a5ca23..3f9ba1e1351 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/UNC_pre_4ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/UNC_pre_4ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/Crown_Fires/FDS_Input_Files/UNC_pre_9ms.fds b/Validation/Crown_Fires/FDS_Input_Files/UNC_pre_9ms.fds index 4bc789f1458..e51161ac3a3 100644 --- a/Validation/Crown_Fires/FDS_Input_Files/UNC_pre_9ms.fds +++ b/Validation/Crown_Fires/FDS_Input_Files/UNC_pre_9ms.fds @@ -35,14 +35,14 @@ MINIMUM_BURNOUT_TIME = 20. MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_ID(2,1) = 'Soil' - MOISTURE_FRACTION(1) = 0.05 + MOISTURE_CONTENT(1) = 0.05 SURFACE_VOLUME_RATIO(1) = 5710. MASS_PER_VOLUME(1) = 12.24 THICKNESS(1:2) = 0.06,0.1 / &SURF ID = 'Generic Foliage' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 1.0 + MOISTURE_CONTENT = 1.0 SURFACE_VOLUME_RATIO = 4000. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/MPI_Scaling_Tests/README.md b/Validation/MPI_Scaling_Tests/README.md new file mode 100644 index 00000000000..245b74b8c90 --- /dev/null +++ b/Validation/MPI_Scaling_Tests/README.md @@ -0,0 +1,9 @@ +# MPI Scaling Tests + +The sub-folder `FDS_Input_Files` contains a set of input files used to test the MPI functionality in FDS. There are two sets of tests. The first, `strong_scaling_test_N.fds`, is a simple simulation that runs for 100 time steps. The integer `N` indicates the number of meshes. `N=001` is a single mesh case run with 1 MPI process (and 1 OpenMP thread). `N=008` is this same case, but divided into 8 meshes and run with 8 MPI processes (and still only 1 OpenMP thread). `N=432` is the same case divided into 432 meshes and run with 432 MPI processes. Becaues there is the same number of grid cells in total, the run times decrease with the increasing number of meshes. Ideally, the 432 mesh case would run 432 times faster than the 1 mesh case, but obviously inefficiencies will not allow this. + +The cases labelled `weak_scaling_test_N` consists of `N` 50 by 50 by 50 cell meshes forming a line of connected meshes in the x-direction. Each case is run with `N` MPI processes, and ideally each job should take the same amount of wall clock time. + +The script `Run_All.sh` can be used to run the cases, and `Process_All.sh` copies the output to the `out` repository. + + diff --git a/Validation/NIST_Douglas_Firs/FDS_Input_Files/tree_2_m_14_pc.fds b/Validation/NIST_Douglas_Firs/FDS_Input_Files/tree_2_m_14_pc.fds index a1dd7de5ff7..e9fa9b9eea3 100644 --- a/Validation/NIST_Douglas_Firs/FDS_Input_Files/tree_2_m_14_pc.fds +++ b/Validation/NIST_Douglas_Firs/FDS_Input_Files/tree_2_m_14_pc.fds @@ -31,7 +31,7 @@ &SURF ID = 'foliage' MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_MASS_FRACTION(1,1) = 1.0 - MOISTURE_FRACTION = 0.14 + MOISTURE_CONTENT = 0.14 SURFACE_VOLUME_RATIO = 3940. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / @@ -39,7 +39,7 @@ &SURF ID = 'small roundwood' MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_MASS_FRACTION(1,1) = 1.0 - MOISTURE_FRACTION = 0.14 + MOISTURE_CONTENT = 0.14 SURFACE_VOLUME_RATIO = 2667. LENGTH = 0.10 GEOMETRY = 'CYLINDRICAL' / @@ -47,7 +47,7 @@ &SURF ID = 'medium roundwood' MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_MASS_FRACTION(1,1) = 1.0 - MOISTURE_FRACTION = 0.14 + MOISTURE_CONTENT = 0.14 SURFACE_VOLUME_RATIO = 888. LENGTH = 0.10 GEOMETRY = 'CYLINDRICAL' / @@ -55,7 +55,7 @@ &SURF ID = 'large roundwood' MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_MASS_FRACTION(1,1) = 1.0 - MOISTURE_FRACTION = 0.14 + MOISTURE_CONTENT = 0.14 SURFACE_VOLUME_RATIO = 500. LENGTH = 0.10 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/NIST_Douglas_Firs/FDS_Input_Files/tree_2_m_49_pc.fds b/Validation/NIST_Douglas_Firs/FDS_Input_Files/tree_2_m_49_pc.fds index 2f1722dbf3b..2ba04a6b434 100644 --- a/Validation/NIST_Douglas_Firs/FDS_Input_Files/tree_2_m_49_pc.fds +++ b/Validation/NIST_Douglas_Firs/FDS_Input_Files/tree_2_m_49_pc.fds @@ -31,7 +31,7 @@ &SURF ID = 'foliage' MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_MASS_FRACTION(1,1) = 1.0 - MOISTURE_FRACTION = 0.49 + MOISTURE_CONTENT = 0.49 SURFACE_VOLUME_RATIO = 3940. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / @@ -39,7 +39,7 @@ &SURF ID = 'small roundwood' MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_MASS_FRACTION(1,1) = 1.0 - MOISTURE_FRACTION = 0.49 + MOISTURE_CONTENT = 0.49 SURFACE_VOLUME_RATIO = 2667. LENGTH = 0.10 GEOMETRY = 'CYLINDRICAL' / @@ -47,7 +47,7 @@ &SURF ID = 'medium roundwood' MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_MASS_FRACTION(1,1) = 1.0 - MOISTURE_FRACTION = 0.49 + MOISTURE_CONTENT = 0.49 SURFACE_VOLUME_RATIO = 888. LENGTH = 0.10 GEOMETRY = 'CYLINDRICAL' / @@ -55,7 +55,7 @@ &SURF ID = 'large roundwood' MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_MASS_FRACTION(1,1) = 1.0 - MOISTURE_FRACTION = 0.49 + MOISTURE_CONTENT = 0.49 SURFACE_VOLUME_RATIO = 500. LENGTH = 0.10 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/NIST_Douglas_Firs/FDS_Input_Files/tree_5_m_26_pc.fds b/Validation/NIST_Douglas_Firs/FDS_Input_Files/tree_5_m_26_pc.fds index 57db6845e29..d4b81d72f18 100644 --- a/Validation/NIST_Douglas_Firs/FDS_Input_Files/tree_5_m_26_pc.fds +++ b/Validation/NIST_Douglas_Firs/FDS_Input_Files/tree_5_m_26_pc.fds @@ -33,7 +33,7 @@ &SURF ID = 'foliage' MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_MASS_FRACTION(1,1) = 1.0 - MOISTURE_FRACTION = 0.26 + MOISTURE_CONTENT = 0.26 SURFACE_VOLUME_RATIO = 3940. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' / @@ -41,7 +41,7 @@ &SURF ID = 'small roundwood' MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_MASS_FRACTION(1,1) = 1.0 - MOISTURE_FRACTION = 0.26 + MOISTURE_CONTENT = 0.26 SURFACE_VOLUME_RATIO = 2667. LENGTH = 0.10 GEOMETRY = 'CYLINDRICAL' / @@ -49,7 +49,7 @@ &SURF ID = 'medium roundwood' MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_MASS_FRACTION(1,1) = 1.0 - MOISTURE_FRACTION = 0.26 + MOISTURE_CONTENT = 0.26 SURFACE_VOLUME_RATIO = 888. LENGTH = 0.10 GEOMETRY = 'CYLINDRICAL' / @@ -57,7 +57,7 @@ &SURF ID = 'large roundwood' MATL_ID(1,1) = 'GENERIC VEGETATION' MATL_MASS_FRACTION(1,1) = 1.0 - MOISTURE_FRACTION = 0.26 + MOISTURE_CONTENT = 0.26 SURFACE_VOLUME_RATIO = 500. LENGTH = 0.10 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/Burner.txt b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/Burner.txt new file mode 100644 index 00000000000..8f20234dd88 --- /dev/null +++ b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/Burner.txt @@ -0,0 +1,13 @@ + +&REAC ID='PROPANE', FUEL='PROPANE', SOOT_YIELD=0.024, RADIATIVE_FRACTION=0.29 / + +&SURF ID='BURNER', SPEC_ID='PROPANE', HRRPUA=333.3, COLOR='RED', RAMP_Q='fire', MATL_ID='MINERAL WOOL', THICKNESS=0.05, ROUGHNESS=0.005 / +&RAMP ID='fire', T= 0., F=0.00 / +&RAMP ID='fire', T= 20., F=0.37 / +&RAMP ID='fire', T= 40., F=0.83 / +&RAMP ID='fire', T= 60., F=0.98 / +&RAMP ID='fire', T= 80., F=1.05 / +&RAMP ID='fire', T=120., F=1.05 / +&RAMP ID='fire', T=130., F=1.05 / + + diff --git a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/Common_Materials.txt b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/Common_Materials.txt new file mode 100644 index 00000000000..34ea060ada6 --- /dev/null +++ b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/Common_Materials.txt @@ -0,0 +1,23 @@ + +&MATL ID = 'MINERAL WOOL' + CONDUCTIVITY = 0.035 + SPECIFIC_HEAT = 0.8 + DENSITY = 70. / + +&MATL ID = 'MARINITE' + EMISSIVITY = 0.9 + DENSITY = 737. + SPECIFIC_HEAT = 1.2 + CONDUCTIVITY = 0.12 / + +&MATL ID = 'STEEL' + EMISSIVITY = 0.9 + DENSITY = 7800. + SPECIFIC_HEAT = 0.465 + CONDUCTIVITY = 43. / + +&SURF ID = 'STEEL' + MATL_ID = 'STEEL' + THICKNESS = 0.003 + COLOR = 'BLACK' / + diff --git a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/Mesh_1_cm.txt b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/Mesh_1_cm.txt new file mode 100644 index 00000000000..7d87164f24d --- /dev/null +++ b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/Mesh_1_cm.txt @@ -0,0 +1,4 @@ + +&MESH IJK=20,30,30, XB=-0.60,-0.40,-0.45,-0.15,-0.30,0.00, MULT_ID='mesh' / +&MULT ID='mesh', DX=0.2, DY=0.3, DZ=0.3, I_UPPER=5, J_UPPER=2, K_UPPER=15 / + diff --git a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/Mesh_2_cm.txt b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/Mesh_2_cm.txt new file mode 100644 index 00000000000..a391684b66f --- /dev/null +++ b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/Mesh_2_cm.txt @@ -0,0 +1,4 @@ + +&MESH IJK=20,15,30, XB=-0.60,-0.20,-0.45,-0.15,-0.30,0.30, MULT_ID='mesh' / +&MULT ID='mesh', DX=0.4, DY=0.3, DZ=0.6, I_UPPER=2, J_UPPER=2, K_UPPER=7 / + diff --git a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/Mesh_4_cm.txt b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/Mesh_4_cm.txt new file mode 100644 index 00000000000..3b93a0ad881 --- /dev/null +++ b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/Mesh_4_cm.txt @@ -0,0 +1,4 @@ + +&MESH IJK=15,20,20, XB=-0.60, 0.00,-0.40,0.40,-0.32,0.48, MULT_ID='mesh' / +&MULT ID='mesh', DX=0.6, DY=0.8, DZ=0.8, I_UPPER=1, J_UPPER=0, K_UPPER=5 / + diff --git a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/Output.txt b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/Output.txt new file mode 100644 index 00000000000..d06e935ed25 --- /dev/null +++ b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/Output.txt @@ -0,0 +1,21 @@ + +&DEVC ID='Flux', XB=0.0,0.0,0.15,0.15,0.01,2.43, POINTS=50, Z_ID='Height', QUANTITY='GAUGE HEAT FLUX', IOR=-2, TIME_HISTORY=T / +&DEVC ID='Temp', XB=0.0,0.0,0.15,0.15,0.01,2.43, POINTS=50, HIDE_COORDINATES=.TRUE., QUANTITY='WALL TEMPERATURE', IOR=-2, TIME_HISTORY=T / +&DEVC ID='CHF', XB=0.0,0.0,0.15,0.15,0.01,2.43, POINTS=50, HIDE_COORDINATES=.TRUE., QUANTITY='CONVECTIVE HEAT FLUX', IOR=-2, TIME_HISTORY=T / +&DEVC ID='RHF', XB=0.0,0.0,0.15,0.15,0.01,2.43, POINTS=50, HIDE_COORDINATES=.TRUE., QUANTITY='RADIATIVE HEAT FLUX', IOR=-2, TIME_HISTORY=T / +&DEVC ID='MLR', XB=0.0,0.0,0.15,0.15,0.01,2.43, POINTS=50, HIDE_COORDINATES=.TRUE., QUANTITY='MASS FLUX', IOR=-2, TIME_HISTORY=T / + +&BNDF QUANTITY='GAUGE HEAT FLUX', CELL_CENTERED=T / +&BNDF QUANTITY='BURNING RATE', CELL_CENTERED=T / +&BNDF QUANTITY='WALL TEMPERATURE', CELL_CENTERED=T / +&BNDF QUANTITY='RADIATIVE HEAT FLUX', CELL_CENTERED=T / +&BNDF QUANTITY='CONVECTIVE HEAT FLUX', CELL_CENTERED=T / +&BNDF QUANTITY='HEAT TRANSFER COEFFICIENT', CELL_CENTERED=T / + +&DUMP DT_DEVC=10., DT_HRR=10., SIG_FIGS=4, SIG_FIGS_EXP=2 / + +&SLCF PBX=0.00 QUANTITY='TEMPERATURE', VECTOR=.TRUE. / +&SLCF PBY=0.00 QUANTITY='VELOCITY', VECTOR=.TRUE. / + +&ISOF QUANTITY='HRRPUV', VALUE=200 / + diff --git a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PBT_1_cm.fds b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PBT_1_cm.fds new file mode 100644 index 00000000000..076b3ecb9d2 --- /dev/null +++ b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PBT_1_cm.fds @@ -0,0 +1,7 @@ +&HEAD CHID='PBT_1_cm', TITLE='Parallel Panel Test, PBT, Propane, 60 kW' / + +&CATF OTHER_FILES='Mesh_1_cm.txt','PBT_Reactions.txt','Common_Materials.txt','Burner.txt','Panels.txt','Output.txt' / + +&TIME T_END=900.0 / + +&TAIL / diff --git a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PBT_2_cm.fds b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PBT_2_cm.fds new file mode 100644 index 00000000000..7d679d5373e --- /dev/null +++ b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PBT_2_cm.fds @@ -0,0 +1,7 @@ +&HEAD CHID='PBT_2_cm', TITLE='Parallel Panel Test, PBT, Propane, 60 kW' / + +&CATF OTHER_FILES='Mesh_2_cm.txt','PBT_Reactions.txt','Common_Materials.txt','Burner.txt','Panels.txt','Output.txt' / + +&TIME T_END=900.0 / + +&TAIL / diff --git a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PBT_4_cm.fds b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PBT_4_cm.fds new file mode 100644 index 00000000000..90a018781c5 --- /dev/null +++ b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PBT_4_cm.fds @@ -0,0 +1,7 @@ +&HEAD CHID='PBT_4_cm', TITLE='Parallel Panel Test, PBT, Propane, 60 kW' / + +&CATF OTHER_FILES='Mesh_4_cm.txt','PBT_Reactions.txt','Common_Materials.txt','Burner.txt','Panels.txt','Output.txt' / + +&TIME T_END=900.0 / + +&TAIL / diff --git a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PBT_60_kW.fds b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PBT_60_kW.fds deleted file mode 100644 index cf839e4ea08..00000000000 --- a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PBT_60_kW.fds +++ /dev/null @@ -1,87 +0,0 @@ -&HEAD CHID='PBT_60_kW', TITLE='Parallel Panel Test, PBT, Propane, 60 kW' / - -&MESH IJK=15,20,20, XB=-0.60,-0.30,-0.40,0.00,-0.30,0.10, MULT_ID='mesh' / -&MULT ID='mesh', DX=0.3, DY=0.4, DZ=0.4, I_UPPER=3, J_UPPER=1, K_UPPER=11 / - -&TIME T_END=900.0 / - -&REAC SOOT_YIELD=0.02 - FUEL='PBT' - FORMULA='C4H10O2' - FUEL_RADCAL_ID='MMA' / 4th SFPE Handbook, HoC, Table C.2; Soot, Table 3-4.16 - -&MATL ID='Kaowool' - CONDUCTIVITY = 0.08 - SPECIFIC_HEAT = 0.80 - DENSITY = 48. / - -&SURF ID='BURNER', HRRPUA=333., COLOR='RED', RAMP_Q='fire', MATL_ID='Kaowool', THICKNESS=0.2 / -&RAMP ID='fire', T= 0., F=0. / -&RAMP ID='fire', T= 10., F=1. / -&RAMP ID='fire', T=180., F=1. / -&RAMP ID='fire', T=181., F=1. / -&RAMP ID='fire', T=900., F=1. / - -&SURF ID = 'SAMPLE FRONT' - COLOR = 'BLACK' - MATL_ID = 'PBT','MARINITE' - THICKNESS = 0.00635,0.0254 / - -&SURF ID = 'SAMPLE BACK' - COLOR = 'BEIGE' - MATL_ID = 'MARINITE','PBT' - THICKNESS = 0.0254,0.00635 / - -&MATL ID='PBT' - ABSORPTION_COEFFICIENT=2560. - N_REACTIONS=1 - A(1) = 2.49E14 - E(1) = 2.12E5 - EMISSIVITY=0.88 - DENSITY=1300. - SPEC_ID='PBT' - NU_SPEC=1. - HEAT_OF_REACTION=507. - HEAT_OF_COMBUSTION=19500. - CONDUCTIVITY = 0.29 - SPECIFIC_HEAT = 2.23 / - -&MATL ID = 'MARINITE' - EMISSIVITY = 0.9 - DENSITY = 737. - SPECIFIC_HEAT = 1.2 - CONDUCTIVITY = 0.12 / - -&MATL ID = 'STEEL' - EMISSIVITY = 0.9 - DENSITY = 7800. - SPECIFIC_HEAT = 0.465 - CONDUCTIVITY = 43. / - -&SURF ID = 'STEEL' - MATL_ID = 'STEEL' - THICKNESS = 0.003 - COLOR = 'BLACK' / - -&OBST XB = -0.30, 0.30, -0.15, 0.15, -0.30, 0.00, SURF_IDS = 'BURNER','STEEL','STEEL' / -&OBST XB = -0.30, 0.30, 0.15, 0.17, -0.30, 2.44, SURF_ID6 = 'STEEL','STEEL','SAMPLE FRONT','SAMPLE BACK','STEEL','STEEL' / -&OBST XB = -0.30, 0.30, -0.17, -0.15, -0.30, 2.44, SURF_ID6 = 'STEEL','STEEL','SAMPLE BACK','SAMPLE FRONT','STEEL','STEEL' / - -&VENT MB='XMIN', SURF_ID='OPEN' / -&VENT MB='XMAX', SURF_ID='OPEN' / -&VENT MB='YMIN', SURF_ID='OPEN' / -&VENT MB='YMAX', SURF_ID='OPEN' / -&VENT MB='ZMAX', SURF_ID='OPEN' / - -&DEVC ID='Flux', XB=0.0,0.0,0.16,0.16,0.01,2.43, POINTS=50, Z_ID='Height', QUANTITY='GAUGE HEAT FLUX', IOR=-2, TIME_HISTORY=.TRUE. / -&DEVC ID='Temp', XB=0.0,0.0,0.16,0.16,0.01,2.43, POINTS=50, HIDE_COORDINATES=.TRUE., QUANTITY='WALL TEMPERATURE', IOR=-2, TIME_HISTORY=.TRUE. / - -&BNDF QUANTITY='GAUGE HEAT FLUX' / -&BNDF QUANTITY='BURNING RATE' / -&BNDF QUANTITY='WALL TEMPERATURE' / - -&DUMP DT_SLCF=0.2, DT_BNDF=1., DT_DEVC=15., DT_HRR=15., SIG_FIGS=4, SIG_FIGS_EXP=2 / - -&SLCF PBX=0.00 QUANTITY='TEMPERATURE', VECTOR=.TRUE. / - -&TAIL / diff --git a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PBT_Reactions.txt b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PBT_Reactions.txt new file mode 100644 index 00000000000..ea330c36192 --- /dev/null +++ b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PBT_Reactions.txt @@ -0,0 +1,30 @@ + +&REAC SOOT_YIELD=0.02 + FUEL='PBT' + FORMULA='C4H10O2' + FUEL_RADCAL_ID='MMA' / 4th SFPE Handbook, HoC, Table C.2; Soot, Table 3-4.16 + +&SURF ID = 'SAMPLE FRONT' + COLOR = 'BLACK' + MATL_ID = 'PBT','MARINITE' + THICKNESS = 0.00635,0.0254 / + +&SURF ID = 'SAMPLE BACK' + COLOR = 'BEIGE' + MATL_ID = 'MARINITE','PBT' + THICKNESS = 0.0254,0.00635 / + +&MATL ID='PBT' + ABSORPTION_COEFFICIENT=2560. + N_REACTIONS=1 + A(1) = 2.49E14 + E(1) = 2.12E5 + EMISSIVITY=0.88 + DENSITY=1300. + SPEC_ID='PBT' + NU_SPEC=1. + HEAT_OF_REACTION=507. + HEAT_OF_COMBUSTION=19500. + CONDUCTIVITY = 0.29 + SPECIFIC_HEAT = 2.23 / + diff --git a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PVC_1_cm.fds b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PVC_1_cm.fds new file mode 100644 index 00000000000..10059eb5e93 --- /dev/null +++ b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PVC_1_cm.fds @@ -0,0 +1,7 @@ +&HEAD CHID='PVC_1_cm', TITLE='Parallel Panel Test, PVC, Propane, 60 kW' / + +&CATF OTHER_FILES='Mesh_1_cm.txt','PVC_Reactions.txt','Common_Materials.txt','Burner.txt','Panels.txt','Output.txt' / + +&TIME T_END=900.0 / + +&TAIL / diff --git a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PVC_2_cm.fds b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PVC_2_cm.fds new file mode 100644 index 00000000000..658fcc3b4c1 --- /dev/null +++ b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PVC_2_cm.fds @@ -0,0 +1,7 @@ +&HEAD CHID='PVC_2_cm', TITLE='Parallel Panel Test, PVC, Propane, 60 kW' / + +&CATF OTHER_FILES='Mesh_2_cm.txt','PVC_Reactions.txt','Common_Materials.txt','Burner.txt','Panels.txt','Output.txt' / + +&TIME T_END=900.0 / + +&TAIL / diff --git a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PVC_4_cm.fds b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PVC_4_cm.fds new file mode 100644 index 00000000000..361422711d9 --- /dev/null +++ b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PVC_4_cm.fds @@ -0,0 +1,7 @@ +&HEAD CHID='PVC_4_cm', TITLE='Parallel Panel Test, PVC, Propane, 60 kW' / + +&CATF OTHER_FILES='Mesh_4_cm.txt','PVC_Reactions.txt','Common_Materials.txt','Burner.txt','Panels.txt','Output.txt' / + +&TIME T_END=900.0 / + +&TAIL / diff --git a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PVC_60_kW.fds b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PVC_60_kW.fds deleted file mode 100644 index 84ca55e7b91..00000000000 --- a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PVC_60_kW.fds +++ /dev/null @@ -1,129 +0,0 @@ -&HEAD CHID='PVC_60_kW', TITLE='Parallel Panel Test, PVC, Propane, 60 kW' / - -&MESH IJK=15,20,20, XB=-0.60,-0.30,-0.40,0.00,-0.30,0.10, MULT_ID='mesh' / -&MULT ID='mesh', DX=0.3, DY=0.4, DZ=0.4, I_UPPER=3, J_UPPER=1, K_UPPER=11 / - -&TIME T_END=900.0 / - -&SPEC ID = 'PVC', FORMULA = 'C2H3Cl' / -&SPEC ID = 'OXYGEN', LUMPED_COMPONENT_ONLY = .TRUE. / -&SPEC ID = 'NITROGEN', LUMPED_COMPONENT_ONLY = .TRUE. / -&SPEC ID = 'HYDROGEN CHLORIDE', LUMPED_COMPONENT_ONLY = .TRUE. / -&SPEC ID = 'WATER VAPOR', LUMPED_COMPONENT_ONLY = .TRUE. / -&SPEC ID = 'CARBON MONOXIDE', LUMPED_COMPONENT_ONLY = .TRUE. / -&SPEC ID = 'CARBON DIOXIDE', LUMPED_COMPONENT_ONLY = .TRUE. / -&SPEC ID = 'SOOT',FORMULA='C', LUMPED_COMPONENT_ONLY = .TRUE. / - -&SPEC ID='AIR', BACKGROUND=.TRUE. - SPEC_ID(1)='OXYGEN', VOLUME_FRACTION(1)=1.53, - SPEC_ID(2)='NITROGEN', VOLUME_FRACTION(2)=5.76 / -&SPEC ID='PRODUCTS', - SPEC_ID(1)='HYDROGEN CHLORIDE', VOLUME_FRACTION(1)=1.0, - SPEC_ID(2)='WATER VAPOR', VOLUME_FRACTION(2)=1.0, - SPEC_ID(3)='CARBON MONOXIDE', VOLUME_FRACTION(3)=0.14, - SPEC_ID(4)='CARBON DIOXIDE', VOLUME_FRACTION(4)=0.96, - SPEC_ID(5)='SOOT', VOLUME_FRACTION(5)=0.90, - SPEC_ID(6)='NITROGEN', VOLUME_FRACTION(6)=5.76 / - -&REAC FUEL='PVC', HEAT_OF_COMBUSTION=16400, SPEC_ID_NU='PVC','AIR','PRODUCTS', NU=-1,-1,1 / - -&MATL ID='Kaowool' - CONDUCTIVITY = 0.08 - SPECIFIC_HEAT = 0.80 - DENSITY = 48. / - -&SURF ID='BURNER', HRRPUA=333., COLOR='RED', RAMP_Q='fire', MATL_ID='Kaowool', THICKNESS=0.2 / -&RAMP ID='fire', T= 0., F=0. / -&RAMP ID='fire', T= 10., F=1. / -&RAMP ID='fire', T=180., F=1. / -&RAMP ID='fire', T=181., F=1. / -&RAMP ID='fire', T=900., F=1. / - -&SURF ID = 'SAMPLE FRONT' - COLOR = 'BLACK' - MATL_ID = 'PVC','MARINITE' - THICKNESS = 0.00635,0.0254 / - -&SURF ID = 'SAMPLE BACK' - COLOR = 'BEIGE' - MATL_ID = 'MARINITE','PVC' - THICKNESS = 0.0254,0.00635 / - -&MATL ID='PVC' - ABSORPTION_COEFFICIENT=2145. - N_REACTIONS=1 - A(1) = 1.4E33 - E(1) = 3.67E5 - EMISSIVITY=0.90 - DENSITY=1430. - SPEC_ID='PVC' - NU_SPEC=0.56 - MATL_ID='CHAR 1' - NU_MATL=0.44 - HEAT_OF_REACTION=170. - HEAT_OF_COMBUSTION=2025. - CONDUCTIVITY = 0.17 - SPECIFIC_HEAT = 1.55 / - -&MATL ID='CHAR 1' - ABSORPTION_COEFFICIENT=2453. - N_REACTIONS=1 - A(1) = 3.5E12 - E(1) = 2.07E5 - EMISSIVITY=0.90 - DENSITY=629. - SPEC_ID='PVC' - NU_SPEC=0.53 - MATL_ID='CHAR 2' - NU_MATL=0.47 - HEAT_OF_REACTION=1200. - HEAT_OF_COMBUSTION=27375. - CONDUCTIVITY = 0.17 - SPECIFIC_HEAT = 1.55 / - -&MATL ID='CHAR 2' - ABSORPTION_COEFFICIENT=29600. - EMISSIVITY=0.85 - DENSITY=296. - CONDUCTIVITY=0.26 - SPECIFIC_HEAT=1.72 / - -&MATL ID = 'MARINITE' - EMISSIVITY = 0.9 - DENSITY = 737. - SPECIFIC_HEAT = 1.2 - CONDUCTIVITY = 0.12 / - -&MATL ID = 'STEEL' - EMISSIVITY = 0.9 - DENSITY = 7800. - SPECIFIC_HEAT = 0.465 - CONDUCTIVITY = 43. / - -&SURF ID = 'STEEL' - MATL_ID = 'STEEL' - THICKNESS = 0.003 - COLOR = 'BLACK' / - -&OBST XB = -0.30, 0.30, -0.15, 0.15, -0.30, 0.00, SURF_IDS = 'BURNER','STEEL','STEEL' / -&OBST XB = -0.30, 0.30, 0.15, 0.17, -0.30, 2.44, SURF_ID6 = 'STEEL','STEEL','SAMPLE FRONT','SAMPLE BACK','STEEL','STEEL' / -&OBST XB = -0.30, 0.30, -0.17, -0.15, -0.30, 2.44, SURF_ID6 = 'STEEL','STEEL','SAMPLE BACK','SAMPLE FRONT','STEEL','STEEL' / - -&VENT MB='XMIN', SURF_ID='OPEN' / -&VENT MB='XMAX', SURF_ID='OPEN' / -&VENT MB='YMIN', SURF_ID='OPEN' / -&VENT MB='YMAX', SURF_ID='OPEN' / -&VENT MB='ZMAX', SURF_ID='OPEN' / - -&DEVC ID='Flux', XB=0.0,0.0,0.16,0.16,0.01,2.43, POINTS=50, Z_ID='Height', QUANTITY='GAUGE HEAT FLUX', IOR=-2, TIME_HISTORY=.TRUE. / -&DEVC ID='Temp', XB=0.0,0.0,0.16,0.16,0.01,2.43, POINTS=50, HIDE_COORDINATES=.TRUE., QUANTITY='WALL TEMPERATURE', IOR=-2, TIME_HISTORY=.TRUE. / - -&BNDF QUANTITY='GAUGE HEAT FLUX' / -&BNDF QUANTITY='BURNING RATE' / -&BNDF QUANTITY='WALL TEMPERATURE' / - -&DUMP DT_SLCF=0.2, DT_BNDF=1., DT_DEVC=15., DT_HRR=15., SIG_FIGS=4, SIG_FIGS_EXP=2 / - -&SLCF PBX=0.00 QUANTITY='TEMPERATURE', VECTOR=.TRUE. / - -&TAIL / diff --git a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PVC_Reactions.txt b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PVC_Reactions.txt new file mode 100644 index 00000000000..4b6e702e314 --- /dev/null +++ b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/PVC_Reactions.txt @@ -0,0 +1,80 @@ + +&SPEC ID = 'PVC', FORMULA = 'C2H3Cl' / +&SPEC ID = 'OXYGEN', LUMPED_COMPONENT_ONLY = .TRUE. / +&SPEC ID = 'NITROGEN', LUMPED_COMPONENT_ONLY = .TRUE. / +&SPEC ID = 'HYDROGEN CHLORIDE', LUMPED_COMPONENT_ONLY = .TRUE. / +&SPEC ID = 'WATER VAPOR', LUMPED_COMPONENT_ONLY = .TRUE. / +&SPEC ID = 'CARBON MONOXIDE', LUMPED_COMPONENT_ONLY = .TRUE. / +&SPEC ID = 'CARBON DIOXIDE', LUMPED_COMPONENT_ONLY = .TRUE. / +&SPEC ID = 'SOOT',FORMULA='C', LUMPED_COMPONENT_ONLY = .TRUE. / + +&SPEC ID='AIR', BACKGROUND=.TRUE. + SPEC_ID(1)='OXYGEN', VOLUME_FRACTION(1)=1.53, + SPEC_ID(2)='NITROGEN', VOLUME_FRACTION(2)=5.76 / +&SPEC ID='PVC PRODUCTS', + SPEC_ID(1)='HYDROGEN CHLORIDE', VOLUME_FRACTION(1)=1.0, + SPEC_ID(2)='WATER VAPOR', VOLUME_FRACTION(2)=1.0, + SPEC_ID(3)='CARBON MONOXIDE', VOLUME_FRACTION(3)=0.14, + SPEC_ID(4)='CARBON DIOXIDE', VOLUME_FRACTION(4)=0.96, + SPEC_ID(5)='SOOT', VOLUME_FRACTION(5)=0.90, + SPEC_ID(6)='NITROGEN', VOLUME_FRACTION(6)=5.76 / +&SPEC ID = 'PROPANE', FORMULA = 'C3H8' / +&SPEC ID='C3H8 PRODUCTS', + SPEC_ID(1)='WATER VAPOR', VOLUME_FRACTION(1)=4., + SPEC_ID(2)='CARBON DIOXIDE', VOLUME_FRACTION(2)=3., + SPEC_ID(3)='NITROGEN', VOLUME_FRACTION(3)=18.82352941 / + +&REAC FUEL='PVC', HEAT_OF_COMBUSTION=16400, SPEC_ID_NU='PVC','AIR','PVC PRODUCTS', NU=-1,-1,1 / +&REAC FUEL='PROPANE', HEAT_OF_COMBUSTION=43600, SPEC_ID_NU='PROPANE','AIR','C3H8 PRODUCTS', NU=-1,-3.267973856,1, RADIATIVE_FRACTION=0.29 / + +&SURF ID = 'SAMPLE FRONT' + COLOR = 'BLACK' + MATL_ID = 'PVC','MARINITE' + STRETCH_FACTOR(1:2) = 1.,2. + THICKNESS = 0.00635,0.0254 / + +&SURF ID = 'SAMPLE BACK' + COLOR = 'BEIGE' + MATL_ID = 'MARINITE','PVC' + STRETCH_FACTOR(1:2) = 2.,1. + THICKNESS = 0.0254,0.00635 / + +&MATL ID='PVC' + ABSORPTION_COEFFICIENT=2145. + N_REACTIONS=1 + A(1) = 1.4E33 + E(1) = 3.67E5 + EMISSIVITY=0.90 + DENSITY=1430. + SPEC_ID='PVC' + NU_SPEC=0.56 + MATL_ID='CHAR 1' + NU_MATL=0.44 + HEAT_OF_REACTION=170. + HEAT_OF_COMBUSTION=2025. + CONDUCTIVITY = 0.17 + SPECIFIC_HEAT = 1.55 / + +&MATL ID='CHAR 1' + ABSORPTION_COEFFICIENT=2453. + N_REACTIONS=1 + A(1) = 3.5E12 + E(1) = 2.07E5 + EMISSIVITY=0.90 + DENSITY=629. + SPEC_ID='PVC' + NU_SPEC=0.53 + MATL_ID='CHAR 2' + NU_MATL=0.47 + HEAT_OF_REACTION=1200. + HEAT_OF_COMBUSTION=27375. + CONDUCTIVITY = 0.17 + SPECIFIC_HEAT = 1.55 / + +&MATL ID='CHAR 2' + ABSORPTION_COEFFICIENT=29600. + EMISSIVITY=0.85 + DENSITY=296. + CONDUCTIVITY=0.26 + SPECIFIC_HEAT=1.72 / + diff --git a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/Panels.txt b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/Panels.txt new file mode 100644 index 00000000000..239ec5236c9 --- /dev/null +++ b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/Panels.txt @@ -0,0 +1,11 @@ + +&OBST XB = -0.30, 0.30, -0.15, 0.15, -0.30, 0.00, SURF_IDS = 'BURNER','STEEL','STEEL' / +&OBST XB = -0.30, 0.30, 0.15, 0.17, 0.00, 2.44, SURF_ID6 = 'STEEL','STEEL','SAMPLE FRONT','SAMPLE BACK','STEEL','STEEL' / +&OBST XB = -0.30, 0.30, -0.17, -0.15, 0.00, 2.44, SURF_ID6 = 'STEEL','STEEL','SAMPLE BACK','SAMPLE FRONT','STEEL','STEEL' / + +&VENT MB='XMIN', SURF_ID='OPEN' / +&VENT MB='XMAX', SURF_ID='OPEN' / +&VENT MB='YMIN', SURF_ID='OPEN' / +&VENT MB='YMAX', SURF_ID='OPEN' / +&VENT MB='ZMAX', SURF_ID='OPEN' / + diff --git a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/WRC_1_cm.fds b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/WRC_1_cm.fds new file mode 100644 index 00000000000..657b331c454 --- /dev/null +++ b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/WRC_1_cm.fds @@ -0,0 +1,7 @@ +&HEAD CHID='WRC_1_cm', TITLE='Parallel Panel Test, WRC, Propane, 60 kW' / + +&CATF OTHER_FILES='Mesh_1_cm.txt','WRC_Reactions.txt','Common_Materials.txt','Burner.txt','Panels.txt','Output.txt' / + +&TIME T_END=600.0 / + +&TAIL / diff --git a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/WRC_2_cm.fds b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/WRC_2_cm.fds new file mode 100644 index 00000000000..a144cd7b4ec --- /dev/null +++ b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/WRC_2_cm.fds @@ -0,0 +1,7 @@ +&HEAD CHID='WRC_2_cm', TITLE='Parallel Panel Test, WRC, Propane, 60 kW' / + +&CATF OTHER_FILES='Mesh_2_cm.txt','WRC_Reactions.txt','Common_Materials.txt','Burner.txt','Panels.txt','Output.txt' / + +&TIME T_END=600.0 / + +&TAIL / diff --git a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/WRC_4_cm.fds b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/WRC_4_cm.fds new file mode 100644 index 00000000000..f98f078bc67 --- /dev/null +++ b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/WRC_4_cm.fds @@ -0,0 +1,7 @@ +&HEAD CHID='WRC_4_cm', TITLE='Parallel Panel Test, WRC, Propane, 60 kW' / + +&CATF OTHER_FILES='Mesh_4_cm.txt','WRC_Reactions.txt','Common_Materials.txt','Burner.txt','Panels.txt','Output.txt' / + +&TIME T_END=600.0 / + +&TAIL / diff --git a/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/WRC_Reactions.txt b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/WRC_Reactions.txt new file mode 100644 index 00000000000..02e69719f0b --- /dev/null +++ b/Validation/NIST_NRC_Parallel_Panels/FDS_Input_Files/WRC_Reactions.txt @@ -0,0 +1,136 @@ + +&SPEC ID = 'WATER VAPOR' / +&SPEC ID='Gas1', FORMULA='C0.8O0.8H1.8', RADCAL_ID='PROPANE', SPECIFIC_HEAT=2.100/ +&SPEC ID='Gas2', FORMULA='C0.8O0.8H1.8', RADCAL_ID='PROPANE', SPECIFIC_HEAT=2.100/ +&SPEC ID='Gas3', FORMULA='C0.8O0.8H1.8', RADCAL_ID='PROPANE', SPECIFIC_HEAT=2.100/ +&SPEC ID='Gas4', FORMULA='C0.8O0.8H1.8', RADCAL_ID='PROPANE', SPECIFIC_HEAT=2.100/ +&SPEC ID='Gas5', FORMULA='C0.8O0.8H1.8', RADCAL_ID='PROPANE', SPECIFIC_HEAT=2.100/ + +&REAC FUEL='Gas1', SOOT_YIELD=0.022, CO_YIELD=0.003, RADIATIVE_FRACTION=0.35, HEAT_OF_COMBUSTION=11500 / +&REAC FUEL='Gas2', SOOT_YIELD=0.022, CO_YIELD=0.003, RADIATIVE_FRACTION=0.35, HEAT_OF_COMBUSTION=14800 / +&REAC FUEL='Gas3', SOOT_YIELD=0.022, CO_YIELD=0.003, RADIATIVE_FRACTION=0.35, HEAT_OF_COMBUSTION=13600 / +&REAC FUEL='Gas4', SOOT_YIELD=0.022, CO_YIELD=0.003, RADIATIVE_FRACTION=0.35, HEAT_OF_COMBUSTION=18000 / +&REAC FUEL='Gas5', SOOT_YIELD=0.022, CO_YIELD=0.003, RADIATIVE_FRACTION=0.35, HEAT_OF_COMBUSTION=5000 / + +&MATL ID='water' + REFERENCE_TEMPERATURE = 100. + DENSITY = 1000. + SPEC_ID = 'WATER VAPOR' + NU_SPEC = 1. + CONDUCTIVITY = 0.6 + SPECIFIC_HEAT_RAMP = 'cp_water' + HEAT_OF_REACTION = 2780. / + +&MATL ID='WRC' + A(1) = 1.4E8 + E(1) = 1.05E5 + EMISSIVITY = 0.81 + DENSITY = 376. + SPEC_ID = 'Gas1' + NU_SPEC = 0.048 + MATL_ID = 'WRC1' + NU_MATL = 0.952 + CONDUCTIVITY = 0.128 + SPECIFIC_HEAT_RAMP = 'cp_WRC' + HEAT_OF_REACTION = 26. / + +&MATL ID='WRC1' + A(1) = 2.57E6 + E(1) = 1.01E5 + EMISSIVITY = 0.79 + DENSITY = 348. + SPEC_ID = 'Gas2' + NU_SPEC = 0.373 + MATL_ID = 'WRC2' + NU_MATL = 0.627 + CONDUCTIVITY = 0.085 + SPECIFIC_HEAT_RAMP = 'cp_WRC1' + HEAT_OF_REACTION = 77. / + +&MATL ID='WRC2' + A(1) = 5.69E18 + E(1) = 2.55E5 + EMISSIVITY = 0.76 + DENSITY = 218. + SPEC_ID = 'Gas3' + NU_SPEC = 0.477 + MATL_ID = 'WRC3' + NU_MATL = 0.523 + CONDUCTIVITY = 0.085 + SPECIFIC_HEAT_RAMP = 'cp_WRC2' + HEAT_OF_REACTION = 280. / + +&MATL ID='WRC3' + A(1) = 5.48E-2 + E(1) = 1.88E4 + EMISSIVITY = 0.74 + DENSITY = 114. + SPEC_ID = 'Gas4' + NU_SPEC = 0.279 + MATL_ID = 'WRC4' + NU_MATL = 0.721 + CONDUCTIVITY = 0.305 + SPECIFIC_HEAT_RAMP = 'cp_WRC3' + HEAT_OF_REACTION = -500. / + +&MATL ID='WRC4' + A(1) = 3.67E-4 + E(1) = 5.46E3 + EMISSIVITY = 0.72 + DENSITY = 82. + SPEC_ID = 'Gas5' + NU_SPEC = 0.517 + MATL_ID = 'Char' + NU_MATL = 0.483 + CONDUCTIVITY = 0.580 + SPECIFIC_HEAT_RAMP = 'cp_WRC4' + HEAT_OF_REACTION = -3. / + +&MATL ID='Char' + EMISSIVITY = 0.70 + DENSITY = 39. + CONDUCTIVITY = 1.20 + SPECIFIC_HEAT_RAMP = 'cp_char'/ + +&RAMP ID='cp_water', T= 20., F=4.181 / +&RAMP ID='cp_water', T= 40., F=4.181 / +&RAMP ID='cp_water', T= 60., F=4.189 / +&RAMP ID='cp_water', T= 80., F=4.206 / +&RAMP ID='cp_water', T= 100., F=4.232 / + +&RAMP ID='cp_WRC', T= 25., F=1.042 / +&RAMP ID='cp_WRC', T=500., F=3.493 / + +&RAMP ID='cp_WRC1', T= 25., F=1.044 / +&RAMP ID='cp_WRC1', T=500., F=3.049 / + +&RAMP ID='cp_WRC2', T= 25., F=1.050 / +&RAMP ID='cp_WRC2', T=500., F=2.613 / + +&RAMP ID='cp_WRC3', T= 25., F=1.052 / +&RAMP ID='cp_WRC3', T=500., F=2.168 / + +&RAMP ID='cp_WRC4', T= 25., F=1.056 / +&RAMP ID='cp_WRC4', T=500., F=1.731 / + +&RAMP ID='cp_char', T= 25., F=1.059 / +&RAMP ID='cp_char', T=700., F=1.287 / + +&SURF ID = 'SAMPLE FRONT' + ROUGHNESS = 0.002 + COLOR = 'TAN' + MATL_ID(1,1:2) = 'WRC','water' + MATL_MASS_FRACTION(1,1:2) = 0.926,0.074 + MATL_ID(2,1) = 'MARINITE' + STRETCH_FACTOR(1:2) = 1.,2. + THICKNESS = 0.021,0.0254 / + +&SURF ID = 'SAMPLE BACK' + ROUGHNESS = 0.002 + COLOR = 'GRAY' + MATL_ID(1,1) = 'MARINITE' + MATL_ID(2,1:2) = 'WRC','water' + MATL_MASS_FRACTION(2,1:2) = 0.926,0.074 + STRETCH_FACTOR(1:2) = 2.,1. + THICKNESS = 0.0254,0.021 / + diff --git a/Validation/NIST_NRC_Parallel_Panels/Run_All.sh b/Validation/NIST_NRC_Parallel_Panels/Run_All.sh index fa8202edd19..453c21ce31f 100755 --- a/Validation/NIST_NRC_Parallel_Panels/Run_All.sh +++ b/Validation/NIST_NRC_Parallel_Panels/Run_All.sh @@ -5,13 +5,20 @@ export SVNROOT=`pwd`/../.. source $SVNROOT/Validation/Common_Run_All.sh -$QFDS $DEBUG -p 96 $QUEUE -d $INDIR PBT_60_kW.fds +$QFDS $DEBUG -p 12 $QUEUE -d $INDIR PBT_4_cm.fds +$QFDS $DEBUG -p 72 $QUEUE -d $INDIR PBT_2_cm.fds +$QFDS $DEBUG -p 288 $QUEUE -d $INDIR PBT_1_cm.fds $QFDS $DEBUG -p 12 $QUEUE -d $INDIR PMMA_60_kW_4_cm.fds $QFDS $DEBUG -p 288 $QUEUE -d $INDIR PMMA_60_kW_2_cm.fds $QFDS $DEBUG -p 288 $QUEUE -d $INDIR PMMA_60_kW_1_cm.fds -$QFDS $DEBUG -p 96 $QUEUE -d $INDIR PVC_60_kW.fds +$QFDS $DEBUG -p 12 $QUEUE -d $INDIR PVC_4_cm.fds +$QFDS $DEBUG -p 72 $QUEUE -d $INDIR PVC_2_cm.fds +$QFDS $DEBUG -p 288 $QUEUE -d $INDIR PVC_1_cm.fds $QFDS $DEBUG -p 8 $QUEUE -d $INDIR Marinite_60_kW_4_cm.fds $QFDS $DEBUG -p 64 $QUEUE -d $INDIR Marinite_60_kW_2_cm.fds $QFDS $DEBUG -p 64 $QUEUE -d $INDIR Marinite_60_kW_1_cm.fds +$QFDS $DEBUG -p 12 $QUEUE -d $INDIR WRC_4_cm.fds +$QFDS $DEBUG -p 72 $QUEUE -d $INDIR WRC_2_cm.fds +$QFDS $DEBUG -p 288 $QUEUE -d $INDIR WRC_1_cm.fds echo FDS cases submitted diff --git a/Validation/NIST_NRC_Transient_Combustibles/FDS_Input_Files/crib_drag.fds b/Validation/NIST_NRC_Transient_Combustibles/FDS_Input_Files/crib_drag.fds index 467027b19d2..2f8a879b7ac 100644 --- a/Validation/NIST_NRC_Transient_Combustibles/FDS_Input_Files/crib_drag.fds +++ b/Validation/NIST_NRC_Transient_Combustibles/FDS_Input_Files/crib_drag.fds @@ -36,12 +36,12 @@ &SURF ID='SOLID PINE', MATL_ID = 'PINE WOOD' - MOISTURE_FRACTION = 0.05 + MOISTURE_CONTENT = 0.05 THICKNESS=0.04 / &SURF ID='PINE CRIB', MATL_ID = 'PINE WOOD' - MOISTURE_FRACTION = 0.05 + MOISTURE_CONTENT = 0.05 SURFACE_VOLUME_RATIO = 69. GEOMETRY = 'CYLINDRICAL' LENGTH = 0.04 / diff --git a/Validation/NIST_USFS_Camp_Swift/FDS_Input_Files/vegetation_model.fds b/Validation/NIST_USFS_Camp_Swift/FDS_Input_Files/vegetation_model.fds index 94d6ea9cb55..ca425eaa824 100644 --- a/Validation/NIST_USFS_Camp_Swift/FDS_Input_Files/vegetation_model.fds +++ b/Validation/NIST_USFS_Camp_Swift/FDS_Input_Files/vegetation_model.fds @@ -44,7 +44,7 @@ &SURF ID = 'bluestem_lower_blade' MATL_ID = 'GENERIC VEGETATION' SURFACE_VOLUME_RATIO = 8439 - MOISTURE_FRACTION = 0.259 + MOISTURE_CONTENT = 0.259 LENGTH =0.3 GEOMETRY = 'CYLINDRICAL' / @@ -71,7 +71,7 @@ &SURF ID = 'bluestem_lower_cyl' MATL_ID = 'GENERIC VEGETATION' SURFACE_VOLUME_RATIO = 1850 - MOISTURE_FRACTION = 0.259 + MOISTURE_CONTENT = 0.259 LENGTH =0.3 GEOMETRY = 'CYLINDRICAL' / @@ -100,7 +100,7 @@ &SURF ID = 'bluestem_upper_blade' MATL_ID = 'GENERIC VEGETATION' SURFACE_VOLUME_RATIO = 9147 - MOISTURE_FRACTION = 0.107 + MOISTURE_CONTENT = 0.107 LENGTH =0.5 GEOMETRY = 'CYLINDRICAL' / @@ -127,7 +127,7 @@ &SURF ID = 'bluestem_upper_small_cyl' MATL_ID = 'GENERIC VEGETATION' SURFACE_VOLUME_RATIO = 6768 - MOISTURE_FRACTION = 0.107 + MOISTURE_CONTENT = 0.107 LENGTH =0.5 GEOMETRY = 'CYLINDRICAL' / @@ -154,7 +154,7 @@ &SURF ID = 'bluestem_upper_large_cyl' MATL_ID = 'GENERIC VEGETATION' SURFACE_VOLUME_RATIO = 2438 - MOISTURE_FRACTION = 0.107 + MOISTURE_CONTENT = 0.107 LENGTH =0.5 GEOMETRY = 'CYLINDRICAL' / @@ -183,7 +183,7 @@ &SURF ID = 'camphorweed_leaf' MATL_ID = 'GENERIC VEGETATION' SURFACE_VOLUME_RATIO = 11170. - MOISTURE_FRACTION = 0.106 + MOISTURE_CONTENT = 0.106 LENGTH =0.20 GEOMETRY = 'CYLINDRICAL' / @@ -210,7 +210,7 @@ &SURF ID = 'camphorweed_small_cyl' MATL_ID = 'GENERIC VEGETATION' SURFACE_VOLUME_RATIO = 3510. - MOISTURE_FRACTION = 0.106 + MOISTURE_CONTENT = 0.106 LENGTH =0.45 GEOMETRY = 'CYLINDRICAL' / @@ -237,7 +237,7 @@ &SURF ID = 'camphorweed_large_cyl' MATL_ID = 'GENERIC VEGETATION' SURFACE_VOLUME_RATIO = 1580. - MOISTURE_FRACTION = 0.106 + MOISTURE_CONTENT = 0.106 LENGTH = 0.45 GEOMETRY = 'CYLINDRICAL' / @@ -266,7 +266,7 @@ &SURF ID = 'threeawn_blade' MATL_ID = 'GENERIC VEGETATION' SURFACE_VOLUME_RATIO = 12280. - MOISTURE_FRACTION = 0.065 + MOISTURE_CONTENT = 0.065 LENGTH =0.41 GEOMETRY = 'CYLINDRICAL' / @@ -293,7 +293,7 @@ &SURF ID = 'threeawn_cyl' MATL_ID = 'GENERIC VEGETATION' SURFACE_VOLUME_RATIO = 5910. - MOISTURE_FRACTION = 0.065 + MOISTURE_CONTENT = 0.065 LENGTH = 0.41 GEOMETRY = 'CYLINDRICAL' / @@ -325,7 +325,7 @@ ! mass weighted average of SVR = ((.653*8439+.367*1850)*.3+(.046*2438+.110*6768+.080*9147)*.5)/(.53*.8) SURFACE_VOLUME_RATIO = 6252. ! mass weighted moisture = ((.653*.25+.367*.25)*.3+(.046*.096+.110*.096+.080*.096)*.5)/(.53*.8) - MOISTURE_FRACTION = 0.21 + MOISTURE_CONTENT = 0.21 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128a.fds b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128a.fds index 92de7fa792d..730d7818a38 100644 --- a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128a.fds +++ b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128a.fds @@ -1,10 +1,5 @@ &HEAD CHID='openmp_test128a', TITLE='General purpose input file to test FDS timings' / -REM DO NOT EDIT the .fds input files directly. When making changes: -REM 1. edit the template file, makecase.sh -REM 2. rerun the script makecases.sh -REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files - &MESH IJK=128,128,128, XB=0.0,1.0,0.0,1.0,0.0,1.0 / &TIME T_END=1.0 / diff --git a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128b.fds b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128b.fds index b7f6bb1f5d5..c0a1e2dcae0 100644 --- a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128b.fds +++ b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128b.fds @@ -1,10 +1,5 @@ &HEAD CHID='openmp_test128b', TITLE='General purpose input file to test FDS timings' / -REM DO NOT EDIT the .fds input files directly. When making changes: -REM 1. edit the template file, makecase.sh -REM 2. rerun the script makecases.sh -REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files - &MESH IJK=128,128,128, XB=0.0,1.0,0.0,1.0,0.0,1.0 / &TIME T_END=1.0 / diff --git a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128c.fds b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128c.fds index a0ec5405af9..3fb25a1fa18 100644 --- a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128c.fds +++ b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128c.fds @@ -1,10 +1,5 @@ &HEAD CHID='openmp_test128c', TITLE='General purpose input file to test FDS timings' / -REM DO NOT EDIT the .fds input files directly. When making changes: -REM 1. edit the template file, makecase.sh -REM 2. rerun the script makecases.sh -REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files - &MESH IJK=128,128,128, XB=0.0,1.0,0.0,1.0,0.0,1.0 / &TIME T_END=1.0 / diff --git a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128d.fds b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128d.fds index bbe3070b227..a552963b072 100644 --- a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128d.fds +++ b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128d.fds @@ -1,10 +1,5 @@ &HEAD CHID='openmp_test128d', TITLE='General purpose input file to test FDS timings' / -REM DO NOT EDIT the .fds input files directly. When making changes: -REM 1. edit the template file, makecase.sh -REM 2. rerun the script makecases.sh -REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files - &MESH IJK=128,128,128, XB=0.0,1.0,0.0,1.0,0.0,1.0 / &TIME T_END=1.0 / diff --git a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128e.fds b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128e.fds index b8b7f5cf934..85a189442a7 100644 --- a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128e.fds +++ b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128e.fds @@ -1,10 +1,5 @@ &HEAD CHID='openmp_test128e', TITLE='General purpose input file to test FDS timings' / -REM DO NOT EDIT the .fds input files directly. When making changes: -REM 1. edit the template file, makecase.sh -REM 2. rerun the script makecases.sh -REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files - &MESH IJK=128,128,128, XB=0.0,1.0,0.0,1.0,0.0,1.0 / &TIME T_END=1.0 / diff --git a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128f.fds b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128f.fds index 027129b1064..cf40e44854d 100644 --- a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128f.fds +++ b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128f.fds @@ -1,10 +1,5 @@ &HEAD CHID='openmp_test128f', TITLE='General purpose input file to test FDS timings' / -REM DO NOT EDIT the .fds input files directly. When making changes: -REM 1. edit the template file, makecase.sh -REM 2. rerun the script makecases.sh -REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files - &MESH IJK=128,128,128, XB=0.0,1.0,0.0,1.0,0.0,1.0 / &TIME T_END=1.0 / diff --git a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128g.fds b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128g.fds index e66f645c99b..228f5544c64 100644 --- a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128g.fds +++ b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128g.fds @@ -1,10 +1,5 @@ &HEAD CHID='openmp_test128g', TITLE='General purpose input file to test FDS timings' / -REM DO NOT EDIT the .fds input files directly. When making changes: -REM 1. edit the template file, makecase.sh -REM 2. rerun the script makecases.sh -REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files - &MESH IJK=128,128,128, XB=0.0,1.0,0.0,1.0,0.0,1.0 / &TIME T_END=1.0 / diff --git a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128h.fds b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128h.fds index 7713dc8eb52..b078241a9fb 100644 --- a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128h.fds +++ b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128h.fds @@ -1,10 +1,5 @@ &HEAD CHID='openmp_test128h', TITLE='General purpose input file to test FDS timings' / -REM DO NOT EDIT the .fds input files directly. When making changes: -REM 1. edit the template file, makecase.sh -REM 2. rerun the script makecases.sh -REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files - &MESH IJK=128,128,128, XB=0.0,1.0,0.0,1.0,0.0,1.0 / &TIME T_END=1.0 / diff --git a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64a.fds b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64a.fds index 3dc544c58fe..718720063c9 100644 --- a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64a.fds +++ b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64a.fds @@ -1,10 +1,5 @@ &HEAD CHID='openmp_test64a', TITLE='General purpose input file to test FDS timings' / -REM DO NOT EDIT the .fds input files directly. When making changes: -REM 1. edit the template file, makecase.sh -REM 2. rerun the script makecases.sh -REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files - &MESH IJK=64,64,64, XB=0.0,1.0,0.0,1.0,0.0,1.0 / &TIME T_END=10.0 / diff --git a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64b.fds b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64b.fds index c125170c370..9474011516f 100644 --- a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64b.fds +++ b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64b.fds @@ -1,10 +1,5 @@ &HEAD CHID='openmp_test64b', TITLE='General purpose input file to test FDS timings' / -REM DO NOT EDIT the .fds input files directly. When making changes: -REM 1. edit the template file, makecase.sh -REM 2. rerun the script makecases.sh -REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files - &MESH IJK=64,64,64, XB=0.0,1.0,0.0,1.0,0.0,1.0 / &TIME T_END=10.0 / diff --git a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64c.fds b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64c.fds index cdb3531e94d..65c55848ac0 100644 --- a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64c.fds +++ b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64c.fds @@ -1,10 +1,5 @@ &HEAD CHID='openmp_test64c', TITLE='General purpose input file to test FDS timings' / -REM DO NOT EDIT the .fds input files directly. When making changes: -REM 1. edit the template file, makecase.sh -REM 2. rerun the script makecases.sh -REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files - &MESH IJK=64,64,64, XB=0.0,1.0,0.0,1.0,0.0,1.0 / &TIME T_END=10.0 / diff --git a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64d.fds b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64d.fds index ddf30cdb839..8a9e84bb102 100644 --- a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64d.fds +++ b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64d.fds @@ -1,10 +1,5 @@ &HEAD CHID='openmp_test64d', TITLE='General purpose input file to test FDS timings' / -REM DO NOT EDIT the .fds input files directly. When making changes: -REM 1. edit the template file, makecase.sh -REM 2. rerun the script makecases.sh -REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files - &MESH IJK=64,64,64, XB=0.0,1.0,0.0,1.0,0.0,1.0 / &TIME T_END=10.0 / diff --git a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64e.fds b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64e.fds index 5e39f5d886c..28f4fb3b4f3 100644 --- a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64e.fds +++ b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64e.fds @@ -1,10 +1,5 @@ &HEAD CHID='openmp_test64e', TITLE='General purpose input file to test FDS timings' / -REM DO NOT EDIT the .fds input files directly. When making changes: -REM 1. edit the template file, makecase.sh -REM 2. rerun the script makecases.sh -REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files - &MESH IJK=64,64,64, XB=0.0,1.0,0.0,1.0,0.0,1.0 / &TIME T_END=10.0 / diff --git a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64f.fds b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64f.fds index bd2408393ff..f360b68520f 100644 --- a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64f.fds +++ b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64f.fds @@ -1,10 +1,5 @@ &HEAD CHID='openmp_test64f', TITLE='General purpose input file to test FDS timings' / -REM DO NOT EDIT the .fds input files directly. When making changes: -REM 1. edit the template file, makecase.sh -REM 2. rerun the script makecases.sh -REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files - &MESH IJK=64,64,64, XB=0.0,1.0,0.0,1.0,0.0,1.0 / &TIME T_END=10.0 / diff --git a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64g.fds b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64g.fds index d2655eb1f8f..4c81531886a 100644 --- a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64g.fds +++ b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64g.fds @@ -1,10 +1,5 @@ &HEAD CHID='openmp_test64g', TITLE='General purpose input file to test FDS timings' / -REM DO NOT EDIT the .fds input files directly. When making changes: -REM 1. edit the template file, makecase.sh -REM 2. rerun the script makecases.sh -REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files - &MESH IJK=64,64,64, XB=0.0,1.0,0.0,1.0,0.0,1.0 / &TIME T_END=10.0 / diff --git a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64h.fds b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64h.fds index 080de4291f7..841e2c6fcea 100644 --- a/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64h.fds +++ b/Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64h.fds @@ -1,10 +1,5 @@ &HEAD CHID='openmp_test64h', TITLE='General purpose input file to test FDS timings' / -REM DO NOT EDIT the .fds input files directly. When making changes: -REM 1. edit the template file, makecase.sh -REM 2. rerun the script makecases.sh -REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files - &MESH IJK=64,64,64, XB=0.0,1.0,0.0,1.0,0.0,1.0 / &TIME T_END=10.0 / diff --git a/Validation/OMP_Scaling_Tests/README.md b/Validation/OMP_Scaling_Tests/README.md new file mode 100644 index 00000000000..bda652b6cb6 --- /dev/null +++ b/Validation/OMP_Scaling_Tests/README.md @@ -0,0 +1,9 @@ +# OpenMP Scaling Tests + +The sub-folder `FDS_Input_Files` contains a set of input files used to test the OpenMP functionality in FDS. There are two sets of tests. The first, `openmp_test64n.fds`, is a single mesh case with 64 by 64 by 64 grid cells. It runs for 10~s of simulation time. The case `openmp_test64a.fds` is run with one OpenMP thread, `openmp_test64b.fds` is run with two, and so on up to `openmp_test64h.fds` which is run with eight. The cases are all run on a single dedicated node with no other jobs running. + +The cases labelled `test128n.fds` are similar, but with a mesh of 128 by 128 by 128 grid cells. + +The script `Run_All.sh` can be used to run the cases, and `Process_All.sh` copies the output to the `out` repository. + + diff --git a/Validation/SP_Wood_Cribs/FDS_Input_Files/props.fds b/Validation/SP_Wood_Cribs/FDS_Input_Files/props.fds index 480d90a429a..47b1036a0a8 100644 --- a/Validation/SP_Wood_Cribs/FDS_Input_Files/props.fds +++ b/Validation/SP_Wood_Cribs/FDS_Input_Files/props.fds @@ -40,7 +40,7 @@ MATL_ID = 'PINE' COLOR = 'BROWN' BACKING = 'INSULATED' - MOISTURE_FRACTION = 0.016 + MOISTURE_CONTENT = 0.016 SURFACE_VOLUME_RATIO = 460. GEOMETRY = 'CARTESIAN' LENGTH = 0.01 diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EX72.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EX72.fds index 03e71f51d20..68f06e992ec 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EX72.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EX72.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.059 + MOISTURE_CONTENT = 0.059 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EX73.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EX73.fds index 26c6613332a..40a19c71218 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EX73.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EX73.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.058 + MOISTURE_CONTENT = 0.058 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EX74.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EX74.fds index db6c394e83b..d403e61016b 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EX74.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EX74.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.054 + MOISTURE_CONTENT = 0.054 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EX75.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EX75.fds index 1b7d69c3421..dec59ff8f22 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EX75.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EX75.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.062 + MOISTURE_CONTENT = 0.062 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EX76.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EX76.fds index 03643570166..698cf4eb08a 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EX76.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EX76.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.056 + MOISTURE_CONTENT = 0.056 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EX77.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EX77.fds index ba16caa6bed..02f181c1755 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EX77.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EX77.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.066 + MOISTURE_CONTENT = 0.066 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC18.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC18.fds index 26b5c342772..bbeabb18c38 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC18.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC18.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.036 + MOISTURE_CONTENT = 0.036 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC19.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC19.fds index 59e67f030d1..50fd171ddce 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC19.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC19.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.063 + MOISTURE_CONTENT = 0.063 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1A.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1A.fds index 6cf78fd8cff..c0dc12c7b85 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1A.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1A.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.065 + MOISTURE_CONTENT = 0.065 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1D.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1D.fds index 10f2ae6a657..0636298957f 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1D.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1D.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.116 + MOISTURE_CONTENT = 0.116 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1G.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1G.fds index 61d7e9c24ed..05fc2d7e968 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1G.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1G.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.038 + MOISTURE_CONTENT = 0.038 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1I.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1I.fds index 0e56932d25e..a2e04d75815 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1I.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1I.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.035 + MOISTURE_CONTENT = 0.035 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1J.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1J.fds index f3df63ab7c1..c00eeecbddb 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1J.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1J.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.123 + MOISTURE_CONTENT = 0.123 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1K.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1K.fds index 274d0351411..c0461f724e7 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1K.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC1K.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.139 + MOISTURE_CONTENT = 0.139 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC20.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC20.fds index 7796c3bb660..2b11ed3ffac 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC20.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC20.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.062 + MOISTURE_CONTENT = 0.062 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC21.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC21.fds index 8ea01d82c39..06629ed0380 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC21.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC21.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.069 + MOISTURE_CONTENT = 0.069 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC22.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC22.fds index aa36d49a221..020390aacd1 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC22.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC22.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.064 + MOISTURE_CONTENT = 0.064 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC23.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC23.fds index 564dc541a51..f8c6316675d 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC23.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC23.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.055 + MOISTURE_CONTENT = 0.055 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC24.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC24.fds index 488d3767eca..e2761de347d 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC24.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC24.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.052 + MOISTURE_CONTENT = 0.052 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC25.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC25.fds index 02a29f29b94..cbe7734679e 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC25.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC25.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.041 + MOISTURE_CONTENT = 0.041 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC26.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC26.fds index ac69ced918c..6bee220a236 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC26.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC26.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.08 + MOISTURE_CONTENT = 0.08 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC27.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC27.fds index 4e4fc594558..92db66a8b26 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC27.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC27.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.08 + MOISTURE_CONTENT = 0.08 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC28.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC28.fds index 505a45f2161..ba2b665e364 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC28.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC28.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.054 + MOISTURE_CONTENT = 0.054 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC29.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC29.fds index b51259b993e..38897701795 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC29.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC29.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.06 + MOISTURE_CONTENT = 0.06 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC2A.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC2A.fds index bb1fe84b73b..7529457f5be 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC2A.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC2A.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.052 + MOISTURE_CONTENT = 0.052 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC2D.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC2D.fds index 4eb1832fac2..c6d3877f528 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC2D.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC2D.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.113 + MOISTURE_CONTENT = 0.113 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC2G.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC2G.fds index 7be4a4235e2..3c26b5c626a 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC2G.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC2G.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.045 + MOISTURE_CONTENT = 0.045 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC2I.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC2I.fds index 7cb5981a294..fde2d587a91 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC2I.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC2I.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.039 + MOISTURE_CONTENT = 0.039 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC2J.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC2J.fds index 5959a606d88..5d3174aa686 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC2J.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC2J.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.085 + MOISTURE_CONTENT = 0.085 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3.fds index 7e3f275c62a..f685616af4e 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.23 + MOISTURE_CONTENT = 0.23 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC30.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC30.fds index 078d8dd53b9..7fecd9f321a 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC30.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC30.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.07 + MOISTURE_CONTENT = 0.07 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC31.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC31.fds index 1a4a28bfadf..9ed271e491f 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC31.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC31.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.057 + MOISTURE_CONTENT = 0.057 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC32.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC32.fds index 7bbec26eacf..d2d140bea22 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC32.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC32.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.076 + MOISTURE_CONTENT = 0.076 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC33.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC33.fds index 2b9937a1b27..1a264be0775 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC33.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC33.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.063 + MOISTURE_CONTENT = 0.063 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC34.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC34.fds index 5da736e224b..a47a1e6a441 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC34.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC34.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.118 + MOISTURE_CONTENT = 0.118 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC35.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC35.fds index 00fd8eecffe..f94f2890f91 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC35.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC35.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.122 + MOISTURE_CONTENT = 0.122 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC36.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC36.fds index 708f0f7cff8..8de39db96d7 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC36.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC36.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.101 + MOISTURE_CONTENT = 0.101 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC37.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC37.fds index dc8c5ce33f1..addf32cb031 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC37.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC37.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.119 + MOISTURE_CONTENT = 0.119 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC38.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC38.fds index 5d7a0a90267..6b545cd9561 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC38.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC38.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.06 + MOISTURE_CONTENT = 0.06 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC39.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC39.fds index bd04cf9baf2..15943cfd6b7 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC39.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC39.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.055 + MOISTURE_CONTENT = 0.055 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3A.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3A.fds index f804d80f4f6..69e65531307 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3A.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3A.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.063 + MOISTURE_CONTENT = 0.063 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3B.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3B.fds index 95f15351362..4a4a605c4bb 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3B.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3B.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.048 + MOISTURE_CONTENT = 0.048 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3G.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3G.fds index 8d1332f6e12..6fa4be7f11e 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3G.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3G.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.027 + MOISTURE_CONTENT = 0.027 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3I.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3I.fds index 1d02030a5f1..66467ed7202 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3I.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3I.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.042 + MOISTURE_CONTENT = 0.042 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3J.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3J.fds index 33496912b9e..e8b65e721e4 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3J.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC3J.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.077 + MOISTURE_CONTENT = 0.077 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4.fds index af5c0678b21..1d368a4f99d 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.226 + MOISTURE_CONTENT = 0.226 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC40.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC40.fds index 7db2bb4f68f..62ea16b9d18 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC40.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC40.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.06 + MOISTURE_CONTENT = 0.06 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC41.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC41.fds index 1d110e2a7dd..d1fb37a2aab 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC41.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC41.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.056 + MOISTURE_CONTENT = 0.056 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC42.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC42.fds index e4eb8973e14..7dad3ff77b3 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC42.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC42.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.054 + MOISTURE_CONTENT = 0.054 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC43.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC43.fds index 7fbe4390cd4..d3677470781 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC43.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC43.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.27 + MOISTURE_CONTENT = 0.27 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC46.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC46.fds index d51a2eb3a9f..fdcf4842ed7 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC46.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC46.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.189 + MOISTURE_CONTENT = 0.189 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC47.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC47.fds index 093d845bc99..3352ace5ae7 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC47.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC47.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.189 + MOISTURE_CONTENT = 0.189 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC48.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC48.fds index ba6a50f2201..14d7a2b0c33 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC48.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC48.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.18 + MOISTURE_CONTENT = 0.18 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4A.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4A.fds index 8baf3bb0340..7308c5aebf8 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4A.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4A.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.068 + MOISTURE_CONTENT = 0.068 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4B.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4B.fds index 4e6e97a9f12..d7c6cc3d6a5 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4B.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4B.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.057 + MOISTURE_CONTENT = 0.057 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4C.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4C.fds index 127a096ce9e..b0f3f41e337 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4C.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4C.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.182 + MOISTURE_CONTENT = 0.182 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4G.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4G.fds index c79feae24da..7f3fe145782 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4G.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4G.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.034 + MOISTURE_CONTENT = 0.034 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4I.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4I.fds index ca6ebadfe37..d3fd626b717 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4I.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC4I.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.05 + MOISTURE_CONTENT = 0.05 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC51.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC51.fds index acc6d825774..af8b0ddf3c2 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC51.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC51.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.045 + MOISTURE_CONTENT = 0.045 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC5B.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC5B.fds index 2465f72a789..ffe5e931a53 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC5B.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC5B.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.05 + MOISTURE_CONTENT = 0.05 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC5C.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC5C.fds index 46de614e6c3..708dee98151 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC5C.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC5C.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.206 + MOISTURE_CONTENT = 0.206 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC5D.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC5D.fds index cb893a791ae..88b617dcf56 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC5D.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC5D.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.031 + MOISTURE_CONTENT = 0.031 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC5G.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC5G.fds index 1f7b7799e82..34810606373 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC5G.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC5G.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.19 + MOISTURE_CONTENT = 0.19 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC5J.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC5J.fds index 862d4381cb4..defc4bda530 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC5J.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC5J.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.076 + MOISTURE_CONTENT = 0.076 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC61.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC61.fds index af0cdc5c1a0..be7077ff3b8 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC61.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC61.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.03 + MOISTURE_CONTENT = 0.03 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC62.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC62.fds index 8cdf8411e4d..3e88fb68f0b 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC62.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC62.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.146 + MOISTURE_CONTENT = 0.146 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC63.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC63.fds index 03f7843daf5..b426e472de9 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC63.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC63.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.154 + MOISTURE_CONTENT = 0.154 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC64.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC64.fds index 184eb5bb647..cbb463c13a4 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC64.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC64.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.158 + MOISTURE_CONTENT = 0.158 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC65.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC65.fds index 369d5f4a4ee..7f6fce32a3d 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC65.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC65.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.149 + MOISTURE_CONTENT = 0.149 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC66.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC66.fds index b983d939d89..31fbf41d32a 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC66.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC66.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.049 + MOISTURE_CONTENT = 0.049 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC67.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC67.fds index 9af47b92ced..559214cdd33 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC67.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC67.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.038 + MOISTURE_CONTENT = 0.038 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC68.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC68.fds index ba44310bd9f..3c37e09b526 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC68.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC68.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.036 + MOISTURE_CONTENT = 0.036 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC69.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC69.fds index 06d67dd6663..c7b7618d48b 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC69.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC69.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.03 + MOISTURE_CONTENT = 0.03 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC6A.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC6A.fds index 2a778d0bde1..b3dedf64d8c 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC6A.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC6A.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.061 + MOISTURE_CONTENT = 0.061 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC6B.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC6B.fds index 662a42da8dd..a7ff5c7ac5e 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC6B.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC6B.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.062 + MOISTURE_CONTENT = 0.062 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC6D.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC6D.fds index 36918513fc6..87455590e57 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC6D.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC6D.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.027 + MOISTURE_CONTENT = 0.027 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC6G.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC6G.fds index 2e8ee865747..ba1bf452056 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC6G.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC6G.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.168 + MOISTURE_CONTENT = 0.168 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC6J.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC6J.fds index 7892d8a1b76..21d3876a6c6 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC6J.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC6J.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.097 + MOISTURE_CONTENT = 0.097 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC7.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC7.fds index 6950cf82c73..0234c5f9412 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC7.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC7.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.264 + MOISTURE_CONTENT = 0.264 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC70.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC70.fds index a45f2eddde4..aa2c7fe2c29 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC70.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC70.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.03 + MOISTURE_CONTENT = 0.03 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC71.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC71.fds index c5f641eb722..0358537db8b 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC71.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC71.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.068 + MOISTURE_CONTENT = 0.068 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC7A.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC7A.fds index 34fd2b15c6b..57d5577975c 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC7A.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC7A.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.09 + MOISTURE_CONTENT = 0.09 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC7G.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC7G.fds index 9cd76bae0e1..c4f0258925a 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC7G.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC7G.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.173 + MOISTURE_CONTENT = 0.173 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC80.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC80.fds index dfc8647fdd2..03bb25cf30f 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC80.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC80.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.054 + MOISTURE_CONTENT = 0.054 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC81.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC81.fds index 679310a6ece..b0e619994ee 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC81.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC81.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.055 + MOISTURE_CONTENT = 0.055 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC82.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC82.fds index bd329778ea9..637a058b844 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC82.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC82.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.049 + MOISTURE_CONTENT = 0.049 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC83.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC83.fds index 427346e9f1c..55e2acf6078 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC83.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC83.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.047 + MOISTURE_CONTENT = 0.047 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC84.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC84.fds index d40cefc7378..07ca405a786 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC84.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC84.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.047 + MOISTURE_CONTENT = 0.047 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC85.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC85.fds index 3c7e9cc108b..72c747cee3f 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC85.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC85.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.162 + MOISTURE_CONTENT = 0.162 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC86.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC86.fds index 23d583e2c90..c53730a8726 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC86.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC86.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.052 + MOISTURE_CONTENT = 0.052 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC89.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC89.fds index ad7a9c29787..4ed17371325 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC89.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC89.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.063 + MOISTURE_CONTENT = 0.063 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC8A.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC8A.fds index 5a6ff6ede40..8526fcc7c72 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC8A.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC8A.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.064 + MOISTURE_CONTENT = 0.064 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC8G.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC8G.fds index aca5df51c78..83c6603de0b 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC8G.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC8G.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.178 + MOISTURE_CONTENT = 0.178 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC8H.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC8H.fds index 008d4498eba..15d646349e2 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC8H.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC8H.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.051 + MOISTURE_CONTENT = 0.051 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC8I.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC8I.fds index 2b193b8db52..104d46eede2 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC8I.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC8I.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.08 + MOISTURE_CONTENT = 0.08 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC90.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC90.fds index 1fc3eba7500..f6a7ccb7f84 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC90.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC90.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.049 + MOISTURE_CONTENT = 0.049 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC91.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC91.fds index 2aebea74d8c..790a0fa4cd2 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC91.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC91.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.05 + MOISTURE_CONTENT = 0.05 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC92.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC92.fds index 7fbc94ace5a..22fd4150f6e 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC92.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC92.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.071 + MOISTURE_CONTENT = 0.071 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC93.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC93.fds index 0af611b6d0d..5586d816c2d 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC93.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC93.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.067 + MOISTURE_CONTENT = 0.067 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC94.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC94.fds index 4ccd2f19fd5..5ebd2d0afdf 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC94.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC94.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.062 + MOISTURE_CONTENT = 0.062 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC95.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC95.fds index 9043f2e27d4..aebcddcfe34 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC95.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC95.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.065 + MOISTURE_CONTENT = 0.065 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC96.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC96.fds index 9a5617858b2..2a28400b5aa 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC96.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC96.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.067 + MOISTURE_CONTENT = 0.067 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC97.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC97.fds index 4d4937cf10b..eb995642287 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC97.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC97.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.06 + MOISTURE_CONTENT = 0.06 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC9A.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC9A.fds index 9c24643ee60..2f11140ed98 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC9A.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC9A.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.072 + MOISTURE_CONTENT = 0.072 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC9B.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC9B.fds index 55e9f194215..8dd56d76395 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC9B.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC9B.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.059 + MOISTURE_CONTENT = 0.059 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC9I.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC9I.fds index d400d9fdac2..c19ed361e5c 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXMC9I.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXMC9I.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.07 + MOISTURE_CONTENT = 0.07 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1.fds index 3883aacb9d9..c83b8c188f5 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.061 + MOISTURE_CONTENT = 0.061 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC10.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC10.fds index b75a3f07077..d48e821a7dd 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC10.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC10.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.066 + MOISTURE_CONTENT = 0.066 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC11.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC11.fds index 39a22086958..84c30f395ea 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC11.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC11.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.091 + MOISTURE_CONTENT = 0.091 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC12.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC12.fds index cf3a294821e..84052d6d7f5 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC12.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC12.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.077 + MOISTURE_CONTENT = 0.077 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC13.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC13.fds index 3ba1b59f0ad..d013371c362 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC13.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC13.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.068 + MOISTURE_CONTENT = 0.068 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC14.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC14.fds index 4ffd7b8a6a9..27cc47f573f 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC14.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC14.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.052 + MOISTURE_CONTENT = 0.052 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC15.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC15.fds index e1b36f93e4c..2f468b487fe 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC15.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC15.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.062 + MOISTURE_CONTENT = 0.062 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC16.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC16.fds index 76967e5f23a..3578b07775a 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC16.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC16.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.058 + MOISTURE_CONTENT = 0.058 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC17.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC17.fds index 1e131f1fad1..4c97896830f 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC17.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC17.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.066 + MOISTURE_CONTENT = 0.066 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC18.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC18.fds index 9fd9c58654f..22f6f8fc489 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC18.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC18.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.067 + MOISTURE_CONTENT = 0.067 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC19.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC19.fds index 1169ee32cb8..af41aaa8edd 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC19.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC19.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.078 + MOISTURE_CONTENT = 0.078 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1A.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1A.fds index 2f4d49218ae..fda8fc0e4a6 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1A.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1A.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.049 + MOISTURE_CONTENT = 0.049 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1B.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1B.fds index 52d505f7d93..c58f17ac11d 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1B.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1B.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.089 + MOISTURE_CONTENT = 0.089 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1C.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1C.fds index d742758a006..05df4bf40ca 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1C.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1C.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.054 + MOISTURE_CONTENT = 0.054 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1D.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1D.fds index 4c47884747b..330ff62b7b4 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1D.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1D.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.061 + MOISTURE_CONTENT = 0.061 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1E.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1E.fds index 090100d73a4..78316d35a16 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1E.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC1E.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.082 + MOISTURE_CONTENT = 0.082 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2.fds index 5eadf1c9a6a..da69354ee8e 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.055 + MOISTURE_CONTENT = 0.055 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC20.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC20.fds index 3d5602671aa..e13c43f86ed 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC20.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC20.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.055 + MOISTURE_CONTENT = 0.055 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC21.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC21.fds index 6cae6dd4cb9..1c01d33d776 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC21.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC21.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.059 + MOISTURE_CONTENT = 0.059 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC22.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC22.fds index e7a76e8283e..c8e60a87159 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC22.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC22.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.062 + MOISTURE_CONTENT = 0.062 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC23.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC23.fds index 2600132bab1..f2f595a158f 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC23.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC23.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.057 + MOISTURE_CONTENT = 0.057 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC24.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC24.fds index 89b261d3b73..ea90541471b 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC24.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC24.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.061 + MOISTURE_CONTENT = 0.061 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC25.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC25.fds index fd47e723477..e9a96a89dea 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC25.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC25.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.134 + MOISTURE_CONTENT = 0.134 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC26.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC26.fds index 6988d69d2f4..35861d06937 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC26.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC26.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.127 + MOISTURE_CONTENT = 0.127 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC27.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC27.fds index 9c31ddddf2f..7f519f2278a 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC27.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC27.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.125 + MOISTURE_CONTENT = 0.125 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC28.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC28.fds index e8ae8754285..ba31298b4ed 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC28.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC28.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.126 + MOISTURE_CONTENT = 0.126 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC29.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC29.fds index c0fb2203f92..3c8289c0d83 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC29.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC29.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.121 + MOISTURE_CONTENT = 0.121 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2A.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2A.fds index b549ffa968a..ea2f001f824 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2A.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2A.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.037 + MOISTURE_CONTENT = 0.037 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2B.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2B.fds index 44af0a3ad57..509d6227924 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2B.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2B.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.069 + MOISTURE_CONTENT = 0.069 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2C.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2C.fds index 8d6a1407e57..bdb6e1bf9d5 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2C.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2C.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.054 + MOISTURE_CONTENT = 0.054 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2D.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2D.fds index 547339a8333..0b370d9cb66 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2D.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2D.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.051 + MOISTURE_CONTENT = 0.051 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2E.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2E.fds index 4ad9b393b50..4435d67070c 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2E.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC2E.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.117 + MOISTURE_CONTENT = 0.117 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3.fds index 7217c0a8cfe..d224fb8c5bb 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.048 + MOISTURE_CONTENT = 0.048 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC30.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC30.fds index 4ab67677761..e74e79c1727 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC30.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC30.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.052 + MOISTURE_CONTENT = 0.052 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC31.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC31.fds index 8190dc5b1d1..321fe9cdac3 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC31.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC31.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.123 + MOISTURE_CONTENT = 0.123 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC32.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC32.fds index bb17fca753b..8743dce3cf4 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC32.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC32.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.052 + MOISTURE_CONTENT = 0.052 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC33.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC33.fds index 4ce7b1bfe56..6e178841987 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC33.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC33.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.123 + MOISTURE_CONTENT = 0.123 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC34.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC34.fds index 006549de4b6..c82e5cca56a 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC34.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC34.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.063 + MOISTURE_CONTENT = 0.063 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC35.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC35.fds index 9eff3d0f465..09d3bddd3d8 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC35.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC35.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.134 + MOISTURE_CONTENT = 0.134 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC36.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC36.fds index 895739be454..dc389e06864 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC36.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC36.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.184 + MOISTURE_CONTENT = 0.184 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC37.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC37.fds index b62b13bd856..3a9daae3db3 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC37.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC37.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.171 + MOISTURE_CONTENT = 0.171 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC38.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC38.fds index 519ee1b59fd..56918bd0d0c 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC38.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC38.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.059 + MOISTURE_CONTENT = 0.059 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3A.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3A.fds index a51cab4bf46..83dacc0c592 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3A.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3A.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.053 + MOISTURE_CONTENT = 0.053 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3B.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3B.fds index ec4a8f96493..37ec7b90007 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3B.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3B.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.045 + MOISTURE_CONTENT = 0.045 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3C.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3C.fds index 53882b84efd..54db825ff46 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3C.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3C.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.062 + MOISTURE_CONTENT = 0.062 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3D.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3D.fds index ae235123212..9e022ba4097 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3D.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3D.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.117 + MOISTURE_CONTENT = 0.117 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3E.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3E.fds index 0058aafd735..9bed20fbe3b 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3E.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3E.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.072 + MOISTURE_CONTENT = 0.072 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3F.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3F.fds index f7443da84a0..cda89af296f 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3F.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC3F.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.11 + MOISTURE_CONTENT = 0.11 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4.fds index c856921e2b3..77b43819026 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.058 + MOISTURE_CONTENT = 0.058 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC40.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC40.fds index f33c61ecb93..00168ff0522 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC40.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC40.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.177 + MOISTURE_CONTENT = 0.177 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC42.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC42.fds index 6980e8a6d88..a1dacab19ff 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC42.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC42.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.057 + MOISTURE_CONTENT = 0.057 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC43.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC43.fds index ae7c69b4187..9ed98a89174 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC43.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC43.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.053 + MOISTURE_CONTENT = 0.053 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC44.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC44.fds index 81e575952b8..d08dae94f71 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC44.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC44.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.052 + MOISTURE_CONTENT = 0.052 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC45.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC45.fds index 4aae99d26eb..27ab0ad006e 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC45.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC45.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.052 + MOISTURE_CONTENT = 0.052 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC46.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC46.fds index 4cd5e56aad3..88ca41c6868 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC46.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC46.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.05 + MOISTURE_CONTENT = 0.05 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC47.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC47.fds index 8b6f24ad41c..1327b07b3c0 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC47.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC47.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.054 + MOISTURE_CONTENT = 0.054 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC48.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC48.fds index 8f1ac8fea8f..47b24ec2167 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC48.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC48.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.052 + MOISTURE_CONTENT = 0.052 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC49.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC49.fds index 85ba5eddd5a..e883f61d0d9 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC49.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC49.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.051 + MOISTURE_CONTENT = 0.051 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4A.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4A.fds index 3902804e983..4414c4f5c8e 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4A.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4A.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.251 + MOISTURE_CONTENT = 0.251 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4B.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4B.fds index f26e258879f..3a9efbdb50f 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4B.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4B.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.05 + MOISTURE_CONTENT = 0.05 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4C.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4C.fds index 8269d0ebbe2..03b0bd0f522 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4C.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4C.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.056 + MOISTURE_CONTENT = 0.056 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4D.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4D.fds index 2e40b9979b0..293ac3687fc 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4D.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4D.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.123 + MOISTURE_CONTENT = 0.123 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4E.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4E.fds index 08629ed30b1..c4d913bdf5e 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4E.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4E.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.082 + MOISTURE_CONTENT = 0.082 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4F.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4F.fds index bb7c2903b88..3bd63cac2af 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4F.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC4F.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.064 + MOISTURE_CONTENT = 0.064 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC5.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC5.fds index 3355a7c567f..8f5bf688170 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC5.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC5.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.055 + MOISTURE_CONTENT = 0.055 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC50.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC50.fds index 9039d5b9a7f..8d02f205440 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC50.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC50.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.043 + MOISTURE_CONTENT = 0.043 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC51.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC51.fds index 65a47d18ba4..f105ffd52c2 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC51.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC51.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.056 + MOISTURE_CONTENT = 0.056 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC52.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC52.fds index 5e6aaf9e2df..6c4d8ac5a5c 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC52.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC52.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.062 + MOISTURE_CONTENT = 0.062 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC53.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC53.fds index 8eb15dabc57..2357cd52b31 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC53.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC53.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.037 + MOISTURE_CONTENT = 0.037 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC54.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC54.fds index ca301864ca3..afab0f2160d 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC54.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC54.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.041 + MOISTURE_CONTENT = 0.041 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC55.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC55.fds index cb97cc0ec9d..bb1969b5b78 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC55.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC55.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.057 + MOISTURE_CONTENT = 0.057 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC56.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC56.fds index 091d8c4f885..a0bbbbcccd6 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC56.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC56.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.058 + MOISTURE_CONTENT = 0.058 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC57.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC57.fds index ef09d3694de..a18eb9a1e87 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC57.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC57.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.062 + MOISTURE_CONTENT = 0.062 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC58.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC58.fds index 2815d79fa12..57b0f374004 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC58.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC58.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.032 + MOISTURE_CONTENT = 0.032 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC59.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC59.fds index cfd4d90cd5f..42b55534920 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC59.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC59.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.029 + MOISTURE_CONTENT = 0.029 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC5A.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC5A.fds index 8eb05d1e26e..43f06109ac1 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC5A.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC5A.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.236 + MOISTURE_CONTENT = 0.236 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC5B.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC5B.fds index cc3f12eb1c2..7580fdcfd84 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC5B.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC5B.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.239 + MOISTURE_CONTENT = 0.239 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC5C.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC5C.fds index 96bc838d361..3ea01ce6077 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC5C.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC5C.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.052 + MOISTURE_CONTENT = 0.052 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC5E.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC5E.fds index 9888c1c4c9c..6d852166786 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC5E.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC5E.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.077 + MOISTURE_CONTENT = 0.077 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6.fds index 86aa29c8ecc..21057f4e35a 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.048 + MOISTURE_CONTENT = 0.048 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC60.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC60.fds index c4e615bd2ed..c48bf517e58 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC60.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC60.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.032 + MOISTURE_CONTENT = 0.032 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC61.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC61.fds index 7622815f820..100183acdea 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC61.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC61.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.042 + MOISTURE_CONTENT = 0.042 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC62.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC62.fds index 60f2e79fa52..05d0f4ef947 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC62.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC62.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.048 + MOISTURE_CONTENT = 0.048 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC63.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC63.fds index e931b078a74..24defa8f410 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC63.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC63.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.045 + MOISTURE_CONTENT = 0.045 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC64.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC64.fds index 94fbddf24e6..74a994bcfdc 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC64.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC64.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.041 + MOISTURE_CONTENT = 0.041 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC65.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC65.fds index 683b1e25dfa..7aa1277d92f 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC65.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC65.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.031 + MOISTURE_CONTENT = 0.031 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC66.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC66.fds index d12e6f656cd..a58a84663b1 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC66.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC66.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.036 + MOISTURE_CONTENT = 0.036 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC67.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC67.fds index f8a4991ee33..189c288a5c5 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC67.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC67.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.053 + MOISTURE_CONTENT = 0.053 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC68.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC68.fds index 0ba24bf3237..bee76162abe 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC68.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC68.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.04 + MOISTURE_CONTENT = 0.04 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC69.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC69.fds index 2e94a6756bc..15bd1fcc2b3 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC69.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC69.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.033 + MOISTURE_CONTENT = 0.033 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6A.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6A.fds index 248e28c2299..51632e10529 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6A.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6A.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.242 + MOISTURE_CONTENT = 0.242 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6B.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6B.fds index c21056de336..f1336b51837 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6B.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6B.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.056 + MOISTURE_CONTENT = 0.056 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6C.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6C.fds index 123d4901a8c..ef95a414562 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6C.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6C.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.08 + MOISTURE_CONTENT = 0.08 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6D.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6D.fds index e7c4f6d9779..b31ac7250cf 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6D.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6D.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.08 + MOISTURE_CONTENT = 0.08 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6E.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6E.fds index 133c888221e..5fd4ee3541d 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6E.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC6E.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.093 + MOISTURE_CONTENT = 0.093 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7.fds index e5ad91cc954..d52e0265542 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.064 + MOISTURE_CONTENT = 0.064 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC70.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC70.fds index 61069a521be..20f14715f91 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC70.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC70.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.116 + MOISTURE_CONTENT = 0.116 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC71.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC71.fds index 1b590db40e2..0820e371d38 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC71.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC71.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.107 + MOISTURE_CONTENT = 0.107 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC72.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC72.fds index ac31caac4d4..9623b744615 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC72.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC72.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.257 + MOISTURE_CONTENT = 0.257 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC73.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC73.fds index dc8e4bb5b27..c7ab08c71a2 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC73.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC73.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.236 + MOISTURE_CONTENT = 0.236 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC74.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC74.fds index 248bb6de441..b33fe898e31 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC74.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC74.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.068 + MOISTURE_CONTENT = 0.068 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC75.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC75.fds index 5ce0b8bebe9..c8d563ad93d 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC75.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC75.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.079 + MOISTURE_CONTENT = 0.079 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC76.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC76.fds index 3bf15de45d2..253240db2cc 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC76.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC76.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.249 + MOISTURE_CONTENT = 0.249 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC77.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC77.fds index 4f05f88ae72..a9991359a78 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC77.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC77.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.249 + MOISTURE_CONTENT = 0.249 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC78.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC78.fds index ecf559f8b30..010a3ef0b38 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC78.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC78.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.204 + MOISTURE_CONTENT = 0.204 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC79.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC79.fds index d8239a490bf..1661da40bb4 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC79.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC79.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.215 + MOISTURE_CONTENT = 0.215 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7A.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7A.fds index 246e283b873..779dc3da8f7 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7A.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7A.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.218 + MOISTURE_CONTENT = 0.218 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7B.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7B.fds index 78f25ba9b3d..0c2f5e5f437 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7B.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7B.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.05 + MOISTURE_CONTENT = 0.05 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7C.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7C.fds index a84ff91f7b2..f976c75d40f 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7C.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7C.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.079 + MOISTURE_CONTENT = 0.079 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7D.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7D.fds index 2163efdfc94..4c3e89ed990 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7D.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7D.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.075 + MOISTURE_CONTENT = 0.075 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7E.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7E.fds index 641321b62aa..62ed1812807 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7E.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC7E.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.083 + MOISTURE_CONTENT = 0.083 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8.fds index 32d0c280eb6..6f64009e55e 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.063 + MOISTURE_CONTENT = 0.063 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC80.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC80.fds index 08e5f6020b0..6e28c46d056 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC80.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC80.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.176 + MOISTURE_CONTENT = 0.176 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC81.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC81.fds index 25836adee7d..9d30e414858 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC81.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC81.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.227 + MOISTURE_CONTENT = 0.227 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC82.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC82.fds index c082cad87d9..e2427e23869 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC82.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC82.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.05 + MOISTURE_CONTENT = 0.05 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC83.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC83.fds index 475bcb6df5b..9840fd75bd6 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC83.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC83.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.031 + MOISTURE_CONTENT = 0.031 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC84.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC84.fds index 20f8eca059a..9c0ed531233 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC84.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC84.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.035 + MOISTURE_CONTENT = 0.035 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC85.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC85.fds index b9f8470b636..65b5ab8675e 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC85.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC85.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.028 + MOISTURE_CONTENT = 0.028 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC86.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC86.fds index c58fd95acc1..d523e44f124 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC86.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC86.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.038 + MOISTURE_CONTENT = 0.038 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC87.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC87.fds index fea1e2d4831..4919fb60046 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC87.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC87.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.038 + MOISTURE_CONTENT = 0.038 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC88.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC88.fds index 4a48cdbdc03..8e8ae92247b 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC88.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC88.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.03 + MOISTURE_CONTENT = 0.03 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC89.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC89.fds index 7b67ad97fde..40eb933bd9d 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC89.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC89.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.03 + MOISTURE_CONTENT = 0.03 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8A.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8A.fds index 21b7a32251d..95ee0c7b022 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8A.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8A.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.193 + MOISTURE_CONTENT = 0.193 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8B.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8B.fds index 77206a6bdf5..8ae0634b77e 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8B.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8B.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.055 + MOISTURE_CONTENT = 0.055 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8C.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8C.fds index 86f85a74c7a..763012040d8 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8C.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8C.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.084 + MOISTURE_CONTENT = 0.084 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8D.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8D.fds index f56643ccec2..d06c2fbd808 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8D.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8D.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.076 + MOISTURE_CONTENT = 0.076 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8E.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8E.fds index 7d8ffd637c1..b433570f3b4 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8E.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8E.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.239 + MOISTURE_CONTENT = 0.239 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8F.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8F.fds index 00b8ff6d9ef..393b75db9f1 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8F.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC8F.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.05 + MOISTURE_CONTENT = 0.05 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9.fds index 2037c82b0d3..e5bd56310ab 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.069 + MOISTURE_CONTENT = 0.069 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC92.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC92.fds index ae4abf22b29..804e349e904 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC92.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC92.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.061 + MOISTURE_CONTENT = 0.061 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC93.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC93.fds index c43f8860feb..7ed3a3c00f7 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC93.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC93.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.057 + MOISTURE_CONTENT = 0.057 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC95.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC95.fds index 42e95f8e9c0..97bb73f5e99 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC95.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC95.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.058 + MOISTURE_CONTENT = 0.058 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC96.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC96.fds index 206a66a5492..ba4832b39d3 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC96.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC96.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.049 + MOISTURE_CONTENT = 0.049 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC97.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC97.fds index e716a2a3621..a748cba6c71 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC97.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC97.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.058 + MOISTURE_CONTENT = 0.058 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC98.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC98.fds index 6b4485e1d82..ca8106dd999 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC98.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC98.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.043 + MOISTURE_CONTENT = 0.043 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC99.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC99.fds index 96bd11a7505..da4413f5102 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC99.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC99.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.052 + MOISTURE_CONTENT = 0.052 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9A.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9A.fds index 169cde81e84..e3bde71d5a6 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9A.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9A.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.214 + MOISTURE_CONTENT = 0.214 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9B.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9B.fds index 67792311d20..16599080943 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9B.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9B.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.054 + MOISTURE_CONTENT = 0.054 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9C.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9C.fds index ce30d61dab2..5e2c6edc806 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9C.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9C.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.103 + MOISTURE_CONTENT = 0.103 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9D.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9D.fds index 0cc0fd9884f..9a6e9485153 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9D.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9D.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.07 + MOISTURE_CONTENT = 0.07 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9E.fds b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9E.fds index e52f7e9d853..f28998d3e95 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9E.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/EXSC9E.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.256 + MOISTURE_CONTENT = 0.256 SURFACE_VOLUME_RATIO = 3092 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF20.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF20.fds index b177c9cc233..53a21049926 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF20.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF20.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.025 + MOISTURE_CONTENT = 0.025 SURFACE_VOLUME_RATIO = 630 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF21.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF21.fds index 844e6624749..c7a128454d5 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF21.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF21.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.022 + MOISTURE_CONTENT = 0.022 SURFACE_VOLUME_RATIO = 630 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF23.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF23.fds index b225c765755..fee9b0a20eb 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF23.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF23.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.062 + MOISTURE_CONTENT = 0.062 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF24.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF24.fds index 20fcdf162b3..37430aca98f 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF24.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF24.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.085 + MOISTURE_CONTENT = 0.085 SURFACE_VOLUME_RATIO = 630 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF29.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF29.fds index 4586cbe15d1..621a1926d48 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF29.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF29.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.089 + MOISTURE_CONTENT = 0.089 SURFACE_VOLUME_RATIO = 630 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF30.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF30.fds index 785b796d5c1..800a4a88046 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF30.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF30.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.05 + MOISTURE_CONTENT = 0.05 SURFACE_VOLUME_RATIO = 7596 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF31.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF31.fds index a04d7aef7d9..6c70b370ef9 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF31.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF31.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.055 + MOISTURE_CONTENT = 0.055 SURFACE_VOLUME_RATIO = 630 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF32.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF32.fds index adecc0f1a4c..a04f7fd3fbf 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF32.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF32.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.061 + MOISTURE_CONTENT = 0.061 SURFACE_VOLUME_RATIO = 630 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF37.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF37.fds index 853ba6fbe5f..c35f6edef74 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF37.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF37.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.065 + MOISTURE_CONTENT = 0.065 SURFACE_VOLUME_RATIO = 630 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF38.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF38.fds index f7ca87fb5d0..f2f31160c54 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF38.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF38.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.062 + MOISTURE_CONTENT = 0.062 SURFACE_VOLUME_RATIO = 630 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF42.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF42.fds index 7deda05eaf9..e4f3a515212 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF42.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF42.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.066 + MOISTURE_CONTENT = 0.066 SURFACE_VOLUME_RATIO = 630 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF43.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF43.fds index c9e01c18f8c..de0acd6c80c 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF43.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF43.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.067 + MOISTURE_CONTENT = 0.067 SURFACE_VOLUME_RATIO = 630 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF47.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF47.fds index 6cae9aa1fbe..ce1f320717e 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF47.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF47.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.058 + MOISTURE_CONTENT = 0.058 SURFACE_VOLUME_RATIO = 630 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF48.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF48.fds index d6e1f1e0bc4..887f7e4b1d6 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF48.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF48.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.06 + MOISTURE_CONTENT = 0.06 SURFACE_VOLUME_RATIO = 630 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF49.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF49.fds index a1e8c414887..0fadd456e11 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF49.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF49.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.058 + MOISTURE_CONTENT = 0.058 SURFACE_VOLUME_RATIO = 630 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF50.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF50.fds index d5349d50bdf..64b83134318 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF50.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF50.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.059 + MOISTURE_CONTENT = 0.059 SURFACE_VOLUME_RATIO = 630 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF51.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF51.fds index 04997e2127d..c6ec79287cd 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF51.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF51.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.067 + MOISTURE_CONTENT = 0.067 SURFACE_VOLUME_RATIO = 630 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF52.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF52.fds index 10b7ad1e365..587b6d3dad5 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF52.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF52.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.085 + MOISTURE_CONTENT = 0.085 SURFACE_VOLUME_RATIO = 630 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF53.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF53.fds index 36042207dbc..53089c9ea64 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF53.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF53.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.064 + MOISTURE_CONTENT = 0.064 SURFACE_VOLUME_RATIO = 630 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF54.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF54.fds index e2372c0c310..3e51f35b2e4 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF54.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF54.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.059 + MOISTURE_CONTENT = 0.059 SURFACE_VOLUME_RATIO = 630 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF55.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF55.fds index 7f2ad95ba61..9f6f026e894 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF55.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF55.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.056 + MOISTURE_CONTENT = 0.056 SURFACE_VOLUME_RATIO = 630 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/MF56.fds b/Validation/USFS_Catchpole/FDS_Input_Files/MF56.fds index df87a7041e1..2eb669f675c 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/MF56.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/MF56.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.061 + MOISTURE_CONTENT = 0.061 SURFACE_VOLUME_RATIO = 630 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC1.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC1.fds index 15880e3ed40..3ffe682a7bf 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC1.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC1.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.067 + MOISTURE_CONTENT = 0.067 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC10.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC10.fds index 297a46ef0ec..f5d362a3b4b 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC10.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC10.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.063 + MOISTURE_CONTENT = 0.063 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC11.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC11.fds index 230a57b050f..a0e62fc6ab1 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC11.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC11.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.064 + MOISTURE_CONTENT = 0.064 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC12.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC12.fds index f6e0395d39a..f180354deb3 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC12.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC12.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.057 + MOISTURE_CONTENT = 0.057 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC13.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC13.fds index 02756fa8241..5bb3ec03780 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC13.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC13.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.063 + MOISTURE_CONTENT = 0.063 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC14.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC14.fds index 7e7292b5d6a..6b68813e5a5 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC14.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC14.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.065 + MOISTURE_CONTENT = 0.065 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC15.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC15.fds index 37f49ed0a16..a6c78fc82a8 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC15.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC15.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.196 + MOISTURE_CONTENT = 0.196 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC16.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC16.fds index dbf7e164b8b..91e94fda256 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC16.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC16.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.182 + MOISTURE_CONTENT = 0.182 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC17.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC17.fds index 31016eb7d8d..3e99dba3b8e 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC17.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC17.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.193 + MOISTURE_CONTENT = 0.193 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC1B.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC1B.fds index ebb5f79c03e..060b13623c3 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC1B.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC1B.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.065 + MOISTURE_CONTENT = 0.065 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC1C.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC1C.fds index 9424fd95226..205a6f91a26 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC1C.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC1C.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.06 + MOISTURE_CONTENT = 0.06 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC1E.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC1E.fds index 72ccb41a912..b30090990f3 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC1E.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC1E.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.029 + MOISTURE_CONTENT = 0.029 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC1H.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC1H.fds index c66de761065..bb5abf74edc 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC1H.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC1H.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.166 + MOISTURE_CONTENT = 0.166 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2.fds index 80044be0409..744a574d481 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.069 + MOISTURE_CONTENT = 0.069 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2B.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2B.fds index d55ef5b629f..7af1781181b 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2B.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2B.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.067 + MOISTURE_CONTENT = 0.067 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2C.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2C.fds index a25988fb881..d0cbc1930eb 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2C.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2C.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.059 + MOISTURE_CONTENT = 0.059 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2E.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2E.fds index 2aae45e075e..ea6be1b6add 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2E.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2E.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.069 + MOISTURE_CONTENT = 0.069 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2F.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2F.fds index 9f1efc2261b..4bd3413c3d3 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2F.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2F.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.072 + MOISTURE_CONTENT = 0.072 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2H.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2H.fds index ca16b063368..5a2d60555a9 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2H.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC2H.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.16 + MOISTURE_CONTENT = 0.16 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC3C.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC3C.fds index 8704c079642..783489aa92f 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC3C.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC3C.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.044 + MOISTURE_CONTENT = 0.044 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC3D.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC3D.fds index ec8354d6ba5..a9e04d7308e 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC3D.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC3D.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.1 + MOISTURE_CONTENT = 0.1 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC3E.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC3E.fds index 8b115fbb555..3df15a1f4aa 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC3E.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC3E.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.067 + MOISTURE_CONTENT = 0.067 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC3F.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC3F.fds index acc74fd7a08..b584b4d0a0a 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC3F.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC3F.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.047 + MOISTURE_CONTENT = 0.047 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC3H.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC3H.fds index 085126f48a0..9f9c3a0f0b0 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC3H.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC3H.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.265 + MOISTURE_CONTENT = 0.265 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC44.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC44.fds index 46c8b918ced..d8797cdccff 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC44.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC44.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.083 + MOISTURE_CONTENT = 0.083 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC45.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC45.fds index 3d677fc2cd6..a9c0848d73c 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC45.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC45.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.064 + MOISTURE_CONTENT = 0.064 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC49.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC49.fds index 2627aba1dd9..3d15a60b1d7 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC49.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC49.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.069 + MOISTURE_CONTENT = 0.069 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC4D.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC4D.fds index 7582a7ac8fc..be4c518ebd2 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC4D.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC4D.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.114 + MOISTURE_CONTENT = 0.114 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC4E.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC4E.fds index e576161babf..27712ac64b7 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC4E.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC4E.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.063 + MOISTURE_CONTENT = 0.063 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC4F.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC4F.fds index 86ffb2cece1..47d512953cd 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC4F.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC4F.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.031 + MOISTURE_CONTENT = 0.031 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC4H.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC4H.fds index e32df16a0ea..1dba67a1dd3 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC4H.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC4H.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.264 + MOISTURE_CONTENT = 0.264 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC5.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC5.fds index c10e38f55e9..3a689793f44 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC5.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC5.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.066 + MOISTURE_CONTENT = 0.066 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC50.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC50.fds index d4ac95b914a..b0c68373545 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC50.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC50.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.08 + MOISTURE_CONTENT = 0.08 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC51.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC51.fds index de3f234fef5..a5724717868 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC51.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC51.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.082 + MOISTURE_CONTENT = 0.082 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC52.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC52.fds index 8fcd530eb28..173106d8d65 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC52.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC52.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.085 + MOISTURE_CONTENT = 0.085 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC53.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC53.fds index dfcd876b5a4..972806a37bd 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC53.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC53.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.084 + MOISTURE_CONTENT = 0.084 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC54.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC54.fds index 02a1228baec..ef3b4610c82 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC54.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC54.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.155 + MOISTURE_CONTENT = 0.155 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC55.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC55.fds index 56e9fc426f8..5bff0e9ec5c 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC55.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC55.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.147 + MOISTURE_CONTENT = 0.147 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC56.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC56.fds index 74dbf937d8e..535e980767b 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC56.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC56.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.076 + MOISTURE_CONTENT = 0.076 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC57.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC57.fds index 964769b17a4..b0cbe38973e 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC57.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC57.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.079 + MOISTURE_CONTENT = 0.079 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC58.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC58.fds index 3eea2ef0225..2d49917d6dd 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC58.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC58.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.078 + MOISTURE_CONTENT = 0.078 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC59.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC59.fds index e9dd273af52..ca6900be774 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC59.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC59.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.071 + MOISTURE_CONTENT = 0.071 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC5E.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC5E.fds index f5f6467a7d7..e45c1d82693 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC5E.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC5E.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.072 + MOISTURE_CONTENT = 0.072 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC5F.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC5F.fds index 109d12aff24..10da788c6e5 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC5F.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC5F.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.101 + MOISTURE_CONTENT = 0.101 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC5H.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC5H.fds index d1512bdb5ee..d7cd7ad8c90 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC5H.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC5H.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.101 + MOISTURE_CONTENT = 0.101 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC6.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC6.fds index 9f30391546e..860ab12e9c7 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC6.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC6.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.072 + MOISTURE_CONTENT = 0.072 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC60.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC60.fds index 3523cd8e568..1283ee558b7 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC60.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC60.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.078 + MOISTURE_CONTENT = 0.078 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC61.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC61.fds index c7813e4d0c2..ea9371b1049 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC61.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC61.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.257 + MOISTURE_CONTENT = 0.257 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC6C.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC6C.fds index 3cbf0a18866..da9d0cb8c7d 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC6C.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC6C.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.246 + MOISTURE_CONTENT = 0.246 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC6E.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC6E.fds index c3284fd223a..5804f698cd4 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC6E.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC6E.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.074 + MOISTURE_CONTENT = 0.074 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC6F.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC6F.fds index d795b85c65b..d90db037d40 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC6F.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC6F.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.062 + MOISTURE_CONTENT = 0.062 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC6H.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC6H.fds index 05c016f078b..2492482014d 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC6H.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC6H.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.107 + MOISTURE_CONTENT = 0.107 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC71.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC71.fds index e4e305a46b2..b8e13123f3a 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC71.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC71.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.065 + MOISTURE_CONTENT = 0.065 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC72.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC72.fds index 2d85dc11404..7c04c1cda46 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC72.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC72.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.049 + MOISTURE_CONTENT = 0.049 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC73.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC73.fds index 10e0600e485..cce9d52da86 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC73.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC73.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.107 + MOISTURE_CONTENT = 0.107 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC74.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC74.fds index 59d9b1dae63..81b304df2b8 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC74.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC74.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.06 + MOISTURE_CONTENT = 0.06 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC75.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC75.fds index 40462e58040..d46fa997451 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC75.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC75.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.09 + MOISTURE_CONTENT = 0.09 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC76.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC76.fds index 5fd6710d27d..4eb0a787cdf 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC76.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC76.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.053 + MOISTURE_CONTENT = 0.053 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC77.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC77.fds index 3ddaae673e2..cf865d66373 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC77.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC77.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.059 + MOISTURE_CONTENT = 0.059 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC78.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC78.fds index 3cfdc8804d2..92da6c56195 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC78.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC78.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.052 + MOISTURE_CONTENT = 0.052 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC79.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC79.fds index c1cf4b7090d..834543efab2 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC79.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC79.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.071 + MOISTURE_CONTENT = 0.071 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7B.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7B.fds index 455b370bb26..d721e33dd80 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7B.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7B.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.065 + MOISTURE_CONTENT = 0.065 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7C.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7C.fds index 4a5d1f621d3..eb1dfa90b82 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7C.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7C.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.282 + MOISTURE_CONTENT = 0.282 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7D.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7D.fds index 389d568e6e7..f2978f82a25 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7D.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7D.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.034 + MOISTURE_CONTENT = 0.034 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7E.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7E.fds index 14cdfc96427..535a2f6655c 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7E.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7E.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.069 + MOISTURE_CONTENT = 0.069 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7F.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7F.fds index 68b52ab1fb9..867751dd4f1 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7F.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7F.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.065 + MOISTURE_CONTENT = 0.065 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7H.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7H.fds index 791d715f40b..9b157077b94 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7H.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC7H.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.07 + MOISTURE_CONTENT = 0.07 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8.fds index dbdb8251be9..d1c7b1358ab 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.064 + MOISTURE_CONTENT = 0.064 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC87.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC87.fds index 48226ebce64..c3fef5708a4 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC87.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC87.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.055 + MOISTURE_CONTENT = 0.055 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC88.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC88.fds index 53f4a03f2c8..a686f96d197 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC88.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC88.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.044 + MOISTURE_CONTENT = 0.044 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8B.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8B.fds index a215e46f293..096b0cad00c 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8B.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8B.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.065 + MOISTURE_CONTENT = 0.065 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8C.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8C.fds index e2d3a1b1aa6..2870377368e 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8C.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8C.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.265 + MOISTURE_CONTENT = 0.265 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8D.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8D.fds index f63b2e14d02..008ba9d9b9e 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8D.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8D.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.064 + MOISTURE_CONTENT = 0.064 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8E.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8E.fds index 53f5b551648..bd8f187a0b8 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8E.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8E.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.055 + MOISTURE_CONTENT = 0.055 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8F.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8F.fds index bf5b353f899..8372a919a3d 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8F.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8F.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.066 + MOISTURE_CONTENT = 0.066 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8J.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8J.fds index 5335c641e7d..1c38ca749e1 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8J.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC8J.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.093 + MOISTURE_CONTENT = 0.093 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC98.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC98.fds index 4c82e66a787..b69913b7f24 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC98.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC98.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.071 + MOISTURE_CONTENT = 0.071 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC99.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC99.fds index b97c9391806..649cb9b595e 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC99.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC99.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.067 + MOISTURE_CONTENT = 0.067 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9C.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9C.fds index 97adb409e40..1ae5e9e96a4 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9C.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9C.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.262 + MOISTURE_CONTENT = 0.262 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9D.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9D.fds index 625560076c1..b63df2f07fa 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9D.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9D.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.033 + MOISTURE_CONTENT = 0.033 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9E.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9E.fds index 188afcdecb0..40afa2031cf 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9E.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9E.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.055 + MOISTURE_CONTENT = 0.055 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9F.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9F.fds index 778d8e869aa..1ed3638259f 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9F.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9F.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.056 + MOISTURE_CONTENT = 0.056 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9G.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9G.fds index f86904d9813..5dda1fa972b 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9G.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9G.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.063 + MOISTURE_CONTENT = 0.063 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9H.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9H.fds index c9956961ca5..8bc2f60ff8f 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9H.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9H.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.231 + MOISTURE_CONTENT = 0.231 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9J.fds b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9J.fds index 59dd7988f7f..5eb7959e881 100644 --- a/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9J.fds +++ b/Validation/USFS_Catchpole/FDS_Input_Files/PPMC9J.fds @@ -60,7 +60,7 @@ &SURF ID = 'Regular Excelsior' MATL_ID = 'Dry Regular Excelsior' - MOISTURE_FRACTION = 0.123 + MOISTURE_CONTENT = 0.123 SURFACE_VOLUME_RATIO = 5710 LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Corsica/FDS_Input_Files/Test_1_0.fds b/Validation/USFS_Corsica/FDS_Input_Files/Test_1_0.fds index b6fe2612c9a..f47df1a9d26 100644 --- a/Validation/USFS_Corsica/FDS_Input_Files/Test_1_0.fds +++ b/Validation/USFS_Corsica/FDS_Input_Files/Test_1_0.fds @@ -28,7 +28,7 @@ &SURF ID = 'Pine Needles' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.05 + MOISTURE_CONTENT = 0.05 SURFACE_VOLUME_RATIO = 3057. LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Corsica/FDS_Input_Files/Test_1_20.fds b/Validation/USFS_Corsica/FDS_Input_Files/Test_1_20.fds index 1d562bead4e..b0c8561e815 100644 --- a/Validation/USFS_Corsica/FDS_Input_Files/Test_1_20.fds +++ b/Validation/USFS_Corsica/FDS_Input_Files/Test_1_20.fds @@ -28,7 +28,7 @@ &SURF ID = 'Pine Needles' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.03 + MOISTURE_CONTENT = 0.03 SURFACE_VOLUME_RATIO = 3057. LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Corsica/FDS_Input_Files/Test_2_0.fds b/Validation/USFS_Corsica/FDS_Input_Files/Test_2_0.fds index 196ed45b27d..bf8204f962e 100644 --- a/Validation/USFS_Corsica/FDS_Input_Files/Test_2_0.fds +++ b/Validation/USFS_Corsica/FDS_Input_Files/Test_2_0.fds @@ -28,7 +28,7 @@ &SURF ID = 'Pine Needles' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.05 + MOISTURE_CONTENT = 0.05 SURFACE_VOLUME_RATIO = 3057. LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Corsica/FDS_Input_Files/Test_2_20.fds b/Validation/USFS_Corsica/FDS_Input_Files/Test_2_20.fds index 419bdda87ad..033addb0cca 100644 --- a/Validation/USFS_Corsica/FDS_Input_Files/Test_2_20.fds +++ b/Validation/USFS_Corsica/FDS_Input_Files/Test_2_20.fds @@ -28,7 +28,7 @@ &SURF ID = 'Pine Needles' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.08 + MOISTURE_CONTENT = 0.08 SURFACE_VOLUME_RATIO = 3057. LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Corsica/FDS_Input_Files/Test_3_0.fds b/Validation/USFS_Corsica/FDS_Input_Files/Test_3_0.fds index 2061be352e2..67afa4c184a 100644 --- a/Validation/USFS_Corsica/FDS_Input_Files/Test_3_0.fds +++ b/Validation/USFS_Corsica/FDS_Input_Files/Test_3_0.fds @@ -28,7 +28,7 @@ &SURF ID = 'Pine Needles' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.05 + MOISTURE_CONTENT = 0.05 SURFACE_VOLUME_RATIO = 3057. LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Corsica/FDS_Input_Files/Test_3_20.fds b/Validation/USFS_Corsica/FDS_Input_Files/Test_3_20.fds index df1b643fb2f..8c4d88f07df 100644 --- a/Validation/USFS_Corsica/FDS_Input_Files/Test_3_20.fds +++ b/Validation/USFS_Corsica/FDS_Input_Files/Test_3_20.fds @@ -28,7 +28,7 @@ &SURF ID = 'Pine Needles' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.08 + MOISTURE_CONTENT = 0.08 SURFACE_VOLUME_RATIO = 3057. LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn100_60D_15S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn100_60D_15S_35L.fds index 6968c29a6d6..5aa5c2e3498 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn100_60D_15S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn100_60D_15S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1138 + MOISTURE_CONTENT = 0.1138 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn101_60D_15S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn101_60D_15S_35L.fds index 4bf2405a2c0..3927daf1b1f 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn101_60D_15S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn101_60D_15S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1122 + MOISTURE_CONTENT = 0.1122 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn102_60D_18S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn102_60D_18S_35L.fds index 9916b37f958..e8882a26a6c 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn102_60D_18S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn102_60D_18S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1438 + MOISTURE_CONTENT = 0.1438 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn103_60D_18S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn103_60D_18S_35L.fds index 4c080a52a47..b4362693679 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn103_60D_18S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn103_60D_18S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1158 + MOISTURE_CONTENT = 0.1158 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn104_60D_21S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn104_60D_21S_35L.fds index e204b195d62..266f389a3b7 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn104_60D_21S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn104_60D_21S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1424 + MOISTURE_CONTENT = 0.1424 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn105_60D_24S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn105_60D_24S_35L.fds index 5a6bde40d2d..c0f51dc3cc7 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn105_60D_24S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn105_60D_24S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1244 + MOISTURE_CONTENT = 0.1244 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn106_60D_24S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn106_60D_24S_35L.fds index 154d620555e..8ea0fa6d644 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn106_60D_24S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn106_60D_24S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1045 + MOISTURE_CONTENT = 0.1045 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn107_60D_27S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn107_60D_27S_35L.fds index 9c703ac4707..fadda7e7399 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn107_60D_27S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn107_60D_27S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1382 + MOISTURE_CONTENT = 0.1382 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn108_60D_27S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn108_60D_27S_35L.fds index 7576d2a22c0..df4895aa9be 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn108_60D_27S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn108_60D_27S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1285 + MOISTURE_CONTENT = 0.1285 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn109_60D_27S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn109_60D_27S_35L.fds index 08336a0c237..ada26c8cb9d 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn109_60D_27S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn109_60D_27S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1226 + MOISTURE_CONTENT = 0.1226 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn110_60D_30S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn110_60D_30S_35L.fds index efa31d17793..15bf94f58a1 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn110_60D_30S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn110_60D_30S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1262 + MOISTURE_CONTENT = 0.1262 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn111_60D_30S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn111_60D_30S_35L.fds index bcf448d8559..1426c0a528e 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn111_60D_30S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn111_60D_30S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1219 + MOISTURE_CONTENT = 0.1219 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn112_60D_30S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn112_60D_30S_35L.fds index 63b3ffab263..81293baca52 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn112_60D_30S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn112_60D_30S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.154 + MOISTURE_CONTENT = 0.154 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn113_60D_33S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn113_60D_33S_35L.fds index 9d96be2ec2d..05e60c95ddb 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn113_60D_33S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn113_60D_33S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1684 + MOISTURE_CONTENT = 0.1684 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn114_120D_18S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn114_120D_18S_35L.fds index 814ca24ee70..82c59913302 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn114_120D_18S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn114_120D_18S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1512 + MOISTURE_CONTENT = 0.1512 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn115_30D_27S_25L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn115_30D_27S_25L.fds index c91beda85a8..700e1741041 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn115_30D_27S_25L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn115_30D_27S_25L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1151 + MOISTURE_CONTENT = 0.1151 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn116_30D_30S_25L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn116_30D_30S_25L.fds index 368a750d5dd..a5e157d6039 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn116_30D_30S_25L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn116_30D_30S_25L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.0807 + MOISTURE_CONTENT = 0.0807 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn117_30D_30S_25L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn117_30D_30S_25L.fds index fdeba84ddb1..5975b84d0af 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn117_30D_30S_25L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn117_30D_30S_25L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1566 + MOISTURE_CONTENT = 0.1566 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn118_120D_18S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn118_120D_18S_35L.fds index fb27f4a5103..2106da52421 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn118_120D_18S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn118_120D_18S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1614 + MOISTURE_CONTENT = 0.1614 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn119_120D_15S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn119_120D_15S_35L.fds index 551827d2d93..1077723c950 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn119_120D_15S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn119_120D_15S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1454 + MOISTURE_CONTENT = 0.1454 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn120_120D_18S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn120_120D_18S_35L.fds index ce5a59b2015..dabf680cbba 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn120_120D_18S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn120_120D_18S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1346 + MOISTURE_CONTENT = 0.1346 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn121_120D_18S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn121_120D_18S_35L.fds index a54099df92c..ea24628d584 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn121_120D_18S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn121_120D_18S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.137 + MOISTURE_CONTENT = 0.137 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn122_120D_18S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn122_120D_18S_35L.fds index 224adfb738d..b6945551712 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn122_120D_18S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn122_120D_18S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1857 + MOISTURE_CONTENT = 0.1857 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn123_120D_18S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn123_120D_18S_35L.fds index 69064a06745..f21fedac478 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn123_120D_18S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn123_120D_18S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1725 + MOISTURE_CONTENT = 0.1725 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn124_120D_21S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn124_120D_21S_35L.fds index 54290505d53..76e7ebde5f6 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn124_120D_21S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn124_120D_21S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1962 + MOISTURE_CONTENT = 0.1962 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn125_120D_21S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn125_120D_21S_35L.fds index f4d278e1364..390715e23cc 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn125_120D_21S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn125_120D_21S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1652 + MOISTURE_CONTENT = 0.1652 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn126_120D_21S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn126_120D_21S_35L.fds index 591acb4011f..df593920323 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn126_120D_21S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn126_120D_21S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1768 + MOISTURE_CONTENT = 0.1768 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn127_120D_24S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn127_120D_24S_35L.fds index 74b63ea81d6..4e9a50a56a7 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn127_120D_24S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn127_120D_24S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1559 + MOISTURE_CONTENT = 0.1559 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn128_120D_24S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn128_120D_24S_35L.fds index acd02f91e96..3ce732f1177 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn128_120D_24S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn128_120D_24S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1916 + MOISTURE_CONTENT = 0.1916 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn129_120D_24S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn129_120D_24S_35L.fds index 75ac23e0306..7ca0dfb358c 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn129_120D_24S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn129_120D_24S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.163 + MOISTURE_CONTENT = 0.163 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn130_120D_27S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn130_120D_27S_35L.fds index 59d76b8e9bc..1e5636da8be 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn130_120D_27S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn130_120D_27S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1793 + MOISTURE_CONTENT = 0.1793 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn131_120D_27S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn131_120D_27S_35L.fds index 6ad3fb1c0e1..acce9a9c08a 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn131_120D_27S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn131_120D_27S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.57 + MOISTURE_CONTENT = 0.57 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn132_120D_27S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn132_120D_27S_35L.fds index 3b6562d71f6..be9d5e9c0d2 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn132_120D_27S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn132_120D_27S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1693 + MOISTURE_CONTENT = 0.1693 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn133_120D_27S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn133_120D_27S_35L.fds index 9e1b91c1acd..45d286cebae 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn133_120D_27S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn133_120D_27S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1608 + MOISTURE_CONTENT = 0.1608 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn134_120D_27S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn134_120D_27S_35L.fds index 8ff082eb105..27a3028ea7f 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn134_120D_27S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn134_120D_27S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1696 + MOISTURE_CONTENT = 0.1696 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn135_120D_27S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn135_120D_27S_35L.fds index d712188579d..b1a724cddbf 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn135_120D_27S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn135_120D_27S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.2 + MOISTURE_CONTENT = 0.2 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn136_120D_30S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn136_120D_30S_35L.fds index 1c95e79fa0a..29b25754b9c 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn136_120D_30S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn136_120D_30S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1886 + MOISTURE_CONTENT = 0.1886 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn137_120D_30S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn137_120D_30S_35L.fds index 1c863e0d658..63d5d7f7a58 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn137_120D_30S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn137_120D_30S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1746 + MOISTURE_CONTENT = 0.1746 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn138_120D_30S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn138_120D_30S_35L.fds index 1d5eeea07d1..034d3aa21c8 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn138_120D_30S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn138_120D_30S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1644 + MOISTURE_CONTENT = 0.1644 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn140_120D_27S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn140_120D_27S_35L.fds index 60a1613a684..f4a24182073 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn140_120D_27S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn140_120D_27S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1933 + MOISTURE_CONTENT = 0.1933 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn28_60D_0S_20L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn28_60D_0S_20L.fds index f2e70fe3d9a..acc529c883c 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn28_60D_0S_20L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn28_60D_0S_20L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.13 + MOISTURE_CONTENT = 0.13 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn29_60D_0S_30L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn29_60D_0S_30L.fds index bc942e8aca1..85bed24e7e3 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn29_60D_0S_30L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn29_60D_0S_30L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1085 + MOISTURE_CONTENT = 0.1085 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn30_30D_3S_30L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn30_30D_3S_30L.fds index e519c543984..5caf686e894 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn30_30D_3S_30L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn30_30D_3S_30L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.115 + MOISTURE_CONTENT = 0.115 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn31_30D_6S_30L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn31_30D_6S_30L.fds index 8b188babad1..52a9e98487a 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn31_30D_6S_30L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn31_30D_6S_30L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.115 + MOISTURE_CONTENT = 0.115 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn34_30D_33S_30L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn34_30D_33S_30L.fds index fd56dc0e3ce..d23f41a1d12 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn34_30D_33S_30L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn34_30D_33S_30L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.125 + MOISTURE_CONTENT = 0.125 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn35_120D_33S_30L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn35_120D_33S_30L.fds index 27bb38ffc31..cd747297317 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn35_120D_33S_30L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn35_120D_33S_30L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.11 + MOISTURE_CONTENT = 0.11 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn36_30D_39S_30L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn36_30D_39S_30L.fds index f98fd760e4d..e9750d99c0a 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn36_30D_39S_30L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn36_30D_39S_30L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.115 + MOISTURE_CONTENT = 0.115 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn37_30D_36S_30L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn37_30D_36S_30L.fds index c440543867e..a9a92b13423 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn37_30D_36S_30L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn37_30D_36S_30L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.123 + MOISTURE_CONTENT = 0.123 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn38_60D_0S_30L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn38_60D_0S_30L.fds index 13e3839cb20..e76852075f8 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn38_60D_0S_30L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn38_60D_0S_30L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.12 + MOISTURE_CONTENT = 0.12 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn39_60D_9S_30L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn39_60D_9S_30L.fds index 67778dfd79f..9c8d81054be 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn39_60D_9S_30L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn39_60D_9S_30L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1175 + MOISTURE_CONTENT = 0.1175 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn40_60D_18S_30L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn40_60D_18S_30L.fds index ea4207d9aeb..997c2283183 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn40_60D_18S_30L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn40_60D_18S_30L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.135 + MOISTURE_CONTENT = 0.135 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn41_60D_24S_30L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn41_60D_24S_30L.fds index 8b60ce56051..2bf59fa5285 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn41_60D_24S_30L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn41_60D_24S_30L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.115 + MOISTURE_CONTENT = 0.115 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn42_60D_27S_30L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn42_60D_27S_30L.fds index f476a7acf6f..1996357803a 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn42_60D_27S_30L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn42_60D_27S_30L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.135 + MOISTURE_CONTENT = 0.135 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn43_60D_30S_30L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn43_60D_30S_30L.fds index eeafb15fe47..9860601d47c 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn43_60D_30S_30L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn43_60D_30S_30L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.125 + MOISTURE_CONTENT = 0.125 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn44_30D_24S_25L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn44_30D_24S_25L.fds index 95732291231..4aa80ef6893 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn44_30D_24S_25L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn44_30D_24S_25L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1394 + MOISTURE_CONTENT = 0.1394 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn45_30D_27S_25L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn45_30D_27S_25L.fds index 577a60eaff9..e4b8afc155c 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn45_30D_27S_25L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn45_30D_27S_25L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.108 + MOISTURE_CONTENT = 0.108 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn46_60D_24S_25L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn46_60D_24S_25L.fds index e7343dd9ffa..00349ac8a9c 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn46_60D_24S_25L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn46_60D_24S_25L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1251 + MOISTURE_CONTENT = 0.1251 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn47_60D_24S_25L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn47_60D_24S_25L.fds index 01504603a3b..e24a26ca05a 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn47_60D_24S_25L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn47_60D_24S_25L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1345 + MOISTURE_CONTENT = 0.1345 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn48_60D_21S_25L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn48_60D_21S_25L.fds index d687d1e7f42..26eaa8f35ab 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn48_60D_21S_25L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn48_60D_21S_25L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.129 + MOISTURE_CONTENT = 0.129 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn49_60D_18S_25L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn49_60D_18S_25L.fds index c37b1a5e005..09aca43c9ff 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn49_60D_18S_25L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn49_60D_18S_25L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1208 + MOISTURE_CONTENT = 0.1208 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn50_60D_15S_25L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn50_60D_15S_25L.fds index e4fcb9afd78..fb986870613 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn50_60D_15S_25L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn50_60D_15S_25L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1535 + MOISTURE_CONTENT = 0.1535 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn51_60D_12S_25L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn51_60D_12S_25L.fds index f3a5009b097..37de33d82ab 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn51_60D_12S_25L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn51_60D_12S_25L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1182 + MOISTURE_CONTENT = 0.1182 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn52_60D_9S_25L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn52_60D_9S_25L.fds index b658643184b..42fe970b4ce 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn52_60D_9S_25L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn52_60D_9S_25L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1316 + MOISTURE_CONTENT = 0.1316 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn53_60D_0S_25L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn53_60D_0S_25L.fds index e6d2764de6d..dff487a84fc 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn53_60D_0S_25L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn53_60D_0S_25L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1254 + MOISTURE_CONTENT = 0.1254 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn54_60D_6S_25L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn54_60D_6S_25L.fds index edb54bfacca..906252bef77 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn54_60D_6S_25L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn54_60D_6S_25L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1219 + MOISTURE_CONTENT = 0.1219 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn55_60D_6S_25L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn55_60D_6S_25L.fds index e31e8ab8bd1..5c2b0ba2338 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn55_60D_6S_25L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn55_60D_6S_25L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1241 + MOISTURE_CONTENT = 0.1241 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn56_60D_9S_25L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn56_60D_9S_25L.fds index 414cbfd3c13..73433026c70 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn56_60D_9S_25L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn56_60D_9S_25L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.126 + MOISTURE_CONTENT = 0.126 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn57_60D_12S_25L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn57_60D_12S_25L.fds index a22f89a6023..9e09d61d499 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn57_60D_12S_25L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn57_60D_12S_25L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1222 + MOISTURE_CONTENT = 0.1222 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn58_30D_18S_20L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn58_30D_18S_20L.fds index c14f42db679..90d08aad91a 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn58_30D_18S_20L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn58_30D_18S_20L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1393 + MOISTURE_CONTENT = 0.1393 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn59_30D_9S_20L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn59_30D_9S_20L.fds index 9c87c1f79df..df99ef63329 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn59_30D_9S_20L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn59_30D_9S_20L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1344 + MOISTURE_CONTENT = 0.1344 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn60_120D_0S_30L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn60_120D_0S_30L.fds index 6b6b2cfed6d..1b33e1c8e34 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn60_120D_0S_30L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn60_120D_0S_30L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1301 + MOISTURE_CONTENT = 0.1301 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn61_120D_15S_30L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn61_120D_15S_30L.fds index d3f8512274f..74e4afabca7 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn61_120D_15S_30L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn61_120D_15S_30L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1215 + MOISTURE_CONTENT = 0.1215 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn62_120D_12S_30L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn62_120D_12S_30L.fds index 0095c182625..60ad3530427 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn62_120D_12S_30L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn62_120D_12S_30L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.118 + MOISTURE_CONTENT = 0.118 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn63_120D_9S_30L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn63_120D_9S_30L.fds index a91b31d792a..6e6d934c953 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn63_120D_9S_30L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn63_120D_9S_30L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1295 + MOISTURE_CONTENT = 0.1295 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn64_120D_9S_30L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn64_120D_9S_30L.fds index ead94e2ba3a..10a1236b0c1 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn64_120D_9S_30L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn64_120D_9S_30L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1212 + MOISTURE_CONTENT = 0.1212 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn65_120D_12S_30L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn65_120D_12S_30L.fds index c58ba9406b6..cdd9a38b06b 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn65_120D_12S_30L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn65_120D_12S_30L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1366 + MOISTURE_CONTENT = 0.1366 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn66_120D_12S_30L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn66_120D_12S_30L.fds index 3a6ddb01032..162b85cc016 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn66_120D_12S_30L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn66_120D_12S_30L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.121 + MOISTURE_CONTENT = 0.121 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn67_120D_15S_30L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn67_120D_15S_30L.fds index 9e105faee03..a690d4e0839 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn67_120D_15S_30L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn67_120D_15S_30L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.137 + MOISTURE_CONTENT = 0.137 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn68_120D_24S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn68_120D_24S_35L.fds index 2b5d898978c..f681d1432f7 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn68_120D_24S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn68_120D_24S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1249 + MOISTURE_CONTENT = 0.1249 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn69_120D_21S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn69_120D_21S_35L.fds index 8915900c1f3..b3c2599582c 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn69_120D_21S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn69_120D_21S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1145 + MOISTURE_CONTENT = 0.1145 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn70_120D_15S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn70_120D_15S_35L.fds index 0fc26934a05..2d37491b2d9 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn70_120D_15S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn70_120D_15S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1306 + MOISTURE_CONTENT = 0.1306 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn71_120D_18S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn71_120D_18S_35L.fds index bbf1689f4af..3fcb68fb7fb 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn71_120D_18S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn71_120D_18S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1284 + MOISTURE_CONTENT = 0.1284 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn72_120D_21S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn72_120D_21S_35L.fds index 38468abfed0..52fd5273d98 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn72_120D_21S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn72_120D_21S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1436 + MOISTURE_CONTENT = 0.1436 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn73_120D_24S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn73_120D_24S_35L.fds index 11ea9827a1f..512f381af23 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn73_120D_24S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn73_120D_24S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.119 + MOISTURE_CONTENT = 0.119 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn74_120D_24S_40L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn74_120D_24S_40L.fds index 5a0e02cf4cb..263b487f407 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn74_120D_24S_40L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn74_120D_24S_40L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1306 + MOISTURE_CONTENT = 0.1306 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn75_120D_24S_40L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn75_120D_24S_40L.fds index 1b5283e81ce..6e60d82acdd 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn75_120D_24S_40L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn75_120D_24S_40L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1357 + MOISTURE_CONTENT = 0.1357 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn76_120D_21S_40L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn76_120D_21S_40L.fds index b6c72b8333e..2e9df3f5043 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn76_120D_21S_40L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn76_120D_21S_40L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1497 + MOISTURE_CONTENT = 0.1497 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn77_120D_21S_40L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn77_120D_21S_40L.fds index f7fd79f6bcb..158b1fba2d5 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn77_120D_21S_40L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn77_120D_21S_40L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1482 + MOISTURE_CONTENT = 0.1482 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn78_120D_21S_40L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn78_120D_21S_40L.fds index 243228b145b..2372f354327 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn78_120D_21S_40L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn78_120D_21S_40L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1318 + MOISTURE_CONTENT = 0.1318 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn79_120D_18S_40L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn79_120D_18S_40L.fds index 9e67f1c3a47..0a15eb49aad 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn79_120D_18S_40L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn79_120D_18S_40L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1332 + MOISTURE_CONTENT = 0.1332 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn80_120D_3S_40L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn80_120D_3S_40L.fds index 74d00a56254..26e5c198cb4 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn80_120D_3S_40L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn80_120D_3S_40L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1366 + MOISTURE_CONTENT = 0.1366 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn81_120D_24S_40L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn81_120D_24S_40L.fds index ffb24dbcc7e..e0b4b098304 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn81_120D_24S_40L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn81_120D_24S_40L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1201 + MOISTURE_CONTENT = 0.1201 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn82_120D_24S_45L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn82_120D_24S_45L.fds index 2cadaf80e2e..c60199832e1 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn82_120D_24S_45L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn82_120D_24S_45L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1333 + MOISTURE_CONTENT = 0.1333 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn83_120D_27S_45L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn83_120D_27S_45L.fds index 84c00448554..268d7bdd656 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn83_120D_27S_45L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn83_120D_27S_45L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1384 + MOISTURE_CONTENT = 0.1384 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn84_120D_30S_45L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn84_120D_30S_45L.fds index 139621018b0..0336ea48b1c 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn84_120D_30S_45L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn84_120D_30S_45L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1627 + MOISTURE_CONTENT = 0.1627 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn85_120D_30S_45L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn85_120D_30S_45L.fds index a9f6cb0d4c3..08c070feade 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn85_120D_30S_45L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn85_120D_30S_45L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.16 + MOISTURE_CONTENT = 0.16 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn86_120D_33S_45L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn86_120D_33S_45L.fds index 2012308f136..d8195bb1ed2 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn86_120D_33S_45L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn86_120D_33S_45L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.103 + MOISTURE_CONTENT = 0.103 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn87_120D_27S_45L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn87_120D_27S_45L.fds index 25361fb66ce..5b43dde8e2a 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn87_120D_27S_45L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn87_120D_27S_45L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1332 + MOISTURE_CONTENT = 0.1332 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn88_120D_33S_45L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn88_120D_33S_45L.fds index dfe63a6298e..8e71ef80726 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn88_120D_33S_45L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn88_120D_33S_45L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1385 + MOISTURE_CONTENT = 0.1385 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn89_120D_21S_40L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn89_120D_21S_40L.fds index 3e4f91993a6..e33299d8971 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn89_120D_21S_40L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn89_120D_21S_40L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1296 + MOISTURE_CONTENT = 0.1296 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn90_120D_27S_40L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn90_120D_27S_40L.fds index be176d11a69..bdbf398f737 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn90_120D_27S_40L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn90_120D_27S_40L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1429 + MOISTURE_CONTENT = 0.1429 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn91_120D_18S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn91_120D_18S_35L.fds index 06f108062d4..d9c60f1c254 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn91_120D_18S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn91_120D_18S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1339 + MOISTURE_CONTENT = 0.1339 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn92_120D_15S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn92_120D_15S_35L.fds index 99193c9b4d8..bffab79819f 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn92_120D_15S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn92_120D_15S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1554 + MOISTURE_CONTENT = 0.1554 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn93_120D_15S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn93_120D_15S_35L.fds index 709882c5e0d..cd6f5f9c712 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn93_120D_15S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn93_120D_15S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1417 + MOISTURE_CONTENT = 0.1417 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn94_120D_9S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn94_120D_9S_35L.fds index f901f1186e8..9455b5d7ff4 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn94_120D_9S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn94_120D_9S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1301 + MOISTURE_CONTENT = 0.1301 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn95_120D_12S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn95_120D_12S_35L.fds index 85d87fdf152..66e4b38efcf 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn95_120D_12S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn95_120D_12S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1297 + MOISTURE_CONTENT = 0.1297 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn96_120D_12S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn96_120D_12S_35L.fds index b3dc1f50f12..1585343e9ab 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn96_120D_12S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn96_120D_12S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1349 + MOISTURE_CONTENT = 0.1349 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn97_120D_15S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn97_120D_15S_35L.fds index 06b9abafec1..5f88a54a382 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn97_120D_15S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn97_120D_15S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.0799 + MOISTURE_CONTENT = 0.0799 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn98_120D_24S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn98_120D_24S_35L.fds index bbfd13271e8..53dfd9fd5f0 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn98_120D_24S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn98_120D_24S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.0708 + MOISTURE_CONTENT = 0.0708 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn99_60D_15S_35L.fds b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn99_60D_15S_35L.fds index fb3abebbcc6..8dac231dade 100644 --- a/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn99_60D_15S_35L.fds +++ b/Validation/USFS_Deep_Fuel_Beds/FDS_Input_Files/burn99_60D_15S_35L.fds @@ -33,7 +33,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'GENERIC VEGETATION' - MOISTURE_FRACTION = 0.1458 + MOISTURE_CONTENT = 0.1458 SURFACE_VOLUME_RATIO = 7590 LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' diff --git a/Verification/FDS_Cases.sh b/Verification/FDS_Cases.sh index 377b0235d86..44b9cdf7596 100755 --- a/Verification/FDS_Cases.sh +++ b/Verification/FDS_Cases.sh @@ -346,6 +346,7 @@ $QFDS -d HVAC HVAC_damper.fds $QFDS -d HVAC HVAC_energy_pressure.fds $QFDS -d HVAC HVAC_filter.fds $QFDS -d HVAC HVAC_flow_loss.fds +$QFDS -d HVAC HVAC_geom.fds $QFDS -d HVAC HVAC_mass_conservation.fds $QFDS -d HVAC HVAC_mass_transport.fds $QFDS -d HVAC HVAC_mass_transport_1.fds @@ -370,6 +371,7 @@ $QFDS -d HVAC leak_test_2.fds $QFDS -d HVAC leak_enthalpy.fds $QFDS -p 2 -d HVAC leak_test_3.fds $QFDS -d HVAC leak_test_4.fds +$QFDS -d HVAC leak_geom.fds $QFDS -d HVAC HVAC_leak_exponent.fds $QFDS -p 8 -d HVAC HVAC_leak_exponent_2.fds diff --git a/Verification/HVAC/HVAC_geom.csv b/Verification/HVAC/HVAC_geom.csv new file mode 100644 index 00000000000..9ca25334bd9 --- /dev/null +++ b/Verification/HVAC/HVAC_geom.csv @@ -0,0 +1,3 @@ +Time,V +4.00E+00,2.00E+00 +5.00E+00,2.00E+00 diff --git a/Verification/HVAC/HVAC_geom.fds b/Verification/HVAC/HVAC_geom.fds new file mode 100644 index 00000000000..3d146574ff7 --- /dev/null +++ b/Verification/HVAC/HVAC_geom.fds @@ -0,0 +1,37 @@ +&HEAD CHID='HVAC_geom'/ + +&MESH XB=0,2,0,0.5,0,1,IJK=40,10,20/ +&MESH XB=0,2,0.5,1.0,0,1,IJK=40,10,20/ + +&TIME T_END=5/ + +&VENT XB=0.0,0.0,0.4,0.6,0.4,0.6,SURF_ID='HVAC',COLOR='YELLOW',ID='M1 IN'/ +&VENT XB=2.0,2.0,0.4,0.6,0.4,0.6,SURF_ID='HVAC',COLOR='PURPLE',ID='M2 OUT'/ + +&OBST XB=0.95,1.05,0,1,0,1/ + +&SURF ID='M1 OUT',COLOR='GREEN',NODE_ID='M1 OUT'/ +&SURF ID='M2 IN',COLOR='BLUE',NODE_ID='M2 IN'/ +&SURF ID='DUCT',COLOR='GRAY 50'/ + +&GEOM ID='DUCT',XB=0.5,1.5,0.4,0.6,0.4,0.6,SURF_ID6='M1 OUT','M2 IN','DUCT','DUCT','DUCT','DUCT',MOVE_ID='M1'/ +&MOVE ID='M1',X0=1,Y0=0.5,Z0=0.5,AXIS=1,1,1,ROTATION_ANGLE=15/ + +&HVAC ID='M1 IN AMB',TYPE_ID='NODE',AMBIENT=T,DUCT_ID='M1L',XYZ=-0.2,0.5,0.5/ +&HVAC ID='M1 IN',TYPE_ID='NODE',VENT_ID='M1 IN',DUCT_ID='M1L'/ +&HVAC ID='M1L',TYPE_ID='DUCT',NODE_ID='M1 IN AMB','M1 IN',AREA=0.04,LOSS=1,1/ + +&HVAC ID='M2 OUT',TYPE_ID='NODE',VENT_ID='M2 OUT',DUCT_ID='M2R'/ +&HVAC ID='M2 OUT AMB',TYPE_ID='NODE',AMBIENT=T,DUCT_ID='M2R',XYZ=2.2,0.5,0.5/ +&HVAC ID='M2R',TYPE_ID='DUCT',NODE_ID='M2 OUT','M2 OUT AMB',AREA=0.04,LOSS=1,1/ + +&HVAC ID='M1 OUT',TYPE_ID='NODE',DUCT_ID='M1M2',GEOM=T/ +&HVAC ID='M2 IN',TYPE_ID='NODE',DUCT_ID='M1M2',GEOM=T/ +&HVAC ID='M1M2',TYPE_ID='DUCT',NODE_ID='M1 OUT','M2 IN',AREA=0.04,VOLUME_FLOW=0.08/ + +&SLCF QUANTITY='VELOCITY',PBZ=0.500/ +&SLCF QUANTITY='VELOCITY',PBY=0.495/ + +&DEVC ID='L',QUANTITY='DUCT VELOCITY',DUCT_ID='M1L'/ +&DEVC ID='LR',QUANTITY='DUCT VELOCITY',DUCT_ID='M1M2'/ +&DEVC ID='R',QUANTITY='DUCT VELOCITY',DUCT_ID='M2R'/ \ No newline at end of file diff --git a/Verification/HVAC/leak_geom.csv b/Verification/HVAC/leak_geom.csv new file mode 100644 index 00000000000..8edeab9d237 --- /dev/null +++ b/Verification/HVAC/leak_geom.csv @@ -0,0 +1,3 @@ +Time,V +4.00E+00,1.00E-01 +5.00E+00,1.00E-01 diff --git a/Verification/HVAC/leak_geom.fds b/Verification/HVAC/leak_geom.fds new file mode 100644 index 00000000000..c3c703ea287 --- /dev/null +++ b/Verification/HVAC/leak_geom.fds @@ -0,0 +1,41 @@ +&HEAD CHID='leak_geom'/ + +&MESH XB=0,3,0,1,0,1,IJK=60,20,20/ + +&MISC STRATIFICATION=F/ + +&TIME T_END=5/ + +&OBST XB=0.05,0.10,0,1,0,1/ +&OBST XB=0.95,1.05,0,1,0,1/ +&OBST XB=1.95,2.05,0,1,0,1/ + +&VENT PBX=0,SURF_ID='OPEN'/ + +&GEOM ID='L',XB=0.10,0.15,0.4,0.6,0.4,0.6,SURF_ID6='INERT','LEAK L OUT','INERT','INERT','INERT','INERT'/ +&GEOM ID='C',XB=0.90,1.10,0.4,0.6,0.3,0.4,SURF_ID6='LEAK C IN','LEAK C OUT','INERT','INERT','INERT','INERT'/ +&GEOM ID='R',XB=1.90,1.95,0.4,0.6,0.4,0.6,SURF_ID6='LEAK R IN','INERT','INERT','INERT','INERT','INERT'/ + +&VENT XB=0.05,0.05,0.4,0.6,0.4,0.6,ID='LEAK L IN',COLOR='RED',SURF_ID='INERT'/ + +&SURF ID='LEAK L OUT',NODE_ID='LEAK L OUT',COLOR='ORANGE'/ +&SURF ID='LEAK C IN',NODE_ID='LEAK C IN',COLOR='YELLOW'/ +&SURF ID='LEAK C OUT',NODE_ID='LEAK C OUT',COLOR='GREEN'/ +&SURF ID='LEAK R IN',NODE_ID='LEAK R IN',COLOR='BLUE'/ +&VENT ID='LEAK R OUT',XB=2.05,2.05,0.4,0.6,0.4,0.6,COLOR='PURPLE',SURF_ID='INERT'/ +&SURF ID='OUTFLOW',VEL=0.1/ +&VENT ID='OUTFLOW',SURF_ID='OUTFLOW',XB=3,3,0.45,0.50,0.45,0.50,COLOR='WHITE'/ + +&OBST XB=0.90,1.10,0.4,0.6,0.6,0.7/ +&VENT ID='LEAK C IN V',XB=0.90,0.90,0.4,0.6,0.6,0.7,COLOR='CYAN',SURF_ID='INERT'/ +&VENT ID='LEAK C OUT V',XB=1.10,1.10,0.4,0.6,0.6,0.7,COLOR='MAGENTA',SURF_ID='INERT'/ + +&HVAC ID='L',TYPE_ID='LEAK',VENT_ID='LEAK L IN',VENT2_ID='LEAK L OUT',GEOM2=T,AREA=0.0025/ +&HVAC ID='C',TYPE_ID='LEAK',VENT_ID='LEAK C IN',GEOM=T,VENT2_ID='LEAK C OUT',GEOM2=T,AREA=0.00125/ +&HVAC ID='C V',TYPE_ID='LEAK',VENT_ID='LEAK C IN V',VENT2_ID='LEAK C OUT V',AREA=0.00125/ +&HVAC ID='R',TYPE_ID='LEAK',VENT_ID='LEAK R IN',GEOM=T,VENT2_ID='LEAK R OUT',AREA=0.0025/ + +&DEVC QUANTITY='DUCT VELOCITY',DUCT_ID='L',ID='L'/ +&DEVC QUANTITY='DUCT VELOCITY',DUCT_ID='C',ID='C'/ +&DEVC QUANTITY='DUCT VELOCITY',DUCT_ID='C V',ID='C V'/ +&DEVC QUANTITY='DUCT VELOCITY',DUCT_ID='R',ID='R'/ \ No newline at end of file diff --git a/Verification/WUI/Morvan_TGA.fds b/Verification/WUI/Morvan_TGA.fds index 93c2e4b6d36..59500ccff66 100644 --- a/Verification/WUI/Morvan_TGA.fds +++ b/Verification/WUI/Morvan_TGA.fds @@ -10,7 +10,7 @@ &SURF ID = 'foliage' MATL_ID = 'vegetation' - MOISTURE_FRACTION = 0.10 + MOISTURE_CONTENT = 0.10 SURFACE_VOLUME_RATIO = 3940. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' diff --git a/Verification/WUI/Morvan_TGA_2.fds b/Verification/WUI/Morvan_TGA_2.fds index c74edcc52c3..805c5ed05db 100644 --- a/Verification/WUI/Morvan_TGA_2.fds +++ b/Verification/WUI/Morvan_TGA_2.fds @@ -10,7 +10,7 @@ &SURF ID = 'foliage' MATL_ID = 'vegetation' - MOISTURE_FRACTION = 0.10 + MOISTURE_CONTENT = 0.10 SURFACE_VOLUME_RATIO = 3940. LENGTH = 0.05 GEOMETRY = 'CYLINDRICAL' diff --git a/Verification/WUI/Needle_TGA_A.fds b/Verification/WUI/Needle_TGA_A.fds index a2540948cd4..809f866a0d9 100644 --- a/Verification/WUI/Needle_TGA_A.fds +++ b/Verification/WUI/Needle_TGA_A.fds @@ -28,7 +28,7 @@ RAMP_TMP_GAS_FRONT='T_RAMP' THICKNESS = 0.00002 HEAT_TRANSFER_COEFFICIENT = 1000. - MOISTURE_FRACTION = 0.075 + MOISTURE_CONTENT = 0.075 MATL_ID(1,1:3) = 'comp 1','comp 2','comp 3' MATL_MASS_FRACTION(1,1:3) = 0.25,0.50,0.25 / diff --git a/Verification/WUI/Needle_TGA_B.fds b/Verification/WUI/Needle_TGA_B.fds index a88ae5b99f0..86ff33fbd88 100644 --- a/Verification/WUI/Needle_TGA_B.fds +++ b/Verification/WUI/Needle_TGA_B.fds @@ -28,7 +28,7 @@ RAMP_TMP_GAS_FRONT='T_RAMP' THICKNESS = 0.00002 HEAT_TRANSFER_COEFFICIENT = 1000. - MOISTURE_FRACTION = 0.053 + MOISTURE_CONTENT = 0.053 MATL_ID(1,1:3) = 'comp 1','comp 2','comp 3' MATL_MASS_FRACTION(1,1:3) = 0.25,0.50,0.25 / diff --git a/Verification/WUI/Needle_TGA_C.fds b/Verification/WUI/Needle_TGA_C.fds index fd8c44d1a89..86eb35b1eb4 100644 --- a/Verification/WUI/Needle_TGA_C.fds +++ b/Verification/WUI/Needle_TGA_C.fds @@ -28,7 +28,7 @@ RAMP_TMP_GAS_FRONT='T_RAMP' THICKNESS = 0.00002 HEAT_TRANSFER_COEFFICIENT = 1000. - MOISTURE_FRACTION = 1.22 + MOISTURE_CONTENT = 1.22 MATL_ID(1,1:3) = 'comp 1','comp 2','comp 3' MATL_MASS_FRACTION(1,1:3) = 0.25,0.50,0.25 / diff --git a/Verification/WUI/Needle_TGA_D.fds b/Verification/WUI/Needle_TGA_D.fds index 8d6cf45d966..6486f694894 100644 --- a/Verification/WUI/Needle_TGA_D.fds +++ b/Verification/WUI/Needle_TGA_D.fds @@ -28,7 +28,7 @@ RAMP_TMP_GAS_FRONT='T_RAMP' THICKNESS = 0.00002 HEAT_TRANSFER_COEFFICIENT = 1000. - MOISTURE_FRACTION = 1.63 + MOISTURE_CONTENT = 1.63 MATL_ID(1,1:3) = 'comp 1','comp 2','comp 3' MATL_MASS_FRACTION(1,1:3) = 0.25,0.50,0.25 / diff --git a/Verification/WUI/Needle_TGA_E.fds b/Verification/WUI/Needle_TGA_E.fds index ae48f6c15a2..de3a644a4c1 100644 --- a/Verification/WUI/Needle_TGA_E.fds +++ b/Verification/WUI/Needle_TGA_E.fds @@ -28,7 +28,7 @@ RAMP_TMP_GAS_FRONT='T_RAMP' THICKNESS = 0.00002 HEAT_TRANSFER_COEFFICIENT = 1000. - MOISTURE_FRACTION = 0.10 + MOISTURE_CONTENT = 0.10 MATL_ID(1,1:3) = 'comp 1','comp 2','comp 3' MATL_MASS_FRACTION(1,1:3) = 0.25,0.50,0.25 / diff --git a/Verification/WUI/Needle_TGA_F.fds b/Verification/WUI/Needle_TGA_F.fds index 984d8f06907..49c743c458b 100644 --- a/Verification/WUI/Needle_TGA_F.fds +++ b/Verification/WUI/Needle_TGA_F.fds @@ -28,7 +28,7 @@ RAMP_TMP_GAS_FRONT='T_RAMP' THICKNESS = 0.00002 HEAT_TRANSFER_COEFFICIENT = 1000. - MOISTURE_FRACTION = 0.064 + MOISTURE_CONTENT = 0.064 MATL_ID(1,1:3) = 'comp 1','comp 2','comp 3' MATL_MASS_FRACTION(1,1:3) = 0.25,0.50,0.25 / diff --git a/Verification/WUI/Needle_TGA_G.fds b/Verification/WUI/Needle_TGA_G.fds index ea590424f41..7311e30eb05 100644 --- a/Verification/WUI/Needle_TGA_G.fds +++ b/Verification/WUI/Needle_TGA_G.fds @@ -28,7 +28,7 @@ RAMP_TMP_GAS_FRONT='T_RAMP' THICKNESS = 0.00002 HEAT_TRANSFER_COEFFICIENT = 1000. - MOISTURE_FRACTION = 1.56 + MOISTURE_CONTENT = 1.56 MATL_ID(1,1:3) = 'comp 1','comp 2','comp 3' MATL_MASS_FRACTION(1,1:3) = 0.25,0.50,0.25 / diff --git a/Verification/WUI/Needle_TGA_H.fds b/Verification/WUI/Needle_TGA_H.fds index 24cb729e0c1..3169d8e9002 100644 --- a/Verification/WUI/Needle_TGA_H.fds +++ b/Verification/WUI/Needle_TGA_H.fds @@ -29,7 +29,7 @@ RAMP_TMP_GAS_FRONT='T_RAMP' THICKNESS = 0.00002 HEAT_TRANSFER_COEFFICIENT = 1000. - MOISTURE_FRACTION = 1.33 + MOISTURE_CONTENT = 1.33 MATL_ID(1,1:3) = 'comp 1','comp 2','comp 3' MATL_MASS_FRACTION(1,1:3) = 0.25,0.50,0.25 / diff --git a/Verification/WUI/bulk_density_file.fds b/Verification/WUI/bulk_density_file.fds index bbec174ecdc..391e9ff2ddd 100644 --- a/Verification/WUI/bulk_density_file.fds +++ b/Verification/WUI/bulk_density_file.fds @@ -21,7 +21,7 @@ MATL_ID = 'vegetation' SURFACE_VOLUME_RATIO = 4000 LENGTH = 0.05 - MOISTURE_FRACTION = 0.5 + MOISTURE_CONTENT = 0.5 GEOMETRY = 'CYLINDRICAL'/ &PART ID = 'foliage part', SURF_ID = 'foliage surf', DRAG_LAW='CYLINDER', STATIC=T, QUANTITIES='PARTICLE BULK DENSITY'/ diff --git a/Verification/WUI/char_oxidation_1.fds b/Verification/WUI/char_oxidation_1.fds index 6b8159bfc01..000fc229f8e 100644 --- a/Verification/WUI/char_oxidation_1.fds +++ b/Verification/WUI/char_oxidation_1.fds @@ -13,7 +13,7 @@ &SURF ID = 'foliage' MATL_ID = 'dry foliage' - MOISTURE_FRACTION = 0.00 + MOISTURE_CONTENT = 0.00 SURFACE_VOLUME_RATIO = 3940. LENGTH = 0.20 GEOMETRY = 'CYLINDRICAL' / diff --git a/Verification/WUI/char_oxidation_2.fds b/Verification/WUI/char_oxidation_2.fds index 94aee0037b0..4b5363f1441 100644 --- a/Verification/WUI/char_oxidation_2.fds +++ b/Verification/WUI/char_oxidation_2.fds @@ -27,7 +27,7 @@ &SURF ID = 'wet needle surf' MATL_ID = 'pulp' - MOISTURE_FRACTION = 0.2 + MOISTURE_CONTENT = 0.2 THICKNESS = 0.0005 LENGTH = 0.10 TMP_INNER = 20. diff --git a/Verification/WUI/ground_vegetation_drag.fds b/Verification/WUI/ground_vegetation_drag.fds index 5dd1c895b6a..323fcdc0157 100644 --- a/Verification/WUI/ground_vegetation_drag.fds +++ b/Verification/WUI/ground_vegetation_drag.fds @@ -52,7 +52,7 @@ &SURF ID = 'GRASS' MATL_ID = 'Dry Grass','SOIL' - MOISTURE_FRACTION(1) = 0.1 + MOISTURE_CONTENT(1) = 0.1 MASS_PER_VOLUME(1) = 4. COLOR = 'FOREST GREEN' DRAG_COEFFICIENT = 2.8 @@ -70,7 +70,7 @@ &SURF ID = 'Blade of Grass' MATL_ID = 'Dry Grass' - MOISTURE_FRACTION = 0.1 + MOISTURE_CONTENT = 0.1 SURFACE_VOLUME_RATIO = 3092. LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Verification/WUI/ground_vegetation_load.fds b/Verification/WUI/ground_vegetation_load.fds index a76492c5c1b..31b411baf1b 100644 --- a/Verification/WUI/ground_vegetation_load.fds +++ b/Verification/WUI/ground_vegetation_load.fds @@ -31,7 +31,7 @@ &SURF ID = 'GRASS' MATL_ID = 'Dry Grass','SOIL' - MOISTURE_FRACTION(1) = 0.1 + MOISTURE_CONTENT(1) = 0.1 MASS_PER_VOLUME(1) = 4. COLOR = 'FOREST GREEN' DRAG_COEFFICIENT = 2.8 @@ -40,7 +40,7 @@ &SURF ID = 'Blade of Grass' MATL_ID = 'Dry Grass' - MOISTURE_FRACTION = 0.1 + MOISTURE_CONTENT = 0.1 SURFACE_VOLUME_RATIO = 3092. LENGTH = 0.02 GEOMETRY = 'CYLINDRICAL' / diff --git a/Verification/WUI/pine_needles.fds b/Verification/WUI/pine_needles.fds index 958eb3c0d00..9aaa8485917 100644 --- a/Verification/WUI/pine_needles.fds +++ b/Verification/WUI/pine_needles.fds @@ -12,7 +12,7 @@ &SURF ID = 'wet vegetation' MATL_ID = 'dry pine' - MOISTURE_FRACTION = 0.25 + MOISTURE_CONTENT = 0.25 SURFACE_VOLUME_RATIO = 8000. LENGTH = 0.1 GEOMETRY = 'CYLINDRICAL' /