Skip to content

Commit

Permalink
Merge branch 'develop' into mnt/tank-cad-testing
Browse files Browse the repository at this point in the history
  • Loading branch information
Gui-FernandesBR authored Nov 30, 2024
2 parents e39413e + 5cb88c3 commit e6dec5b
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 13 deletions.
File renamed without changes.
16 changes: 15 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,36 @@ Attention: The newest changes should be on top -->

### Added


### Changed

- MNT: Refactor Tank's testing Assertion with CAD data. [#678](https://github.com/RocketPy-Team/RocketPy/pull/678)

### Fixed


## [v1.7.0] - 2024-11-30

### Added

- DOC: GENESIS Flight Example [#734](https://github.com/RocketPy-Team/RocketPy/pull/734)
- DOC: Camoes Flight Example [#733](https://github.com/RocketPy-Team/RocketPy/pull/733)
- ENH: Callback function for collecting additional data from Monte Carlo sims [#702](https://github.com/RocketPy-Team/RocketPy/pull/702)
- ENH: Implement optional plot saving [#597](https://github.com/RocketPy-Team/RocketPy/pull/597)

### Changed

- MNT: Refactor Tank's testing Assertion with CAD data. [#678](https://github.com/RocketPy-Team/RocketPy/pull/678)
- REL: update version to 1.7.0 in configuration files [#741](https://github.com/RocketPy-Team/RocketPy/pull/741)
- MNT: Place filename save parameter to the end. [#739](https://github.com/RocketPy-Team/RocketPy/pull/739)
- DOC: improvements to developers documentation [#732](https://github.com/RocketPy-Team/RocketPy/pull/732)

### Fixed

- BUG: Allow multiple sets of stochastic fins [#737](https://github.com/RocketPy-Team/RocketPy/pull/737)
- BUG: forecast and reanalysis models - Update ECMWF dictionary values [#736](https://github.com/RocketPy-Team/RocketPy/pull/736)
- BUG: forecast and reanalysis models - move wind_speed to correct position [#735](https://github.com/RocketPy-Team/RocketPy/pull/735)
- BUG: Sideslip Angle and Damping Coefficient Calculation [#729](https://github.com/RocketPy-Team/RocketPy/pull/729)
- DOC: fixed documentation about spherical caps [#728](https://github.com/RocketPy-Team/RocketPy/pull/728)

## [v1.6.2] - 2024-11-08

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
author = "RocketPy Team"

# The full version, including alpha/beta/rc tags
release = "1.6.2"
release = "1.7.0"


# -- General configuration ---------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions docs/user/environment/1-atm-models/ensemble.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Global Ensemble Forecast System (GEFS)
The ``GEFS`` model is a global ensemble forecast model ...


.. jupyter-execute::
.. code-block:: python
from datetime import date, timedelta
from rocketpy import Environment
Expand All @@ -45,7 +45,7 @@ The ``GEFS`` model is a global ensemble forecast model ...
.. forecasts are kept away stored.
.. Changing this is as easy as the following line of code.
.. jupyter-execute::
.. code-block:: python
env_gefs.select_ensemble_member(3) # selects the 3rd forecast member
Expand All @@ -56,7 +56,7 @@ A very useful thing is to compare the forecast of all ensemble members, as well
as confirming how many are there.
All of this can be done by calling the :meth:`rocketpy.Environment.all_info` method.

.. jupyter-execute::
.. code-block:: python
env_gefs.all_info()
Expand Down
2 changes: 1 addition & 1 deletion docs/user/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ If you want to choose a specific version to guarantee compatibility, you may ins

.. code-block:: shell
pip install rocketpy==1.6.2
pip install rocketpy==1.7.0
Optional Installation Method: ``conda``
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "rocketpy"
version = "1.6.2"
version = "1.7.0"
description="Advanced 6-DOF trajectory simulation for High-Power Rocketry."
dynamic = ["dependencies"]
readme = "README.md"
Expand Down
2 changes: 1 addition & 1 deletion rocketpy/motors/hybrid_motor.py
Original file line number Diff line number Diff line change
Expand Up @@ -616,4 +616,4 @@ def draw(self, *, filename=None):
-------
None
"""
self.plots.draw(filename)
self.plots.draw(filename=filename)
2 changes: 1 addition & 1 deletion rocketpy/motors/liquid_motor.py
Original file line number Diff line number Diff line change
Expand Up @@ -478,4 +478,4 @@ def draw(self, *, filename=None):
-------
None
"""
self.plots.draw(filename)
self.plots.draw(filename=filename)
2 changes: 1 addition & 1 deletion rocketpy/motors/solid_motor.py
Original file line number Diff line number Diff line change
Expand Up @@ -742,4 +742,4 @@ def draw(self, *, filename=None):
-------
None
"""
self.plots.draw(filename)
self.plots.draw(filename=filename)
2 changes: 1 addition & 1 deletion rocketpy/motors/tank.py
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ def draw(self, *, filename=None):
-------
None
"""
self.plots.draw(filename)
self.plots.draw(filename=filename)

def info(self):
"""Prints out a summary of the tank properties."""
Expand Down
2 changes: 1 addition & 1 deletion rocketpy/rocket/aero_surface/fins/fins.py
Original file line number Diff line number Diff line change
Expand Up @@ -442,4 +442,4 @@ def draw(self, *, filename=None):
-------
None
"""
self.plots.draw(filename)
self.plots.draw(filename=filename)
2 changes: 1 addition & 1 deletion rocketpy/rocket/aero_surface/nose_cone.py
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ def draw(self, *, filename=None):
-------
None
"""
self.plots.draw(filename)
self.plots.draw(filename=filename)

def info(self):
"""Prints and plots summarized information of the nose cone.
Expand Down
1 change: 1 addition & 0 deletions rocketpy/simulation/monte_carlo.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ def __init__(
a Flight object and returns a value of that variable. For instance
.. code-block:: python
custom_data_collector = {
"max_acceleration": lambda flight: max(flight.acceleration(flight.time)),
"date": lambda flight: flight.env.date,
Expand Down

0 comments on commit e6dec5b

Please sign in to comment.