Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
351 commits
Select commit Hold shift + click to select a range
6aa41b2
ENH: add LiquidMotor inertia evaluation.
phmbressan Nov 21, 2022
625770f
MAINT: add and update docstrings for LiquidMotors.
phmbressan Nov 21, 2022
6771022
Merge pull request #299 from RocketPy-Team/enh/liquid-motors-tank-ine…
giovaniceotto Nov 21, 2022
a14e883
MAINT: expand docstrings regarding center of mass and inertia.
phmbressan Nov 21, 2022
088f857
Merge pull request #307 from RocketPy-Team/enh/liquid-motors-updates
giovaniceotto Nov 22, 2022
4597fcc
Merge branch 'unit_testing' into enh/LiquidMotor-pr
gautamsaiy Feb 13, 2023
9c9bb1e
updated inertia
gautamsaiy Feb 13, 2023
7adcddf
ready for pr.
gautamsaiy Feb 14, 2023
eb90d56
ADD: update Function Operations.
phmbressan Feb 15, 2023
378c45f
MAINT: merge v0.13.0.
phmbressan Feb 15, 2023
ebf46b9
ADD: TankGeometry class for Piecewise definition.
phmbressan Feb 17, 2023
2b71a95
MAINT: refactor MassBasedTank Function definitions.
phmbressan Feb 17, 2023
7ad7789
MAINT: refactor UllageBasedTank and standardize its definition.
phmbressan Feb 17, 2023
9a05dbc
ADD: Introduce and inplement LevelBasedTank.
phmbressan Feb 17, 2023
faad719
MAINT: refactor MassBasedTank Function definitions.
phmbressan Feb 17, 2023
ac15aec
MAINT: refactor Tank class accordingly (WIP).
phmbressan Feb 17, 2023
29e3e3f
ADD: new classes and references to __init__.py.
phmbressan Feb 17, 2023
20f378a
ENH: update TankGeometry class with funcify.
phmbressan Feb 19, 2023
ba0e3bb
MAINT: add TankGeometry docstrings.
phmbressan Feb 19, 2023
b3b1f71
MAINT: use scipy root to improve root finding performance.
phmbressan Feb 19, 2023
b47dd74
ENH: add average Function Operation.
phmbressan Feb 19, 2023
4b17be5
MAINT: minor Function additions.
phmbressan Feb 19, 2023
02c1f20
ENH: implement Tank class Center of Mass and Inertia. Move to another…
phmbressan Feb 19, 2023
84e02d5
MAINT: add docstrings to LiquidMotor.
phmbressan Feb 19, 2023
4b8128d
MAINT: update __init__.py and linting.
phmbressan Feb 19, 2023
dad6c00
TST: add unit testing for Tanks.
phmbressan Feb 19, 2023
dbd0609
MAINT: remove unnecessary funcify calls.
phmbressan Feb 22, 2023
d58861e
FIX: correct compose Functions implementation (WIP).
phmbressan Feb 22, 2023
47bd1fe
TST: minor fix of Tank tests.
phmbressan Feb 23, 2023
c231df4
ENH: define basic Classes and Methods structure (WIP).
phmbressan Feb 24, 2023
d4eaf23
ENH: update parent Motor class to suit new subclasses.
phmbressan Mar 4, 2023
ce2358e
ENH: draft of GenericMotor implementation.
phmbressan Mar 4, 2023
3defcc3
FIX: correct subclassing of GenericMotor.
phmbressan Mar 4, 2023
0a28957
ENH: update LiquidMotor methods and attribute naming.
phmbressan Mar 4, 2023
1298c7c
MAINT: improve exception handling of Tank.
phmbressan Mar 4, 2023
ea51bd3
ENH: update SolidMotor structure:
phmbressan Mar 4, 2023
1ea2008
ENH: implement HybridMotor class:
phmbressan Mar 4, 2023
c4bf57a
EHN: add GenericMotor implementation and minor fixes.
phmbressan Mar 5, 2023
a586454
STY: code linting.
phmbressan Mar 5, 2023
5099a89
burnout time changes. Getting started must change
FranzYuri Mar 9, 2023
f0d9835
Fix code style issues with Black
lint-action Mar 10, 2023
300ce25
MAINT: add plots and update docstrings.
phmbressan Mar 11, 2023
33db7cf
Merge branch 'enh/motors-abstract' into enh/liquid-motors
phmbressan Mar 11, 2023
e9b4c8a
MAINT: create motors submodule
giovaniceotto Mar 11, 2023
7173d93
Merge branch 'beta/v1.0.0' into enh/liquid-motors
giovaniceotto Mar 14, 2023
a76c31b
MAINT: minor adjustments after beta/v1.0.0 merge
giovaniceotto Mar 14, 2023
ecd6922
Fix code style issues with Black
lint-action Mar 14, 2023
f4d6fd5
DOC: minor fixes to support added example notebooks.
phmbressan Mar 15, 2023
8f4616a
TST: remove tests of older code development.
phmbressan Mar 15, 2023
238cbd0
MERGE: revised_eom into liquid motor
giovaniceotto Mar 17, 2023
ace5c33
Fix code style issues with Black
lint-action Mar 17, 2023
610ebbb
ENH: improve default value of throat radius
giovaniceotto Mar 17, 2023
fc69b46
MAINT: change ZeroDivision handling and update title plots.
phmbressan Mar 18, 2023
da78294
Fix code style issues with Black
lint-action Mar 18, 2023
2636bbe
enh: added use of Function.setDiscrete,
MateusStano Mar 20, 2023
ebe458f
MAINT: define new naming convention for inertia tensor for Motors
giovaniceotto Mar 29, 2023
063f6b3
MAINT: New inertia tensor formalism in the Rocket class
giovaniceotto Mar 29, 2023
ca55ed2
Fix code style issues with Black
lint-action Mar 29, 2023
2381a6d
MAINT: Apply new inertia tensor naming to Flight class
giovaniceotto Mar 30, 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
5f67037
MAINT: Refactor "time (s)" to "Time (s)" to fix input mismatch in Fun…
giovaniceotto Apr 11, 2023
fb8fd9d
MAINT: Set new inertia naming convention
giovaniceotto Apr 11, 2023
f18f10f
TST: implement new inertia formalism
giovaniceotto Apr 11, 2023
900ecfc
merge beta/v1.0.0 into enh/liquid-motors
MateusStano Apr 12, 2023
0b11939
Fix code style issues with Black
lint-action Apr 12, 2023
839d597
ENH: added TankGeometry imports in init.py
MateusStano Apr 12, 2023
b10e71c
ENH: fixed inertia prints
MateusStano Apr 12, 2023
8d5d094
ENH: changed `function` into `radius_function` in TankGeometry
MateusStano Apr 12, 2023
05d3aa1
MAINT: added spaces in except_negative error message
MateusStano Apr 12, 2023
3425220
ENH: refactored gasHeight in Ullage and LiquidHeight based tanks
MateusStano Apr 12, 2023
fba114d
ENH: change `structure` to `geometry` in Tanks classes
MateusStano Apr 12, 2023
b0262ca
ENH: fixed liquidVolume calculation in UllageBasedTank
MateusStano Apr 12, 2023
43cb9ca
ENH: notebooks changes
MateusStano Apr 12, 2023
8710668
Merge branch 'enh/liquid-motors' of https://github.com/RocketPy-Team/…
MateusStano Apr 13, 2023
8604a8a
MAINT: dismiss nozzleRadius and grainSeparation defaults in HybridMotors
giovaniceotto Apr 13, 2023
b1ab481
TST: fix inertia naming convention in solid motor tests
giovaniceotto Apr 13, 2023
a876360
Fix code style issues with Black
lint-action Apr 13, 2023
ed76bb3
ENH: speedup EOM
giovaniceotto Apr 19, 2023
7a59ff0
Fix code style issues with Black
lint-action Apr 19, 2023
c7dbea7
Merge branch 'enh/Function-Arithmetic' into enh/liquid-motors-optimiz…
phmbressan Apr 21, 2023
8c7c766
ENH: move centroid and inertia volume computation to TankGeometry.
phmbressan Apr 22, 2023
0b6f8e2
MAINT: refactor Tank according to tests.
phmbressan Apr 23, 2023
3fe8c04
TEMP: minor changes to Function pending resolution.
phmbressan Apr 23, 2023
c918fc0
DOC: update liquid motor notebook.
phmbressan Apr 23, 2023
d4bce36
Merge enh/Function-Arithmetic.
phmbressan Apr 23, 2023
d067413
ENH: Tank checks for absence of liquid or gas.
phmbressan Apr 23, 2023
f0f5472
MAINT: turn Tank discretization and flux time mandatory.
phmbressan Apr 23, 2023
4685e63
TEMP: add tests only empty Tank notebook.
phmbressan Apr 24, 2023
ba2ef82
Merge branch 'enh/Function-Arithmetic' into enh/liquid-motors-optimiz…
phmbressan Apr 24, 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
e60ea7b
ENH: add dry mass support for Motors (WIP).
phmbressan May 17, 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
ede9072
MAINT: update docstrings to match dry mass parameter.
phmbressan May 22, 2023
1125f90
TST: tests updates.
phmbressan May 22, 2023
7804a34
Fix code style issues with Black
lint-action May 22, 2023
45e3ac4
FIX: minor typo correction.
phmbressan May 22, 2023
38b4f8f
ENH: create Vector and Matrix class
giovaniceotto May 22, 2023
6c5b82d
TST: add tests for matrix class
giovaniceotto May 22, 2023
cf50076
TST: add tests for vector class
giovaniceotto May 22, 2023
d748830
ENH: implement Matrix and Vector instances in uDot
giovaniceotto May 22, 2023
a4eca18
Fix code style issues with Black
lint-action 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
a7ffc8b
ENH: Motors dry center of mass and dry inertia tensor calculations.
phmbressan May 27, 2023
bd3b8f4
DOC: update notebooks to include dry center of mass and dry inertia.
phmbressan May 27, 2023
b459682
Update rocketpy/motors/TankGeometry.py
phmbressan May 27, 2023
c9d27fd
Fix code style issues with Black
lint-action May 27, 2023
88ccb01
Update rocketpy/Function.py
phmbressan May 27, 2023
4f0835a
MAINT: handle single floats in Tank flux time.
phmbressan May 27, 2023
225b3dc
MAINT: handle empty Tanks integral bounds.
phmbressan May 28, 2023
6761f6b
DOC: update docs, including temp example_liquid_empty.
phmbressan May 28, 2023
7bffaeb
FIX: uncomment debugging code lines.
phmbressan May 28, 2023
d6d60e7
MAINT: fix bugs and polish Vector and Matrix implementation
giovaniceotto May 29, 2023
8371a91
MAINT: Update flight derivatives to use match new Vector operations
giovaniceotto May 29, 2023
0056778
Fix code style issues with Black
lint-action May 29, 2023
a4b4ab0
MAINT: Fix flight derivative bugs
giovaniceotto May 29, 2023
0619b00
Fix code style issues with Black
lint-action May 29, 2023
638d21b
ENH: Implement callable/Function based Vectors and Matrices
giovaniceotto May 29, 2023
8418fdd
DOC: Improve Vector and Matrix docstrings to include examples
giovaniceotto May 29, 2023
0d08691
ENH: speed up execution by dropping support for lists and np.arrays i…
giovaniceotto Jun 2, 2023
b261455
MAINT: bump up numpy requirements to 1.13
giovaniceotto Jun 2, 2023
6c87c09
MAINT: update uDot to match new Vector class changes
giovaniceotto Jun 2, 2023
72229e4
Fix code style issues with Black
lint-action Jun 2, 2023
e397af3
Update rocketpy/Function.py
phmbressan Jun 5, 2023
c694ce2
Update rocketpy/Function.py
phmbressan Jun 5, 2023
7d031f7
Fix code style issues with Black
lint-action Jun 5, 2023
8867fb0
ENH: improve matmul execution time by removing try except
giovaniceotto Jun 6, 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
1f1722a
Update rocketpy/Function.py comparison error message.
phmbressan Jun 7, 2023
7a557e7
Update rocketpy/Function.py comparison error message.
phmbressan Jun 7, 2023
1a44a30
Fix rocketpy/motors/Tank.py docstring typo.
phmbressan Jun 7, 2023
379fd88
Merge branch 'enh/Function-Arithmetic' into enh/liquid-motors-optimiz…
phmbressan Jun 7, 2023
6df536a
MAINT: correct docstrings and minor fixes.
phmbressan Jun 7, 2023
ee2e4a1
MAINT: refactor identityFunction for speed
phmbressan Jun 7, 2023
18acbac
MAINT: improve TankGeometry naming and descriptions.
phmbressan Jun 7, 2023
e039f8b
STY: run black for code linting.
phmbressan Jun 7, 2023
3283dee
Update rocketpy/motors/Tank.py docstrings.
phmbressan Jun 7, 2023
f398390
DOC: update Tank class flux_time docstring.
phmbressan Jun 7, 2023
df897a1
ENH: add setDiscreteBasedOnModel polation optional parameter.
phmbressan Jun 8, 2023
5374a6e
MAINT: ignore numpy invalid value on Function divide.
phmbressan Jun 8, 2023
cddffde
MAINT: merge beta/v1.0.0 to update branch.
phmbressan Jun 8, 2023
2bae6e5
TST: small tests fix post merge.
phmbressan Jun 8, 2023
de7f5e7
TST: remove SolidMotor solve_ivp t_eval to fix testing.
phmbressan Jun 8, 2023
97222a8
FIX: imports for python 3.7 compliance.
phmbressan Jun 8, 2023
8d33117
Merge branch 'enh/liquid-motors' into enh/liquid-motors-optimization
phmbressan Jun 8, 2023
e2b7cf4
Fix code style issues with Black
lint-action Jun 8, 2023
8e916e6
MAINT: support cache in python 3.7.
phmbressan Jun 8, 2023
2a081ee
TST: update solve_ivp SolidMotor config and relax testing tolerances.
phmbressan Jun 8, 2023
e1bb1f1
TST: cherry pick newer testing tolerances.
phmbressan May 6, 2023
ca18df8
TST: change integrator from BDF to LSODA.
phmbressan Jun 9, 2023
e0c49b6
Merge pull request #354 from RocketPy-Team/enh/liquid-motors-optimiza…
phmbressan Jun 9, 2023
7789687
Update rocketpy/motors/HybridMotor.py dry_mass docstring.
phmbressan Jun 10, 2023
749e9c9
Update rocketpy/motors/HybridMotor.py
phmbressan Jun 10, 2023
0ae9b2d
Update rocketpy/motors/HybridMotor.py dry CoM description
phmbressan Jun 10, 2023
adf60a2
DOC: update Motors docstrings.
phmbressan Jun 10, 2023
1cbffec
MAINT: change naming scheme and update docstrings.
phmbressan Jun 13, 2023
73e584d
ENH: variable exhaust velocity computation.
phmbressan Jun 14, 2023
3e470fd
BUG: fix wrong sign in T21 of np free EOM
MateusStano Jun 14, 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
09a96ae
ENH: Implement transformation matrices
giovaniceotto Jun 21, 2023
ed2033e
MAINT: cleanup uDot implementation and respective toggles
giovaniceotto Jun 21, 2023
4461227
Merge branch 'beta/v1.0.0' into enh/liquid-motors-linear-algebra
giovaniceotto Jun 21, 2023
9ceab4f
BUG: EmptyMotor missing required attributes intialization
MateusStano Jun 21, 2023
ad6f2f9
ENH: Changes to Rocket to account for motor mass
MateusStano Jun 21, 2023
2306f87
MAINT: rename Flight.EOM to Flight.equations_of_motion
giovaniceotto Jun 22, 2023
cd5ce08
ENH: partial solution to static margin calculation errors
MateusStano Jun 23, 2023
e4c75a1
MAINT: turn non instance related Motor methods into static.
phmbressan Jun 24, 2023
eb900d6
Merge branch 'beta/v1.0.0' into enh/liquid-motors
MateusStano Jun 24, 2023
64b191a
Merge branch 'enh/liquid-motors' into enh/auto_burn_out_time.
phmbressan Jun 24, 2023
0d81ed9
Merge branch 'enh/liquid-motors' into enh/motors-mass
MateusStano Jun 24, 2023
4b3c5c5
Merge branch 'enh/liquid-motors' into enh/liquid-motors-linear-algebra
giovaniceotto Jun 25, 2023
9e252ce
Fix code style issues with Black
lint-action Jun 25, 2023
6ea010d
FIX: import functools cached_property in Flight
giovaniceotto Jun 25, 2023
9c29145
ENH: changed all inertias calculations
MateusStano Jun 25, 2023
a23cdd9
TST: fix tests rocket and motor definitions
MateusStano Jun 25, 2023
a170eeb
ENH: remove unnecessary massDot
MateusStano Jun 25, 2023
fc228d2
TST: fix acceptance tests
MateusStano Jun 25, 2023
2f09814
Merge pull request #364 from RocketPy-Team/enh/liquid-motors-linear-a…
MateusStano Jun 25, 2023
3991d41
Merge branch 'enh/liquid-motors' into enh/motors-mass
MateusStano Jun 25, 2023
ad1a5ab
ENH: changes to new EOM due to mass alterations
MateusStano Jun 25, 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
57e0222
Merge pull request #337 from RocketPy-Team/enh/auto_burn_out_time
Gui-FernandesBR Jun 25, 2023
f724b0c
TST: fix tests before merging.
phmbressan Jun 25, 2023
b6ca131
Merge branch 'enh/liquid-motors' into enh/motors-mass
phmbressan Jun 25, 2023
187ed62
MAINT: minor fixes post merging.
phmbressan Jun 25, 2023
43130ea
TST: relax dimentionless testing tolerance.
phmbressan Jun 25, 2023
fe78755
Merge pull request #363 from RocketPy-Team/enh/motors-mass
Gui-FernandesBR Jun 25, 2023
ad2b241
TST: rename tanks test file.
phmbressan Jun 25, 2023
ae9b614
GIT: update gitignore file
Gui-FernandesBR Jun 25, 2023
5e6e114
GIT: delete apple .DS_Store binary file
Gui-FernandesBR Jun 25, 2023
c73dcae
ENH: update SEBLM testing notebook
MateusStano Jun 26, 2023
e0b1731
Merge branch 'enh/liquid-motors' of https://github.com/RocketPy-Team/…
MateusStano Jun 26, 2023
bc1c4d9
Merge branch 'enh/liquid-motors' of https://github.com/RocketPy-Team/…
phmbressan Jun 26, 2023
73030e8
FIX: Tank max height being called in lambda constant Function.
phmbressan Jun 26, 2023
9734a8c
Merge branch 'enh/liquid-motors' of https://github.com/rocketpy-team/…
Gui-FernandesBR Jun 26, 2023
a92aee3
MAINT: sort imports
Gui-FernandesBR Jun 27, 2023
dced730
MAINT: minor fixes in all the files
Gui-FernandesBR Jun 27, 2023
4f032a3
DOC: partially upgrade notebooks
Gui-FernandesBR Jun 27, 2023
cb9f377
ENH: implement reset_funcified_methods
giovaniceotto Jun 27, 2023
c828cbc
MAINT: raise ValueError to coordinate systems
Gui-FernandesBR Jun 27, 2023
f444a1c
ENH: Use reset_funcified_methods in Liquid and Hybrild Motors addTank…
giovaniceotto Jun 27, 2023
0ff14eb
Fix code style issues with Black
lint-action Jun 27, 2023
7013024
DOC: expand LiquidMotor class docstring.
phmbressan Jun 28, 2023
feb8166
DOC: expand docstrings for motors and TankGeometry classes.
phmbressan Jun 28, 2023
14662c2
DOC: finishing ntbks examples, TODOs still remain
Gui-FernandesBR Jun 28, 2023
dcbec7b
MAINT: fix minor issues
Gui-FernandesBR Jun 29, 2023
6e6eda9
Merge branch 'enh/liquid-motors' into enh/resetable-funcified-methods
Gui-FernandesBR Jun 29, 2023
365d673
ENH: create all prints files
MateusStano Jun 29, 2023
2fff51e
ENH: plots files
MateusStano Jun 29, 2023
92f2608
ENH: add plots and prints in the main classes
MateusStano Jun 29, 2023
d54095d
Merge branch 'enh/liquid-motors' into enh/move-liquid-plots-and-prints
MateusStano Jun 29, 2023
80daa46
DOC: update docstring of the Tank class.
phmbressan Jun 30, 2023
33c46c8
MAINT: minor issues and docstring changes.
phmbressan Jun 30, 2023
b495f69
FIX: incorrect naming and cache overuse in tanks.
phmbressan Jun 30, 2023
97c0b16
ENH: implement total volume method in Tank.
phmbressan Jun 30, 2023
f753108
Update rocketpy/motors/Motor.py by removing duplicate code.
phmbressan Jun 30, 2023
4a334cc
Merge remote-tracking branch
Gui-FernandesBR Jun 30, 2023
9343eb4
FIX: tests not passing due to minor issues
Gui-FernandesBR Jun 30, 2023
7a397a6
DOC: fix TODOs and finishing notebooks
Gui-FernandesBR Jun 30, 2023
3cb8e8d
MAINT: fix errors originated in Tank class
Gui-FernandesBR Jun 30, 2023
59d158a
DOC: fixing last notebooks
Gui-FernandesBR Jun 30, 2023
c810266
MAINT: rename Tank.mass to Tank.fluidMass
Gui-FernandesBR Jun 30, 2023
b34baf7
MAINT: change 'recalculates' to 'resets'
Gui-FernandesBR Jun 30, 2023
1e9f841
MAINT: typo fix
Gui-FernandesBR Jun 30, 2023
56391b8
ENH: Use reset_funcified_methods in SolidMotor evaluateGeometry
giovaniceotto Jun 30, 2023
3e1bc1c
Merge branch 'enh/liquid-motors' into
Gui-FernandesBR Jun 30, 2023
587004b
MAINT: improve motors plots and prints
Gui-FernandesBR Jun 30, 2023
be524dc
MAINT: explicating rocket inertia when printing it
Gui-FernandesBR Jun 30, 2023
031db97
Merge pull request #385 from RocketPy-Team/enh/resetable-funcified-me…
Gui-FernandesBR Jun 30, 2023
c389162
Merge branch 'enh/liquid-motors' into enh/move-liquid-plots-and-prints
Gui-FernandesBR Jun 30, 2023
c60b5bb
Merge pull request #387 from RocketPy-Team/enh/move-liquid-plots-and-…
Gui-FernandesBR Jun 30, 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
77 changes: 60 additions & 17 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
Byte-compiled / optimized / DLL files
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[co]
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
Expand All @@ -17,6 +20,7 @@ parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
Expand All @@ -42,8 +46,10 @@ htmlcov/
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/

