Skip to content

Commit

Permalink
Merge pull request firemodels#13732 from rmcdermo/master
Browse files Browse the repository at this point in the history 
FDS Validation: fix conflicts with 10 cm Camp Swift input file
  • Loading branch information
@rmcdermo
rmcdermo authored Nov 8, 2024
2 parents 8faf618 + 4bac0ac commit 3ddd724
Show file tree
Hide file tree
Showing 3 changed files with 95 additions and 73 deletions.
151 changes: 80 additions & 71 deletions Validation/NIST_USFS_Camp_Swift/FDS_Input_Files/CS_BB1_0p10dx.fds
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ E: 666,295.73 meters
N: 3,347,184.94 meters
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

&MULT ID='xblock',DX=4,DY=4,I_LOWER=0,I_UPPER=49,J_LOWER=0,J_UPPER=49/
&MESH IJK=40,40,68, XB=-65.73,-61.73,-34.94,-30.94,0,80,MULT_ID='xblock',TRNZ_ID='TRNZ' /
&MULT ID='xblock',DX=6.25,DY=6.25,I_LOWER=0,I_UPPER=31,J_LOWER=0,J_UPPER=31/
&MESH IJK=64,64,64, XB=-65.73,-59.48,-34.94,-28.69,0,80,MULT_ID='xblock',TRNZ_ID='TRNZ' /

&TIME T_BEGIN=0,T_END=180./

Expand Down Expand Up @@ -44,12 +44,26 @@ N: 3,347,184.94 meters
&CATF OTHER_FILES='./vegetation_model.fds' /

-- Outputs
&DUMP DT_HRR=0.1, DT_DEVC=0.1, DT_PART=2, DT_SLCF=1, RESULTS_DIR='smv_out'/
&DUMP DT_HRR=0.1, DT_DEVC=0.1, DT_PART=2, DT_SLCF=1, RESULTS_DIR='CS_BB1_0p10dx_smv_out'/

&SLCF PBZ=1.0, QUANTITY='VELOCITY', VECTOR=T /
&SLCF PBZ=1.0, QUANTITY='HRRPUV'/
&SLCF PBZ=1.0, QUANTITY='TEMPERATURE'/

&SLCF PBZ=10.0, QUANTITY='VELOCITY', VECTOR=T /
&SLCF PBZ=10.0, QUANTITY='HRRPUV'/
&SLCF PBZ=10.0, QUANTITY='TEMPERATURE'/

&SLCF DB='YMID', QUANTITY='VELOCITY', VECTOR=T /
&SLCF DB='YMID', QUANTITY='HRRPUV'/
&SLCF DB='YMID', QUANTITY='TEMPERATURE'/

&SLCF DB='XMID', QUANTITY='VELOCITY', VECTOR=T /
&SLCF DB='XMID', QUANTITY='HRRPUV'/
&SLCF DB='XMID', QUANTITY='TEMPERATURE'/

=======

-- Measurement devices in field
&DEVC ID='9NFBP', XYZ=22.94, 105.36, 0.9, QUANTITY='RADIATIVE HEAT FLUX GAS',ORIENTATION=-0.292,0.956,0. /
&DEVC ID='15WFBP', XYZ=4.18, 67.87, 0.9, QUANTITY='RADIATIVE HEAT FLUX GAS',ORIENTATION=-0.309,0.951,0. /
Expand Down Expand Up @@ -158,73 +172,68 @@ cDEVC ID='D', QUANTITY='FIRE DEPTH', XB=-10,110,0,0,0.1,0.1 /

-- grid stretching in z-direction

