hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update thrust curve files

Browse Source
This commit is contained in:
Sampo Niskanen 2012-12-10 23:30:56 +02:00
parent ff22040df0
commit 49858f589f
18 changed files with 11121 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,4 +1,6 @@
*~
# /
/bin
/build

0
core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J175.rse → core/resources-src/datafiles/thrustcurves/manual/Loki_J175.rse
View File

5
core/resources-src/datafiles/thrustcurves/thrustcurve.org/README.txt → core/resources-src/datafiles/thrustcurves/manual/README.txt
View File

@ -3,10 +3,7 @@ This directory contains manually added / modified thrust curves.
All other thrust curves are from www.thrustcurve.org
(all RASP and RSE files).
SF_*.eng - Thrust curves for Weco Feuerwerk motors, created by Sampo N.
WECO_*.eng - Thrust curves for Weco Feuerwerk motors, created by Sampo N.
Loki_J175.rse - Corrected motor type from hybrid to reloadable
Quest_D5_1.eng - Corrected motor mass from .451 to .0451
Quest_Micro_Maxx_II.eng - Removed "NE" from delays since OR cannot handle it.

10895
core/resources-src/datafiles/thrustcurves/thrustcurve.org/00INDEX.txt Normal file
View File

File diff suppressed because it is too large Load Diff

28
core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G145.rse Normal file
View File

@ -0,0 +1,28 @@
<engine-database>
<engine-list>
<engine mfg="Cesaroni Technology Inc." code="140-G145-PK-15A" Type="reloadable"
dia="24." len="228.001" initWt="161.9" propWt="77.2" delays="15,12,10,8,6"
auto-calc-mass="1" auto-calc-cg="1" avgThrust="137.552" peakThrust="346.018"
throatDia="0." exitDia="0." Itot="139.615" burn-time="1.01" massFrac="47.68"
Isp="184.41" tDiv="10" tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1"
mDiv="10" mStep="-1." mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
<comments>Pink Pro24 6G
140-G145-PK 15A
</comments>
<data>
<eng-data t="0." f="0." m="77.2" cg="114."/>
<eng-data t="0.007" f="286.726" m="76.6451" cg="114."/>
<eng-data t="0.013" f="346.018" m="75.5955" cg="114."/>
<eng-data t="0.022" f="310.619" m="73.9616" cg="114."/>
<eng-data t="0.039" f="226.991" m="71.4348" cg="114."/>
<eng-data t="0.066" f="203.097" m="68.2242" cg="114."/>
<eng-data t="0.343" f="174.779" m="39.2852" cg="114."/>
<eng-data t="0.672" f="138.496" m="10.7897" cg="114."/>
<eng-data t="0.775" f="75.664" m="4.69104" cg="114."/>
<eng-data t="0.899" f="29.204" m="1.09587" cg="114."/>
<eng-data t="0.982" f="13.274" m="0.121107" cg="114."/>
<eng-data t="1.015" f="0." m="0." cg="114."/>
</data>
</engine>
</engine-list>
</engine-database>

2
core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L730.rse
View File

@ -1,7 +1,7 @@
<engine-database>
<engine-list>
<engine mfg="Cesaroni Technology Inc." code="L730" Type="reloadable" dia="54."
len="6490." initWt="2247." propWt="1351." delays="1000" auto-calc-mass="1"
len="649" initWt="2247." propWt="1351." delays="1000" auto-calc-mass="1"
auto-calc-cg="1" avgThrust="732.947" peakThrust="1216.59" throatDia="0."
exitDia="0." Itot="2763.21" burn-time="3.77" massFrac="60.12" Isp="208.56"
tDiv="10" tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10"

22
core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1160.eng Normal file
View File

@ -0,0 +1,22 @@
;
M1160 75 757 P 3.454 5.698 Ces
0.063 954
0.094 772
0.126 1100
0.220 1167
0.410 1227
1.009 1300
1.451 1325
1.766 1361
1.924 1343
2.507 1276
2.996 1221
3.485 1179
4.022 1142
4.337 1124
4.479 1057
4.747 814
5.000 200
5.141 18
5.280 0
;

32
core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1160.rse Normal file
View File

