Skip to content

Commit

Permalink
Merge pull request firemodels#12361 from shostikk/master
Browse files Browse the repository at this point in the history 
Optimize Aalto Woods inputs and fix BST_FRS dataplot for cat-naming
  • Loading branch information
@shostikk
shostikk authored Jan 11, 2024
2 parents d36f92f + 4c69cb8 commit 660a1ad
Show file tree
Hide file tree
Showing 23 changed files with 291 additions and 349 deletions.
36 changes: 18 additions & 18 deletions Utilities/Matlab/FDS_validation_dataplot_inputs.csv
View file

Large diffs are not rendered by default.

59 changes: 24 additions & 35 deletions Validation/Aalto_Woods/FDS_Input_Files/Roomcorner_M12.fds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,32 @@
&TIME T_END=240.0 /

&SURF ID = 'woodenwalls',
COLOR='SANDY BROWN'
STRETCH_FACTOR(1) = 1
STRETCH_FACTOR(2) = 1.5
DELTA_TMP_MAX = 100.
SUBSTEP_POWER = 3
N_LAYER_CELLS_MAX(1) = 625
N_LAYER_CELLS_MAX(2) = 50
CELL_SIZE_FACTOR = 0.2,
THICKNESS = 0.01,0.2
MINIMUM_LAYER_THICKNESS = 1E-10
BACKING='EXPOSED',
MATL_ID(1,:)='water','wood',
MATL_ID(2,1)='concrete',
MATL_MASS_FRACTION(1,:) = 0.09, 0.91 /
COLOR='SANDY BROWN'
THICKNESS(1:2) = 0.01,0.20
STRETCH_FACTOR(1:2) = 1.2,2.0
CELL_SIZE_FACTOR(1:2) = 0.5,1.0
DELTA_TMP_MAX = 100.
SUBSTEP_POWER = 3
N_LAYER_CELLS_MAX = 500
MINIMUM_LAYER_THICKNESS = 1E-10
BACKING='EXPOSED',
MATL_ID(1,:)='MOISTURE','SPRUCE',
MATL_ID(2,1)='CONCRETE',
MATL_MASS_FRACTION(1,:) = 0.09, 0.91 /

&VENT SURF_ID='burner'
XB = 0.0,0.2,0.0,0.2,0.0,0.0
IOR = 3/

&VENT SURF_ID='woodenwalls'
XB = 0.0,0.0,0.0,2.4,0.0,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,3.6,0.0,0.0,0.0,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,3.6,2.4,2.4,0.0,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,3.6,0.0,2.4,2.4,2.4 /
&VENT SURF_ID='concretewalls'
XB = 0.0,3.6,0.0,2.4,0.0,0.0 /
&VENT SURF_ID='OPEN'
XB = 5.3,5.3,0.0,2.4,0.0,2.4 /
&VENT SURF_ID='OPEN'
XB = 3.8,5.3,0.0,0.0,0.0,2.4 /
&VENT SURF_ID='OPEN'
XB = 3.8,5.3,2.4,2.4,0.0,2.4 /
&VENT SURF_ID='OPEN'
XB = 3.8,5.3,0.0,2.4,2.4,2.4 /
XB = 0.0,0.2,0.0,0.2,0.0,0.0
IOR = 3/

&VENT SURF_ID='woodenwalls' XB = 0.0,0.0,0.0,2.4,0.0,2.4 /
&VENT SURF_ID='woodenwalls' XB = 0.0,3.6,0.0,0.0,0.0,2.4 /
&VENT SURF_ID='woodenwalls' XB = 0.0,3.6,2.4,2.4,0.0,2.4 /
&VENT SURF_ID='woodenwalls' XB = 0.0,3.6,0.0,2.4,2.4,2.4 /
&VENT SURF_ID='concretewalls' XB = 0.0,3.6,0.0,2.4,0.0,0.0 /
&VENT SURF_ID='OPEN' XB = 5.3,5.3,0.0,2.4,0.0,2.4 /
&VENT SURF_ID='OPEN' XB = 3.8,5.3,0.0,0.0,0.0,2.4 /
&VENT SURF_ID='OPEN' XB = 3.8,5.3,2.4,2.4,0.0,2.4 /
&VENT SURF_ID='OPEN' XB = 3.8,5.3,0.0,2.4,2.4,2.4 /