&TRNZ ID='TRNZ', CC= 1.176470588235294, PC= 0.100000000000000 /
&TRNZ ID='TRNZ', CC= 2.352941176470588, PC= 0.200000000000000 /
&TRNZ ID='TRNZ', CC= 3.529411764705882, PC= 0.300000000000000 /
&TRNZ ID='TRNZ', CC= 4.705882352941177, PC= 0.400000000000000 /
&TRNZ ID='TRNZ', CC= 5.882352941176471, PC= 0.500000000000000 /
&TRNZ ID='TRNZ', CC= 7.058823529411764, PC= 0.600000000000000 /
&TRNZ ID='TRNZ', CC= 8.235294117647058, PC= 0.700000000000000 /
&TRNZ ID='TRNZ', CC= 9.411764705882353, PC= 0.800000000000000 /
&TRNZ ID='TRNZ', CC= 10.588235294117647, PC= 0.900000000000000 /
&TRNZ ID='TRNZ', CC= 11.764705882352942, PC= 1.000000000000000 /
&TRNZ ID='TRNZ', CC= 12.941176470588236, PC= 1.107097326344343 /
&TRNZ ID='TRNZ', CC= 14.117647058823529, PC= 1.221795699445410 /
&TRNZ ID='TRNZ', CC= 15.294117647058824, PC= 1.344634590397112 /
&TRNZ ID='TRNZ', CC= 16.470588235294116, PC= 1.476191758317428 /
&TRNZ ID='TRNZ', CC= 17.647058823529413, PC= 1.617085967774425 /
&TRNZ ID='TRNZ', CC= 18.823529411764707, PC= 1.767979899076866 /
&TRNZ ID='TRNZ', CC= 20.000000000000000, PC= 1.929583265117651 /
&TRNZ ID='TRNZ', CC= 21.176470588235293, PC= 2.102656149429794 /
&TRNZ ID='TRNZ', CC= 22.352941176470587, PC= 2.288012581155136 /
&TRNZ ID='TRNZ', CC= 23.529411764705884, PC= 2.486524363740255 /
&TRNZ ID='TRNZ', CC= 24.705882352941178, PC= 2.699125175367413 /
&TRNZ ID='TRNZ', CC= 25.882352941176471, PC= 2.926814960406473 /
&TRNZ ID='TRNZ', CC= 27.058823529411764, PC= 3.170664632542488 /
&TRNZ ID='TRNZ', CC= 28.235294117647058, PC= 3.431821111699607 /
&TRNZ ID='TRNZ', CC= 29.411764705882351, PC= 3.711512718451902 /
&TRNZ ID='TRNZ', CC= 30.588235294117649, PC= 4.011054951293145 /
&TRNZ ID='TRNZ', CC= 31.764705882352942, PC= 4.331856673938262 /
&TRNZ ID='TRNZ', CC= 32.941176470588232, PC= 4.675426741757778 /
&TRNZ ID='TRNZ', CC= 34.117647058823529, PC= 5.043381098511925 /
&TRNZ ID='TRNZ', CC= 35.294117647058826, PC= 5.437450376763143 /
&TRNZ ID='TRNZ', CC= 36.470588235294116, PC= 5.859488037714646 /
&TRNZ ID='TRNZ', CC= 37.647058823529413, PC= 6.311479088759911 /
&TRNZ ID='TRNZ', CC= 38.823529411764703, PC= 6.795549419745083 /
&TRNZ ID='TRNZ', CC= 40.000000000000000, PC= 7.313975801856415 /
&TRNZ ID='TRNZ', CC= 41.176470588235297, PC= 7.869196596161359 /
&TRNZ ID='TRNZ', CC= 42.352941176470587, PC= 8.463823222169779 /
&TRNZ ID='TRNZ', CC= 43.529411764705884, PC= 9.100652440356372 /
&TRNZ ID='TRNZ', CC= 44.705882352941174, PC= 9.782679506413796 /
&TRNZ ID='TRNZ', CC= 45.882352941176471, PC= 10.513112259106064 /
&TRNZ ID='TRNZ', CC= 47.058823529411768, PC= 11.295386207982871 /
&TRNZ ID='TRNZ', CC= 48.235294117647058, PC= 12.133180691918243 /
&TRNZ ID='TRNZ', CC= 49.411764705882355, PC= 13.030436184473414 /
&TRNZ ID='TRNZ', CC= 50.588235294117645, PC= 13.991372827477768 /
&TRNZ ID='TRNZ', CC= 51.764705882352942, PC= 15.020510279998517 /
&TRNZ ID='TRNZ', CC= 52.941176470588232, PC= 16.122688976056523 /
&TRNZ ID='TRNZ', CC= 54.117647058823529, PC= 17.303092891071586 /
&TRNZ ID='TRNZ', CC= 55.294117647058826, PC= 18.567273924116673 /
&TRNZ ID='TRNZ', CC= 56.470588235294116, PC= 19.921178010660256 /
&TRNZ ID='TRNZ', CC= 57.647058823529413, PC= 21.371173088615237 /
&TRNZ ID='TRNZ', CC= 58.823529411764703, PC= 22.924079049229594 /
&TRNZ ID='TRNZ', CC= 60.000000000000000, PC= 24.587199813689505 /
&TRNZ ID='TRNZ', CC= 61.176470588235297, PC= 26.368357686303671 /
&TRNZ ID='TRNZ', CC= 62.352941176470587, PC= 28.275930145845223 /
&TRNZ ID='TRNZ', CC= 63.529411764705884, PC= 30.318889248095250 /
&TRNZ ID='TRNZ', CC= 64.705882352941174, PC= 32.506843824913418 /
&TRNZ ID='TRNZ', CC= 65.882352941176464, PC= 34.850084678314367 /
&TRNZ ID='TRNZ', CC= 67.058823529411768, PC= 37.359632982115151 /
&TRNZ ID='TRNZ', CC= 68.235294117647058, PC= 40.047292118805601 /
&TRNZ ID='TRNZ', CC= 69.411764705882348, PC= 42.925703195450524 /
&TRNZ ID='TRNZ', CC= 70.588235294117652, PC= 46.008404499736656 /
&TRNZ ID='TRNZ', CC= 71.764705882352942, PC= 49.309895175809295 /
&TRNZ ID='TRNZ', CC= 72.941176470588232, PC= 52.845703419390865 /
&TRNZ ID='TRNZ', CC= 74.117647058823536, PC= 56.632459512929607 /
&TRNZ ID='TRNZ', CC= 75.294117647058826, PC= 60.687974044291089 /
&TRNZ ID='TRNZ', CC= 76.470588235294116, PC= 65.031321676885554 /
&TRNZ ID='TRNZ', CC= 77.647058823529406, PC= 69.682930865234539 /
&TRNZ ID='TRNZ', CC= 78.823529411764710, PC= 74.664679937944101 /

