Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
5099a89
burnout time changes. Getting started must change
FranzYuri Mar 9, 2023
f0d9835
Fix code style issues with Black
lint-action Mar 10, 2023
2636bbe
enh: added use of Function.setDiscrete,
MateusStano Mar 20, 2023
ffb3dd3
TST: decrease assertion requirements for flutter test
giovaniceotto Apr 1, 2023
adca87f
FIX: make methods compliant to the burn_time range.
phmbressan Apr 7, 2023
8b28356
TST: update testing to support burn_time.
phmbressan Apr 7, 2023
b20161b
TEMP: prepare package structure for merging.
phmbressan Apr 24, 2023
399eac1
Merge branch 'enh/liquid-motors' into enh/auto_burn_out_time
phmbressan Apr 24, 2023
6732323
MAINT: minor changes post merging.
phmbressan Apr 24, 2023
230b59c
Fix code style issues with Black
lint-action Apr 24, 2023
ca33e98
MAINT: refactor Motor.py constructor.
phmbressan May 6, 2023
3c83f80
MAINT: changed SolidMotor integrator to LSODA and tighten tolerances …
phmbressan May 6, 2023
32db637
TST: relax SolidMotor tests tolerances due to event trigger inaccuracy.
phmbressan May 6, 2023
2a33d6e
Fix code style issues with Black
lint-action May 6, 2023
541a01b
MAINT: change reshapeThrustCurve burnout argument to burn time range.
phmbressan May 17, 2023
a120fce
Merge branch 'enh/auto_burn_out_time' of https://github.com/RocketPy-…
phmbressan May 17, 2023
ee6cc9a
STY: apply code linting with black.
phmbressan May 17, 2023
4eeb099
MAINT: refactor reshapeThrustCurve code for clarity.
phmbressan May 22, 2023
9509772
ENH: change remaining `burnOut` to `burn_time`
MateusStano May 26, 2023
fe04a93
ENH: change remaining `burnOut` to `burn_time`
MateusStano May 26, 2023
53ec00d
FIX: motor thrust clip removed start and final points.
phmbressan Jun 6, 2023
081f0de
DOC: update dosctrings.
phmbressan Jun 6, 2023
84639c6
FIX: issue that solve_ivp did not include final burn point.
phmbressan Jun 6, 2023
f9c1790
FIX: fix burn_time out of bounds handling.
phmbressan Jun 7, 2023
8866187
Merge enh/liquid-motors and solve conflicts.
phmbressan Jun 21, 2023
124c9c0
TST: remove pandas dependency of liquidmotors test post merge.
phmbressan Jun 21, 2023
07a78ed
FIX: reshape thrust method start time translation.
phmbressan Jun 21, 2023
c58b768
Fix code style issues with Black
lint-action Jun 21, 2023
e4c75a1
MAINT: turn non instance related Motor methods into static.
phmbressan Jun 24, 2023
64b191a
Merge branch 'enh/liquid-motors' into enh/auto_burn_out_time.
phmbressan Jun 24, 2023
1a2959e
FIX: move tuple_handler function to tools.py
Gui-FernandesBR Jun 25, 2023
275e336
Merge branch 'enh/liquid-motors' into enh/auto_burn_out_time
Gui-FernandesBR Jun 25, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ A sample Motor object can be created by the following code:
```python
Pro75M1670 = SolidMotor(
thrustSource="../data/motors/Cesaroni_M1670.eng",
burnOut=3.9,
burn_time=3.9,
grainNumber=5,
grainSeparation=5/1000,
grainDensity=1815,
Expand Down
2 changes: 1 addition & 1 deletion docs/development/rocketpy_as_developer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ The motor class contains information about the thrust curve and uses some geomet

Pro75M1670 = SolidMotor(
thrustSource="../data/motors/Cesaroni_M1670.eng", #copy here the path to the thrust source file
burnOut=3.9,
burn_time=3.9,
grainNumber=5,
grainSeparation=5 / 1000,
grainDensity=1815,
Expand Down
2 changes: 1 addition & 1 deletion docs/matlab/Getting_Started.m
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@

Pro75M1670 = rocketpy.SolidMotor(pyargs( ...
'thrustSource', "../../data/motors/Cesaroni_M1670.eng", ...
'burnOut', 3.9, ...
'burn_time', 3.9, ...
'grainsCenterOfMassPosition', -0.85704, ...
'grainNumber', int32(5), ...
'grainSeparation', 5 / 1000, ...
Expand Down
11 changes: 10 additions & 1 deletion docs/notebooks/SEBLM.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
]
},
{
"attachments": {},
"cell_type": "markdown",
"metadata": {},
"source": [
Expand Down Expand Up @@ -64,6 +65,7 @@
]
},
{
"attachments": {},
"cell_type": "markdown",
"metadata": {},
"source": [
Expand All @@ -84,6 +86,7 @@
]
},
{
"attachments": {},
"cell_type": "markdown",
"metadata": {},
"source": [
Expand Down Expand Up @@ -116,6 +119,7 @@
]
},
{
"attachments": {},
"cell_type": "markdown",
"metadata": {},
"source": [
Expand Down Expand Up @@ -148,6 +152,7 @@
]
},
{
"attachments": {},
"cell_type": "markdown",
"metadata": {},
"source": [
Expand Down Expand Up @@ -190,6 +195,7 @@
]
},
{
"attachments": {},
"cell_type": "markdown",
"metadata": {},
"source": [
Expand All @@ -204,7 +210,7 @@
"source": [
"SEBLM = LiquidMotor(\n",
" thrustSource=\"../../data/SEBLM/test124_Thrust_Curve.csv\",\n",
" burnOut=20.0,\n",
" burn_time=20.0,\n",
" nozzleRadius=0.069/2,\n",
" nozzlePosition=-1.364,\n",
" coordinateSystemOrientation=\"nozzleToCombustionChamber\",\n",
Expand Down Expand Up @@ -259,6 +265,7 @@
]
},
{
"attachments": {},
"cell_type": "markdown",
"metadata": {},
"source": [
Expand Down Expand Up @@ -356,6 +363,7 @@
]
},
{
"attachments": {},
"cell_type": "markdown",
"metadata": {},
"source": [
Expand All @@ -370,6 +378,7 @@
]
},
{
"attachments": {},
"cell_type": "markdown",
"metadata": {},
"source": []
Expand Down
2 changes: 1 addition & 1 deletion docs/notebooks/compare_flights_usage.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"\n",
"Pro75M1670 = SolidMotor(\n",
" thrustSource=\"../../data/motors/Cesaroni_M1670.eng\",\n",
" burnOut=3.9,\n",
" burn_time=3.9,\n",
" grainsCenterOfMassPosition=-0.85704,\n",
" grainNumber=5,\n",
" grainSeparation=5 / 1000,\n",
Expand Down
Loading