FireX: Merge with firemodels/master

Manuals/Bibliography/authors.tex

@@ -61,7 +61,7 @@ \chapter{About the Developers}
 
 \item[Simo Hostikka] is an associate professor of fire safety engineering at Aalto University School of Engineering, since January 2014. Before joining Aalto, he worked as a Principal Scientist and Team Leader at VTT Technical Research Centre of Finland. He received a master of science (technology) degree in 1997 and a doctorate in 2008 from the Department of Engineering Physics and Mathematics of the Helsinki University of Technology.  He is the principal developer of the radiation and solid phase sub-models within FDS.
 
-\item[Jason Floyd] is a Principle Research Engineer at the UL Research Institutes' Fire Safety Research Institute in Columbia, Maryland. He received a B.S. (1993), M.S (1995), and a Ph.D. (2000) from the Nuclear Engineering Program of the University of Maryland. After graduating, he was awarded a National Research Council Post-Doctoral Fellowship at the Building and Fire Research Laboratory of NIST. He is a principal developer of the combustion, control logic, aerosol, droplet evaporation, and HVAC sub-models within FDS.
+\item[Jason Floyd] is a Principal Research Engineer at the UL Research Institutes' Fire Safety Research Institute in Columbia, Maryland. He received a B.S. (1993), M.S (1995), and a Ph.D. (2000) from the Nuclear Engineering Program of the University of Maryland. After graduating, he was awarded a National Research Council Post-Doctoral Fellowship at the Building and Fire Research Laboratory of NIST. He is a principal developer of the combustion, control logic, aerosol, droplet evaporation, and HVAC sub-models within FDS.
 
 \item[Randall McDermott] joined the Fire Research Division at NIST in 2008. He received a B.S.~from the University of Tulsa in Chemical Engineering in 1994 and a Ph.D.~from the University of Utah in 2005. His research interests include subgrid-scale models and numerical methods for large-eddy simulation, turbulent combustion, immersed boundary methods, and Lagrangian particle methods.
 

Manuals/FDS_Technical_Reference_Guide/Solid_Chapter.tex

@@ -121,7 +121,7 @@ \subsubsection{Empirical Natural/Forced Convection Model}
                                                 2 +  0.454 \, \hbox{Ra}^{1/4}                         &  \hbox{Sphere}
        \end{array} \right.
 \ee
-\footnotetext{The heat transfer coefficient for a vertical plate or cylinder is simplified to $h=1.31 \, (\Delta T)^{1/3}$~\cite{Holman:2} in cases where the back side of a solid obstruction is outside the computational domain and the gas temperature is assumed to be ambient. }
+\footnotetext{The heat transfer coefficient for a vertical plate or cylinder is simplified to $h=1.31 \, (\Delta T)^{1/3}$~\cite{Holman:2} when the back side of a solid obstruction is outside the computational domain or \ct{BACKING='VOID'}, and the back side gas temperature is assumed to be ambient or is user-specified. }
 For forced convection, the Nusselt number takes the form:
 \be
    \NU_{\rm forced} = C_0 + \left( C_1 \, \RE^n - C_2 \right) \, \PR^m  \quad ; \quad \RE = \frac{\rho |\bu| L}{\mu}  \quad ; \quad m=1/3

Source/ccib.f90

@@ -15,6 +15,7 @@ MODULE CC_SCALARS
 USE MATH_FUNCTIONS, ONLY: GET_SCALAR_FACE_VALUE
 
 IMPLICIT NONE (TYPE,EXTERNAL)
+PRIVATE
 
 ! Debug Flags:
 LOGICAL, PARAMETER :: DEBUG_CC_INTERPOLATION=.FALSE. ! IBM interpolation and forcing scheme.
@@ -96,8 +97,6 @@ MODULE CC_SCALARS
 ! Baroclininc torque linking variables.
 REAL(EB), SAVE, ALLOCATABLE, DIMENSION(:) :: F_LINK,A_LINK
 