@ -0,0 +1,32 @@
<engine-database>
<engine-list>
<engine mfg="Cesaroni Technology Inc." code="5880-M1160-GR-P" Type="reloadable"
dia="75." len="756.999" initWt="5698." propWt="3517." delays="0"
auto-calc-mass="1" auto-calc-cg="1" avgThrust="1146.1" peakThrust="1381.9"
throatDia="0." exitDia="0." Itot="5886.35" burn-time="5.14" massFrac="61.72"
Isp="170.67" tDiv="10" tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1"
mDiv="10" mStep="-1." mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
<comments>Green3 Pro75 5G
5880-M1160-GR P
</comments>
<data>
<eng-data t="0." f="0." m="3517." cg="378.5"/>
<eng-data t="0.038" f="929.495" m="3506.45" cg="378.5"/>
<eng-data t="0.061" f="745.241" m="3494.94" cg="378.5"/>
<eng-data t="0.093" f="1072.62" m="3477.56" cg="378.5"/>
<eng-data t="0.189" f="1182.84" m="3412.88" cg="378.5"/>
<eng-data t="0.619" f="1271.68" m="3097.57" cg="378.5"/>
<eng-data t="1.382" f="1311.16" m="2508.84" cg="378.5"/>
<eng-data t="1.824" f="1381.9" m="2153.24" cg="378.5"/>
<eng-data t="2.424" f="1270.04" m="1677.89" cg="378.5"/>
<eng-data t="3.668" f="1164.75" m="773.037" cg="378.5"/>
<eng-data t="3.68" f="1166.39" m="764.681" cg="378.5"/>
<eng-data t="4.334" f="1110.46" m="319.836" cg="378.5"/>
<eng-data t="4.527" f="1039.72" m="195.863" cg="378.5"/>
<eng-data t="4.735" f="763.337" m="83.8237" cg="378.5"/>
<eng-data t="5.049" f="101.998" m="2.65098" cg="378.5"/>
<eng-data t="5.136" f="0." m="0." cg="378.5"/>
</data>
</engine>
</engine-list>
</engine-database>

26
core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1401.eng Normal file
View File

@ -0,0 +1,26 @@
;
M1401 75 757 1000 3.508 5.774 Ces
0.079 1669
0.134 1562
0.189 1513
0.512 1507
1.009 1519
1.506 1574
1.679 1598
1.861 1604
2.003 1574
2.5 1513
2.981 1483
3.501 1471
3.722 1434
3.785 1404
3.911 1191
4.053 1009
4.116 808
4.235 595
4.345 407
4.447 200
4.589 30
4.794 60
4.99 0
;

27
core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1830.rse Normal file
View File

@ -0,0 +1,27 @@
<engine-database>
<engine-list>
<engine mfg="Cesaroni Technology Inc." code="5604-M1830-CS-P" Type="reloadable"
dia="75." len="621." initWt="4524." propWt="2666." delays="0" auto-calc-mass="1"
auto-calc-cg="1" avgThrust="1765.05" peakThrust="2300.79" throatDia="0."
exitDia="0." Itot="5586.38" burn-time="3.17" massFrac="58.93" Isp="213.67"
tDiv="10" tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10"
mStep="-1." mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
<comments>CStar Pro75 4G
5604-M1830-CS P
</comments>
<data>
<eng-data t="0." f="0." m="2666." cg="310.5"/>
<eng-data t="0.018" f="2300.79" m="2656.12" cg="310.5"/>
<eng-data t="0.028" f="1952.86" m="2645.97" cg="310.5"/>
<eng-data t="0.155" f="2008.98" m="2525.91" cg="310.5"/>
<eng-data t="1.111" f="2121.21" m="1583.74" cg="310.5"/>
<eng-data t="1.452" f="2053.87" m="1244.02" cg="310.5"/>
<eng-data t="1.782" f="1958.47" m="928.077" cg="310.5"/>
<eng-data t="2.608" f="1694.72" m="208.044" cg="310.5"/>
<eng-data t="2.677" f="1546.02" m="154.686" cg="310.5"/>
<eng-data t="3.06" f="115.039" m="2.88227" cg="310.5"/>
<eng-data t="3.165" f="0." m="0." cg="310.5"/>
</data>
</engine>
</engine-list>
</engine-database>

30
core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2200.rse Normal file
View File

