Migrating from SVN. Major changes are to current test data and data viz.

Data Analysis/DataPlotsHelios_060218.m

@@ -50,8 +50,8 @@
 pom_threshold = 50*psi_to_Pa;
 pcc_threshold = 50*psi_to_Pa;
 tau_filter = 0.1; % s
-pom_filt = SimpleFilter(test_time1,pom,tau_filter,'low');
-pcc_filt = SimpleFilter(test_time2,pcc,tau_filter,'low');
+pom_filt = SimpleFilter(test_time1,pom,tau_filter);
+pcc_filt = SimpleFilter(test_time2,pcc,tau_filter);
 burn_start_time = test_time1(find(pom_filt>pom_threshold,1)) - 0.05;
 burn_end_time = test_time1(find(pom_filt<pom_threshold & test_time1>burn_start_time + 0.1,1)) + 0.05;
 burn_start_time2 = test_time2(find(pcc_filt>pcc_threshold,1)) - 0.05;
@@ -100,9 +100,8 @@
 
 %% Filtering
 tau_filter = 1.0; % s
-pft_filt = SimpleFilter(time,pft,tau_filter,'low');
-dp_fuel_filt = SimpleFilter(time,dp_fuel,tau_filter,'low');
-pcc_diff = SimpleFilter(time,dp_fuel,tau_filter,'high');
+pft_filt = SimpleFilter(time,pft,tau_filter);
+dp_fuel_filt = SimpleFilter(time,dp_fuel,tau_filter);
 
 %% Do Calculations
 % Calculate fuel mass flow based on ullage expansion
@@ -121,7 +120,6 @@
 % Calculate Performance Characteristics
 Impulse = trapz(time(burn_ind),ft(burn_ind));
 pcc_int = trapz(time(burn_ind),pcc(burn_ind));
-pcc_rms_int = sqrt(trapz(time(burn_ind),pcc_diff(burn_ind).^2));
 C_f = ft./(pcc*A_star);
 C_f_int = Impulse/(pcc_int*A_star);
 c_star_int = (pcc_int*A_star)/(m_ox + dm_fuel_test);
@@ -136,7 +134,6 @@
 fprintf('Burn Time: %.3g s\n', burn_time)
 fprintf('Avg. Thrust: %.3g kN (%.3g lbf)\n', ft_avg/1e3, ft_avg/lbf_to_N)
 fprintf('Avg. Pcc: %.3g MPa (%.3g psi)\n', pcc_avg/1e6, pcc_avg/psi_to_Pa)
-fprintf('Avg. Pcc RMS: %.3g %%\n', pcc_rms_int/pcc_int*1e2)
 fprintf('Isp: %.3g m/s (%.3g s)\n', Isp, Isp/9.81)
 fprintf('Isp efficiency: %.3g %%\n', Isp/Isp_theo)
 fprintf('C_f: %.3g \n', C_f_int)
@@ -225,14 +222,12 @@ function ExportData(test_time,pft,pom,pot,we,ft,pcc)
 end
 end
 
-function smoothed = SimpleFilter(time,values,tau,type)
+function smoothed = SimpleFilter(time,values,tau)
 dt = median(diff(time));
 Wn = dt/(tau);
 values(isnan(values)) = 0;
-[b, a] = butter(1,Wn,type);
+[b, a] = butter(1,Wn,'low');
 smoothed = filter(b, a, values);
-shift_ind = round(1/(4*Wn));
-smoothed(1:(end-shift_ind)) = smoothed((1+shift_ind):end);
 end
 
 function smoothed = DiffFilter(time,values,tau)

Data Analysis/DataPlotsOlympus_061419.m

@@ -219,6 +219,8 @@
 % ExportData(time(test_ind),pft(test_ind),pom(test_ind),pot(test_ind),...
 %     zeros(size(time(test_ind))),ft(test_ind),pcc(test_ind))
 
+GenerateThrustCurve((time(burn_ind)), ft(burn_ind), m_ox, m_fuel(1));
+
 %% Subfunctions
 function ExportData(test_time,pft,pom,pot,we,ft,pcc)
     [file,path] = uiputfile('*.mat');

OptimizeLiquidMass.m

@@ -22,7 +22,7 @@
 %-------Gases-----------------------
 
 helium = Gas();
-helium.c_v = 3.12e3; % J/kg*K
+helium.c_v = 3.12; % J/kg*K
 helium.molecular_mass = 4.0026e-3; % kg/mol
 
 nitrogen = Gas();

