MNT: post rebase fixes.

Author: phmbressan

CHANGELOG.md

@@ -205,8 +205,6 @@ To install this version, run `pip install rocketpy==1.8.0`
 
 ### Changed
 
-- DOC: Fix documentation dependencies [#651](https://github.com/RocketPy-Team/RocketPy/pull/651)
-- DOC: Fix documentation warnings [#645](https://github.com/RocketPy-Team/RocketPy/pull/645)
 - DOC: New Environment class docs pages [#644](https://github.com/RocketPy-Team/RocketPy/pull/644)
 
 ### Fixed

docs/examples/SEB_liquid_motor.ipynb

@@ -35,74 +35,6 @@ def __init__(self, tank):
         self.flux_time = tank.flux_time
         self.geometry = tank.geometry
 
-    def fluid_mass(self, start_time, end_time):
-        """Plots the fluid mass of the tank as a function of time.
-
-        Parameters
-        ----------
-        start_time : float
-            Initial time to plot the fluid mass.
-        end_time : float
-            Final time to plot the fluid mass.
-
-        Returns
-        -------
-        None
-        """
-        _, ax = Function.compare_plots(
-            [
-                (self.tank.fluid_mass, "Total fluid mass"),
-                (self.tank.liquid_mass, "Liquid Mass"),
-                (self.tank.gas_mass, "Gas Mass"),
-            ],
-            start_time,
-            end_time,
-            title="Tank Fluid Masses",
-            xlabel="Time (s)",
-            ylabel="Mass (kg)",
-            show=False,
-            return_object=True,
-        )
-        ax.get_lines()[1].set_linestyle("--")
-        ax.get_lines()[2].set_linestyle("-.")
-        plt.show()
-
-    def net_mass_flow_rate(self):
-        """Plots the net mass flow rate of the tank as a function of time.
-
-        Returns
-        -------
-        None
-        """
-        self.tank.net_mass_flow_rate()
-
-    def fluid_volume(self):
-        """Plots the fluid volume of the tank as a function of time.
-
-        Returns
-        -------
-        None
-        """
-        self.tank.fluid_volume()
-
-    def center_of_mass(self):
-        """Plots the center of mass of the tank as a function of time.
-
-        Returns
-        -------
-        None
-        """
-        self.tank.center_of_mass()
-
-    def inertia(self):
-        """Plots the inertia of the tank as a function of time.
-
-        Returns
-        -------
-        None
-        """
-        self.tank.inertia()
-
     def _generate_tank(self, translate=(0, 0), csys=1):
         """Generates a matplotlib patch object that represents the tank.
 
@@ -263,4 +195,3 @@ def all(self):
         self.fluid_volume()
         self.fluid_center_of_mass()
         self.tank.inertia.plot(*self.flux_time)
-        self.fluid_mass(*self.tank.flux_time)

rocketpy/plots/tank_plots.py

@@ -431,9 +431,7 @@ def oxidizer_tank(oxidizer_fluid, oxidizer_pressurant, propellant_tank_geometry)
 
 
 @pytest.fixture
-def spherical_oxidizer_tank(
-    oxidizer_fluid, oxidizer_pressurant, spherical_oxidizer_geometry
-):
+def spherical_oxidizer_tank(oxidizer_fluid, oxidizer_pressurant):
     """An example of a oxidizer spherical tank.
 
     Parameters

tests/fixtures/motor/data/Cesaroni_M1670_shifted.eng

@@ -348,4 +348,19 @@ def expected_gas_inertia(t):
         tank.liquid_inertia.y_array,
         atol=1e-3,
         rtol=1e-2,
-    )
+    )
+    assert np.allclose(
+        expected_gas_inertia(times), tank.gas_inertia.y_array, atol=1e-3, rtol=1e-2
+    )
+    assert np.allclose(
+        expected_liquid_inertia(times) + expected_gas_inertia(times),
+        tank.inertia.y_array,
+        atol=1e-3,
+        rtol=1e-2,
+    )
+
+
+@patch("matplotlib.pyplot.show")
+def test_tank_geometry_plots_info(mock_show):  # pylint: disable=unused-argument
+    assert TankGeometry({(0, 5): 1}).plots.all() is None
+