diff --git a/core/resources/datafiles/thrustcurves/RASAero/RASAero_Motors.eng b/core/resources/datafiles/thrustcurves/RASAero/RASAero_Motors.eng index a5d937a21..aa98b3a1a 100644 --- a/core/resources/datafiles/thrustcurves/RASAero/RASAero_Motors.eng +++ b/core/resources/datafiles/thrustcurves/RASAero/RASAero_Motors.eng @@ -1898,7 +1898,7 @@ G80T 29 124 4-7-10 0.0479 0.1161 AT G101T 29 114.3 5-8-12 0.046 0.136 AT 0.01 35.29 0.02 63.97 -0.02 78.09 +0.025 78.09 0.03 84.71 0.04 89.96 0.06 93.96 @@ -7314,9 +7314,9 @@ K660 54 572 7-17 1.177 1.949 CTI 3.69 0 ; ; -K1200 54 488 7-17 0.9814 1.6319 CTI +K1200 54 488 7-17 0.9814 1.6319 CTI 0.01 492.25 -0.01 1235.24 +0.015 1235.24 0.02 1369.46 0.05 1236.01 0.1 1279.47 @@ -7346,7 +7346,7 @@ K1200 54 488 7-17 0.9814 1.6319 CTI ; K1440 54 572 7-17 1.1624 1.8926 CTI 0.01 1061.8 -0.01 2168.21 +0.015 2168.21 0.02 2036.3 0.07 1691.73 0.1 1805.18 @@ -7570,7 +7570,7 @@ M1060 98 548 0 3.622 6.673 CTI 0.2 1453 0.24 1494 0.38 1450 -0.38 1425 +0.43 1425 0.5 1423 1 1462 1.5 1456 @@ -7704,7 +7704,7 @@ O5100 150 803 1000 13.245 23.577 CTI 0.04 3260.42 0.05 4001.47 0.07 4927.78 -0.07 5483.57 +0.08 5483.57 0.09 5817.04 0.13 6057.88 0.2 6206.09 @@ -8025,7 +8025,7 @@ H124_pvc 38 508 0 0.142 0.664 SRS 0.01 198.24 0.02 300.84 0.03 314.34 -0.03 316 +0.035 316 0.04 305.39 0.08 280.35 0.11 221.43 @@ -8055,7 +8055,7 @@ I147_pp 38 711 0 0.264 0.967 SRS 0 194.47 0.02 366.71 0.03 390.09 -0.03 392.3 +0.04 392.3 0.05 359.02 0.07 217.4 0.1 207.68 @@ -8078,9 +8078,9 @@ I147_pp 38 711 0 0.264 0.967 SRS I117_pvc 38 914 0 0.37 1.133 SRS 0.01 203.36 0.02 339.95 -0.02 358.77 +0.025 358.77 0.03 367.94 -0.03 361.47 +0.045 361.47 0.06 277.4 0.08 277.11 0.15 250.99 @@ -8233,7 +8233,6 @@ J348 54 606.5 0 0.3742 1.5983 SRS J144_pp 38 914 0 0.37 1.133 SRS 0.01 301.25 0.03 376.44 -0.03 376.86 0.08 247.31 0.22 273.45 0.45 263.59 @@ -8302,7 +8301,7 @@ K347 54 911.4 0 0.7688 2.3107 SRS 2.06 393.65 2.13 443.69 2.3 365.38 -2.3 292.31 +2.35 292.31 2.4 257.92 2.6 184.84 2.79 124.66 @@ -10847,7 +10846,6 @@ I150 38 229 20-100 0.1718 0.3983 EM ; I160 38 280 100 0.2319 0.4867 EM 0.01 205.72 -0.01 192.73 0.2 192.73 0.4 201.39 0.5 199.22 @@ -11301,8 +11299,8 @@ K1075RT 54 728 1000 1.314 2.541 GM 1.8 1123.36 2.24 0 ; -; -K700RT 54 492 1000 0.90135 0.17535 GM +; NOTE: the total weight in RASAero is originally 0.17535, but that is smaller than the propellant weight => throws an error... +K700RT 54 492 1000 0.90135 1.7535 GM 0.12 534 0.18 658.6 0.2 725.35 @@ -12289,8 +12287,8 @@ K600F 54 403 6-10-14-100 0.68096 1.41568 KBA 2.548 4.025 2.653 0 ; -; -L1000S 54 727.96 100 1.301 1.248 KBA +; NOTE: the total weight in RASAero is originally 1.248, but that is smaller than the propellant weight => throws an error... +L1000S 54 727.96 100 1.301 2.325 KBA 0.038 1310.24 0.085 1090.03 0.139 1023.97 @@ -12303,7 +12301,7 @@ L1000S 54 727.96 100 1.301 1.248 KBA 2.179 924.878 2.233 737.7 2.264 847.805 -2.295 682.648 +2.285 682.648 2.295 539.512 2.302 649.617 2.318 451.428 @@ -20962,8 +20960,8 @@ M1465BL 98 870 1000 4.49 9.80 GM 4.45 334 5.2 0 ; -; -M1025WC 98 870 1000 5.33 10.1 9.80 GM +; NOTE: original RASAero data had "M1025WC 98 870 1000 5.33 10.1 9.80 GM", but that was an entry too many => error +M1025WC 98 870 1000 5.33 10.1 GM 0.1 1780 0.5 1558 3.25 1500 @@ -21188,7 +21186,6 @@ J160 38 1219 1000 0.327926 0.544 RTW 0.015456 262.049 0.185471 255.442 0.278207 240.028 -0.278207 229.017 0.386399 251.038 0.510046 242.23 0.64915 213.603