diff --git a/Manuals/FDS_User_Guide/FDS_User_Guide.tex b/Manuals/FDS_User_Guide/FDS_User_Guide.tex index 1b00dfbae8b..2a2c4424854 100644 --- a/Manuals/FDS_User_Guide/FDS_User_Guide.tex +++ b/Manuals/FDS_User_Guide/FDS_User_Guide.tex @@ -2416,14 +2416,14 @@ \subsection{1-D Heat Conduction in Solids of Varying Thickness} Solid boundaries usually have one or more layers of a known thickness, in which case you specify the layer thicknesses and material composition on the {\ct SURF} line. However, there may be solids of more complicated geometry for which the various layers may have varying thicknesses. In such cases, you do not specify a {\ct THICKNESS} or a {\ct MATL\_ID} on the {\ct SURF} line. Instead, you specify {\ct MATL\_ID} on the obstructions ({\ct OBST}s) that make up the solid. Multiple obstructions can be used to create multiple layers, and each layer can be assigned one or more material components via {\ct MATL\_ID(:)} and {\ct MATL\_MASS\_FRACTION(:)}. Unlike the way these parameters are specified on a {\ct SURF} line, the single index represents a material component, not a layer. As an example, consider these input lines: \begin{lstlisting} -&SURF ID='SKIN', COLOR='BLACK', HT1D=T / +&SURF ID='SKIN', COLOR='BLACK', VARIABLE_THICKNESS=T / &OBST XB=0.2,0.8,0.2,0.8,0.2,0.8, SURF_ID='SKIN', MATL_ID='Steel','Aluminum', MATL_MASS_FRACTION=0.8,0.2 / &HOLE XB=0.3,0.7,0.3,0.7,0.3,0.7 / &OBST XB=0.3,0.7,0.3,0.7,0.3,0.7, PERMIT_HOLE=F, MATL_ID='Aluminum', MATL_MASS_FRACTION=1. / \end{lstlisting} -The {\ct SURF} line serves only to color the surface black and to indicate, via the parameter {\ct HT1D}, that the layer thicknesses and material composition are to be conveyed via the {\ct OBST}s that make up the solid. In this case, the solid is a 0.6~m cube made up of steel and aluminum with a hollowed out core made up of pure aluminum. The material properties are conveyed via {\ct MATL} lines as described above. +The {\ct SURF} line serves only to color the surface black and to indicate, via the parameter {\ct VARIABLE\_THICKNESS}, that the layer thicknesses and material composition are to be conveyed via the {\ct OBST}s that make up the solid. In this case, the solid is a 0.6~m cube made up of steel and aluminum with a hollowed out core made up of pure aluminum. The material properties are conveyed via {\ct MATL} lines as described above. @@ -12789,7 +12789,6 @@ \section{\texorpdfstring{{\tt SURF}}{SURF} (Surface Properties)} {\ct HEAT\_TRANSFER\_MODEL} & Character & Section~\ref{info:convection} & & \\ \hline {\ct HORIZONTAL} & Logical & Section~\ref{info:GEOMETRY} & & {\ct F} \\ \hline {\ct HRRPUA} & Real & Section~\ref{info:gas_burner} & \si{kW/m^2} & \\ \hline -{\ct HT1D} & Logical & Section~\ref{info:ht1d} & & {\ct F} \\ \hline {\ct HT3D} & Logical & Section~\ref{info:ht3d} & & {\ct F} \\ \hline {\ct ID} & Character & Section~\ref{info:SURF} & & \\ \hline {\ct IGNITION\_TEMPERATURE} & Real & Section~\ref{info:specified_burning} & $^\circ$C & 5000. \\ \hline @@ -12877,6 +12876,7 @@ \section{\texorpdfstring{{\tt SURF}}{SURF} (Surface Properties)} {\ct TMP\_GAS\_BACK} & Real & Section~\ref{info:BACKING} & $^\circ$C & \\ \hline {\ct TMP\_INNER} & Real & Section~\ref{info:TMP_INNER} & $^\circ$C & 20. \\ \hline {\ct TRANSPARENCY} & Real & Section~\ref{info:colors} & & 1. \\ \hline +{\ct VARIABLE\_THICKNESS} & Logical & Section~\ref{info:ht1d} & & {\ct F} \\ \hline {\ct VEG\_LSET\_BETA} & Real & Section~\ref{info:level_set} & & 0. \\ \hline {\ct VEG\_LSET\_CHAR\_FRACTION} & Real & Section~\ref{info:level_set} & & 0.2 \\ \hline {\ct VEG\_LSET\_FIREBASE\_TIME} & Real & Section~\ref{info:level_set} & s & \\ \hline diff --git a/Source/dump.f90 b/Source/dump.f90 index 972c86f31be..d7742874468 100644 --- a/Source/dump.f90 +++ b/Source/dump.f90 @@ -2974,7 +2974,7 @@ SUBROUTINE INITIALIZE_DIAGNOSTIC_FILE(DT) CYCLE SURFLOOP ENDIF - THICK: IF (SF%THERMAL_BC_INDEX==THERMALLY_THICK .AND. .NOT.SF%HT1D .AND. .NOT. SF%HT_DIM>1) THEN + THICK: IF (SF%THERMAL_BC_INDEX==THERMALLY_THICK .AND. .NOT.SF%VARIABLE_THICKNESS .AND. .NOT. SF%HT_DIM>1) THEN WRITE(LU_OUTPUT,'(A)') ' Material List' DO NN=1,SF%N_MATL WRITE(LU_OUTPUT,'(8X,I3,2X,A)') NN,TRIM(SF%MATL_NAME(NN)) @@ -3003,7 +3003,7 @@ SUBROUTINE INITIALIZE_DIAGNOSTIC_FILE(DT) ENDIF IF (SF%GEOMETRY==SURF_CYLINDRICAL) WRITE(LU_OUTPUT,'(A)') ' Assumed cylindrical symmetry' IF (SF%GEOMETRY==SURF_SPHERICAL) WRITE(LU_OUTPUT,'(A)') ' Assumed spherical symmetry' - ELSEIF (SF%THERMAL_BC_INDEX==THERMALLY_THICK .AND. (SF%HT1D .OR. SF%HT_DIM>1)) THEN + ELSEIF (SF%THERMAL_BC_INDEX==THERMALLY_THICK .AND. (SF%VARIABLE_THICKNESS .OR. SF%HT_DIM>1)) THEN WRITE(LU_OUTPUT,'(A)') ' Internal noding and material information taken from underlying obstructions' ENDIF THICK @@ -9865,7 +9865,7 @@ SUBROUTINE DUMP_PROF(T,NM) ENDIF SF => SURFACE(SURF_INDEX) - IF (SF%PYROLYSIS_MODEL==PYROLYSIS_PREDICTED .OR. SF%HT_DIM>1 .OR. SF%HT1D) THEN + IF (SF%PYROLYSIS_MODEL==PYROLYSIS_PREDICTED .OR. SF%HT_DIM>1 .OR. SF%VARIABLE_THICKNESS) THEN NWP = SUM(ONE_D%N_LAYER_CELLS) IF (NWP==0) CYCLE PROF_LOOP X_S_NEW(0:NWP) = ONE_D%X(0:NWP) diff --git a/Source/init.f90 b/Source/init.f90 index 2ee8c473505..d041493add1 100644 --- a/Source/init.f90 +++ b/Source/init.f90 @@ -1569,7 +1569,7 @@ END SUBROUTINE INITIALIZE_INTERPOLATION END SUBROUTINE INITIALIZE_MESH_VARIABLES_2 -!> \brief Find WALL THIN_WALL cells with HT1D or HT3D and adjust the 1-D internal noding +!> \brief Find WALL THIN_WALL cells with VARIABLE_THICKNESS or HT3D and adjust the 1-D internal noding !> \param NM Mesh index SUBROUTINE ADJUST_HT3D_WALL_CELLS(NM) @@ -1591,7 +1591,7 @@ SUBROUTINE ADJUST_HT3D_WALL_CELLS(NM) END SUBROUTINE ADJUST_HT3D_WALL_CELLS -!> \brief For a given WALL or THIN_WALL with HT1D or HT3D, adjust the 1-D internal noding +!> \brief For a given WALL or THIN_WALL with VARIABLE_THICKNESS or HT3D, adjust the 1-D internal noding !> \param NM Mesh index !> \param WALL_CELL Optional WALL cell index !> \param THIN_WALL_CELL Optional THIN_WALL cell index @@ -1624,7 +1624,7 @@ SUBROUTINE REALLOCATE_ONE_D_ARRAYS(NM,WALL_CELL,THIN_WALL_CELL) IF (PRESENT(WALL_CELL)) THEN WC => M%WALL(WALL_CELL) SF => SURFACE(WC%SURF_INDEX) - IF (.NOT.SF%HT1D .AND. .NOT.SF%HT_DIM>1) RETURN + IF (.NOT.SF%VARIABLE_THICKNESS .AND. .NOT.SF%HT_DIM>1) RETURN IF (WC%BOUNDARY_TYPE/=SOLID_BOUNDARY) RETURN IF (SF%NORMAL_DIRECTION_ONLY) RETURN ONE_D => M%BOUNDARY_ONE_D(WC%OD_INDEX) @@ -3709,7 +3709,7 @@ SUBROUTINE FIND_WALL_BACK_INDEX(NM,IW) ITER = 0 OBST_INDEX = 0 THICKNESS = 0._EB -IF (SF%HT1D .OR. SF%HT_DIM>1) THEN +IF (SF%VARIABLE_THICKNESS .OR. SF%HT_DIM>1) THEN N_LAYERS = 1 LAYER_THICKNESS = 0._EB MATL_MASS_FRACTION = 0._EB @@ -3733,7 +3733,8 @@ SUBROUTINE FIND_WALL_BACK_INDEX(NM,IW) IF (NOM>0) THEN IF (.NOT.PROCESS_MESH_NEIGHBORHOOD(NOM)) RETURN ! If NOM not controlled by current MPI process, abandon search OM => MESHES(NOM) - ELSEIF (IW<=M%N_EXTERNAL_WALL_CELLS .AND. (SF%HT_DIM>1.OR.SF%HT1D)) THEN ! Do not apply HT3D or HT1D to exterior boundary + ELSEIF (IW<=M%N_EXTERNAL_WALL_CELLS .AND. (SF%HT_DIM>1.OR.SF%VARIABLE_THICKNESS)) THEN + ! Do not apply HT3D to VARIABLE_THICKNESS exterior boundary MESSAGE = 'ERROR: SURF '//TRIM(SURFACE(WC%SURF_INDEX)%ID)//' cannot be applied to an exterior boundary' CALL SHUTDOWN(MESSAGE,PROCESS_0_ONLY=.FALSE.) RETURN @@ -3752,9 +3753,9 @@ SUBROUTINE FIND_WALL_BACK_INDEX(NM,IW) IC = OM%CELL_INDEX(II,JJ,KK) - ! For HT1D and HT3D cases, get material information from obstruction + ! For VARIABLE_THICKNESS and HT3D cases, get material information from obstruction - IF (SF%HT1D .OR. SF%HT_DIM>1) THEN + IF (SF%VARIABLE_THICKNESS .OR. SF%HT_DIM>1) THEN OBST_INDEX_PREVIOUS = OBST_INDEX OBST_INDEX = OM%CELL(IC)%OBST_INDEX @@ -3823,7 +3824,7 @@ SUBROUTINE FIND_WALL_BACK_INDEX(NM,IW) ! If 1-D solid and the user-specified thickness is less than the current thickness, abandon the search for back-wall cell - IF (.NOT.SF%HT1D .AND. SF%HT_DIM==1 .AND. THICKNESS>SUM(SF%LAYER_THICKNESS)) RETURN + IF (.NOT.SF%VARIABLE_THICKNESS .AND. SF%HT_DIM==1 .AND. THICKNESS>SUM(SF%LAYER_THICKNESS)) RETURN SELECT CASE(IOR) ! New cell indices as we march deeper into the obstruction CASE(-1) ; II=II+1 @@ -3836,7 +3837,7 @@ SUBROUTINE FIND_WALL_BACK_INDEX(NM,IW) ENDDO FIND_BACK_WALL_CELL -! If the user has specified LINING materials (HT3D or HT1D with SURF MATLs and THICKNESS), add this information to +! If the user has specified LINING materials (HT3D or VARIABLE_THICKNESS with SURF MATLs and THICKNESS), add this information to ! existing lists of layers and materials. ! The new arrays of thickness and material information are temporarily stored in arrays with _NEW suffix. @@ -3894,9 +3895,9 @@ SUBROUTINE FIND_WALL_BACK_INDEX(NM,IW) MATL_INDEX(1:N_MATLS) = MATL_INDEX_NEW(1:N_MATLS_NEW) ENDIF -! If HT1D or HT3D, reallocate ONE_D arrays holding layer and material info +! If VARIABLE_THICKNESS or HT3D, reallocate ONE_D arrays holding layer and material info -IF (SF%HT1D .OR. SF%HT_DIM>1) THEN +IF (SF%VARIABLE_THICKNESS .OR. SF%HT_DIM>1) THEN ONE_D%N_LAYERS = N_LAYERS ONE_D%N_MATL = N_MATLS DEALLOCATE(ONE_D%MATL_COMP) ; ALLOCATE(ONE_D%MATL_COMP(ONE_D%N_MATL)) diff --git a/Source/read.f90 b/Source/read.f90 index 8a2753cd16d..59e9ab95c7f 100644 --- a/Source/read.f90 +++ b/Source/read.f90 @@ -7088,7 +7088,7 @@ SUBROUTINE READ_SURF VEG_LSET_M1,VEG_LSET_M10,VEG_LSET_M100,VEG_LSET_MLW,VEG_LSET_MLH,VEG_LSET_SURF_LOAD,VEG_LSET_FIREBASE_TIME,& VEG_LSET_CHAR_FRACTION,VEL_PART,INIT_PER_AREA LOGICAL :: DEFAULT,VEG_LSET_SPREAD,VEG_LSET_TAN2,TGA_ANALYSIS,COMPUTE_EMISSIVITY,& - COMPUTE_EMISSIVITY_BACK,HT1D,HT3D,THERM_THICK,NORMAL_DIRECTION_ONLY + COMPUTE_EMISSIVITY_BACK,VARIABLE_THICKNESS,HT3D,THERM_THICK,NORMAL_DIRECTION_ONLY,HT1D ! Ember generating variables REAL(EB) :: EMBER_GENERATION_HEIGHT(2),EMBER_POWER_MEAN,EMBER_POWER_SIGMA @@ -7098,7 +7098,7 @@ SUBROUTINE READ_SURF DT_INSERT,E_COEFFICIENT,EMBER_GENERATION_HEIGHT,EMBER_POWER_MEAN,EMBER_POWER_SIGMA,& EMISSIVITY,EMISSIVITY_BACK,EXTERNAL_FLUX,EXTINCTION_TEMPERATURE,& FREE_SLIP,FYI,GEOMETRY,HEAT_OF_VAPORIZATION,HEAT_TRANSFER_COEFFICIENT,HEAT_TRANSFER_COEFFICIENT_BACK,& - HEAT_TRANSFER_MODEL,HORIZONTAL,HRRPUA,HT1D,HT3D,ID,IGNITION_TEMPERATURE,& + HEAT_TRANSFER_MODEL,HORIZONTAL,HRRPUA,VARIABLE_THICKNESS,HT3D,ID,IGNITION_TEMPERATURE,& INIT_IDS,INIT_PER_AREA,& INNER_RADIUS,INTERNAL_HEAT_SOURCE,LAYER_DIVIDE,& LEAK_PATH,LEAK_PATH_ID,LENGTH,MASS_FLUX,MASS_FLUX_TOTAL,MASS_FLUX_VAR,MASS_FRACTION,& @@ -7120,7 +7120,8 @@ SUBROUTINE READ_SURF VEG_LSET_M1,VEG_LSET_M10,VEG_LSET_M100,VEG_LSET_MLW,VEG_LSET_MLH,VEG_LSET_QCON,& VEG_LSET_ROS_00,VEG_LSET_ROS_BACK,VEG_LSET_ROS_FLANK,VEG_LSET_ROS_HEAD,VEG_LSET_SIGMA,& VEG_LSET_SURF_LOAD,VEG_LSET_TAN2,VEG_LSET_WIND_EXP,& - VEL,VEL_BULK,VEL_GRAD,VEL_PART,VEL_T,VOLUME_FLOW,WIDTH,XYZ,Z0,Z_0 + VEL,VEL_BULK,VEL_GRAD,VEL_PART,VEL_T,VOLUME_FLOW,WIDTH,XYZ,Z0,Z_0,& + HT1D ! Backward compatibility ! Count the SURF lines in the input file @@ -7228,11 +7229,12 @@ SUBROUTINE READ_SURF SURF_DEFAULT = TRIM(ID) ENDIF - ! Set up a dummy surface for HT1D and HT3D. The properties will be changed later. + ! Set up a dummy surface for VARIABLE_THICKNESS and HT3D. The properties will be changed later. - If ((HT1D .OR. HT3D) .AND. THICKNESS(1)>TWO_EPSILON_EB .AND. MATL_ID(1,1)/='null') SF%LINING = .TRUE. - If ((HT1D .OR. HT3D) .AND. THICKNESS(1)TWO_EPSILON_EB .AND. MATL_ID(1,1)/='null') SF%LINING = .TRUE. + If ((VARIABLE_THICKNESS .OR. HT3D) .AND. THICKNESS(1)TWO_EPSILON_EB .AND. THICKNESS(NL)<0._EB .AND. .NOT.HT3D .AND. .NOT.HT1D) THEN + IF (SURFACE_VOLUME_RATIO(NL)>TWO_EPSILON_EB .AND. THICKNESS(NL)<0._EB .AND. .NOT.HT3D .AND. .NOT.VARIABLE_THICKNESS) THEN SELECT CASE(GEOMETRY) CASE('CARTESIAN') ; THICKNESS(NL) = 1._EB/SURFACE_VOLUME_RATIO(NL) CASE('CYLINDRICAL') ; THICKNESS(NL) = 2._EB/SURFACE_VOLUME_RATIO(NL) @@ -7434,14 +7436,14 @@ SUBROUTINE READ_SURF ! Check SURF parameters for potential problems LAYER_LOOP: DO IL=1,MAX_LAYERS - IF (TMP_FRONT>-TMPM .AND. (MATL_ID(IL,1)/='null' .OR. HT1D .OR. HT3D)) DIRICHLET_FRONT = .TRUE. - IF (TMP_BACK >-TMPM .AND. (MATL_ID(IL,1)/='null' .OR. HT1D .OR. HT3D)) DIRICHLET_BACK = .TRUE. + IF (TMP_FRONT>-TMPM .AND. (MATL_ID(IL,1)/='null' .OR. VARIABLE_THICKNESS .OR. HT3D)) DIRICHLET_FRONT = .TRUE. + IF (TMP_BACK >-TMPM .AND. (MATL_ID(IL,1)/='null' .OR. VARIABLE_THICKNESS .OR. HT3D)) DIRICHLET_BACK = .TRUE. IF ((ADIABATIC.OR.NET_HEAT_FLUX<1.E12_EB.OR.ABS(CONVECTIVE_HEAT_FLUX)>TWO_EPSILON_EB) & .AND. MATL_ID(IL,1)/='null') THEN WRITE(MESSAGE,'(A)') 'ERROR: SURF '//TRIM(SF%ID)//' cannot have a specified flux and a MATL_ID' CALL SHUTDOWN(MESSAGE) ; RETURN ENDIF - IF (THICKNESS(IL)<=0._EB .AND. .NOT.HT1D .AND. .NOT.HT3D .AND. MATL_ID(IL,1)/='null') THEN + IF (THICKNESS(IL)<=0._EB .AND. .NOT.VARIABLE_THICKNESS .AND. .NOT.HT3D .AND. MATL_ID(IL,1)/='null') THEN WRITE(MESSAGE,'(A,I0)') 'ERROR: SURF '//TRIM(SF%ID)// ' must have a specified THICKNESS for Layer ',IL CALL SHUTDOWN(MESSAGE) ; RETURN ENDIF @@ -7463,7 +7465,7 @@ SUBROUTINE READ_SURF ! Pack SURF parameters into the SURFACE derived type SF => SURFACE(N) - SF%HT1D = HT1D + SF%VARIABLE_THICKNESS = VARIABLE_THICKNESS SF%ADIABATIC = ADIABATIC SF%AREA_MULTIPLIER = AREA_MULTIPLIER SELECT CASE(BACKING) @@ -8187,6 +8189,7 @@ SUBROUTINE SET_SURF_DEFAULTS TEXTURE_HEIGHT = 1._EB TGA_ANALYSIS = .FALSE. THICKNESS = -1._EB +VARIABLE_THICKNESS = .FALSE. HT1D = .FALSE. HT3D = .FALSE. NORMAL_DIRECTION_ONLY = .FALSE. diff --git a/Source/type.f90 b/Source/type.f90 index 6a58df09474..04bc0112e3c 100644 --- a/Source/type.f90 +++ b/Source/type.f90 @@ -868,7 +868,7 @@ MODULE TYPES SPECIFIED_NORMAL_GRADIENT=.FALSE.,CONVERT_VOLUME_TO_MASS=.FALSE.,SPECIFIED_HEAT_SOURCE=.FALSE.,& BOUNDARY_FUEL_MODEL=.FALSE.,SET_H=.FALSE.,DIRICHLET_FRONT=.FALSE.,DIRICHLET_BACK=.FALSE.,BLOWING=.FALSE. INTEGER :: HT_DIM=1 !< Heat Transfer Dimension - LOGICAL :: HT1D=.FALSE. + LOGICAL :: VARIABLE_THICKNESS=.FALSE. !< Allow the surface to have varying thickness LOGICAL :: LINING=.FALSE. !< Indicator that the properties refer to a wall lining, not entire wall LOGICAL :: NORMAL_DIRECTION_ONLY=.FALSE. !< Heat Transfer in normal direction only, even if the solid is HT3D LOGICAL :: INCLUDE_BOUNDARY_COORD_TYPE=.TRUE. !< This surface requires basic coordinate information diff --git a/Source/wall.f90 b/Source/wall.f90 index 5fe1d1e5d2b..f24f9677a56 100644 --- a/Source/wall.f90 +++ b/Source/wall.f90 @@ -1848,7 +1848,7 @@ SUBROUTINE SOLID_HEAT_TRANSFER_1D(NM,T,DT_BC,PARTICLE_INDEX,WALL_INDEX,CFACE_IND LAYER_DIVIDE = SF%LAYER_DIVIDE -COMPUTE_GRID: IF (SF%PYROLYSIS_MODEL==PYROLYSIS_PREDICTED .OR. SF%HT_DIM>1 .OR. SF%HT1D) THEN +COMPUTE_GRID: IF (SF%PYROLYSIS_MODEL==PYROLYSIS_PREDICTED .OR. SF%HT_DIM>1 .OR. SF%VARIABLE_THICKNESS) THEN NWP = SUM(ONE_D%N_LAYER_CELLS(1:ONE_D%N_LAYERS)) CALL GET_WALL_NODE_WEIGHTS(NWP,ONE_D%N_LAYERS,ONE_D%N_LAYER_CELLS(1:ONE_D%N_LAYERS),ONE_D%LAYER_THICKNESS,SF%GEOMETRY, & ONE_D%X(0:NWP),LAYER_DIVIDE,DX_S(1:NWP),RDX_S(0:NWP+1),RDXN_S(0:NWP),DX_WGT_S(0:NWP),DXF,DXB,& diff --git a/Verification/Fires/box_burn_away1.fds b/Verification/Fires/box_burn_away1.fds index d5d7b8b9a2c..bc3e6987961 100644 --- a/Verification/Fires/box_burn_away1.fds +++ b/Verification/Fires/box_burn_away1.fds @@ -24,7 +24,7 @@ computed by the first DEVC. &SURF ID = 'FOAM SLAB' COLOR = 'TOMATO 3' MATL_ID = 'FOAM' - HT1D = T + VARIABLE_THICKNESS = T BURN_AWAY = T / &OBST XB=0.30,0.70,0.30,0.70,0.30,0.70, SURF_ID='FOAM SLAB', BULK_DENSITY=20. / diff --git a/Verification/Fires/box_burn_away2.fds b/Verification/Fires/box_burn_away2.fds index eb8d63a4877..509c10dd295 100644 --- a/Verification/Fires/box_burn_away2.fds +++ b/Verification/Fires/box_burn_away2.fds @@ -26,7 +26,7 @@ The gas species here is additional SPEC. &SURF ID = 'FOAM SLAB' COLOR = 'TOMATO 3' MATL_ID = 'FOAM' - HT1D = T + VARIABLE_THICKNESS = T BURN_AWAY = T / &DUMP SMOKE3D = .FALSE. diff --git a/Verification/Fires/box_burn_away3.fds b/Verification/Fires/box_burn_away3.fds index 3997c7780e7..c56cecee66c 100644 --- a/Verification/Fires/box_burn_away3.fds +++ b/Verification/Fires/box_burn_away3.fds @@ -21,7 +21,7 @@ The gas species here is mixture fraction fuel, burning rate specified. &SURF ID = 'FOAM SLAB' COLOR = 'TOMATO 3' MATL_ID = 'FOAM' - HT1D = T + VARIABLE_THICKNESS = T BURN_AWAY = T HRRPUA = 4000. / diff --git a/Verification/Fires/box_burn_away4.fds b/Verification/Fires/box_burn_away4.fds index 74069f7d425..699fc02ba33 100644 --- a/Verification/Fires/box_burn_away4.fds +++ b/Verification/Fires/box_burn_away4.fds @@ -23,7 +23,7 @@ The gas species here is mixture fraction fuel, burning rate specified. &SURF ID = 'FOAM SLAB' COLOR = 'TOMATO 3' MATL_ID = 'FOAM' - HT1D = T + VARIABLE_THICKNESS = T BURN_AWAY = T HRRPUA = 2200. / diff --git a/Verification/Fires/box_burn_away5.fds b/Verification/Fires/box_burn_away5.fds index 5c3802c901d..d3fd402014f 100644 --- a/Verification/Fires/box_burn_away5.fds +++ b/Verification/Fires/box_burn_away5.fds @@ -27,7 +27,7 @@ The gas species is mixture fraction fuel. &SURF ID = 'FOAM SLAB' COLOR = 'TOMATO 3' MATL_ID = 'FOAM' - HT1D = T + VARIABLE_THICKNESS = T BURN_AWAY = T / &REAC FUEL='METHANE', AUTO_IGNITION_TEMPERATURE=15000. ,N_SIMPLE_CHEMISTRY_REACTIONS=2/ diff --git a/Verification/Fires/box_burn_away6.fds b/Verification/Fires/box_burn_away6.fds index 4a2dad9f42a..81461682321 100644 --- a/Verification/Fires/box_burn_away6.fds +++ b/Verification/Fires/box_burn_away6.fds @@ -27,7 +27,7 @@ The gas species is mixture fraction fuel. &SURF ID = 'FOAM SLAB' COLOR = 'TOMATO 3' MATL_ID = 'FOAM' - HT1D = T + VARIABLE_THICKNESS = T BURN_AWAY = T / &SPEC ID='NITROGEN',BACKGROUND=.TRUE./ diff --git a/Verification/Fires/box_burn_away8.fds b/Verification/Fires/box_burn_away8.fds index 48a9063f110..8bc98a4f7c9 100644 --- a/Verification/Fires/box_burn_away8.fds +++ b/Verification/Fires/box_burn_away8.fds @@ -23,7 +23,7 @@ The gas species here is mixture fraction fuel, burning rate specified. &SURF ID = 'FOAM SLAB' COLOR = 'TOMATO 3' MATL_ID = 'FOAM' - HT1D = T + VARIABLE_THICKNESS = T BURN_AWAY = T MLRPUA = 0.0733333 / diff --git a/Verification/Fires/box_burn_away_2D.fds b/Verification/Fires/box_burn_away_2D.fds index a962a60343a..20e9cf71089 100644 --- a/Verification/Fires/box_burn_away_2D.fds +++ b/Verification/Fires/box_burn_away_2D.fds @@ -28,7 +28,7 @@ The gas species is mixture fraction fuel. &SURF ID = 'FOAM SLAB' COLOR = 'TOMATO 3' MATL_ID = 'FOAM' - HT1D = T + VARIABLE_THICKNESS = T BURN_AWAY = T / &REAC FUEL='METHANE',AUTO_IGNITION_TEMPERATURE=15000. / diff --git a/Verification/Fires/box_burn_away_2D_residue.fds b/Verification/Fires/box_burn_away_2D_residue.fds index 9b7b02d3b5f..00ab52c870b 100644 --- a/Verification/Fires/box_burn_away_2D_residue.fds +++ b/Verification/Fires/box_burn_away_2D_residue.fds @@ -37,7 +37,7 @@ The gas species is mixture fraction fuel. &SURF ID = 'FOAM SLAB' COLOR = 'TOMATO 3' MATL_ID = 'FOAM' - HT1D = T + VARIABLE_THICKNESS = T STRETCH_FACTOR = 1.0 BURN_AWAY = T / diff --git a/Verification/Fires/couch3d.fds b/Verification/Fires/couch3d.fds index 5255d0effe1..7df4e89cd39 100644 --- a/Verification/Fires/couch3d.fds +++ b/Verification/Fires/couch3d.fds @@ -49,7 +49,7 @@ The case is meant as a teaching tool and to test functionality. &SURF ID = 'UPHOLSTERY' FYI = 'Properties completely fabricated' COLOR = 'PURPLE' - HT1D = T + VARIABLE_THICKNESS = T BURN_AWAY = T MATL_ID = 'FABRIC' THICKNESS = 0.002 / diff --git a/Verification/Heat_Transfer/ht1d_pile.fds b/Verification/Heat_Transfer/ht1d_pile.fds index efc7b0bff58..da13031d274 100644 --- a/Verification/Heat_Transfer/ht1d_pile.fds +++ b/Verification/Heat_Transfer/ht1d_pile.fds @@ -9,8 +9,8 @@ &RADI RADIATION=F / -&SURF ID='HOT', TMP_FRONT=500, RAMP_T='temp', TMP_BACK=20., RAMP_TMP_BACK='temp', COLOR='RED', HT1D=T / -&SURF ID='COLD', TMP_FRONT= 20, RAMP_T='temp', TMP_BACK=500., RAMP_TMP_BACK='temp', COLOR='BLUE', HT1D=T / +&SURF ID='HOT', TMP_FRONT=500, RAMP_T='temp', TMP_BACK=20., RAMP_TMP_BACK='temp', COLOR='RED', VARIABLE_THICKNESS=T / +&SURF ID='COLD', TMP_FRONT= 20, RAMP_T='temp', TMP_BACK=500., RAMP_TMP_BACK='temp', COLOR='BLUE', VARIABLE_THICKNESS=T / &RAMP ID='temp', T=0, F=1 / &RAMP ID='temp', T=1, F=1 /