@ -0,0 +1,30 @@
<engine-database>
<engine-list>
<engine mfg="Cesaroni Technology Inc." code="12066-N2200-PK-P" Type="unspecified"
dia="98." len="1010." initWt="11356." propWt="6308." delays="0"
auto-calc-mass="1" auto-calc-cg="1" avgThrust="2062.8" peakThrust="2755.85"
throatDia="0." exitDia="0." Itot="12088." burn-time="5.86" massFrac="55.5477"
Isp="195.408" tDiv="10" tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1"
mDiv="10" mStep="-1." mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
<comments>Pink Pro98 5G
12066-N2200-PK P
Note that the motor was fired in a 6G casing with a single Pro98-Spacer
</comments>
<data>
<eng-data t="0." f="0." m="6308." cg="505."/>
<eng-data t="0.033" f="2755.85" m="6284.27" cg="505."/>
<eng-data t="0.143" f="2434.78" m="6135.29" cg="505."/>
<eng-data t="0.624" f="2555.18" m="5509.04" cg="505."/>
<eng-data t="1.814" f="2602.01" m="3907.76" cg="505."/>
<eng-data t="2.67" f="2461.54" m="2776.83" cg="505."/>
<eng-data t="4.186" f="2130.43" m="960.45" cg="505."/>
<eng-data t="4.66" f="2063.55" m="441.754" cg="505."/>
<eng-data t="4.796" f="1852.84" m="302.781" cg="505."/>
<eng-data t="5.067" f="775.92" m="116.903" cg="505."/>
<eng-data t="5.236" f="474.916" m="61.7464" cg="505."/>
<eng-data t="5.497" f="180.602" m="17.1055" cg="505."/>
<eng-data t="5.86" f="0." m="0." cg="505."/>
</data>
</engine>
</engine-list>
</engine-database>

15
core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2540.eng Normal file
View File

@ -0,0 +1,15 @@
; Based on the Rocksim file by Andre Choquette
N2540 98 1239 P 10.7 16.2805 Ces
0.073 2586.93
0.11 2789.97
0.398 2761.96
1.14 2761.96
1.73 2828.47
2.613 2894.98
4.16 2747.96
5.666 2565.93
5.972 2415.
6.338 1953.33
6.819 745.624
7.061 101.517
7.222 0

30
core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_D5.eng
View File

@ -1,25 +1,25 @@
;QUEST D5 RASP.ENG FILE
;The total impulse, peak thrust, average thrust and burn time are
;the same as the averaged static test data on the NAR web site in
;the certification file. The curve drawn with these data points is as
;close to the certification curve as can be with such a limited
;number of points (32) allowed with wRASP up to v1.6.
D5 20 96 4-6 0.024 0.0451 QUEST
0.01 1.014
; QUEST D5 RASP.ENG FILE
; The total impulse, peak thrust, average thrust and burn time are
; the same as the averaged static test data on the NAR web site in
; the certification file. The curve drawn with these data points is as
; close to the certification curve as can be with such a limited
; number of points (32) allowed with wRASP up to v1.6.
D5 20 96 4-6 0.0240 0.0451 QUEST
0.010 1.014
0.122 2.652
0.172 4.836
0.273 7.723
0.331 10.61
0.39 13.809
0.448 16.8
0.48 12.403
0.331 10.610
0.390 13.809
0.448 16.800
0.480 12.403
0.484 8.266
0.517 5.221
0.713 4.125
0.974 4.121
1.135 3.338
1.324 3.101
1.55 3.254
1.550 3.254
1.971 3.169
2.393 3.162
2.752 3.391
@ -27,9 +27,9 @@ D5 20 96 4-6 0.024 0.0451 QUEST
3.547 3.301
3.694 3.064
3.948 3.294
4.215 3.29
4.215 3.290
4.412 3.287
4.496 2.505
4.586 1.801
4.61 0
4.610 0.000
;

30
core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_D5_1.eng
View File