&OBST XB=3.6,3.8,0,2.4,0,2.4, SURF_ID6='woodenwalls','concretewalls','INERT','INERT','INERT','INERT'/

Expand Down
100 changes: 38 additions & 62 deletions Validation/Aalto_Woods/FDS_Input_Files/Roomcorner_modified.fds
View file
Original file line number Diff line number Diff line change
@@ -1,71 +1,47 @@
&HEAD CHID='Roomcorner_modified'/
&HEAD CHID='Roomcorner_modified'/ Room corner test with only partial walls and ceiling

&TIME T_END=330.0 /

&SURF ID = 'woodenwalls',
COLOR='SANDY BROWN'
STRETCH_FACTOR(1) = 1
STRETCH_FACTOR(2) = 1.5
DELTA_TMP_MAX = 100.
SUBSTEP_POWER = 3
N_LAYER_CELLS_MAX(1) = 1375
N_LAYER_CELLS_MAX(2) = 50
CELL_SIZE_FACTOR = 0.2,
THICKNESS = 0.022,0.2
MINIMUM_LAYER_THICKNESS = 1E-10
BACKING='EXPOSED',
MATL_ID(1,:)='water','wood',
MATL_ID(2,1)='concrete',
MATL_MASS_FRACTION(1,:) = 0.09, 0.91 /
COLOR='SANDY BROWN'
THICKNESS(1:2) = 0.022,0.20
STRETCH_FACTOR(1:2) = 1.2,2.0
CELL_SIZE_FACTOR(1:2) = 0.5,1.0
DELTA_TMP_MAX = 100.
SUBSTEP_POWER = 3
N_LAYER_CELLS_MAX = 500
MINIMUM_LAYER_THICKNESS = 1E-10
BACKING='EXPOSED',
MATL_ID(1,:)='MOISTURE','SPRUCE',
MATL_ID(2,1)='CONCRETE',
MATL_MASS_FRACTION(1,:) = 0.09, 0.91 /

&VENT SURF_ID='burner'
XB = 0.0,0.2,0.0,0.2,0.0,0.0
IOR = 3/

&VENT SURF_ID='woodenwalls'
XB = 0.0,0.0,0.0,2.4,0.0,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,2.4,0.0,0.0,0.0,2.4 /
&VENT SURF_ID='concretewalls'
XB = 2.4,3.6,0.0,0.0,0.0,2.4 /
&VENT SURF_ID='concretewalls'
XB = 0.0,3.6,2.4,2.4,0.0,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,0.2,2.1,2.3,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,0.4,1.9,2.1,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,0.6,1.7,1.9,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,0.8,1.5,1.7,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,1.0,1.3,1.5,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,1.2,0.0,1.3,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 1.2,1.4,0.9,1.1,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 1.2,1.6,0.7,0.9,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 1.2,1.8,0.5,0.7,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 1.2,2.0,0.3,0.5,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 1.2,2.2,0.1,0.3,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 1.2,2.4,0.0,0.1,2.4,2.4 /
&VENT SURF_ID='concretewalls'
XB = 0.0,3.6,0.0,2.4,2.4,2.4 /
&VENT SURF_ID='concretewalls'
XB = 0.0,3.6,0.0,2.4,0.0,0.0 /
&VENT SURF_ID='OPEN'
XB = 5.3,5.3,0.0,2.4,0.0,2.4 /
&VENT SURF_ID='OPEN'
XB = 3.8,5.3,0.0,0.0,0.0,2.4 /
&VENT SURF_ID='OPEN'
XB = 3.8,5.3,2.4,2.4,0.0,2.4 /
&VENT SURF_ID='OPEN'
XB = 3.8,5.3,0.0,2.4,2.4,2.4 /
XB = 0.0,0.2,0.0,0.2,0.0,0.0
IOR = 3/

