ENH: added new parameters into add_parachute method in Rocket class

Author: ArthurJWH

rocketpy/rocket/parachute.py

@@ -92,6 +92,7 @@ class Parachute:
         Function of noisy_pressure_signal.
     Parachute.clean_pressure_signal_function : Function
         Function of clean_pressure_signal.
+<<<<<<< HEAD
     Parachute.radius : float
         Length of the non-unique semi-axis (radius) of the inflated hemispheroid
         parachute in meters.
@@ -106,6 +107,15 @@ class Parachute:
     Parachute.added_mass_coefficient : float
         Coefficient used to calculate the added-mass due to dragged air. It is
         calculated from the porosity of the parachute.
+=======
+    Parachute.parachute_radius : float
+        Radius of the inflated parachute in meters.
+    Parachute.parachute_height : float
+        Height of the inflated parachute in meters.
+    Parachute.porosity : float
+        Porosity of the parachute material, which is a measure of how much air can
+        pass through the parachute material.
+>>>>>>> 78ef92e7 (ENH: added new parameters into add_parachute method in Rocket class)
     """
 
     def __init__(
@@ -171,6 +181,7 @@ def __init__(
             The values are used to add noise to the pressure signal which is
             passed to the trigger function. Default value is ``(0, 0, 0)``.
             Units are in Pa.
+<<<<<<< HEAD
         radius : float, optional
             Length of the non-unique semi-axis (radius) of the inflated hemispheroid
             parachute. Default value is 1.5.
@@ -184,6 +195,18 @@ def __init__(
             in [0, 1]. Affects only the added-mass scaling during descent; it does
             not change ``cd_s`` (drag). The default, 0.0432, yields an added-mass
             of 1.0 (“neutral” behavior).
+=======
+        parachute_radius : float, optional
+            Radius of the inflated parachute. Default value is 1.5.
+            Units are in meters.
+        parachute_height : float, optional
+            Height of the inflated parachute. Default value is the radius parachute.
+            Units are in meters.
+        porosity : float, optional
+            Porosity of the parachute material, which is a measure of how much air can
+            pass through the parachute material.
+            Default value is 0.0432 (for consistency with previous versions).
+>>>>>>> 78ef92e7 (ENH: added new parameters into add_parachute method in Rocket class)
         """
         self.name = name
         self.cd_s = cd_s
@@ -210,7 +233,6 @@ def __init__(
             - 0.25975 * self.porosity**2
             + 1.2626 * self.porosity**3
         )
-
         alpha, beta = self.noise_corr
         self.noise_function = lambda: alpha * self.noise_signal[-1][
             1

rocketpy/rocket/rocket.py

@@ -1507,6 +1507,7 @@ def add_parachute(
             The values are used to add noise to the pressure signal which is
             passed to the trigger function. Default value is (0, 0, 0). Units
             are in pascal.
+<<<<<<< HEAD
         radius : float, optional
             Length of the non-unique semi-axis (radius) of the inflated hemispheroid
             parachute. Default value is 1.5.
@@ -1520,6 +1521,18 @@ def add_parachute(
             in [0, 1]. Affects only the added-mass scaling during descent; it does
             not change ``cd_s`` (drag). The default, 0.0432, yields an added-mass
             of 1.0 (“neutral” behavior).
+=======
+        parachute_radius : float, optional
+            Radius of the inflated parachute. Default value is 1.5.
+            Units are in meters.
+        parachute_height : float, optional
+            Height of the inflated parachute. Default value is the radius parachute.
+            Units are in meters.
+        porosity : float, optional
+            Porosity of the parachute material, which is a measure of how much air can
+            pass through the parachute material.
+            Default value is 0.0432 (for consistency with previous versions).
+>>>>>>> 78ef92e7 (ENH: added new parameters into add_parachute method in Rocket class)
 
         Returns
         -------