Merge pull request #14827 from shostikk/master

FDS Source: change FALLOFF name to DELAMINATION

Author: shostikk

Source/read.f90

@@ -7810,7 +7810,7 @@ SUBROUTINE READ_SURF(QUICK_READ)
             REFERENCE_HEAT_FLUX(MAX_QDOTPP_REF),REFERENCE_HEAT_FLUX_TIME_INTERVAL,MINIMUM_SCALING_HEAT_FLUX,&
             MAXIMUM_SCALING_HEAT_FLUX,REFERENCE_THICKNESS(MAX_QDOTPP_REF),&
             AREA_MULTIPLIER,Z_0,PARTICLE_EXTRACTION_VELOCITY,NEAR_WALL_EDDY_VISCOSITY,&
-            FALLOFF_TMP(MAX_LAYERS),FALLOFF_DENSITY(MAX_LAYERS)
+            DELAMINATION_TMP(MAX_LAYERS),DELAMINATION_DENSITY(MAX_LAYERS)
 INTEGER :: NPPC,N,IOS,NL,NN,NNN,NNNN,N_LIST,LEAK_PATH(2),DUCT_PATH(2),RGB(3),NR,IL
 INTEGER ::  N_LAYER_CELLS_MAX(MAX_LAYERS),VEG_LSET_FUEL_INDEX,INDEX_LIST(MAX_MATERIALS**2)
 INTEGER :: CHILD_LAYER(MAX_LAYERS,N_MATL),CHILD_SURF(N_MATL)
@@ -7829,7 +7829,7 @@ SUBROUTINE READ_SURF(QUICK_READ)
                 DSC_CONVERSION_FACTOR,DT_INSERT,E_COEFFICIENT,&
                 EMBER_GENERATION_HEIGHT,EMBER_IGNITION_POWER_MEAN,EMBER_IGNITION_POWER_SIGMA,EMBER_TRACKING_RATIO,EMBER_YIELD,&
                 EMISSIVITY,EMISSIVITY_BACK,EXTERNAL_FLUX,EXTINCTION_TEMPERATURE,&
-                FALLOFF_DENSITY,FALLOFF_TMP,&
+                DELAMINATION_DENSITY,DELAMINATION_TMP,&
                 FREE_SLIP,INERT_Q_REF,FYI,GEOMETRY,HEAT_OF_VAPORIZATION,&
                 HEAT_TRANSFER_COEFFICIENT,HEAT_TRANSFER_COEFFICIENT_BACK,HEAT_TRANSFER_COEFFICIENT_SIGMA,&
                 HEAT_TRANSFER_MODEL,HORIZONTAL,HRRPUA,VARIABLE_THICKNESS,HT3D,ID,IGNITION_TEMPERATURE,&
@@ -8765,11 +8765,11 @@ SUBROUTINE READ_SURF(QUICK_READ)
 
    ! Set delamination temperature and/or density
 
-   SF%FALLOFF_TMP = HUGE_EB
-   SF%FALLOFF_DENSITY = -1._EB
+   SF%DELAMINATION_TMP = HUGE_EB
+   SF%DELAMINATION_DENSITY = -1._EB
    DO NL = 1,MAX_LAYERS
-      IF (FALLOFF_TMP(NL) > 0._EB) SF%FALLOFF_TMP(NL) = FALLOFF_TMP(NL) + TMPM
-      IF (FALLOFF_DENSITY(NL) > 0._EB) SF%FALLOFF_DENSITY(NL) = FALLOFF_DENSITY(NL)
+      IF (DELAMINATION_TMP(NL) > 0._EB) SF%DELAMINATION_TMP(NL) = DELAMINATION_TMP(NL) + TMPM
+      IF (DELAMINATION_DENSITY(NL) > 0._EB) SF%DELAMINATION_DENSITY(NL) = DELAMINATION_DENSITY(NL)
    ENDDO
 
 
@@ -8973,8 +8973,8 @@ SUBROUTINE SET_SURF_DEFAULTS
 EXTERNAL_FLUX           = 0._EB
 EXTINCTION_TEMPERATURE  = -273._EB
 INERT_Q_REF             = .FALSE.
-FALLOFF_TMP             = -1._EB
-FALLOFF_DENSITY         = -1._EB
+DELAMINATION_TMP        = -1._EB
+DELAMINATION_DENSITY    = -1._EB
 FREE_SLIP               = .FALSE.
 FYI                     = 'null'
 GEOMETRY                = 'CARTESIAN'

Source/type.f90

@@ -965,7 +965,7 @@ MODULE TYPES
    REAL(EB), ALLOCATABLE, DIMENSION(:) :: STRETCH_FACTOR
    REAL(EB), DIMENSION(MAX_LAYERS) :: LAYER_DENSITY,&
         MOISTURE_CONTENT,SURFACE_VOLUME_RATIO,PACKING_RATIO,KAPPA_S=-1._EB,RENODE_DELTA_T
-   REAL(EB), DIMENSION(MAX_LAYERS) :: FALLOFF_TMP,FALLOFF_DENSITY !< Temp. and density criteria for layer fall-off (delam.)
+   REAL(EB), DIMENSION(MAX_LAYERS) :: DELAMINATION_TMP,DELAMINATION_DENSITY !< Temp. and density criteria for layer delam.
    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

Source/wall.f90

@@ -2425,8 +2425,8 @@ SUBROUTINE SOLID_HEAT_TRANSFER(NM,T,DT_BC,PARTICLE_INDEX,WALL_INDEX,CFACE_INDEX,
       I = 0
       DO NL=1,ONE_D%N_LAYERS
          IF (ONE_D%LAYER_THICKNESS(NL).GT.ONE_D%MIN_LAYER_THICKNESS(NL) .AND. &
-              (ONE_D%TMP(I+ONE_D%N_LAYER_CELLS(NL)) > SF%FALLOFF_TMP(NL)) .OR.&
-              (    RHO_S(I+ONE_D%N_LAYER_CELLS(NL)) < SF%FALLOFF_DENSITY(NL))) THEN
+              (ONE_D%TMP(I+ONE_D%N_LAYER_CELLS(NL)) > SF%DELAMINATION_TMP(NL)) .OR.&
+              (    RHO_S(I+ONE_D%N_LAYER_CELLS(NL)) < SF%DELAMINATION_DENSITY(NL))) THEN
             REGRID_FACTOR(1:I+ONE_D%N_LAYER_CELLS(NL))=0._EB
             ONE_D%RHO_C_S(1:I+ONE_D%N_LAYER_CELLS(NL))=0._EB
             Q_S(1:I+ONE_D%N_LAYER_CELLS(NL))=0._EB