Merge pull request #16242 from marcosvanella/FireX

FireX: Merge with firemodels/master

Author: marcosvanella

Manuals/FDS_User_Guide/FDS_User_Guide.tex

@@ -13618,14 +13618,9 @@ \section{\texorpdfstring{{\tt SURF}}{SURF} (Surface Properties)}
     \ct{VEG_LSET_MLH}                                     & Real            & Section~\ref{info:level_set}              &                     & 0.70                    \\ \hline
     \ct{VEG_LSET_QCON}                                    & Real            & Section~\ref{info:level_set}              & \unit{kW/m^2}       & 0. \rule{0pt}{2.3ex}    \\ \hline
     \ct{VEG_LSET_ROS_00}                                  & Real            & Section~\ref{info:level_set}              & m/s                 & 0.                      \\ \hline
-    \ct{VEG_LSET_ROS_BACK}                                & Real            & Section~\ref{info:level_set}              & m/s                 & 0.                      \\ \hline
-    \ct{VEG_LSET_ROS_FLANK}                               & Real            & Section~\ref{info:level_set}              & m/s                 & 0.                      \\ \hline
-    \ct{VEG_LSET_ROS_HEAD}                                & Real            & Section~\ref{info:level_set}              & m/s                 & 0.                      \\ \hline
     \ct{VEG_LSET_ROS_FIXED}                               & Logical         & Section~\ref{info:level_set}              &                     & \ct{F}                  \\ \hline
     \ct{VEG_LSET_SIGMA}                                   & Real            & Section~\ref{info:level_set}              & 1/m                 & 5000.                   \\ \hline
     \ct{VEG_LSET_SURF_LOAD}                               & Real            & Section~\ref{info:level_set}              & \unit{kg/m^2)}      & 1.0 \rule{0pt}{2.3ex}   \\ \hline
-    \ct{VEG_LSET_TAN2}                                    & Real            & Section~\ref{info:level_set}              &                     &                         \\ \hline
-    \ct{VEG_LSET_WIND_EXP}                                & Real            & Section~\ref{info:level_set}              &                     & 1.                      \\ \hline
     \ct{VEG_LSET_WIND_HEIGHT}                             & Real            & Section~\ref{info:custom_wind}            & m                   & 6.1                      \\ \hline
     \ct{VEG_LSET_WIND_RAMP}                               & Character       & Section~\ref{info:custom_wind}            &                     &                         \\ \hline
     \ct{VEL}                                              & Real            & Section~\ref{info:Velocity_BC}            & m/s                 &                         \\ \hline
@@ -14428,7 +14423,6 @@ \chapter{Error Codes}
     1012 \> \ct{REAC_ID ... not found for HRRPUV REAC.} \> Section~\ref{info:gasoutputquantities} \\
     1013 \> \ct{Output QUANTITY2 ... requires a SPEC_ID.} \> Section~\ref{info:gasoutputquantities} \\
     1014 \> \ct{Output QUANTITY2 ... needs to be a SLCF appropriate quantity.} \> Section~\ref{info:gasoutputquantities} \\
-    1015 \> \ct{Output QUANTITY ... requires a QUANTITY2.} \> Section~\ref{info:gasoutputquantities} \\
     1016 \> \ct{Output QUANTITY ... requires a SPEC_ID.} \> Section~\ref{info:gasoutputquantities} \\
     1017 \> \ct{Output QUANTITY ... SPEC_ID ... not found.} \> Section~\ref{info:gasoutputquantities} \\
     1018 \> \ct{Output QUANTITY ... requires a MATL_ID.} \> Section~\ref{info:solidoutputquantities} \\

Source/cons.f90

@@ -646,8 +646,7 @@ MODULE GLOBAL_CONSTANTS
 INTEGER :: LEVEL_SET_MODE=0               !< Indicator of the type of level set calculation to be done
 LOGICAL :: LEVEL_SET_COUPLED_FIRE=.TRUE.  !< Indicator for fire and wind level set coupling
 LOGICAL :: LEVEL_SET_COUPLED_WIND=.TRUE.  !< Indicator for fire and wind level set coupling
-LOGICAL :: LEVEL_SET_ELLIPSE=.TRUE.       !< Indicator of Richards elliptical level set formulation
-LOGICAL :: LSET_TAN2
+LOGICAL :: LEVEL_SET_ELLIPSE=.TRUE.       !< Placeholder for future level set spread formulations
 
 ! Parameters for Terrain and Wind simulation needs
 

Source/data.f90

@@ -34,7 +34,7 @@ MODULE OUTPUT_DATA
               INTEGRATED=.FALSE.,SOLID_PHASE=.FALSE.,GAS_PHASE=.TRUE.,INTEGRATED_PARTICLES=.FALSE.,&
               MASS_FRACTION=.FALSE.,SPEC_ID_REQUIRED=.FALSE.,PART_ID_REQUIRED=.FALSE.,INSIDE_SOLID=.FALSE.,&
               MATL_ID_REQUIRED=.FALSE.,TIME_AVERAGED=.TRUE.,DEVC_APPROPRIATE=.TRUE.,&
-              DUCT_ID_REQUIRED=.FALSE.,NODE_ID_REQUIRED=.FALSE.,HVAC=.FALSE.,QUANTITY2_REQUIRED=.FALSE.,&
+              DUCT_ID_REQUIRED=.FALSE.,NODE_ID_REQUIRED=.FALSE.,HVAC=.FALSE.,&
               CELL_L_REQUIRED=.FALSE.,HVAC_SMV=.FALSE.,PROF_APPROPRIATE=.FALSE., ELEM_ID_REQUIRED=.FALSE.
 END TYPE OUTPUT_QUANTITY_TYPE