&VENT SURF_ID='woodenwalls' XB = 0.0,0.0,0.0,2.4,0.0,2.4 /
&VENT SURF_ID='woodenwalls' XB = 0.0,2.4,0.0,0.0,0.0,2.4 /
&VENT SURF_ID='concretewalls' XB = 2.4,3.6,0.0,0.0,0.0,2.4 /
&VENT SURF_ID='concretewalls' XB = 0.0,3.6,2.4,2.4,0.0,2.4 /
&VENT SURF_ID='woodenwalls' XB = 0.0,0.2,2.1,2.3,2.4,2.4 /
&VENT SURF_ID='woodenwalls' XB = 0.0,0.4,1.9,2.1,2.4,2.4 /
&VENT SURF_ID='woodenwalls' XB = 0.0,0.6,1.7,1.9,2.4,2.4 /
&VENT SURF_ID='woodenwalls' XB = 0.0,0.8,1.5,1.7,2.4,2.4 /
&VENT SURF_ID='woodenwalls' XB = 0.0,1.0,1.3,1.5,2.4,2.4 /
&VENT SURF_ID='woodenwalls' XB = 0.0,1.2,0.0,1.3,2.4,2.4 /
&VENT SURF_ID='woodenwalls' XB = 1.2,1.4,0.9,1.1,2.4,2.4 /
&VENT SURF_ID='woodenwalls' XB = 1.2,1.6,0.7,0.9,2.4,2.4 /
&VENT SURF_ID='woodenwalls' XB = 1.2,1.8,0.5,0.7,2.4,2.4 /
&VENT SURF_ID='woodenwalls' XB = 1.2,2.0,0.3,0.5,2.4,2.4 /
&VENT SURF_ID='woodenwalls' XB = 1.2,2.2,0.1,0.3,2.4,2.4 /
&VENT SURF_ID='woodenwalls' XB = 1.2,2.4,0.0,0.1,2.4,2.4 /
&VENT SURF_ID='concretewalls' XB = 0.0,3.6,0.0,2.4,2.4,2.4 /
&VENT SURF_ID='concretewalls' XB = 0.0,3.6,0.0,2.4,0.0,0.0 /
&VENT SURF_ID='OPEN' XB = 5.3,5.3,0.0,2.4,0.0,2.4 /
&VENT SURF_ID='OPEN' XB = 3.8,5.3,0.0,0.0,0.0,2.4 /
&VENT SURF_ID='OPEN' XB = 3.8,5.3,2.4,2.4,0.0,2.4 /
&VENT SURF_ID='OPEN' XB = 3.8,5.3,0.0,2.4,2.4,2.4 /

&OBST XB=3.6,3.8,0,2.4,0,2.4, SURF_ID6='concretewalls','concretewalls','INERT','INERT','INERT','INERT'/

Expand Down
2 changes: 1 addition & 1 deletion Validation/Aalto_Woods/FDS_Input_Files/common.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
&VENT MB='ZMAX', SURF_ID='OPEN' /
&VENT XB=-0.05,0.05,-0.05,0.05,0,0, SURF_ID='SAMPLE' /

&MATL ID = 'water'
&MATL ID = 'MOISTURE'
DENSITY = 1000.
CONDUCTIVITY = 0.6
EMISSIVITY = 0.9
Expand Down
66 changes: 28 additions & 38 deletions Validation/Aalto_Woods/FDS_Input_Files/common_roomcorner.txt
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,39 @@
&MESH ID='MESH1',
IJK=25,25,120,
XB = 0,0.5,0,0.5,0,2.4,
MPI_PROCESS = 0 /

&MESH ID='MESH2',
IJK=5,19,24,
XB = 0,0.5,0.5,2.4,0,2.4,
MPI_PROCESS = 0/

&MESH ID='MESH3',
IJK=48,24,24,
XB = 0.5,5.3,0,2.4,0,2.4,
MPI_PROCESS = 0 /
&MESH ID='Burner mesh' , IJK=25,25,60, XB = 0, 0.5, 0, 0.5, 0.0, 1.2, MPI_PROCESS = 0 /
&MESH ID='Above burner', IJK=25,25,60, XB = 0, 0.5, 0, 0.5, 1.2, 2.4, MPI_PROCESS = 1 /
&MESH ID='MESH2', IJK=5,19,24, XB = 0, 0.5, 0.5,2.4, 0.0, 2.4, MPI_PROCESS = 2 /
&MESH ID='MESH3', IJK=48,24,24, XB = 0.5,5.3, 0, 2.4, 0.0, 2.4, MPI_PROCESS = 3 /

&REAC ID = 'initialfire', SOOT_YIELD=0.01, FUEL='PROPANE' /

&SPEC ID='WATER VAPOR' /

