Skip to content

Commit 33d0db8

Browse files
mcgrattamcgratta
authored
Merge pull request firemodels#739 from mcgratta/master
SWJTU and McCaffrey
2 parents e629a72 + 203da6b commit 33d0db8

58 files changed

Lines changed: 4456 additions & 4456 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎McCaffrey_Plume/McCaffrey_14_kW_11_git.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FDS-6.10.1-895-g94c03d9-master
1+
FDS-6.10.1-1794-g520b2f8-master

‎McCaffrey_Plume/McCaffrey_14_kW_11_line.csv‎

Lines changed: 109 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,112 @@
11
m,C,m/s
22
Height,tmp,vel
3-
1.3890000E-002, 9.1713168E+002, 5.1254719E-001
4-
4.1159817E-002, 9.2367675E+002, 1.3511335E+000
5-
6.8429633E-002, 9.2325883E+002, 2.0993950E+000
6-
9.5699450E-002, 9.1990029E+002, 2.7398435E+000
7-
1.2296927E-001, 9.1597908E+002, 3.2693111E+000
8-
1.5023908E-001, 9.1194850E+002, 3.7017233E+000
9-
1.7750890E-001, 9.0609475E+002, 4.0546463E+000
10-
2.0477872E-001, 8.9580328E+002, 4.3399830E+000
11-
2.3204853E-001, 8.7956492E+002, 4.5657938E+000
12-
2.5931835E-001, 8.5740475E+002, 4.7397033E+000
13-
2.8658817E-001, 8.3036628E+002, 4.8698695E+000
14-
3.1385798E-001, 7.9947963E+002, 4.9631391E+000
15-
3.4112780E-001, 7.6602368E+002, 5.0258208E+000
16-
3.6839761E-001, 7.3091435E+002, 5.0634671E+000
17-
3.9566743E-001, 6.9489701E+002, 5.0812082E+000
18-
4.2293725E-001, 6.5849596E+002, 5.0844288E+000
19-
4.5020706E-001, 6.2241346E+002, 5.0772172E+000
20-
4.7747688E-001, 5.8691099E+002, 5.0615875E+000
21-
5.0474670E-001, 5.5280654E+002, 5.0382772E+000
22-
5.3201651E-001, 5.1999808E+002, 5.0092483E+000
23-
5.5928633E-001, 4.8896939E+002, 4.9767829E+000
24-
5.8655615E-001, 4.5938526E+002, 4.9407923E+000
25-
6.1382596E-001, 4.3191511E+002, 4.8994420E+000
26-
6.4109578E-001, 4.0642989E+002, 4.8513008E+000
27-
6.6836560E-001, 3.8298867E+002, 4.7963321E+000
28-
6.9563541E-001, 3.6119764E+002, 4.7375031E+000
29-
7.2290523E-001, 3.4078816E+002, 4.6761808E+000
30-
7.5017505E-001, 3.2175026E+002, 4.6112981E+000
31-
7.7744486E-001, 3.0320144E+002, 4.5419681E+000
32-
8.0471468E-001, 2.8800744E+002, 4.4728516E+000
33-
8.3198450E-001, 2.7313835E+002, 4.4023773E+000
34-
8.5925431E-001, 2.5928253E+002, 4.3318412E+000
35-
8.8652413E-001, 2.4627290E+002, 4.2583627E+000
36-
9.1379394E-001, 2.3425789E+002, 4.1820838E+000
37-
9.4106376E-001, 2.2307969E+002, 4.1053276E+000
38-
9.6833358E-001, 2.1263352E+002, 4.0314853E+000
39-
9.9560339E-001, 2.0311258E+002, 3.9626957E+000
40-
1.0228732E+000, 1.9424406E+002, 3.8999115E+000
41-
1.0501430E+000, 1.8626616E+002, 3.8402583E+000
42-
1.0774128E+000, 1.7867928E+002, 3.7831948E+000
43-
1.1046827E+000, 1.7192510E+002, 3.7317151E+000
44-
1.1319525E+000, 1.6533699E+002, 3.6855075E+000
45-
1.1592223E+000, 1.5944699E+002, 3.6425285E+000
46-
1.1864921E+000, 1.5378650E+002, 3.6000305E+000
47-
1.2137619E+000, 1.4870536E+002, 3.5575887E+000
48-
1.2410317E+000, 1.4371188E+002, 3.5161802E+000
49-
1.2683016E+000, 1.3912260E+002, 3.4769409E+000
50-
1.2955714E+000, 1.3467765E+002, 3.4403290E+000
51-
1.3228412E+000, 1.3050474E+002, 3.4063765E+000
52-
1.3501110E+000, 1.2640897E+002, 3.3742974E+000
53-
1.3773808E+000, 1.2241445E+002, 3.3438149E+000
54-
1.4046506E+000, 1.1856947E+002, 3.3145428E+000
55-
1.4319205E+000, 1.1484479E+002, 3.2829435E+000
56-
1.4591903E+000, 1.1142005E+002, 3.2488623E+000
57-
1.4864601E+000, 1.0816046E+002, 3.2151381E+000
58-
1.5137299E+000, 1.0510711E+002, 3.1827538E+000
59-
1.5409997E+000, 1.0217783E+002, 3.1508945E+000
60-
1.5682695E+000, 9.9405911E+001, 3.1198897E+000
61-
1.5955394E+000, 9.6753179E+001, 3.0913380E+000
62-
1.6228092E+000, 9.4245624E+001, 3.0627157E+000
63-
1.6500790E+000, 9.1887129E+001, 3.0356632E+000
64-
1.6773488E+000, 8.9685960E+001, 3.0086628E+000
65-
1.7046186E+000, 8.7646963E+001, 2.9830495E+000
66-
1.7318884E+000, 8.5719521E+001, 2.9601800E+000
67-
1.7591583E+000, 8.3933453E+001, 2.9387234E+000
68-
1.7864281E+000, 8.2273861E+001, 2.9182646E+000
69-
1.8136979E+000, 8.0715377E+001, 2.8964212E+000
70-
1.8409677E+000, 7.9149813E+001, 2.8730739E+000
71-
1.8682375E+000, 7.7651847E+001, 2.8493445E+000
72-
1.8955073E+000, 7.6065192E+001, 2.8252241E+000
73-
1.9227772E+000, 7.4508708E+001, 2.8006165E+000
74-
1.9500470E+000, 7.3041926E+001, 2.7768522E+000
75-
1.9773168E+000, 7.1648561E+001, 2.7532761E+000
76-
2.0045866E+000, 7.0370001E+001, 2.7326006E+000
77-
2.0318564E+000, 6.9206107E+001, 2.7108494E+000
78-
2.0591262E+000, 6.8108988E+001, 2.6911076E+000
79-
2.0863961E+000, 6.7066455E+001, 2.6750230E+000
80-
2.1136659E+000, 6.6016363E+001, 2.6617758E+000
81-
2.1409357E+000, 6.4948441E+001, 2.6529872E+000
82-
2.1682055E+000, 6.3892584E+001, 2.6405798E+000
83-
2.1954753E+000, 6.2874026E+001, 2.6243715E+000
84-
2.2227451E+000, 6.1882682E+001, 2.6056735E+000
85-
2.2500150E+000, 6.0928403E+001, 2.5863831E+000
86-
2.2772848E+000, 5.9999602E+001, 2.5675313E+000
87-
2.3045546E+000, 5.9104045E+001, 2.5497783E+000
88-
2.3318244E+000, 5.8184355E+001, 2.5348750E+000
89-
2.3590942E+000, 5.7252156E+001, 2.5209567E+000
90-
2.3863640E+000, 5.6292188E+001, 2.5085215E+000
91-
2.4136339E+000, 5.5283781E+001, 2.4963091E+000
92-
2.4409037E+000, 5.4314051E+001, 2.4832708E+000
93-
2.4681735E+000, 5.3429350E+001, 2.4718104E+000
94-
2.4954433E+000, 5.2631620E+001, 2.4572677E+000
95-
2.5227131E+000, 5.1886688E+001, 2.4473203E+000
96-
2.5499829E+000, 5.1196750E+001, 2.4316295E+000
97-
2.5772528E+000, 5.0536829E+001, 2.4186147E+000
98-
2.6045226E+000, 4.9899021E+001, 2.4027202E+000
99-
2.6317924E+000, 4.9276347E+001, 2.3916907E+000
100-
2.6590622E+000, 4.8698929E+001, 2.3797115E+000
101-
2.6863320E+000, 4.8199150E+001, 2.3672769E+000
102-
2.7136018E+000, 4.7728618E+001, 2.3527045E+000
103-
2.7408717E+000, 4.7306126E+001, 2.3378593E+000
104-
2.7681415E+000, 4.6887281E+001, 2.3238851E+000
105-
2.7954113E+000, 4.6477154E+001, 2.3039726E+000
106-
2.8226811E+000, 4.6037867E+001, 2.2875938E+000
107-
2.8499509E+000, 4.5597523E+001, 2.2688557E+000
108-
2.8772207E+000, 4.5102740E+001, 2.2599808E+000
109-
2.9044906E+000, 4.4682003E+001, 2.2271500E+000
110-
2.9317604E+000, 4.4157426E+001, 2.2264926E+000
111-
2.9590302E+000, 4.3696745E+001, 2.1611264E+000
3+
1.3890000E-002, 8.8099027E+002, 4.7600082E-001
4+
4.1159817E-002, 8.8511478E+002, 1.1944291E+000
5+
6.8429633E-002, 8.7929852E+002, 1.8235323E+000
6+
9.5699450E-002, 8.7019464E+002, 2.3469327E+000
7+
1.2296927E-001, 8.5979859E+002, 2.7678843E+000
8+
1.5023908E-001, 8.4788511E+002, 3.1027436E+000
9+
1.7750890E-001, 8.3385544E+002, 3.3698054E+000
10+
2.0477872E-001, 8.1642704E+002, 3.5815981E+000
11+
2.3204853E-001, 7.9451510E+002, 3.7459111E+000
12+
2.5931835E-001, 7.6742606E+002, 3.8690094E+000
13+
2.8658817E-001, 7.3466420E+002, 3.9571445E+000
14+
3.1385798E-001, 6.9685299E+002, 4.0165547E+000
15+
3.4112780E-001, 6.5555539E+002, 4.0514102E+000
16+
3.6839761E-001, 6.1253856E+002, 4.0659002E+000
17+
3.9566743E-001, 5.6962579E+002, 4.0655876E+000
18+
4.2293725E-001, 5.2896472E+002, 4.0563616E+000
19+
4.5020706E-001, 4.9061021E+002, 4.0393670E+000
20+
4.7747688E-001, 4.5497956E+002, 4.0169689E+000
21+
5.0474670E-001, 4.2228719E+002, 3.9906808E+000
22+
5.3201651E-001, 3.9203147E+002, 3.9591436E+000
23+
5.5928633E-001, 3.6499534E+002, 3.9224200E+000
24+
5.8655615E-001, 3.4027417E+002, 3.8791036E+000
25+
6.1382596E-001, 3.1805243E+002, 3.8266152E+000
26+
6.4109578E-001, 2.9811023E+002, 3.7669698E+000
27+
6.6836560E-001, 2.8016066E+002, 3.7068632E+000
28+
6.9563541E-001, 2.6403765E+002, 3.6504735E+000
29+
7.2290523E-001, 2.4942544E+002, 3.5981214E+000
30+
7.5017505E-001, 2.3613847E+002, 3.5473509E+000
31+
7.7744486E-001, 2.2370086E+002, 3.4975555E+000
32+
8.0471468E-001, 2.1255419E+002, 3.4494779E+000
33+
8.3198450E-001, 2.0246975E+002, 3.4020359E+000
34+
8.5925431E-001, 1.9353586E+002, 3.3595565E+000
35+
8.8652413E-001, 1.8530748E+002, 3.3225728E+000
36+
9.1379394E-001, 1.7798219E+002, 3.2911347E+000
37+
9.4106376E-001, 1.7125526E+002, 3.2616065E+000
38+
9.6833358E-001, 1.6473887E+002, 3.2307450E+000
39+
9.9560339E-001, 1.5851074E+002, 3.2000462E+000
40+
1.0228732E+000, 1.5269249E+002, 3.1708582E+000
41+
1.0501430E+000, 1.4720125E+002, 3.1425709E+000
42+
1.0774128E+000, 1.4182689E+002, 3.1151844E+000
43+
1.1046827E+000, 1.3660502E+002, 3.0858409E+000
44+
1.1319525E+000, 1.3145451E+002, 3.0558504E+000
45+
1.1592223E+000, 1.2658359E+002, 3.0246542E+000
46+
1.1864921E+000, 1.2200371E+002, 2.9910940E+000
47+
1.2137619E+000, 1.1775688E+002, 2.9566477E+000
48+
1.2410317E+000, 1.1383576E+002, 2.9217064E+000
49+
1.2683016E+000, 1.1020901E+002, 2.8877322E+000
50+
1.2955714E+000, 1.0688951E+002, 2.8558724E+000
51+
1.3228412E+000, 1.0381787E+002, 2.8238548E+000
52+
1.3501110E+000, 1.0096786E+002, 2.7910653E+000
53+
1.3773808E+000, 9.8241007E+001, 2.7607884E+000
54+
1.4046506E+000, 9.5603487E+001, 2.7312230E+000
55+
1.4319205E+000, 9.3128902E+001, 2.6991213E+000
56+
1.4591903E+000, 9.0858957E+001, 2.6662433E+000
57+
1.4864601E+000, 8.8672708E+001, 2.6331571E+000
58+
1.5137299E+000, 8.6594674E+001, 2.6015654E+000
59+
1.5409997E+000, 8.4575197E+001, 2.5754245E+000
60+
1.5682695E+000, 8.2617172E+001, 2.5551385E+000
61+
1.5955394E+000, 8.0731873E+001, 2.5383622E+000
62+
1.6228092E+000, 7.8936964E+001, 2.5238948E+000
63+
1.6500790E+000, 7.7267292E+001, 2.5090141E+000
64+
1.6773488E+000, 7.5667429E+001, 2.4954145E+000
65+
1.7046186E+000, 7.4217772E+001, 2.4823569E+000
66+
1.7318884E+000, 7.2863582E+001, 2.4697622E+000
67+
1.7591583E+000, 7.1614984E+001, 2.4565544E+000
68+
1.7864281E+000, 7.0433254E+001, 2.4443903E+000
69+
1.8136979E+000, 6.9308006E+001, 2.4350284E+000
70+
1.8409677E+000, 6.8130041E+001, 2.4253698E+000
71+
1.8682375E+000, 6.6910545E+001, 2.4153698E+000
72+
1.8955073E+000, 6.5674242E+001, 2.4012994E+000
73+
1.9227772E+000, 6.4519041E+001, 2.3855693E+000
74+
1.9500470E+000, 6.3481798E+001, 2.3724785E+000
75+
1.9773168E+000, 6.2547651E+001, 2.3595243E+000
76+
2.0045866E+000, 6.1645344E+001, 2.3502212E+000
77+
2.0318564E+000, 6.0751846E+001, 2.3421811E+000
78+
2.0591262E+000, 5.9833957E+001, 2.3330412E+000
79+
2.0863961E+000, 5.8915279E+001, 2.3234052E+000
80+
2.1136659E+000, 5.8027887E+001, 2.3134515E+000
81+
2.1409357E+000, 5.7192303E+001, 2.3038119E+000
82+
2.1682055E+000, 5.6364343E+001, 2.2955022E+000
83+
2.1954753E+000, 5.5534937E+001, 2.2888424E+000
84+
2.2227451E+000, 5.4726850E+001, 2.2859486E+000
85+
2.2500150E+000, 5.3968868E+001, 2.2811140E+000
86+
2.2772848E+000, 5.3276287E+001, 2.2751206E+000
87+
2.3045546E+000, 5.2616716E+001, 2.2675414E+000
88+
2.3318244E+000, 5.1968495E+001, 2.2566298E+000
89+
2.3590942E+000, 5.1344650E+001, 2.2468033E+000
90+
2.3863640E+000, 5.0721536E+001, 2.2365656E+000
91+
2.4136339E+000, 5.0130025E+001, 2.2257581E+000
92+
2.4409037E+000, 4.9561944E+001, 2.2171153E+000
93+
2.4681735E+000, 4.9028501E+001, 2.2070512E+000
94+
2.4954433E+000, 4.8497588E+001, 2.2007705E+000
95+
2.5227131E+000, 4.7971457E+001, 2.1921155E+000
96+
2.5499829E+000, 4.7444984E+001, 2.1817156E+000
97+
2.5772528E+000, 4.6926220E+001, 2.1751488E+000
98+
2.6045226E+000, 4.6415433E+001, 2.1713648E+000
99+
2.6317924E+000, 4.5925368E+001, 2.1683373E+000
100+
2.6590622E+000, 4.5472031E+001, 2.1661351E+000
101+
2.6863320E+000, 4.5052541E+001, 2.1606202E+000
102+
2.7136018E+000, 4.4666807E+001, 2.1545038E+000
103+
2.7408717E+000, 4.4324716E+001, 2.1513731E+000
104+
2.7681415E+000, 4.4009789E+001, 2.1458739E+000
105+
2.7954113E+000, 4.3673202E+001, 2.1407727E+000
106+
2.8226811E+000, 4.3350978E+001, 2.1371528E+000
107+
2.8499509E+000, 4.3025154E+001, 2.1211807E+000
108+
2.8772207E+000, 4.2636222E+001, 2.1198681E+000
109+
2.9044906E+000, 4.2269925E+001, 2.0970119E+000
110+
2.9317604E+000, 4.1823780E+001, 2.0975853E+000
111+
2.9590302E+000, 4.1313363E+001, 2.0519512E+000
112112
NaN,NaN,NaN

‎McCaffrey_Plume/McCaffrey_14_kW_21_git.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FDS-6.10.1-895-g94c03d9-master
1+
FDS-6.10.1-1794-g520b2f8-master

0 commit comments

Comments
 (0)