Outputs/F_thrust_RASAERO.eng

@@ -0,0 +1,32 @@
+; Name diameter(mm) Length(mm) delay propellant_weight(kg) mass(kg)
+O7700-I 143 2438 P 4.20 16.14 SSI
+0.010 1406.597
+0.190 1753.227
+0.380 1721.213
+0.560 1691.433
+0.750 1662.697
+0.930 1635.808
+1.110 1609.887
+1.300 1582.558
+1.480 1560.380
+1.660 1537.757
+1.850 1515.163
+2.030 1491.912
+2.220 1470.369
+2.400 1450.767
+2.580 1431.599
+2.770 1411.821
+2.950 1392.894
+3.130 1375.920
+3.320 1357.572
+3.500 1339.102
+3.690 1320.492
+3.870 1303.714
+4.050 1287.687
+4.240 1268.399
+4.420 1252.532
+4.600 1237.966
+4.790 1224.114
+4.970 1208.048
+5.160 1191.200
+5.331 0.000

Outputs/F_thrust_RASAERO.txt

@@ -1,32 +1,32 @@
 ; Name diameter(mm) Length(mm) delay propellant_weight(kg) mass(kg)
-O6900-I 143 2438 P 3.85 15.79 SSI
-0.010 1320.418
-0.200 1561.631
-0.400 1546.229
-0.590 1531.306
-0.790 1516.129
-0.980 1500.406
-1.180 1482.341
-1.370 1466.933
-1.570 1451.104
-1.760 1434.491
-1.960 1417.684
-2.150 1401.527
-2.350 1384.385
-2.540 1368.230
-2.740 1352.983
-2.930 1337.996
-3.130 1322.032
-3.320 1307.148
-3.520 1290.261
-3.710 1275.134
-3.910 1259.703
-4.100 1245.385
-4.300 1230.102
-4.490 1215.732
-4.690 1200.258
-4.880 490.540
-5.080 428.407
-5.270 376.835
-5.470 329.905
-5.655 0.000
+O14300-I 143 2438 P 56.61 68.55 SSI
+0.006 2663.471
+0.344 1425.436
+0.708 1460.808
+1.046 1283.946
+1.468 1496.181
+1.823 1708.415
+2.161 1637.670
+2.502 1566.926
+2.863 1531.553
+3.201 1602.298
+3.542 1460.808
+3.897 1602.298
+4.237 1637.670
+4.575 1460.808
+4.935 1566.926
+5.276 1496.181
+5.614 1425.436
+5.968 1354.691
+6.308 1531.553
+6.651 1213.201
+7.015 1177.829
+7.352 1390.063
+7.688 1283.946
+8.028 1177.829
+8.382 1425.436
+8.720 1425.436
+9.067 1390.063
+9.422 1248.574
+9.762 1283.946
+10.100 1000.967

Outputs/F_thrust_RASAERO8125.txt

@@ -0,0 +1,33 @@
+; Name diameter(mm) Length(mm) delay propellant_weight(kg) mass(kg)
+M11100-I 101.6 1938 P 4.78 10.73 SS8125I
+0.010 1674.463
+0.200 1750.452
+0.390 1718.633
+0.570 1688.256
+0.760 1660.109
+0.950 1631.561
+1.140 1604.121
+1.320 1578.341
+1.510 1555.441
+1.700 1531.626
+1.890 1508.789
+2.070 1485.753
+2.260 1464.456
+2.450 1444.087
+2.640 1423.985
+2.820 1405.144
+3.010 1385.370
+3.200 1367.976
+3.390 1348.826
+3.570 1331.123
+3.760 1312.111
+3.950 1295.494
+4.140 1277.518
+4.320 1260.203
+4.510 1244.052
+4.700 1229.869
+4.890 1214.602
+5.070 1197.413
+5.260 1182.964
+5.444 0.000
+;

Outputs/F_thrust_RASAERO_100.txt

@@ -0,0 +1,33 @@
+; Name diameter(mm) Length(mm) delay propellant_weight(kg) mass(kg)
+M11100-I 101.6 1938 P 5.68 11.63 SSS100I
+0.010 1533.573
+0.260 1722.620
+0.510 1678.133
+0.770 1636.994
+1.020 1598.718
+1.270 1563.832
+1.520 1531.412
+1.780 1498.266
+2.030 1467.778
+2.280 1440.061
+2.530 1413.303
+2.790 1385.588
+3.040 1361.859
+3.290 1336.570
+3.540 1312.367
+3.800 1288.947
+4.050 1265.957
+4.300 1243.896
+4.550 1224.352
+4.810 1205.060
+5.060 1182.849
+5.310 1165.263
+5.560 1146.137
+5.820 1126.426
+6.070 1106.964
+6.320 1088.369
+6.570 1072.188
+6.830 1053.732
+7.080 1035.516
+7.329 0.000
+;

