Merge pull request #14713 from mcgratta/master

FDS Source: Rename MOISTURE_FRACTION MOISTURE_CONTENT, maintain backw…

Author: mcgratta

Manuals/FDS_User_Guide/FDS_User_Guide.tex

@@ -7178,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}.
 
@@ -7437,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
@@ -7464,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
@@ -7477,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
@@ -7586,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
@@ -11877,6 +11877,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
@@ -13582,7 +13583,7 @@ \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
@@ -14082,7 +14083,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}  \\

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

Source/read.f90

@@ -6994,11 +6994,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)
@@ -7794,9 +7795,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),&
@@ -7827,7 +7827,7 @@ 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,NODE_ID,NPPC,NUSSELT_C0,NUSSELT_C1,NUSSELT_C2,NUSSELT_M,&
                 PARTICLE_EXTRACTION_VELOCITY,PARTICLE_MASS_FLUX,PARTICLE_SURFACE_DENSITY,PART_ID,&
@@ -7964,6 +7964,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.
 
@@ -8006,11 +8010,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
 
@@ -8038,18 +8042,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)<TWO_EPSILON_EB) EXIT
                DO NNN=1,N_MATL
                   IF (MATL_ID(NL,NN)==MATERIAL(NNN)%ID) EXIT
                ENDDO
-               IF (MATERIAL(NNN)%RHO_S*MOISTURE_FRACTION(NL)/MATERIAL(MOISTURE_INDEX)%RHO_S < 1._EB) THEN
+               IF (MATERIAL(NNN)%RHO_S*MOISTURE_CONTENT(NL)/MATERIAL(MOISTURE_INDEX)%RHO_S < 1._EB) THEN
                   SF%DENSITY_ADJUST_FACTOR(NL,NN) = 1._EB / &
-                     (1._EB-MATERIAL(NNN)%RHO_S*MOISTURE_FRACTION(NL)/MATERIAL(MOISTURE_INDEX)%RHO_S)
+                     (1._EB-MATERIAL(NNN)%RHO_S*MOISTURE_CONTENT(NL)/MATERIAL(MOISTURE_INDEX)%RHO_S)
                ELSE
-                  WRITE(MESSAGE,'(3A)') 'ERROR(303): MOISTURE_FRACTION on SURF ',TRIM(SF%ID),' exceeds theoretical limit.'
+                  WRITE(MESSAGE,'(3A)') 'ERROR(303): MOISTURE_CONTENT on SURF ',TRIM(SF%ID),' exceeds theoretical limit.'
                   CALL SHUTDOWN(MESSAGE) ; RETURN
                ENDIF
             ENDDO
@@ -8074,11 +8078,11 @@ SUBROUTINE READ_SURF(QUICK_READ)
             EMISSIVITY_BACK = 1._EB
          ENDIF
 
-         ! If the user has specified a MOISTURE_FRACTION for this layer, add a new material component and adjust other MFs
+         ! If the user has specified a MOISTURE_CONTENT for this layer, add a new material component and adjust other MFs
 
-         IF (MOISTURE_FRACTION(NL)>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
 
@@ -8984,7 +8988,8 @@ 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
@@ -13265,7 +13270,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
 
@@ -13281,10 +13286,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

Source/type.f90

@@ -962,7 +962,7 @@ MODULE TYPES
    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

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' /

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. /

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. /

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. /

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' /