&SURF ID='burner'
COLOR='FLESH'
SPEC_ID = 'PROPANE',
HRRPUA=2500./
COLOR='FLESH'
SPEC_ID = 'PROPANE',
HRRPUA=2500./

&MATL ID='concrete'
CONDUCTIVITY = 0.1
SPECIFIC_HEAT = 0.88
DENSITY = 568.2 /
&MATL ID='CONCRETE'
CONDUCTIVITY = 0.1
SPECIFIC_HEAT = 0.88
DENSITY = 568.2 /

&SURF ID = 'concretewalls'
COLOR='GRAY 80'
MATL_ID='concrete'
THICKNESS = 0.2 /

&MATL ID = 'water'
DENSITY = 1000.
CONDUCTIVITY = 0.6
EMISSIVITY = 0.9
SPECIFIC_HEAT = 4.2
N_REACTIONS = 1
A(1) = 8.37E12
E(1) = 121.0E3
N_S(1) = 1.
NU_SPEC = 1.0
SPEC_ID = 'WATER VAPOR'
HEAT_OF_REACTION = 2500./
COLOR='GRAY 80'
MATL_ID='CONCRETE'
THICKNESS = 0.2 /

&MATL ID = 'MOISTURE'
DENSITY = 1000.
CONDUCTIVITY = 0.6
EMISSIVITY = 0.9
SPECIFIC_HEAT = 4.2
N_REACTIONS = 1
A(1) = 8.37E12
E(1) = 121.0E3
N_S(1) = 1.
NU_SPEC = 1.0
SPEC_ID = 'WATER VAPOR'
HEAT_OF_REACTION = 2500./

&RAMP ID = 'char_k', T = 20, F = 0.115038 /
&RAMP ID = 'char_k', T = 900, F = 0.187198 /
Expand All @@ -67,4 +57,4 @@ THICKNESS = 0.2 /
&RAMP ID = 'char_cp', T = 500., F = 1.5820 /
&RAMP ID = 'char_cp', T = 600., F = 1.6440 /
&RAMP ID = 'char_cp', T = 700., F = 1.6982 /
&RAMP ID = 'char_cp', T = 800., F = 1.7474 /
&RAMP ID = 'char_cp', T = 800., F = 1.7474 /
6 changes: 3 additions & 3 deletions Validation/Aalto_Woods/FDS_Input_Files/pine.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

&REAC FUEL='PYROLYZATE', C=6, H=10, O=5, SOOT_YIELD=0.01, HEAT_OF_COMBUSTION = 13850. /

&MATL ID = 'wood'
&MATL ID = 'PINE'
EMISSIVITY = 0.9
DENSITY = 493.
CONDUCTIVITY_RAMP = 'wood_k'
Expand All @@ -13,9 +13,9 @@
NU_SPEC(1,1) = 0.84
SPEC_ID(1,1) = 'PYROLYZATE'
NU_MATL(1,1) = 0.16
MATL_ID(1,1) = 'char' /
MATL_ID(1,1) = 'CHAR' /

&MATL ID = 'char'
&MATL ID = 'CHAR'
EMISSIVITY = 0.84
DENSITY = 104
CONDUCTIVITY_RAMP = 'char_k'
Expand Down
25 changes: 12 additions & 13 deletions Validation/Aalto_Woods/FDS_Input_Files/pine_N2_35.fds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,20 @@
&TIME T_END=3000., DT = 0.5, WALL_INCREMENT = 1 /

&MISC TMPA=27,
Y_O2_INFTY=0.00001,
SOLID_PHASE_ONLY = .TRUE. /
Y_O2_INFTY=0.00001,
SOLID_PHASE_ONLY = .TRUE. /

&SURF ID = 'SAMPLE',
STRETCH_FACTOR(1) = 1,
STRETCH_FACTOR(2) = 1,
HEAT_TRANSFER_COEFFICIENT = 15.,
EXTERNAL_FLUX = 35
CELL_SIZE_FACTOR = 0.2,
THICKNESS = 0.02,0.013,
MINIMUM_LAYER_THICKNESS = 1E-10
BACKING='EXPOSED',
MATL_ID(1,:)='water','wood',
MATL_ID(2,1)='CERAMIC',
MATL_MASS_FRACTION(1,:) = 0.09, 0.91 /
EXTERNAL_FLUX = 35
THICKNESS(1:2) = 0.02,0.013,
STRETCH_FACTOR(1:2) = 1.2,2.0,
CELL_SIZE_FACTOR(1:2) = 1.0,1.0
HEAT_TRANSFER_COEFFICIENT = 15.,
MINIMUM_LAYER_THICKNESS = 1E-10
BACKING='EXPOSED',
MATL_ID(1,:)='MOISTURE','PINE',
MATL_ID(2,1)='CERAMIC',
MATL_MASS_FRACTION(1,:) = 0.09, 0.91 /

