Skip to content

Commit 15ffd5a

Browse files
mcgrattamcgratta
committed
FDS Verification: Remove quotes from column headers
1 parent 3b345d7 commit 15ffd5a

File tree

5 files changed

+69
-69
lines changed

5 files changed

+69
-69
lines changed

‎Utilities/Matlab/scripts/favre_test.m‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
YRMSL2 = L.data(2,find(strcmp(L.colheaders,'YO2_RMS')));
3333
YRMSL3 = L.data(3,find(strcmp(L.colheaders,'YO2_RMS')));
3434

35-
RHO1 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'"RHO_1"')));
36-
RHO2 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'"RHO_2"')));
37-
RHO3 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'"RHO_3"')));
38-
RHOYO2_1 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'"RHOYO2_1"')));
39-
RHOYO2_2 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'"RHOYO2_2"')));
40-
RHOYO2_3 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'"RHOYO2_3"')));
35+
RHO1 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'RHO_1')));
36+
RHO2 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'RHO_2')));
37+
RHO3 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'RHO_3')));
38+
RHOYO2_1 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'RHOYO2_1')));
39+
RHOYO2_2 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'RHOYO2_2')));
40+
RHOYO2_3 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'RHOYO2_3')));
4141

4242
% brute force integration for means
4343

@@ -109,12 +109,12 @@
109109
YRMSL2 = L.data(2,find(strcmp(L.colheaders,'YO2_RMS_INT')));
110110
YRMSL3 = L.data(3,find(strcmp(L.colheaders,'YO2_RMS_INT')));
111111

112-
RHO1 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'"RHO_1_INT"')));
113-
RHO2 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'"RHO_2_INT"')));
114-
RHO3 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'"RHO_3_INT"')));
115-
RHOYO2_1 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'"RHOYO2_1_INT"')));
116-
RHOYO2_2 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'"RHOYO2_2_INT"')));
117-
RHOYO2_3 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'"RHOYO2_3_INT"')));
112+
RHO1 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'RHO_1_INT')));
113+
RHO2 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'RHO_2_INT')));
114+
RHO3 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'RHO_3_INT')));
115+
RHOYO2_1 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'RHOYO2_1_INT')));
116+
RHOYO2_2 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'RHOYO2_2_INT')));
117+
RHOYO2_3 = M.data(find(M.data(:,1)>t_stats_start),find(strcmp(M.colheaders,'RHOYO2_3_INT')));
118118

119119
% brute force integration
120120

‎Utilities/Matlab/scripts/mass_balance.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828

2929
F = importdata([ddir,chid,'_devc.csv'],',',2);
3030

31-
mdot_in = F.data(:,find(strcmp(F.colheaders,'"H2O in"')));
32-
mdot_out = F.data(:,find(strcmp(F.colheaders,'"H2O out"')));
31+
mdot_in = F.data(:,find(strcmp(F.colheaders,'H2O in')));
32+
mdot_out = F.data(:,find(strcmp(F.colheaders,'H2O out')));
3333

3434
bal = dmdt - mdot_in - mdot_out;
3535

‎Utilities/Matlab/scripts/mass_balance_gas_volume.m‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@
1818
M = importdata([ddir,chid,'_devc.csv'],',',2);
1919

2020
t = M.data(:,1);
21-
m = M.data(:,find(strcmp(M.colheaders,'"M"')));
21+
m = M.data(:,find(strcmp(M.colheaders,'M')));
2222
dmdt = zeros(length(t),1);
2323
for i=2:length(t)
2424
dmdt(i) = (m(i)-m(i-1))/(t(i)-t(i-1));
2525
end
2626

27-
mf_x1 = M.data(:,find(strcmp(M.colheaders,'"TMF_X1"')));
28-
mf_x2 = M.data(:,find(strcmp(M.colheaders,'"TMF_X2"')));
29-
mf_y1 = M.data(:,find(strcmp(M.colheaders,'"TMF_Y1"')));
30-
mf_y2 = M.data(:,find(strcmp(M.colheaders,'"TMF_Y2"')));
31-
mf_z1 = M.data(:,find(strcmp(M.colheaders,'"TMF_Z1"')));
32-
mf_z2 = M.data(:,find(strcmp(M.colheaders,'"TMF_Z2"')));
27+
mf_x1 = M.data(:,find(strcmp(M.colheaders,'TMF_X1')));
28+
mf_x2 = M.data(:,find(strcmp(M.colheaders,'TMF_X2')));
29+
mf_y1 = M.data(:,find(strcmp(M.colheaders,'TMF_Y1')));
30+
mf_y2 = M.data(:,find(strcmp(M.colheaders,'TMF_Y2')));
31+
mf_z1 = M.data(:,find(strcmp(M.colheaders,'TMF_Z1')));
32+
mf_z2 = M.data(:,find(strcmp(M.colheaders,'TMF_Z2')));
3333