&TRNZ ID='TRNZ', CC= 1.250000000000000, PC= 0.100000000000000 /
&TRNZ ID='TRNZ', CC= 2.500000000000000, PC= 0.200000000000000 /
&TRNZ ID='TRNZ', CC= 3.750000000000000, PC= 0.300000000000000 /
&TRNZ ID='TRNZ', CC= 5.000000000000000, PC= 0.400000000000000 /
&TRNZ ID='TRNZ', CC= 6.250000000000000, PC= 0.500000000000000 /
&TRNZ ID='TRNZ', CC= 7.500000000000000, PC= 0.600000000000000 /
&TRNZ ID='TRNZ', CC= 8.750000000000000, PC= 0.700000000000000 /
&TRNZ ID='TRNZ', CC= 10.000000000000000, PC= 0.800000000000000 /
&TRNZ ID='TRNZ', CC= 11.250000000000000, PC= 0.900000000000000 /
&TRNZ ID='TRNZ', CC= 12.500000000000000, PC= 1.000000000000000 /
&TRNZ ID='TRNZ', CC= 13.750000000000000, PC= 1.100000000000000 /
&TRNZ ID='TRNZ', CC= 15.000000000000000, PC= 1.200000000000000 /
&TRNZ ID='TRNZ', CC= 16.250000000000000, PC= 1.300000000000000 /
&TRNZ ID='TRNZ', CC= 17.500000000000000, PC= 1.400000000000000 /
&TRNZ ID='TRNZ', CC= 18.750000000000000, PC= 1.500000000000000 /
&TRNZ ID='TRNZ', CC= 20.000000000000000, PC= 1.600000000000000 /
&TRNZ ID='TRNZ', CC= 21.250000000000000, PC= 1.700000000000000 /
&TRNZ ID='TRNZ', CC= 22.500000000000000, PC= 1.800000000000000 /
&TRNZ ID='TRNZ', CC= 23.750000000000000, PC= 1.900000000000000 /
&TRNZ ID='TRNZ', CC= 25.000000000000000, PC= 2.000000000000000 /
&TRNZ ID='TRNZ', CC= 26.250000000000000, PC= 2.110262770323341 /
&TRNZ ID='TRNZ', CC= 27.500000000000000, PC= 2.231841555517119 /
&TRNZ ID='TRNZ', CC= 28.750000000000000, PC= 2.365897692197243 /
&TRNZ ID='TRNZ', CC= 30.000000000000000, PC= 2.513711702289192 /
&TRNZ ID='TRNZ', CC= 31.250000000000000, PC= 2.676695524742598 /
&TRNZ ID='TRNZ', CC= 32.500000000000000, PC= 2.856406002558599 /
&TRNZ ID='TRNZ', CC= 33.750000000000000, PC= 3.054559753959834 /
&TRNZ ID='TRNZ', CC= 35.000000000000000, PC= 3.273049569754463 /
&TRNZ ID='TRNZ', CC= 36.250000000000000, PC= 3.513962493523984 /
&TRNZ ID='TRNZ', CC= 37.500000000000000, PC= 3.779599757339217 /
&TRNZ ID='TRNZ', CC= 38.750000000000000, PC= 4.072498763433015 /
&TRNZ ID='TRNZ', CC= 40.000000000000000, PC= 4.395457321801567 /
&TRNZ ID='TRNZ', CC= 41.250000000000000, PC= 4.751560375255058 /
&TRNZ ID='TRNZ', CC= 42.500000000000000, PC= 5.144209467198884 /
&TRNZ ID='TRNZ', CC= 43.750000000000000, PC= 5.577155233625589 /
&TRNZ ID='TRNZ', CC= 45.000000000000000, PC= 6.054533229685294 /
&TRNZ ID='TRNZ', CC= 46.250000000000000, PC= 6.580903433054775 /
&TRNZ ID='TRNZ', CC= 47.500000000000000, PC= 7.161293801446568 /
&TRNZ ID='TRNZ', CC= 48.750000000000000, PC= 7.801248300325204 /
&TRNZ ID='TRNZ', CC= 50.000000000000000, PC= 8.506879859597642 /
&TRNZ ID='TRNZ', CC= 51.250000000000000, PC= 9.284928765127219 /
&TRNZ ID='TRNZ', CC= 52.500000000000000, PC= 10.142827042834565 /
&TRNZ ID='TRNZ', CC= 53.750000000000000, PC= 11.088769450390913 /
&TRNZ ID='TRNZ', CC= 55.000000000000000, PC= 12.131791754625851 /
&TRNZ ID='TRNZ', CC= 56.250000000000000, PC= 13.281857042365640 /
&TRNZ ID='TRNZ', CC= 57.500000000000000, PC= 14.549950889154633 /
&TRNZ ID='TRNZ', CC= 58.750000000000000, PC= 15.948186294924000 /
&TRNZ ID='TRNZ', CC= 60.000000000000000, PC= 17.489919388967110 /
&TRNZ ID='TRNZ', CC= 61.250000000000000, PC= 19.189877009450804 /
&TRNZ ID='TRNZ', CC= 62.500000000000000, PC= 21.064297376118873 /
&TRNZ ID='TRNZ', CC= 63.750000000000000, PC= 23.131085199912008 /
&TRNZ ID='TRNZ', CC= 65.000000000000000, PC= 25.409982711131811 /
&TRNZ ID='TRNZ', CC= 66.250000000000000, PC= 27.922758239832433 /
&TRNZ ID='TRNZ', CC= 67.500000000000000, PC= 30.693414149784719 /
&TRNZ ID='TRNZ', CC= 68.750000000000000, PC= 33.748416112225478 /
&TRNZ ID='TRNZ', CC= 70.000000000000000, PC= 37.116945909445093 /
&TRNZ ID='TRNZ', CC= 71.250000000000000, PC= 40.831180183026660 /
&TRNZ ID='TRNZ', CC= 72.500000000000000, PC= 44.926597789376714 /
&TRNZ ID='TRNZ', CC= 73.750000000000000, PC= 49.442318698448140 /
&TRNZ ID='TRNZ', CC= 75.000000000000000, PC= 54.421477672860654 /
&TRNZ ID='TRNZ', CC= 76.250000000000000, PC= 59.911636296851142 /
&TRNZ ID='TRNZ', CC= 77.500000000000000, PC= 65.965237290808872 /
&TRNZ ID='TRNZ', CC= 78.750000000000000, PC= 72.640105451067967 /