Outputs/F_thrust_RASAERO_105.txt

@@ -0,0 +1,32 @@
+; Name diameter(mm) Length(mm) delay propellant_weight(kg) mass(kg)
+M1710-I 143 2438 P 5.47 11.42 SSI105I
+0.010 1455.957
+0.290 1709.413
+0.570 1661.926
+0.850 1619.489
+1.130 1578.376
+1.410 1542.485
+1.690 1508.087
+1.970 1472.802
+2.250 1441.859
+2.530 1412.700
+2.810 1384.213
+3.090 1357.195
+3.370 1331.220
+3.650 1304.877
+3.930 1279.639
+4.220 1255.347
+4.500 1231.357
+4.780 1210.377
+5.060 1191.510
+5.340 1168.419
+5.620 1150.271
+5.900 1130.485
+6.180 1110.938
+6.460 1090.872
+6.740 1073.692
+7.020 1060.255
+7.300 1043.769
+7.580 1025.464
+7.860 297.752
+8.134 0.000

Outputs/F_thrust_RASAERO_80.txt

@@ -0,0 +1,33 @@
+; Name diameter(mm) Length(mm) delay propellant_weight(kg) mass(kg)
+M11100-I 101.6 1938 P 4.72 9.69 SSS8I
+0.010 1406.597
+0.190 1753.227
+0.380 1721.213
+0.560 1691.433
+0.750 1662.697
+0.930 1635.808
+1.110 1609.887
+1.300 1582.558
+1.480 1560.380
+1.660 1537.757
+1.850 1515.163
+2.030 1491.912
+2.220 1470.369
+2.400 1450.767
+2.580 1431.599
+2.770 1411.821
+2.950 1392.894
+3.130 1375.920
+3.320 1357.572
+3.500 1339.102
+3.690 1320.492
+3.870 1303.714
+4.050 1287.687
+4.240 1268.399
+4.420 1252.532
+4.600 1237.966
+4.790 1224.114
+4.970 1208.048
+5.160 1191.200
+5.331 0.000
+;

Outputs/F_thrust_RASAERO_825.txt

@@ -0,0 +1,32 @@
+; Name diameter(mm) Length(mm) delay propellant_weight(kg) mass(kg)
+M11100-I 101.6 1938 P 4.84 10.79 SS825I
+0.010 1673.515
+0.200 1749.384
+0.390 1717.571
+0.580 1685.042
+0.780 1656.020
+0.970 1627.280
+1.160 1599.772
+1.350 1573.417
+1.540 1550.364
+1.730 1526.751
+1.920 1503.283
+2.120 1478.727
+2.310 1457.538
+2.500 1437.279
+2.690 1417.426
+2.880 1397.391
+3.070 1378.740
+3.260 1360.794
+3.450 1341.243
+3.650 1321.846
+3.840 1303.920
+4.030 1287.115
+4.220 1267.968
+4.410 1251.238
+4.600 1236.042
+4.790 1222.128
+4.990 1204.118
+5.180 1188.027
+5.370 1173.740
+5.559 0.000

Outputs/F_thrust_RASAERO_85.txt

@@ -0,0 +1,33 @@
+; Name diameter(mm) Length(mm) delay propellant_weight(kg) mass(kg)
+M11100-I 101.6 1938 P 4.96 10.09 SSS85I
+0.010 1446.394
+0.210 1745.409
+0.410 1711.931
+0.610 1678.010
+0.810 1648.317
+1.010 1618.541
+1.210 1589.449
+1.410 1563.456
+1.610 1538.202
+1.810 1514.112
+2.010 1488.200
+2.210 1465.699
+2.410 1444.107
+2.610 1422.877
+2.810 1401.900
+3.000 1382.460
+3.200 1363.890
+3.400 1343.532
+3.600 1324.165
+3.800 1304.935
+4.000 1287.384
+4.200 1267.498
+4.400 1249.935
+4.600 1234.134
+4.800 1219.266
+5.000 1201.158
+5.200 1184.867
+5.400 1169.844
+5.600 1153.479
+5.794 0.000
+;