# Translations
*.mo
Expand All @@ -53,6 +59,7 @@ coverage.xml
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
Expand All @@ -65,6 +72,7 @@ instance/
docs/_build/

# PyBuilder
.pybuilder/
target/

# Jupyter Notebook
Expand All @@ -75,10 +83,38 @@ profile_default/
ipython_config.py

# pyenv
.python-version

# celery beat schedule file
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
#poetry.lock

# pdm
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
#pdm.lock
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
# in version control.
# https://pdm.fming.dev/#use-with-ide
.pdm.toml

# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py
Expand All @@ -91,6 +127,7 @@ venv/
ENV/
env.bak/
venv.bak/
.venv*

# Spyder project settings
.spyderproject
Expand All @@ -107,22 +144,28 @@ venv.bak/
.dmypy.json
dmypy.json

# big weather
CuritibaRioSaoPauloEnsemble_2018_ERA-5.nc
CuritibaRioSaoPaulo_2018_ERA-5.nc
CuritibaRioSaoPaulo_2017_ERA-5.nc
CuritibaRioSaoPaulo_2016_ERA-5.nc
CuritibaRioSaoPaulo_2015_ERA-5.nc
fetchCuritibaRioSaoPaulo.py
fetchCuritibaRioSaoPauloEnsemble.py
# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# Cython debug symbols
cython_debug/

# docs
# Docs
*.docx
*.pdf

# VS Code
# VSCode project settings
.vscode/

# Tests
naboI/
# PyCharm
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
.idea/

# Mac
.DS_Store
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
test:
python -m pytest tests -vv

tests:
testfile:
python -m pytest tests/$(file) -vv

tests:
test

coverage:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,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
Loading