&TAIL /
14 changes: 13 additions & 1 deletion Validation/NIST_USFS_Camp_Swift/FDS_Input_Files/CS_BB1_0p25dx.fds
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,24 @@ N: 3,347,184.94 meters
&CATF OTHER_FILES='./vegetation_model.fds' /

-- Outputs
&DUMP DT_HRR=0.1, DT_DEVC=0.1, DT_PART=2, DT_SLCF=1, RESULTS_DIR='smv_out'/
&DUMP DT_HRR=0.1, DT_DEVC=0.1, DT_PART=2, DT_SLCF=1, RESULTS_DIR='CS_BB1_0p25dx_smv_out'/

&SLCF PBZ=1.0, QUANTITY='VELOCITY', VECTOR=T /
&SLCF PBZ=1.0, QUANTITY='HRRPUV'/
&SLCF PBZ=1.0, QUANTITY='TEMPERATURE'/

&SLCF PBZ=10.0, QUANTITY='VELOCITY', VECTOR=T /
&SLCF PBZ=10.0, QUANTITY='HRRPUV'/
&SLCF PBZ=10.0, QUANTITY='TEMPERATURE'/

&SLCF DB='YMID', QUANTITY='VELOCITY', VECTOR=T /
&SLCF DB='YMID', QUANTITY='HRRPUV'/
&SLCF DB='YMID', QUANTITY='TEMPERATURE'/