-PRIVATE
-
 PUBLIC :: ADD_CUTCELL_D_PBAR_DT, ADD_LINKEDCELL_D_PBAR_DT,ADD_CUTCELL_PSUM,ADD_LINKEDCELL_PSUM,&
           ADD_INPLACE_NNZ_H_WHLDOM,CALL_FOR_GLMAT,CALL_FROM_GLMAT_SETUP,&
           CCCOMPUTE_RADIATION,CC_DIVERGENCE_PART_1,CC_VEL_FACE_TO_SOLID_NODE,CC_BAROCLINIC_CORRECTION,&

Source/chem.f90

@@ -18,6 +18,7 @@ MODULE CVODE_INTERFACE
 USE FSUNDIALS_CORE_MOD
 
 IMPLICIT NONE
+PRIVATE
 
 TYPE :: USERDATA
     REAL(EB) :: ZETA0 ! initial unmixed fraction
@@ -29,7 +30,7 @@ MODULE CVODE_INTERFACE
 
 LOGICAL :: DEBUG=.FALSE.
 REAL(EB), PARAMETER :: MIN_CHEM_TMP=200._EB
-REAL(EB) :: CUR_CFD_TIME
+REAL(EB), PUBLIC :: CUR_CFD_TIME
 
 PUBLIC CVODE_SERIAL
 

Source/ctrl.f90

@@ -8,6 +8,9 @@ MODULE CONTROL_FUNCTIONS
 USE DEVICE_VARIABLES
 
 IMPLICIT NONE (TYPE,EXTERNAL)
+PRIVATE
+
+PUBLIC UPDATE_CONTROLS,EVALUATE_CONTROL
 
 CONTAINS
 

Source/fire.f90

@@ -12,18 +12,14 @@ MODULE FIRE
 #endif
 
 IMPLICIT NONE (TYPE,EXTERNAL)
-
-
 PRIVATE
 
 REAL(EB), ALLOCATABLE, DIMENSION(:) :: DZ_F0
 REAL(EB) :: RRTMP0,MOLPCM3,T_CHEM_ODE, T_CHEM_COMM
-
-
 LOGICAL :: COMBUSTION_INIT=.FALSE.
-!INTEGER :: I0,J0,K0, NM0
 
 ! Variables needed for chemistry load distribution
+
 REAL(EB), ALLOCATABLE, DIMENSION(:,:) :: REALS_TO_SEND_ARRAY, REALS_TO_RECV_ARRAY, RESULTS_TO_SEND_ARRAY, &
                                        RESULTS_TO_RECV_ARRAY
 INTEGER, ALLOCATABLE, DIMENSION(:) :: NCELLS_TO_SEND_ARRAY, NCELLS_TO_RECV_ARRAY, SEND_DISPS, REVC_DISPS, &
@@ -32,7 +28,6 @@ MODULE FIRE
 INTEGER :: NVAR_TO_SEND
 INTEGER :: NVAR_TO_RECEIVE
 
-
 PUBLIC COMBUSTION_LOAD_BALANCED,COMBUSTION_BC,CONDENSATION_EVAPORATION,GET_FLAME_TEMPERATURE
 
 CONTAINS

Source/geom.f90

@@ -19,6 +19,8 @@ MODULE COMPLEX_GEOMETRY
 #endif /* WITH_MKL */
 
 IMPLICIT NONE (TYPE,EXTERNAL)
+PRIVATE
+
 CHARACTER(2*MESSAGE_LENGTH) :: MESSAGE
 
 !! ---------------------------------------------------------------------------------
@@ -319,7 +321,6 @@ MODULE COMPLEX_GEOMETRY
 ! End Variable declaration for CC_IBM.
 ! ---------------------------------------------------------------------------------
 
-PRIVATE
 PUBLIC :: BLOCK_CC_SOLID_EXTWALLCELLS,GEOFCT,CALL_FOR_GLMAT,CALL_FROM_GLMAT_SETUP,CCGUARD,CC_MATVEC_DEFINED,GEOMEPS,&
           DELTA_INT,DELTA_VERT,DEBUG_SET_CUTCELLS,DEBUG_WAIT,DIST_THRES,&
           GET_CARTCELL_CUTCELLS_TIME_INDEX,GET_CFACE_INDEX,GETU,&