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

Author: cxp484

Manuals/FDS_Verification_Guide/FDS_Verification_Guide.tex

@@ -4421,7 +4421,7 @@ \subsection{Gravitational Settling and Deposition of Aerosols\\(\texorpdfstring{
 \subsection{Thermophoretic Settling and Deposition of Aerosols\\(\texorpdfstring{\ct{aerosol_thermophoretic_deposition}}{aerosol\_thermophoretic\_deposition})}
     \label{aerosol_thermophoretic_deposition}
 
-This verification test consists of two test cases. The second case, \ct{aerosol\_thermophoretic\_deposition\_2}, reverses the temperature gradient. The case consists of a box 1~cm on side with adiabatic, free-slip side walls and a 100 K temperature gradient over the height of the box. The box is filled with two gas species each having a molecular weight of 28.8~g/mol, a viscosity of 0.00002~\si{kg/(m.s}, a thermal conductivity of 0.025~\si{W/(m.K}, and specific heat of 1~\si{kJ/(kg.K}, and zero diffusivity. One of the gas species is defined as an aerosol with a diameter of 1~$\mu$m, a solid phase density of 2000~kg/m$^3$, and a solid phase conductivity of 1~\si{W/(m.K}. The initial mass fraction of the aerosol is 0.00001. The gas temperature is initialized to its steady-state temperature gradient. \ct{STRATIFICATION}, \ct{NOISE}, and all aerosol behaviors except for \ct{THERMOPHORETIC\_SETTLING} and \ct{THERMOPHORETIC\_DEPOSITION} are turned off. Thermophoretic settling rates are weakly dependent on the gas density. Since there is a temperature gradient, the settling rates are not uniform over the height of the box. Unlike the gravitational settling case, this means over long enough time periods the overall settling rate is not linear in time; however, for a short time period a near linear settling rate is expected and can be determined analytically
+This verification test consists of two test cases. The second case, \ct{aerosol\_thermophoretic\_deposition\_2}, reverses the temperature gradient. The case consists of a box 1~cm on a side with adiabatic, free-slip side walls and a 100 K temperature gradient over the height of the box. The box is filled with two gas species each having a molecular weight of 28.8~g/mol, a viscosity of $2\times10^{-5}$~\si{kg/(m.s)}, a thermal conductivity of 0.025~\si{W/(m.K)}, and specific heat of 1~\si{kJ/(kg.K)}, and zero diffusivity. One of the gas species is defined as an aerosol with a diameter of 1~$\mu$m, a solid phase density of 2000~\si{kg/m^3}, and a solid phase conductivity of 1~\si{W/(m.K)}. The initial mass fraction of the aerosol is $1\times10^{-5}$. The gas temperature is initialized to its steady-state temperature gradient. \ct{STRATIFICATION}, \ct{NOISE}, and all aerosol behaviors except for \ct{THERMOPHORETIC\_SETTLING} and \ct{THERMOPHORETIC\_DEPOSITION} are turned off. Thermophoretic settling rates are weakly dependent on the gas density. Since there is a temperature gradient, the settling rates are not uniform over the height of the box. Unlike the gravitational settling case, this means over long enough time periods the overall settling rate is not linear in time; however, for a short time period a near linear settling rate is expected and can be determined analytically.
 
 \begin{figure}[ht]
 \noindent
@@ -4438,7 +4438,7 @@ \subsection{Thermophoretic Settling and Deposition of Aerosols\\(\texorpdfstring
 \subsection{Turbulent Deposition of Aerosols (\texorpdfstring{\ct{aerosol\_turbulent\_deposition}}{aerosol\_turbulent\_deposition})}
     \label{aerosol_turbulent_deposition}
 
-This verification test consists of three tunnel like geometries 10~cm on side with adiabatic, free-slip walls. One end of the tunnel is \ct{OPEN} and the other end has a constant inlet velocity of 0.001 m/s, 0.1 m/s, or 1 m/s. The tunnels are filled with two gas species each having a molecular weight of 28.8~g/mol, a viscosity of 0.00002~\si{kg/(m.s)}, a thermal conductivity of 0.025~\si{W/(m.K)}, and specific heat of 1~\si{kJ/(kg.K)}, and zero diffusivity. One of the gas species is defined as an aerosol with a diameter of 100~$\mu$m, a solid phase density of 2000~kg/m$^3$, and a solid phase conductivity of 1~\si{W/(m.K}. The initial mass fraction of the aerosol is 0.00001. \ct{STRATIFICATION}, \ct{NOISE}, and all aerosol behaviors except for \ct{TURBULENT\_DEPOSITION} are turned off. Turbulent deposition is computed using a correlation based open the wall friction velocity and the wall dimensionless stopping distance. The correlation has three parts, and the selected velocities test each part. Since the inlet condition is a constant velocity with a constant aerosol mass fraction, the first wall cell after the inlet will see a uniform settling rate over time.
+This verification test consists of three tunnel like geometries 10~cm on side with adiabatic, free-slip walls. One end of the tunnel is \ct{OPEN} and the other end has a constant inlet velocity of 0.001 m/s, 0.1 m/s, or 1 m/s. The tunnels are filled with two gas species each having a molecular weight of 28.8~g/mol, a viscosity of $2\times10^{-5}$~\si{kg/(m.s)}, a thermal conductivity of 0.025~\si{W/(m.K)}, and specific heat of 1~\si{kJ/(kg.K)}, and zero diffusivity. One of the gas species is defined as an aerosol with a diameter of 100~$\mu$m, a solid phase density of 2000~\si{kg/m^3}, and a solid phase conductivity of 1~\si{W/(m.K}. The initial mass fraction of the aerosol is $1\times10^{-5}$. \ct{STRATIFICATION}, \ct{NOISE}, and all aerosol behaviors except for \ct{TURBULENT\_DEPOSITION} are turned off. Turbulent deposition is computed using a correlation based open the wall friction velocity and the wall dimensionless stopping distance. The correlation has three parts, and the selected velocities test each part. Since the inlet condition is a constant velocity with a constant aerosol mass fraction, the first wall cell after the inlet will see a uniform settling rate over time.
 
 \begin{figure}[ht]
     \centering

Source/main.f90

@@ -202,7 +202,7 @@ PROGRAM FDS
 
 DO NM=LOWER_MESH_INDEX,UPPER_MESH_INDEX
    CALL INITIALIZE_ATMOSPHERE(NM)
-   IF (.NOT.SETUP_ONLY) CALL INITIALIZE_WALL_ARRAY(NM)
+   IF (.NOT.SETUP_ONLY .OR. CHECK_MESH_ALIGNMENT) CALL INITIALIZE_WALL_ARRAY(NM)
 ENDDO
 IF (MY_RANK==0 .AND. VERBOSE) CALL VERBOSE_PRINTOUT('Completed INITIALIZE_WALL_ARRAY')
 
@@ -232,10 +232,9 @@ PROGRAM FDS
 
 ! Stop all the processes if this is just a set-up run
 
-IF (SETUP_ONLY .OR. CHECK_MESH_ALIGNMENT) THEN
+IF (SETUP_ONLY .OR. CHECK_MESH_ALIGNMENT .OR. STOP_STATUS/=0) THEN
    IF (MY_RANK==0) CALL INITIALIZE_DIAGNOSTIC_FILE(DT)
-   STOP_STATUS = SETUP_ONLY_STOP
-   IF (MY_RANK==0) WRITE(LU_ERR,'(A)') ' Checking mesh alignment. This could take a few tens of seconds...'
+   IF (STOP_STATUS==0) STOP_STATUS = SETUP_ONLY_STOP
    CALL STOP_CHECK(1)
 ENDIF
 

Source/wall.f90

@@ -51,9 +51,9 @@ SUBROUTINE WALL_BC(T,DT,NM)
 CALL POINT_TO_MESH(NM)
 
 IF (PREDICTOR) THEN
-   UU => US
-   VV => VS
-   WW => WS
+   UU => U
+   VV => V
+   WW => W
    RHOP => RHOS
    ZZP  => ZZS
    PBAR_P => PBAR_S

Utilities/Matlab/FDS_verification_dataplot_inputs.csv

@@ -703,7 +703,7 @@ d,thermocouple_time_constant,Heat_Transfer/thermocouple_time_constant_git.txt,He
 f,thermocouple_time_constant,Heat_Transfer/thermocouple_time_constant_git.txt,Heat_Transfer/thermocouple_time_constant.csv,1,2,Time,T_3.0,Exact (3.0 s),ro,0,100000,,2.99,3.01,-1.00E+09,1.00E+09,0,Heat_Transfer/thermocouple_time_constant_devc.csv,2,3,Time,T_3.0,FDS (3.0 s),r-,0,100000,,2.99,3.01,-1.00E+09,1.00E+09,0,Bead Temperature (thermocouple\_time\_constant),Time (s),Temperature (°C),0,20,1,15,35,1,no,0.05 0.90,SouthEast,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/thermocouple_time_constant,Relative Error,max,0.01,Heat Transfer,ro,r,TeX
 f,thermocouple_time_constant,Heat_Transfer/thermocouple_time_constant_git.txt,Heat_Transfer/thermocouple_time_constant.csv,1,2,Time,T_8.0,Exact (8.0 s),go,0,100000,,7.99,8.01,-1.00E+09,1.00E+09,0,Heat_Transfer/thermocouple_time_constant_devc.csv,2,3,Time,T_8.0,FDS (8.0 s),g-,0,100000,,7.99,8.01,-1.00E+09,1.00E+09,0,Bead Temperature (thermocouple\_time\_constant),Time (s),Temperature (°C),0,20,1,15,35,1,no,0.05 0.90,SouthEast,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/thermocouple_time_constant,Relative Error,max,0.01,Heat Transfer,ro,r,TeX
 d,thick_orifice,Pressure_Effects/thick_orifice_5cm_git.txt,Pressure_Effects/thick_orifice.csv,1,2,x,p,Empirical,ko,-100000,100000,,-10000,10000,-1.00E+09,1.00E+09,0,Pressure_Effects/thick_orifice_5cm_line.csv,2,3,x,p,FDS,k-,-100000,100000,,-10000,10000,-1.00E+09,1.00E+09,0,Pressure Rise (thick\_orifice),x (m),Pressure Rise (Pa),-5,11,1,-2,6,1,no,0.05 0.90,East,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/thick_orifice,Relative Error,max,0.05,Heat Transfer,ro,r,TeX
-d,test_hrr_2d_cyl,Energy_Budget/test_hrr_2d_cyl_git.txt,Energy_Budget/test_hrr_3d_hrr.csv,2,3,Time,HRR,3D HRR,k--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Energy_Budget/test_hrr_2d_cyl_hrr.csv,2,3,Time,HRR,2D Cyl HRR,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Heat Release Rate,Time (s),$\dot{Q}$ (kW),0,10,1,0,200,1,no,0.05 0.90,SouthEast,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/test_hrr_2d_cyl,Relative Error,mean,0.01,Energy Budget,m+,m,LaTeX
+d,test_hrr_2d_cyl,Energy_Budget/test_hrr_2d_cyl_git.txt,Energy_Budget/test_hrr_3d_hrr.csv,2,3,Time,HRR,3D HRR,k--,0,100000,,3,10,-1.00E+09,1.00E+09,0,Energy_Budget/test_hrr_2d_cyl_hrr.csv,2,3,Time,HRR,2D Cyl HRR,k-,0,100000,,3,10,-1.00E+09,1.00E+09,0,Heat Release Rate,Time (s),$\dot{Q}$ (kW),0,10,1,0,200,1,no,0.05 0.90,SouthEast,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/test_hrr_2d_cyl,Relative Error,mean,0.02,Energy Budget,m+,m,LaTeX
 d,tmp_lower_limit,Fires/tmp_lower_limit_default_git.txt,Fires/tmp_lower_limit.csv,1,2,Time,T,Expected (min T),ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Fires/tmp_lower_limit_default_devc.csv,2,3,Time,minT,FDS (min T),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Temperature Lower Limit (default),Time (s),Temperature (°C),0,1,1,0,40,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/tmp_lower_limit_default,Absolute Error,threshold,0.05,Fires,kd,k,TeX
 d,tmp_lower_limit,Fires/tmp_lower_limit_simple_git.txt,Fires/tmp_lower_limit.csv,1,2,Time,T,Expected (min T),ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Fires/tmp_lower_limit_simple_devc.csv,2,3,Time,minT,FDS (min T),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Temperature Lower Limit (simple),Time (s),Temperature (°C),0,1,1,0,40,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/tmp_lower_limit_simple,Absolute Error,threshold,0.01,Fires,kd,k,TeX
 d,tunnel_const_gamma,Fires/tunnel_const_gamma_git.txt,Fires/tunnel_const_gamma.csv,1,2,x,p,Exact (p),ko,0,100000,,0,0.03,-1.00E+09,1.00E+09,0,Fires/tunnel_const_gamma_line.csv,2,3,x,p,FDS (p),k-,0,100000,,0,0.03,-1.00E+09,1.00E+09,0,Pressure  (fire\_const\_gamma),Distance (m),Pressure (Pa),0,0.1,1,0,1,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/tunnel_const_gamma_p,Relative Error,mean,0.01,Fires,r*,r,TeX