&SLCF DB='XMID', QUANTITY='VELOCITY', VECTOR=T /
&SLCF DB='XMID', QUANTITY='HRRPUV'/
&SLCF DB='XMID', QUANTITY='TEMPERATURE'/

-- Measurement devices in field
&DEVC ID='9NFBP', XYZ=22.94, 105.36, 0.9, QUANTITY='RADIATIVE HEAT FLUX GAS',ORIENTATION=-0.292,0.956,0. /
&DEVC ID='15WFBP', XYZ=4.18, 67.87, 0.9, QUANTITY='RADIATIVE HEAT FLUX GAS',ORIENTATION=-0.309,0.951,0. /
Expand Down
3 changes: 2 additions & 1 deletion Validation/NIST_USFS_Camp_Swift/Run_All.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
export SVNROOT=`pwd`/../..
source $SVNROOT/Validation/Common_Run_All.sh

$QFDS $DEBUG $QUEUE -p 400 -d $INDIR CS_BB1_0p25dx.fds
$QFDS $DEBUG $QUEUE -p 400 -d $INDIR CS_BB1_0p25dx.fds
#$QFDS $DEBUG $QUEUE -p 1024 -d $INDIR CS_BB1_0p10dx.fds

echo FDS cases submitted

0 comments on commit 3ddd724

Please sign in to comment.