MNT: fix merge errors from v1 into dispersion branch

README.md

@@ -357,4 +357,4 @@ This project is licensed under the MIT License - see the [LICENSE.md](https://gi
 
 ## Release Notes
 
-Want to know which bugs have been fixed and the new features of each version? Check out the [release notes](https://github.com/RocketPy-Team/RocketPy/releases).
+Want to know which bugs have been fixed and the new features of each version? Check out the [release notes](https://github.com/RocketPy-Team/RocketPy/releases).

docs/examples/ndrt_2020_flight_sim.ipynb

@@ -81,7 +81,7 @@
    "source": [
     "parameters = {\n",
     "    # Mass Details\n",
-    "    \"rocket_mass\": (18.998, 0.010),  # Rocket dry mass: 20.846 kg\n",
+    "    \"rocket_mass\": (18.998, 0.010), # Rocket dry mass: 20.846 kg\n",
     "    # propulsion details\n",
     "    \"motor_structure_mass\": (1.848, 0.1),\n",
     "    \"burn_time\": (3.433, 0.1),\n",
@@ -222,7 +222,7 @@
     "    throat_radius=parameters.get(\"throat_radius\")[0],\n",
     "    interpolation_method=\"linear\",\n",
     "    nozzle_position=parameters.get(\"nozzle_position\")[0],\n",
-    "    coordinate_system_orientation=\"combustion_chamber_to_nozzle\",  # combustion_chamber_to_nozzle\"\n",
+    "    coordinate_system_orientation=\"combustion_chamber_to_nozzle\" #combustion_chamber_to_nozzle\"\n",
     ")"
    ]
   },
@@ -329,7 +329,9 @@
     ")\n",
     "ndrt2020.set_rail_buttons(1.5, 2, 45)\n",
     "\n",
-    "ndrt2020.add_motor(motor=motor_l1395, position=parameters.get(\"motor_position\")[0])"
+    "ndrt2020.add_motor(\n",
+    "    motor=motor_l1395, position=parameters.get(\"motor_position\")[0]\n",
+    ")"
    ]
   },
   {
@@ -356,7 +358,7 @@
     "nose_cone = ndrt2020.add_nose(\n",
     "    length=parameters.get(\"nose_length\")[0],\n",
     "    kind=\"tangent\",\n",
-    "    position=parameters.get(\"nose_position\")[0],\n",
+    "    position=parameters.get(\"nose_position\")[0]\n",
     ")\n",
     "fin_set = ndrt2020.add_trapezoidal_fins(\n",
     "    4,\n",
@@ -698,7 +700,7 @@
     "    outputs=\"Altitude above ground level (m)\",\n",
     "    interpolation=\"linear\",\n",
     "    extrapolation=\"zero\",\n",
-    ")  # the division by 3.281 is to convert from feet to meters"
+    ") # the division by 3.281 is to convert from feet to meters"
    ]
   },
   {
@@ -738,7 +740,7 @@
    ],
    "source": [
     "Function.compare_plots(\n",
-    "    plot_list=[(actual_vz, \"Actual\"), (actual_vz_filtered, \"Filtered\")],\n",
+    "    plot_list=[(actual_vz, \"Actual\"),(actual_vz_filtered, \"Filtered\")],\n",
     "    ylabel=\"Vertical velocity (m/s)\",\n",
     "    title=\"Vertical velocity\",\n",
     "    xlabel=\"Time (s)\",\n",
@@ -783,11 +785,11 @@
    ],
    "source": [
     "Function.compare_plots(\n",
-    "    plot_list=[(actual_az, \"Actual\"), (actual_az_filtered, \"Filtered\")],\n",
+    "    plot_list=[(actual_az, \"Actual\"),(actual_az_filtered, \"Filtered\")],\n",
     "    ylabel=\"Vertical acceleration (m/s^2)\",\n",
     "    title=\"Vertical acceleration\",\n",
     "    xlabel=\"Time (s)\",\n",
-    ")"
+    ")\n"
    ]
   },
   {

docs/notebooks/compare_flights_usage.ipynb

@@ -72,7 +72,7 @@
     "env = Environment(latitude=-23, longitude=-49, date=after_tomorrow)\n",
     "env.set_atmospheric_model(type=\"Forecast\", file=\"GFS\")\n",
     "\n",
-    "Pro75M1670 = SolidMotor(\n",
+    "Pro75M1670 =  SolidMotor(\n",
     "    thrust_source=\"../../data/motors/Cesaroni_M1670.eng\",\n",
     "    dry_mass=1.815,\n",
     "    dry_inertia=(0.125, 0.125, 0.002),\n",
@@ -109,7 +109,9 @@
     "\n",
     "calisto.add_motor(Pro75M1670, position=-1.255)\n",
     "\n",
-    "nosecone = calisto.add_nose(length=0.55829, kind=\"vonKarman\", position=1.278)\n",
+    "nosecone = calisto.add_nose(\n",
+    "    length=0.55829, kind=\"vonKarman\", position=1.278\n",
+    ")\n",
     "\n",
     "fin_set = calisto.add_trapezoidal_fins(\n",
     "    n=4,\n",
@@ -118,7 +120,7 @@
     "    span=0.110,\n",
     "    position=-1.04956,\n",
     "    cant_angle=0.5,\n",
-    "    airfoil=(\"../../data/calisto/NACA0012-radians.csv\", \"radians\"),\n",
+    "    airfoil=(\"../../data/calisto/NACA0012-radians.csv\",\"radians\"),\n",
     ")\n",
     "\n",
     "tail = calisto.add_tail(\n",
@@ -130,6 +132,7 @@
     "    # p = pressure considering parachute noise signal\n",
     "    # h = height above ground level considering parachute noise signal\n",
     "    # y = [x, y, z, vx, vy, vz, e0, e1, e2, e3, w1, w2, w3]\n",
+    "\n",
     "    # activate drogue when vz < 0 m/s.\n",
     "    return True if y[5] < 0 else False\n",
     "\n",
@@ -138,8 +141,9 @@
     "    # p = pressure considering parachute noise signal\n",
     "    # h = height above ground level considering parachute noise signal\n",
     "    # y = [x, y, z, vx, vy, vz, e0, e1, e2, e3, w1, w2, w3]\n",
-    "    # activate main when vz < 0 m/s and z < 800 + 1400 m (+1400 due to surface elevation).\n",
-    "    return True if y[5] < 0 and y[2] < 800 + 1400 else False\n",
+    "\n",
+    "    # activate main when vz < 0 m/s and z < 800 m\n",
+    "    return True if y[5] < 0 and h < 800 else False\n",
     "\n",
     "\n",
     "Main = calisto.add_parachute(\n",
@@ -190,7 +194,7 @@
     "            heading=heading,\n",
     "            name=f\"Incl {inclination} Head {heading}\",\n",
     "        )\n",
-    "        flights.append(flight)"
+    "        flights.append(flight)\n"
    ]
   },
   {
@@ -651,6 +655,7 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [

docs/notebooks/deployable_payload_example.ipynb

@@ -972,32 +972,3 @@
  "nbformat": 4,
  "nbformat_minor": 2
 }
-],
-"metadata": {
-"kernelspec": {
-"display_name": "Python 3",
-"language": "python",
-"name": "python3"
-},
-"language_info": {
-"codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-},
-"file_extension": ".py",
-"mimetype": "text/x-python",
-"name": "python",
-"nbconvert_exporter": "python",
-"pygments_lexer": "ipython3",
-"version": "3.10.5"
-},
-"orig_nbformat": 4,
-"vscode": {
-"interpreter": {
-    "hash": "26de051ba29f2982a8de78e945f0abaf191376122a1563185a90213a26c5da77"
-}
-}
-},
-"nbformat": 4,
-"nbformat_minor": 2
-}