3434
bal = dmdt + (mf_x2-mf_x1 + mf_y2-mf_y1 + mf_z2-mf_z1);
3535

‎Utilities/Matlab/scripts/mass_balance_reac.m‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131

3232
F = importdata([ddir,chid,'_devc.csv'],',',2);
3333

34-
mdot_out = F.data(:,find(strcmp(F.colheaders,['"',devc_id,' xmax"']))) ...
35-
+ F.data(:,find(strcmp(F.colheaders,['"',devc_id,' xmin"']))) ...
36-
+ F.data(:,find(strcmp(F.colheaders,['"',devc_id,' ymin"']))) ...
37-
+ F.data(:,find(strcmp(F.colheaders,['"',devc_id,' ymax"']))) ...
38-
+ F.data(:,find(strcmp(F.colheaders,['"',devc_id,' Burner"'])));
34+
mdot_out = F.data(:,find(strcmp(F.colheaders,[devc_id,' xmax']))) ...
35+
+ F.data(:,find(strcmp(F.colheaders,[devc_id,' xmin']))) ...
36+
+ F.data(:,find(strcmp(F.colheaders,[devc_id,' ymin']))) ...
37+
+ F.data(:,find(strcmp(F.colheaders,[devc_id,' ymax']))) ...
38+
+ F.data(:,find(strcmp(F.colheaders,[devc_id,' Burner'])));
3939

40-
gen = F.data(:,find(strcmp(F.colheaders,['"',devc_id,' mdot reac"'])));
40+
gen = F.data(:,find(strcmp(F.colheaders,[devc_id,' mdot reac'])));
4141

4242
bal = -dmdt + mdot_out + gen;
4343

‎Utilities/Matlab/scripts/soborot_mass_transport.m‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -65,23 +65,23 @@
6565
% FLUX_LIMITER='CHARM'
6666

6767
M = importdata([data_dir,'soborot_charm_square_wave_16_devc.csv'],',',2);
68-
col_start = find(strcmp(M.colheaders,'"Y_TRACER-1"'));
69-
col_end = find(strcmp(M.colheaders,'"Y_TRACER-16"'));
68+
col_start = find(strcmp(M.colheaders,'Y_TRACER-1'));
69+
col_end = find(strcmp(M.colheaders,'Y_TRACER-16'));
7070
Y_charm_16 = M.data(end,col_start:col_end);
7171

7272
M = importdata([data_dir,'soborot_charm_square_wave_32_devc.csv'],',',2);
73-
col_start = find(strcmp(M.colheaders,'"Y_TRACER-1"'));
74-
col_end = find(strcmp(M.colheaders,'"Y_TRACER-32"'));
73+
col_start = find(strcmp(M.colheaders,'Y_TRACER-1'));
74+
col_end = find(strcmp(M.colheaders,'Y_TRACER-32'));
7575
Y_charm_32 = M.data(end,col_start:col_end);
7676

7777
M = importdata([data_dir,'soborot_charm_square_wave_64_devc.csv'],',',2);
78-
col_start = find(strcmp(M.colheaders,'"Y_TRACER-1"'));
79-
col_end = find(strcmp(M.colheaders,'"Y_TRACER-64"'));
78+
col_start = find(strcmp(M.colheaders,'Y_TRACER-1'));
79+
col_end = find(strcmp(M.colheaders,'Y_TRACER-64'));
8080
Y_charm_64 = M.data(end,col_start:col_end);
8181

8282
M = importdata([data_dir,'soborot_charm_square_wave_128_devc.csv'],',',2);
83-
col_start = find(strcmp(M.colheaders,'"Y_TRACER-1"'));
84-
col_end = find(strcmp(M.colheaders,'"Y_TRACER-128"'));
83+
col_start = find(strcmp(M.colheaders,'Y_TRACER-1'));
84+
col_end = find(strcmp(M.colheaders,'Y_TRACER-128'));
8585
Y_charm_128 = M.data(end,col_start:col_end);
8686

8787
figure
@@ -118,28 +118,28 @@
118118
% FLUX_LIMITER='SUPERBEE'
119119

120120
M = importdata([data_dir,'soborot_superbee_square_wave_16_devc.csv'],',',2);
121-
col_start = find(strcmp(M.colheaders,'"Y_TRACER-1"'));
122-
col_end = find(strcmp(M.colheaders,'"Y_TRACER-16"'));
121+
col_start = find(strcmp(M.colheaders,'Y_TRACER-1'));
122+
col_end = find(strcmp(M.colheaders,'Y_TRACER-16'));
123123
Y_superbee_16 = M.data(end,col_start:col_end);
124124

