Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / core / resources / datafiles / thrustcurves / Cesaroni_J425.eng

diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_J425.eng b/core/resources/datafiles/thrustcurves/Cesaroni_J425.eng
index c7da07b27115d5b78b65198f5b2eabbddfb6281d..f220b24b9f393795a53dcaf55246121ea2bb98b2 100644 (file)
--- a/core/resources/datafiles/thrustcurves/Cesaroni_J425.eng
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_J425.eng
@@ -1,24 +1,83 @@
-J425BS 38 421 16-13-11-9-7 0.405 0.7000000000000001 Cesaroni\r
-   0.028 141.739\r
-   0.053 133.043\r
-   0.079 126.957\r
-   0.126 123.478\r
-   0.574 116.957\r
-   1.014 110.0\r
-   1.3 105.652\r
-   1.34 102.609\r
-   1.374 95.217\r
-   1.414 77.826\r
-   1.437 73.478\r
-   1.472 72.174\r
-   1.519 64.783\r
-   1.547 54.783\r
-   1.595 36.087\r
-   1.658 18.261\r
-   1.695 13.913\r
-   1.747 10.87\r
-   1.821 9.13\r
-   1.898 6.087\r
-   1.935 4.783\r
-   1.944 3.478\r
-   1.945 0.0\r
+; Pro38 784J425-16A\r
+J425 38 409.2 16-13-11-9-7 0.405 0.7000000000000001 CTI\r
+   0.0060 4.399\r
+   0.01 92.386\r
+   0.011 272.759\r
+   0.012 434.068\r
+   0.013 507.39\r
+   0.016 589.511\r
+   0.02 668.699\r
+   0.021 720.025\r
+   0.027 659.901\r
+   0.037 632.038\r
+   0.053 589.511\r
+   0.069 566.048\r
+   0.098 554.317\r
+   0.135 552.85\r
+   0.167 548.451\r
+   0.206 546.984\r
+   0.251 542.585\r
+   0.289 542.585\r
+   0.326 538.186\r
+   0.369 533.786\r
+   0.41 526.454\r
+   0.455 527.921\r
+   0.489 523.521\r
+   0.508 520.588\r
+   0.524 520.588\r
+   0.561 517.655\r
+   0.589 522.055\r
+   0.62 517.655\r
+   0.656 513.256\r
+   0.687 510.323\r
+   0.72 505.924\r
+   0.75 507.39\r
+   0.787 505.924\r
+   0.818 504.457\r
+   0.856 500.058\r
+   0.887 495.659\r
+   0.919 494.192\r
+   0.952 492.726\r
+   0.987 489.793\r
+   1.017 489.793\r
+   1.05 485.394\r
+   1.078 482.461\r
+   1.113 482.461\r
+   1.146 479.528\r
+   1.18 479.528\r
+   1.217 472.196\r
+   1.252 473.662\r
+   1.288 470.729\r
+   1.321 464.863\r
+   1.348 451.665\r
+   1.366 431.135\r
+   1.382 401.806\r
+   1.395 378.343\r
+   1.407 357.813\r
+   1.421 338.749\r
+   1.445 325.551\r
+   1.476 313.819\r
+   1.498 300.621\r
+   1.521 278.625\r
+   1.541 249.296\r
+   1.556 224.366\r
+   1.568 206.769\r
+   1.58 184.772\r
+   1.596 161.309\r
+   1.607 140.779\r
+   1.625 117.316\r
+   1.641 93.853\r
+   1.67 73.322\r
+   1.69 63.057\r
+   1.717 52.792\r
+   1.745 48.393\r
+   1.772 45.46\r
+   1.796 42.527\r
+   1.821 42.527\r
+   1.849 38.128\r
+   1.884 29.329\r
+   1.906 26.396\r
+   1.929 19.064\r
+   1.955 16.131\r
+   1.978 10.265\r
+   1.996 0.0\r