docs/notebooks/dispersion_analysis/dispersion_analysis.ipynb

@@ -539,15 +539,15 @@
     "## Post-processing Monte Carlo Dispersion Results\n",
     "\n",
     "Now that we have finish running thousands of simulations, it is time to process the results and get some nice graphs out of them! "
-  ]
-},
-{
-  "attachments": {},
-  "cell_type": "markdown",
-  "metadata": {
-    "id": "X8ewOccUpOQb"
+   ]
   },
-  "source": [
+  {
+   "attachments": {},
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "X8ewOccUpOQb"
+   },
+   "source": [
     "### Importing Dispersion Analysis Saved Data\n",
     "\n",
     "We start by loading the file which stores the outputs."
@@ -558,7 +558,7 @@
    "execution_count": 7,
    "metadata": {
     "colab": {
-      "base_uri": "https://localhost:8080/"
+     "base_uri": "https://localhost:8080/"
     },
     "id": "-7qgTJzRpOQb",
     "outputId": "76d2cecd-a09f-429f-cca2-f4e03e39d49e"
@@ -650,25 +650,8 @@
    "execution_count": 8,
    "metadata": {
     "colab": {
-      "collapsed_sections": [
-        "au88RN0P-bVl",
-        "-9u9RIaqpOQl",
-        "tExJzLhDpOQp",
-        "ifuJX7jYpORB",
-        "mYD4EQ5spORE",
-        "ajI4vr7QpORL",
-        "9m19OV9upORS",
-        "mQzQELcJpORX",
-        "7MUVLAM-pORb",
-        "4LpDYGpfpORf",
-        "nKSzDWi7pORi",
-        "BvMCGZYHpORn",
-        "LhPQQlpHpORq",
-        "5MvfiSQZvwPK"
-      ],
-      "name": "Valetudo_Monte_Carlo_Dispersion_Analysis.ipynb",
-      "provenance": [],
-      "toc_visible": true
+     "base_uri": "https://localhost:8080/",
+     "height": 607
     },
     "id": "1JQSzd5cpOQh",
     "outputId": "455abcdf-9dd7-4689-9523-50154c7fb302"