125125
M = importdata([data_dir,'soborot_superbee_square_wave_32_devc.csv'],',',2);
126-
col_start = find(strcmp(M.colheaders,'"Y_TRACER-1"'));
127-
col_end = find(strcmp(M.colheaders,'"Y_TRACER-32"'));
126+
col_start = find(strcmp(M.colheaders,'Y_TRACER-1'));
127+
col_end = find(strcmp(M.colheaders,'Y_TRACER-32'));
128128
Y_superbee_32 = M.data(end,col_start:col_end);
129129

130130
M = importdata([data_dir,'soborot_superbee_square_wave_64_devc.csv'],',',2);
131-
col_start = find(strcmp(M.colheaders,'"Y_TRACER-1"'));
132-
col_end = find(strcmp(M.colheaders,'"Y_TRACER-64"'));
131+
col_start = find(strcmp(M.colheaders,'Y_TRACER-1'));
132+
col_end = find(strcmp(M.colheaders,'Y_TRACER-64'));
133133
Y_superbee_64 = M.data(end,col_start:col_end);
134134

135135
M = importdata([data_dir,'soborot_superbee_square_wave_128_devc.csv'],',',2);
136-
col_start = find(strcmp(M.colheaders,'"Y_TRACER-1"'));
137-
col_end = find(strcmp(M.colheaders,'"Y_TRACER-128"'));
136+
col_start = find(strcmp(M.colheaders,'Y_TRACER-1'));
137+
col_end = find(strcmp(M.colheaders,'Y_TRACER-128'));
138138
Y_superbee_128 = M.data(end,col_start:col_end);
139139

140140
M = importdata([data_dir,'soborot_superbee_square_wave_128_1mesh_devc.csv'],',',2);
141-
col_start = find(strcmp(M.colheaders,'"Y_TRACER-1"'));
142-
col_end = find(strcmp(M.colheaders,'"Y_TRACER-128"'));
141+
col_start = find(strcmp(M.colheaders,'Y_TRACER-1'));
142+
col_end = find(strcmp(M.colheaders,'Y_TRACER-128'));
143143
Y_superbee_128_1mesh = M.data(end,col_start:col_end);
144144

145145
figure
@@ -176,23 +176,23 @@
176176
% FLUX_LIMITER='GODUNOV'
177177

178178
M = importdata([data_dir,'soborot_godunov_square_wave_16_devc.csv'],',',2);
179-
col_start = find(strcmp(M.colheaders,'"Y_TRACER-1"'));
180-
col_end = find(strcmp(M.colheaders,'"Y_TRACER-16"'));
179+
col_start = find(strcmp(M.colheaders,'Y_TRACER-1'));
180+
col_end = find(strcmp(M.colheaders,'Y_TRACER-16'));
181181
Y_godunov_16 = M.data(end,col_start:col_end);
182182

183183
M = importdata([data_dir,'soborot_godunov_square_wave_32_devc.csv'],',',2);
184-
col_start = find(strcmp(M.colheaders,'"Y_TRACER-1"'));
185-
col_end = find(strcmp(M.colheaders,'"Y_TRACER-32"'));
184+
col_start = find(strcmp(M.colheaders,'Y_TRACER-1'));
185+
col_end = find(strcmp(M.colheaders,'Y_TRACER-32'));
186186
Y_godunov_32 = M.data(end,col_start:col_end);
187187

188188
M = importdata([data_dir,'soborot_godunov_square_wave_64_devc.csv'],',',2);
189-
col_start = find(strcmp(M.colheaders,'"Y_TRACER-1"'));
190-
col_end = find(strcmp(M.colheaders,'"Y_TRACER-64"'));
189+
col_start = find(strcmp(M.colheaders,'Y_TRACER-1'));
190+
col_end = find(strcmp(M.colheaders,'Y_TRACER-64'));
191191
Y_godunov_64 = M.data(end,col_start:col_end);
192192

193193
M = importdata([data_dir,'soborot_godunov_square_wave_128_devc.csv'],',',2);
194-
col_start = find(strcmp(M.colheaders,'"Y_TRACER-1"'));
195-
col_end = find(strcmp(M.colheaders,'"Y_TRACER-128"'));
194+
col_start = find(strcmp(M.colheaders,'Y_TRACER-1'));
195+
col_end = find(strcmp(M.colheaders,'Y_TRACER-128'));
196196
Y_godunov_128 = M.data(end,col_start:col_end);
197197