@ -1,25 +1,25 @@
; QUEST D5 RASP.ENG FILE
; The total impulse, peak thrust, average thrust and burn time are
; the same as the averaged static test data on the NAR web site in
; the certification file. The curve drawn with these data points is as
; close to the certification curve as can be with such a limited
; number of points (32) allowed with wRASP up to v1.6.
D5 20 96 4-6 0.0240 0.0451 QUEST
0.010 1.014
;QUEST D5 RASP.ENG FILE
;The total impulse, peak thrust, average thrust and burn time are
;the same as the averaged static test data on the NAR web site in
;the certification file. The curve drawn with these data points is as
;close to the certification curve as can be with such a limited
;number of points (32) allowed with wRASP up to v1.6.
D5 20 96 4-6 0.024 0.0451 QUEST
0.01 1.014
0.122 2.652
0.172 4.836
0.273 7.723
0.331 10.610
0.390 13.809
0.448 16.800
0.480 12.403
0.331 10.61
0.39 13.809
0.448 16.8
0.48 12.403
0.484 8.266
0.517 5.221
0.713 4.125
0.974 4.121
1.135 3.338
1.324 3.101
1.550 3.254
1.55 3.254
1.971 3.169
2.393 3.162
2.752 3.391
@ -27,9 +27,9 @@ D5 20 96 4-6 0.0240 0.0451 QUEST
3.547 3.301
3.694 3.064
3.948 3.294
4.215 3.290
4.215 3.29
4.412 3.287
4.496 2.505
4.586 1.801
4.610 0.000
4.61 0
;

2
core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_Micro_Maxx_II.eng
View File

@ -1,5 +1,5 @@
; Traced from NAR certification data dated 1-29-2009
MicroMaxxII 6 26 1 5.0E-4 0.0010 Q
MicroMaxxII 6 26 NE-1 5.0E-4 0.0010 Q
0.021 0.015
0.036 0.05
0.043 0.103

BIN
core/resources/datafiles/thrustcurves/thrustcurves.ser
View File

Binary file not shown.

20
core/src/net/sf/openrocket/database/motor/ThrustCurveMotorSet.java
View File

@ -28,8 +28,8 @@ public class ThrustCurveMotorSet implements Comparable<ThrustCurveMotorSet> {
private static final DesignationComparator DESIGNATION_COMPARATOR = new DesignationComparator();
private static final ThrustCurveMotorComparator comparator = new ThrustCurveMotorComparator();
private final ArrayList<ThrustCurveMotor> motors = new ArrayList<ThrustCurveMotor>();
private final Map<ThrustCurveMotor, String> digestMap =
new IdentityHashMap<ThrustCurveMotor, String>();
@ -44,7 +44,7 @@ public class ThrustCurveMotorSet implements Comparable<ThrustCurveMotorSet> {
private Motor.Type type = Motor.Type.UNKNOWN;
public void addMotor(ThrustCurveMotor motor) {
// Check for first insertion
@ -92,7 +92,7 @@ public class ThrustCurveMotorSet implements Comparable<ThrustCurveMotorSet> {
}
Collections.sort(delays);
// Check whether to add as new motor or overwrite existing
final String digest = motor.getDigest();
for (int index = 0; index < motors.size(); index++) {
@ -145,7 +145,7 @@ public class ThrustCurveMotorSet implements Comparable<ThrustCurveMotorSet> {
return false;
}
if (!simplifiedDesignation.equals(simplifyDesignation(m.getDesignation())))
if (!simplifiedDesignation.equalsIgnoreCase(simplifyDesignation(m.getDesignation())))
return false;
return true;
@ -219,8 +219,8 @@ public class ThrustCurveMotorSet implements Comparable<ThrustCurveMotorSet> {
}
@Override
public String toString() {
return "ThrustCurveMotorSet[" + manufacturer + " " + designation +
@ -228,8 +228,8 @@ public class ThrustCurveMotorSet implements Comparable<ThrustCurveMotorSet> {
}
private static final Pattern SIMPLIFY_PATTERN = Pattern.compile("^[0-9]*[ -]*([A-Z][0-9]+).*");
/**
@ -245,7 +245,7 @@ public class ThrustCurveMotorSet implements Comparable<ThrustCurveMotorSet> {
if (m.matches()) {
return m.group(1);
} else {
return str;
return str.replaceAll("\\s", "");
}
}

2
core/src/net/sf/openrocket/file/motor/RASPMotorLoader.java
View File

@ -109,7 +109,7 @@ public class RASPMotorLoader extends AbstractMotorLoader {
if (buf[i].equalsIgnoreCase("P") ||
buf[i].equalsIgnoreCase("plugged")) {
delays.add(Motor.PLUGGED);
} else {
} else if (buf[i].matches("[0-9]+")) {
// Many RASP files have "100" as an only delay
double d = Double.parseDouble(buf[i]);
if (d < 99)