&CATF OTHER_FILES = 'output.txt','pine.txt','common.txt' /

Expand Down
25 changes: 12 additions & 13 deletions Validation/Aalto_Woods/FDS_Input_Files/pine_N2_50.fds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,20 @@
&TIME T_END=1750., DT = 0.5, WALL_INCREMENT = 1 /

&MISC TMPA=27,
Y_O2_INFTY=0.00001,
SOLID_PHASE_ONLY = .TRUE. /
Y_O2_INFTY=0.00001,
SOLID_PHASE_ONLY = .TRUE. /

&SURF ID = 'SAMPLE',
STRETCH_FACTOR(1) = 1,
STRETCH_FACTOR(2) = 1,
HEAT_TRANSFER_COEFFICIENT = 15.,
EXTERNAL_FLUX = 50
CELL_SIZE_FACTOR = 0.2,
THICKNESS = 0.02,0.013,
MINIMUM_LAYER_THICKNESS = 1E-10
BACKING='EXPOSED',
MATL_ID(1,:)='water','wood',
MATL_ID(2,1)='CERAMIC',
MATL_MASS_FRACTION(1,:) = 0.09, 0.91 /
EXTERNAL_FLUX = 50
THICKNESS(1:2) = 0.02,0.013,
STRETCH_FACTOR(1:2) = 1.2,2.0,
CELL_SIZE_FACTOR(1:2) = 1.0,1.0
HEAT_TRANSFER_COEFFICIENT = 15.,
MINIMUM_LAYER_THICKNESS = 1E-10
BACKING='EXPOSED',
MATL_ID(1,:)='MOISTURE','PINE',
MATL_ID(2,1)='CERAMIC',
MATL_MASS_FRACTION(1,:) = 0.09, 0.91 /

&CATF OTHER_FILES = 'output.txt','pine.txt','common.txt' /

Expand Down
23 changes: 11 additions & 12 deletions Validation/Aalto_Woods/FDS_Input_Files/pine_flaming_25.fds
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
&HEAD CHID='pine_flaming_25', TITLE='Pine cone calorimeter flaming.' /

&MESH IJK=20,20,30, XB=-0.10,0.10,-0.10,0.10,0.0,0.3 /
&MESH IJK=8,8,12, XB=-0.10,0.10,-0.10,0.10,0.0,0.3 /

&TIME T_END=2000., DT = 0.5, WALL_INCREMENT = 1 /

&MISC TMPA=27 /

&SURF ID = 'SAMPLE',
STRETCH_FACTOR(1) = 1,
STRETCH_FACTOR(2) = 1,
HEAT_TRANSFER_COEFFICIENT = 15.,
EXTERNAL_FLUX = 25
CELL_SIZE_FACTOR = 0.2,
THICKNESS = 0.02,0.013,
MINIMUM_LAYER_THICKNESS = 1E-10
BACKING='EXPOSED',
MATL_ID(1,:)='water','wood',
MATL_ID(2,1)='CERAMIC',
MATL_MASS_FRACTION(1,:) = 0.09, 0.91 /
EXTERNAL_FLUX = 25
THICKNESS(1:2) = 0.02,0.013,
STRETCH_FACTOR(1:2) = 1.2,2.0,
CELL_SIZE_FACTOR(1:2) = 0.3,1.0
HEAT_TRANSFER_COEFFICIENT = 15.,
MINIMUM_LAYER_THICKNESS = 1E-10
BACKING='EXPOSED',
MATL_ID(1,:)='MOISTURE','PINE',
MATL_ID(2,1)='CERAMIC',
MATL_MASS_FRACTION(1,:) = 0.09, 0.91 /

&CATF OTHER_FILES = 'output.txt','pine.txt','common.txt' /

Expand Down
Loading

0 comments on commit 660a1ad

Please sign in to comment.