198198
figure
@@ -311,23 +311,23 @@
311311
% FLUX_LIMITER='CHARM'
312312

313313
M = importdata([data_dir,'soborot_charm_cos_wave_16_devc.csv'],',',2);
314-
col_start = find(strcmp(M.colheaders,'"Y_TRACER-1"'));
315-
col_end = find(strcmp(M.colheaders,'"Y_TRACER-16"'));
314+
col_start = find(strcmp(M.colheaders,'Y_TRACER-1'));
315+
col_end = find(strcmp(M.colheaders,'Y_TRACER-16'));
316316
Y_charm_16 = M.data(end,col_start:col_end);
317317

318318
M = importdata([data_dir,'soborot_charm_cos_wave_32_devc.csv'],',',2);
319-
col_start = find(strcmp(M.colheaders,'"Y_TRACER-1"'));
320-
col_end = find(strcmp(M.colheaders,'"Y_TRACER-32"'));
319+
col_start = find(strcmp(M.colheaders,'Y_TRACER-1'));
320+
col_end = find(strcmp(M.colheaders,'Y_TRACER-32'));
321321
Y_charm_32 = M.data(end,col_start:col_end);
322322

323323
M = importdata([data_dir,'soborot_charm_cos_wave_64_devc.csv'],',',2);
324-
col_start = find(strcmp(M.colheaders,'"Y_TRACER-1"'));
325-
col_end = find(strcmp(M.colheaders,'"Y_TRACER-64"'));
324+
col_start = find(strcmp(M.colheaders,'Y_TRACER-1'));
325+
col_end = find(strcmp(M.colheaders,'Y_TRACER-64'));
326326
Y_charm_64 = M.data(end,col_start:col_end);
327327

328328
M = importdata([data_dir,'soborot_charm_cos_wave_128_devc.csv'],',',2);
329-
col_start = find(strcmp(M.colheaders,'"Y_TRACER-1"'));
330-
col_end = find(strcmp(M.colheaders,'"Y_TRACER-128"'));
329+
col_start = find(strcmp(M.colheaders,'Y_TRACER-1'));
330+
col_end = find(strcmp(M.colheaders,'Y_TRACER-128'));
331331
Y_charm_128 = M.data(end,col_start:col_end);
332332

333333
figure
@@ -367,23 +367,23 @@
367367
% FLUX_LIMITER='SUPERBEE'
368368

369369
M = importdata([data_dir,'soborot_superbee_cos_wave_16_devc.csv'],',',2);
370-
col_start = find(strcmp(M.colheaders,'"Y_TRACER-1"'));
371-
col_end = find(strcmp(M.colheaders,'"Y_TRACER-16"'));
370+
col_start = find(strcmp(M.colheaders,'Y_TRACER-1'));
371+
col_end = find(strcmp(M.colheaders,'Y_TRACER-16'));
372372
Y_superbee_16 = M.data(end,col_start:col_end);
373373

374374
M = importdata([data_dir,'soborot_superbee_cos_wave_32_devc.csv'],',',2);
375-
col_start = find(strcmp(M.colheaders,'"Y_TRACER-1"'));
376-
col_end = find(strcmp(M.colheaders,'"Y_TRACER-32"'));
375+
col_start = find(strcmp(M.colheaders,'Y_TRACER-1'));
376+
col_end = find(strcmp(M.colheaders,'Y_TRACER-32'));
377377
Y_superbee_32 = M.data(end,col_start:col_end);
378378

379379
M = importdata([data_dir,'soborot_superbee_cos_wave_64_devc.csv'],',',2);
380-
col_start = find(strcmp(M.colheaders,'"Y_TRACER-1"'));
381-
col_end = find(strcmp(M.colheaders,'"Y_TRACER-64"'));
380+
col_start = find(strcmp(M.colheaders,'Y_TRACER-1'));
381+
col_end = find(strcmp(M.colheaders,'Y_TRACER-64'));
382382
Y_superbee_64 = M.data(end,col_start:col_end);
383383

384384
M = importdata([data_dir,'soborot_superbee_cos_wave_128_devc.csv'],',',2);
385-
col_start = find(strcmp(M.colheaders,'"Y_TRACER-1"'));
386-
col_end = find(strcmp(M.colheaders,'"Y_TRACER-128"'));
385+
col_start = find(strcmp(M.colheaders,'Y_TRACER-1'));
386+
col_end = find(strcmp(M.colheaders,'Y_TRACER-128'));
387387
Y_superbee_128 = M.data(end,col_start:col_end);
388388

389389
figure

0 commit comments

Comments
 (0)