Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ENH: Introducing the Monte Carlo class #232

Merged
merged 383 commits into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
383 commits
Select commit Hold shift + click to select a range
469e281
ENH: class_inputs dict to one inputs_dict,
MateusStano Jan 15, 2023
304de07
ENH: change __export_flight_data
MateusStano Jan 15, 2023
398c453
BUG: Aerosurfaces dictionary check
MateusStano Jan 15, 2023
b0086b2
ENH: add try except in __create_initial_objects
MateusStano Jan 15, 2023
f2eb098
ENH: adapted run_dispersion
MateusStano Jan 15, 2023
88aeadb
ENH: remove uncessary check
MateusStano Jan 15, 2023
3aab22c
MAINT: improved/added docs
MateusStano Jan 15, 2023
5de9043
MAINT: add TODOs
MateusStano Jan 15, 2023
eba0060
ENH: necessary notebook changes
MateusStano Jan 15, 2023
50b3f23
Merge pull request #267 from RocketPy-Team/enh/dispersion_class/review
Gui-FernandesBR Jan 16, 2023
ba89187
Squashed commit of the following:
MateusStano Jan 19, 2023
9680864
ENH: add rocket rail buttons attributes
MateusStano Jan 26, 2023
046af0f
BUG: fix env.railLength get
MateusStano Jan 26, 2023
0c78565
DEV: add TODO
MateusStano Jan 26, 2023
704631c
BUG: fix attributes call in env prints
MateusStano Jan 26, 2023
45eb38e
ENH: add distanceVsPosition necessary changes to input dict
MateusStano Jan 26, 2023
455fef1
ENH: add distancesVsPosition changes to objs definitions
MateusStano Jan 26, 2023
e31ce9f
ENH: add motor_position dict check
MateusStano Jan 26, 2023
0f9440c
BUG: fix aeroSurfaces dict check when rocket as input
MateusStano Jan 26, 2023
82058d3
ENH: improve export methods
MateusStano Jan 26, 2023
d28d53f
BUG: fix parachute dict checks
MateusStano Jan 26, 2023
934c84a
DEV: add TODOs
MateusStano Jan 26, 2023
d73d355
ENH: necessary notebook changes
MateusStano Jan 26, 2023
c9c1f5b
Merge branch 'beta/v1.0.0' into enh/class_dispersion
MateusStano Jan 26, 2023
5cfb9cc
MAINT: delete supplement.py and move functions to utilities.py
MateusStano Jan 26, 2023
dd9fba8
BUG: motorPosition and powerDragFactors input_dict corrections
MateusStano Jan 28, 2023
0b92768
ENH: add if else in process_rail_buttons for when only std is given
MateusStano Jan 28, 2023
f0258b5
ENH: add if else in process_aero_surfaces for when only std is given
MateusStano Jan 28, 2023
a4a4d7f
BUG: motor definition input changes
MateusStano Jan 28, 2023
3e1998c
BUG: fixed `out` when not using jupyter notebook
MateusStano Jan 28, 2023
addb18c
TST: add two initial tests
MateusStano Jan 28, 2023
d1869b2
TST: fix remaining problems with nosecone name
MateusStano Jan 28, 2023
4e9222c
ENH: add get_aero_surface_by_name method
MateusStano Jan 28, 2023
405a887
ENH: improve and simplify __process_dispersion_dict
MateusStano Jan 28, 2023
1d22b1b
BUG: fix unparametrized rail button in create_initial_objects
MateusStano Jan 28, 2023
8eae375
BUG: fix class_name_pretty assignment
MateusStano Jan 28, 2023
375fa9e
TST: remove files after tests
Gui-FernandesBR Jan 30, 2023
7752401
BUG: wrong finalStaticMargin definition
Gui-FernandesBR Jan 30, 2023
a24ee5d
MAINT: convert imageio into an optional dependency
Gui-FernandesBR Jan 31, 2023
7623c7f
ENH: speedup removing for loops and closing files
Gui-FernandesBR Jan 31, 2023
2e94074
maint: change `burnOut` to `burnOutTime`
MateusStano Feb 23, 2023
3c049c8
maint: typos in Flight
MateusStano Feb 23, 2023
ff2e25a
enh: add Path type support in Function class
MateusStano Feb 23, 2023
3652c7e
enh: aero surfaces changes
MateusStano Feb 23, 2023
198ef8e
enh: first version of dispersion data classes
MateusStano Mar 1, 2023
7b0625b
enh: data classes can only be defined with objects
MateusStano Mar 1, 2023
cdacb9c
enh: export data fixes
MateusStano Mar 1, 2023
3d36039
enh: some data classes adaptations
MateusStano Mar 1, 2023
52bf547
Fix code style issues with Black
lint-action Mar 1, 2023
4568336
GIT: rename monte carlo files
Gui-FernandesBR Mar 2, 2023
a400a99
MAINT: update __init__ and requirements
Gui-FernandesBR Mar 5, 2023
4b47268
MAINT: new tools and utilities files definition
Gui-FernandesBR Mar 5, 2023
d409e29
FIX: solving the effective1RL definition
Gui-FernandesBR Mar 5, 2023
a853d33
MAINT: comments on monte carlo files
Gui-FernandesBR Mar 5, 2023
5497ce0
ENH: new build_dispersion_dict method
Gui-FernandesBR Mar 5, 2023
1b98958
ENH: update dispersion class and notebook
Gui-FernandesBR Mar 5, 2023
e1e6902
Fix code style issues with Black
lint-action Mar 5, 2023
171fcf1
enh: added 7623c7f changes
MateusStano Mar 9, 2023
5ff8eb2
enh: AeroSurfaces class update (position input in aerosurfaces list)
MateusStano Mar 9, 2023
3087fe5
enh: 'position' made an input in the rocket 'add' methods
MateusStano Mar 10, 2023
3f69073
enh: implemented DispersionModel super class
MateusStano Mar 10, 2023
76bb57d
enh: ensemble member
MateusStano Mar 12, 2023
5556a22
enh: ensemble member, windFactors and DragFactors
MateusStano Mar 12, 2023
b624708
enh: added .dict() exclude on fields
MateusStano Mar 13, 2023
288e274
enh: dispersion class improvements
MateusStano Mar 13, 2023
5787508
enh: display changed to print with end='\r'
MateusStano Mar 15, 2023
7143b6f
Fix code style issues with Black
lint-action Mar 15, 2023
ef01444
bug: fix parachute without lag warning
MateusStano Mar 15, 2023
16d1258
enh: valetudo data added
MateusStano Mar 16, 2023
d442046
enh: saving and exporting data overhaul
MateusStano Mar 16, 2023
2822f28
Fix code style issues with Black
lint-action Mar 16, 2023
17f148b
MAINT: TODO updates
MateusStano Mar 21, 2023
d57e871
enh: added env.datetime_date and env.date to save date argument user …
MateusStano Mar 21, 2023
f24d95c
MAINT: imports
MateusStano Mar 21, 2023
f5d3c59
ENH: file saving and importing
MateusStano Mar 21, 2023
bf35dd8
ENH: notebook changes
MateusStano Mar 21, 2023
308eaf5
MAINT: reordered all methods in Dispersion Class
MateusStano Mar 21, 2023
71e7959
MAINT: removed some TODOs
MateusStano Mar 22, 2023
28d2c8a
ENH: created RailButtons class
MateusStano Mar 22, 2023
26b538e
ENH: implement rail buttons
MateusStano Mar 23, 2023
d76d0c3
ENH: RailButtons Update
MateusStano Mar 23, 2023
6142519
FIX: remove unuseful distribution functions and fix imports
Gui-FernandesBR Mar 29, 2023
013bc3f
ENH: removed flight_list
MateusStano Apr 3, 2023
0d5fa70
ENH: remove distribuition functions that do not work
MateusStano Apr 3, 2023
ae7fb29
BUG: fixed rail buttons implementation
MateusStano Apr 3, 2023
e791676
ENH: created __repr__ for data classes
MateusStano Apr 3, 2023
34a2554
ENH: fixed inputs_log
MateusStano Apr 5, 2023
df04dde
ENH: files imported directly in init
MateusStano Apr 5, 2023
447fb8b
Merge remote-tracking branch 'RocketPy-Team/beta/v1.0.0' into enh/cla…
Gui-FernandesBR Apr 10, 2023
8ea9aed
Merge branch 'enh/class_dispersion' of https://github.com/rocketpy-te…
Gui-FernandesBR Apr 10, 2023
9bdb99e
Merge branch 'beta/v1.0.0' into enh/class_dispersion
Gui-FernandesBR Apr 10, 2023
c726851
FIX: solve the IndentationError error
Gui-FernandesBR Apr 11, 2023
d62d6d5
Fix code style issues with Black
lint-action Apr 11, 2023
73abe7a
FIX: solve problems due to last merge conflicts
Gui-FernandesBR Apr 12, 2023
1545dcb
Merge branch 'enh/class_dispersion' into enh/dispersion-data-classes
Gui-FernandesBR Apr 13, 2023
4d25e58
FIX: solve the sweepAngle issue
Gui-FernandesBR Apr 14, 2023
4e87044
MAINT: updating docstrings and comments
Gui-FernandesBR Apr 14, 2023
f4115d6
TST: adding dispersion class test
Gui-FernandesBR Apr 14, 2023
e30c30f
MAINT: adding pydantic as a required dependency
Gui-FernandesBR Apr 14, 2023
0f8c070
MAINT: updating dispersion class notebook
Gui-FernandesBR Apr 14, 2023
f534de2
TST: adjust test to use savefig option
Gui-FernandesBR Apr 14, 2023
9be3046
Fix code style issues with Black
lint-action Apr 14, 2023
ba3f7aa
MAINT: delete/update TODOs and fix small code mistakes
MateusStano Apr 16, 2023
080a1d5
ENH: Function __repr__ changed to be inbetween " ' "
MateusStano Apr 22, 2023
4e8319e
ENH: refactor imports and post simulation attributes
MateusStano Apr 22, 2023
3af0407
MAINT: update import related docs
MateusStano Apr 22, 2023
4ca7fcd
MAINT: improve dataclasses docs
MateusStano Apr 22, 2023
aae698f
TST: fix dispersion and function tests
MateusStano Apr 22, 2023
4d73b46
TST: fix doctests
MateusStano Apr 22, 2023
cad59be
MAINT: changes to avoid conflicts
MateusStano Apr 27, 2023
d636899
Merge branch 'enh/new-aero-surfaces' into enh/dispersion-data-classes
MateusStano Apr 29, 2023
cce3727
ENH: add exclude on required fields
MateusStano Apr 29, 2023
7fa083a
ENH: improved __repr__ and __str__
MateusStano Apr 29, 2023
57b6fa8
ENH: fix validators for generators
MateusStano Apr 29, 2023
1fbd421
ENH: random object creator and dict generator
MateusStano Apr 29, 2023
beb7062
ENH: changes to Dispersion.py to use generators
MateusStano Apr 29, 2023
316292f
TST: fix function doctests
MateusStano Apr 29, 2023
86563ff
TST: change addRAilButton to setRailButton
MateusStano Apr 29, 2023
8ef4f18
Merge pull request #336 from RocketPy-Team/enh/dispersion-data-classes
Gui-FernandesBR May 4, 2023
ebc8adc
Merge branch 'beta/v1.0.0' into class_dispersion
Gui-FernandesBR May 26, 2023
5456665
Revert "Merge branch 'beta/v1.0.0' into class_dispersion"
Gui-FernandesBR Jun 5, 2023
a122f45
MAINT: move dispersion plots and prints
Gui-FernandesBR Jun 11, 2023
5cf8153
DOCS: adjust notebooks to new plots
Gui-FernandesBR Jun 11, 2023
6a31cc0
merge beta/v1.0.0
MateusStano Jun 13, 2023
d2f642b
MAINT: change AeroSurfaces to AeroSurface
MateusStano Jun 13, 2023
3033158
Merge branch 'enh/class_dispersion' into maint/move-dispersion-plots
MateusStano Jun 14, 2023
2e774e0
ENH: add get_components to Components class
MateusStano Jun 23, 2023
a044a6d
ENH: changes due to new RailButtons and Component classes
MateusStano Jun 23, 2023
de24063
Merge branch 'beta/v1.0.0' into enh/class_dispersion
MateusStano Jun 23, 2023
f43b825
ENH: flexible dispersion plots
Gui-FernandesBR Sep 3, 2023
3d4cfae
Merge branch 'enh/class_dispersion' into maint/move-dispersion-plots
Gui-FernandesBR Sep 3, 2023
59b0d94
Merge pull request #375 from RocketPy-Team/maint/move-dispersion-plots
Gui-FernandesBR Oct 29, 2023
9648dd3
Merge branch 'develop' into enh/class_dispersion
Gui-FernandesBR Oct 29, 2023
1de431b
Fix code style issues with Black
lint-action Oct 29, 2023
c43d631
Merge branch 'develop' into enh/class_dispersion
MateusStano Dec 2, 2023
2db520c
MNT: move Dispersion.py to simulation/dispersion.py
MateusStano Dec 2, 2023
0c7b1d9
DOC: improve docs of DispersionModel
MateusStano Dec 2, 2023
8f56eda
Squashed commit of the following:
MateusStano Dec 2, 2023
f0a41ce
MNT: fix merge errors from v1 into dispersion branch
MateusStano Dec 2, 2023
3bc6a1e
ENH: remove pydantic from DispersionModel and McEnvironment
MateusStano Dec 8, 2023
99bcf20
ENH: improvements to DispersionModel and McEnvironment
MateusStano Dec 9, 2023
9fef7e1
ENH: add motor model and remove pydantic from McSolidMotor
MateusStano Dec 9, 2023
93dd297
DOC: improve/add docs to DispersionModel
MateusStano Dec 9, 2023
627e527
MNT: rename DispersionModel.py to dispersion_model.py
MateusStano Dec 9, 2023
1f36076
DEV: update notebook
MateusStano Dec 9, 2023
69d1614
ENH: add _validate_1d_array_like function
MateusStano Dec 10, 2023
3973d11
BUG: add factor initialization
MateusStano Dec 10, 2023
7f5cfc4
MNT: remove unecessary comment and fix docs
MateusStano Dec 11, 2023
1acb55a
ENH: remove date from mcenvironment
MateusStano Dec 11, 2023
290b43d
ENH: add aliases for inertias
MateusStano Dec 11, 2023
631f46e
ENH: add burn_start_time and burn_out_time to mcsolidmotor
MateusStano Dec 11, 2023
6f49591
BUG: burn_time fix for solidmotor create_object
MateusStano Dec 11, 2023
4dc7618
ENH: update mc_rocket
MateusStano Dec 12, 2023
266f5c5
ENH: adapt validations in DispersionModel for `position` from rocket
MateusStano Dec 12, 2023
8b0bc21
ENH: update mc_aero_surface and mc_parachute
MateusStano Dec 12, 2023
ec5b303
ENH: remove repeated code
MateusStano Dec 12, 2023
25605e8
ENH: add _validate_airfoil
MateusStano Dec 12, 2023
f45b586
DOC: add docs and improve old docs
MateusStano Dec 12, 2023
b122f70
ENH: update notebook for mc_rocket changes
MateusStano Dec 12, 2023
1d23858
Merge pull request #509 from RocketPy-Team/enh/remove-pydantic-disper…
MateusStano Dec 13, 2023
1d675e6
ENH: add generic motor
MateusStano Dec 14, 2023
a08b562
ENH: update flight
MateusStano Dec 14, 2023
7287caa
ENH: add randomization to mc_flight
MateusStano Dec 15, 2023
3e8a89b
ENH: revert changed in components
MateusStano Dec 18, 2023
2d8c95a
ENH: add GenericMotor support in McRocket
MateusStano Dec 18, 2023
fc8fddf
Merge pull request #512 from RocketPy-Team/enh/remove-pydantic-rocket
phmbressan Jan 18, 2024
7b2e8cb
Merge remote-tracking branch 'origin/develop' into enh/class_dispersion
MateusStano Jan 26, 2024
a2bc40c
Fix code style issues with Black
lint-action Jan 26, 2024
7dc3ad7
ENH: unify mc_rocket dict generation
MateusStano Jan 27, 2024
0e4f6b6
ENH: dispersion class overhaul
MateusStano Jan 27, 2024
003c1dc
ENH: generalize run_dispersion excepetion
MateusStano Feb 7, 2024
b012ca1
MNT: minor improvements and refactors
MateusStano Feb 7, 2024
b16e329
Merge pull request #543 from RocketPy-Team/enh/dispersion-model
MateusStano Feb 8, 2024
1bae4b6
MNT: renaming to stochastic
MateusStano Feb 8, 2024
3bee793
MNT: renaming to monte_carlo
MateusStano Feb 8, 2024
15c8219
Fix code style issues with Black
lint-action Feb 8, 2024
c60bbab
MNT: notebooks and some docs renaming
MateusStano Feb 8, 2024
f234624
MNT: Fix typos
Gui-FernandesBR Feb 10, 2024
0f80516
Merge pull request #549 from RocketPy-Team/enh/dispersion-renaming
Gui-FernandesBR Feb 12, 2024
702eb7b
Merge branch 'develop' into enh/class_dispersion
Gui-FernandesBR Feb 12, 2024
90cc262
ENH: create controller class
MateusStano Sep 29, 2023
87a7afe
ENH: create Airbreaks class
MateusStano Sep 29, 2023
6243856
ENH: create add_controllers and add_airbreaks
MateusStano Sep 29, 2023
55b4445
BUG: typos and imports
MateusStano Oct 2, 2023
6628d3d
DOC: improve controller docs
MateusStano Oct 9, 2023
bd341d2
ENH: add airbrakes plots, prints, docs and `reference_area`
MateusStano Oct 9, 2023
909b865
ENH: adjust flight for saving airbrakes data and variable reference area
MateusStano Oct 9, 2023
9ce606c
DOC: add airbrakes example notebook
MateusStano Oct 9, 2023
445f529
DOC: save airbrakes notebook outputs
MateusStano Oct 9, 2023
67912ca
MNT: quick polish of airbrakes example notebook and add it to docs
giovaniceotto Oct 11, 2023
966d435
MNT:
Gui-FernandesBR Oct 15, 2023
eab5736
MNT: change Airbrakes to AirBrakes
MateusStano Nov 21, 2023
ce9aa43
DOC: improve doc to clearify deployed level 0 and add reference docs
MateusStano Nov 21, 2023
4434b74
MNT: rename airbrakes to air_brakes
MateusStano Nov 21, 2023
1daedb2
MNT: rename files for name consistency
MateusStano Nov 21, 2023
0f9aa18
Update rocketpy/simulation/flight.py
MateusStano Nov 21, 2023
97d7b2b
Update rocketpy/prints/control_prints.py
MateusStano Jan 21, 2024
632f539
Update rocketpy/prints/control_prints.py
MateusStano Jan 21, 2024
34f7ec3
Update rocketpy/prints/control_prints.py
MateusStano Jan 21, 2024
7ecc149
ENH: minor fixes
MateusStano Jan 21, 2024
e2df289
ENH: add get_controller_observed_variables
MateusStano Jan 24, 2024
d9df0a1
Fix code style issues with Black
lint-action Jan 25, 2024
481ec71
MNT: init deployment_level with settet and add_airbrakes maint
MateusStano Jan 31, 2024
f64de0a
Fix code style issues with Black
lint-action Jan 31, 2024
2f25c28
DOC: Replacing git clone command with curl in notebooks.
Lucas-Prates Jan 31, 2024
c057376
DOC: improve documentation for header behavior.
phmbressan Feb 2, 2024
0e9fc41
ENH: Plotting both drag power on and off curves in a single plot.
juliomachad0 Feb 7, 2024
2bbf6a8
MNT: Making the changes that @Gui-FernandesBR suggested.
juliomachad0 Feb 7, 2024
7dadbe4
MNT: apply isort and black to all the files
Gui-FernandesBR Feb 8, 2024
d24bd3b
BUG: fix `get_controller_observed_variables` in the air brakes examples
Gui-FernandesBR Feb 9, 2024
1747144
Revert "Merge branch 'develop' into enh/class_dispersion"
Gui-FernandesBR Feb 12, 2024
233af3b
Merge branch 'develop' into enh/class_dispersion
Gui-FernandesBR Feb 12, 2024
cd7d715
FIX: there were errors with the last merge commit . Fix it.
Gui-FernandesBR Feb 12, 2024
1f35123
MNT: update requirements
Gui-FernandesBR Mar 5, 2024
5530a1e
MNT: small changes and fixes (pylint)
Gui-FernandesBR Mar 5, 2024
2bbbcd8
TST: temporally deactivate dispersion tests
Gui-FernandesBR Mar 5, 2024
bed82d8
ENH: speedup python for loop for export_flight_data
Gui-FernandesBR Mar 5, 2024
8da4d70
ENH: adds rail length to the StochasticFlight
Gui-FernandesBR Mar 5, 2024
a5267ae
MNT: change the StochasticModel repr method
Gui-FernandesBR Mar 5, 2024
3dbb1f8
Merge branch 'develop' into enh/class_dispersion
Gui-FernandesBR Mar 5, 2024
4e00af7
TST: improve tests for the Monte Carlo analysis, tests are now passing
Gui-FernandesBR Mar 5, 2024
4ac7187
TST: better documentation for tests
Gui-FernandesBR Mar 5, 2024
8fba210
ENH: Update file naming convention for MonteCarlo simulation outputs
Gui-FernandesBR Mar 5, 2024
319fe8f
ENH: Modify the standard_output, leaving only the crucial items (spee…
Gui-FernandesBR Mar 5, 2024
6d96caa
ENH: improve the example notebook of MonteCarlo class
Gui-FernandesBR Mar 5, 2024
7e30c76
DOC: improve monte Carlo documentation files
Gui-FernandesBR Mar 13, 2024
d0b9711
MNT: Refactor code to use dictionary unpacking in stochastic_aero_sur…
Gui-FernandesBR Mar 13, 2024
17d91d0
MNT: Refactor input/output log parsing to use JSON instead of ast.lit…
Gui-FernandesBR Mar 13, 2024
0d783df
MNT: minor fixes
Gui-FernandesBR Mar 13, 2024
cc02d06
Merge branch 'develop' into enh/class_dispersion
Gui-FernandesBR Mar 13, 2024
5fefdf9
FIX: update fixture variable name in stochastic unit test
Gui-FernandesBR Mar 14, 2024
ccf32a4
ENH: Add custom JSON encoder for RocketPy objects
Gui-FernandesBR Mar 15, 2024
bc73117
TST: add tests for file setters and json parsing in the Monte Carlo c…
Gui-FernandesBR Mar 15, 2024
ae5daa5
Merge branch 'mnt/flight-simulation-speed-up' into enh/class_dispersion
Gui-FernandesBR May 3, 2024
dd77203
BUG: fix the json.dumps functions in monte_carlo.py
Gui-FernandesBR May 3, 2024
c814a2e
DOC: update monte carlo class example
Gui-FernandesBR May 3, 2024
1193232
Merge branch 'develop' into enh/class_dispersion
Gui-FernandesBR May 15, 2024
80be600
DEV: adds a TODO to stop using assert
Gui-FernandesBR May 15, 2024
225575c
Fix code style issues with Black
lint-action May 15, 2024
d4fd959
DEV: Left one final TODO for the _randomize_rail_length
Gui-FernandesBR May 15, 2024
db7c1dc
MNT: Add warning for testing purposes in MonteCarlo class
Gui-FernandesBR May 15, 2024
33dea0c
DOC: update Monte Carlo class notebook
Gui-FernandesBR May 15, 2024
817906e
BUG: Components printing positions not working for tuples
MateusStano May 16, 2024
c2408b5
DOC: improve usage notebook
MateusStano May 16, 2024
2b15aa5
Merge branch 'develop' into enh/class_dispersion
Gui-FernandesBR May 16, 2024
b36089b
DOC: updates monte carlo notebooks
Gui-FernandesBR May 21, 2024
b0b3ff6
ENH: updates the standard_output of monte carlo export
Gui-FernandesBR May 21, 2024
521a8e8
MNT: stocastic model repr method commented
Gui-FernandesBR May 21, 2024
582092b
Fix code style issues with Black
lint-action May 21, 2024
209434f
Merge branch 'develop' into enh/class_dispersion
Gui-FernandesBR May 21, 2024
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
Gui-FernandesBR marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
],
"source": [
"# Basic analysis info\n",
"filename = \"dispersion_analysis_outputs/valetudo_rocket_v0\"\n",
"filename = \"monte_carlo_analysis_outputs/valetudo_rocket_v0\"\n",
"number_of_simulations = 100\n",
"\n",
"# Create data files for inputs, outputs and error logging\n",
Expand All @@ -404,7 +404,7 @@
"Env.max_expected_height = 1500\n",
"Env.set_atmospheric_model(\n",
" type=\"Ensemble\",\n",
" file=\"dispersion_analysis_inputs/LASC2019_reanalysis.nc\",\n",
" file=\"monte_carlo_analysis_inputs/LASC2019_reanalysis.nc\",\n",
" dictionary=\"ECMWF\",\n",
")\n",
"\n",
Expand All @@ -428,7 +428,7 @@
"\n",
" # Create motor\n",
" Keron = SolidMotor(\n",
" thrust_source=\"dispersion_analysis_inputs/thrustCurve.csv\",\n",
" thrust_source=\"monte_carlo_analysis_inputs/thrustCurve.csv\",\n",
" burn_time=5.274,\n",
" reshape_thrust_curve=(setting[\"burn_time\"], setting[\"impulse\"]),\n",
" nozzle_radius=setting[\"nozzle_radius\"],\n",
Expand Down Expand Up @@ -460,8 +460,8 @@
" setting[\"rocket_inertia_11\"],\n",
" setting[\"rocket_inertia_33\"],\n",
" ),\n",
" power_off_drag=\"dispersion_analysis_inputs/Cd_PowerOff.csv\",\n",
" power_on_drag=\"dispersion_analysis_inputs/Cd_PowerOn.csv\",\n",
" power_off_drag=\"monte_carlo_analysis_inputs/Cd_PowerOff.csv\",\n",
" power_on_drag=\"monte_carlo_analysis_inputs/Cd_PowerOn.csv\",\n",
" center_of_mass_without_motor=0,\n",
" coordinate_system_orientation=\"tail_to_nose\",\n",
" )\n",
Expand Down Expand Up @@ -574,7 +574,7 @@
}
],
"source": [
"filename = \"dispersion_analysis_outputs/valetudo_rocket_v0\"\n",
"filename = \"monte_carlo_analysis_outputs/valetudo_rocket_v0\"\n",
"\n",
"# Initialize variable to store all results\n",
"dispersion_general_results = []\n",
Expand Down Expand Up @@ -20354,7 +20354,7 @@
"from matplotlib.patches import Ellipse\n",
"\n",
"# Import background map\n",
"img = imread(\"dispersion_analysis_inputs/Valetudo_basemap_final.jpg\")\n",
"img = imread(\"monte_carlo_analysis_inputs/Valetudo_basemap_final.jpg\")\n",
"\n",
"# Retrieve dispersion data por apogee and impact XY position\n",
"apogee_x = np.array(dispersion_results[\"apogee_x\"])\n",
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="UTF-8"?>
<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:gx="http://www.google.com/kml/ext/2.2">
<Document id="1">
<Style id="8">
<LineStyle id="9">
<color>ff0000ff</color>
<colorMode>normal</colorMode>
<width>3</width>
</LineStyle>
<PolyStyle id="10">
<color>64ff0000</color>
<colorMode>normal</colorMode>
<fill>1</fill>
<outline>1</outline>
</PolyStyle>
</Style>
<Style id="17">
<LineStyle id="18">
<color>ff0000ff</color>
<colorMode>normal</colorMode>
<width>3</width>
</LineStyle>
<PolyStyle id="19">
<color>64ff0000</color>
<colorMode>normal</colorMode>
<fill>1</fill>
<outline>1</outline>
</PolyStyle>
</Style>
<Style id="26">
<LineStyle id="27">
<color>ff0000ff</color>
<colorMode>normal</colorMode>
<width>3</width>
</LineStyle>
<PolyStyle id="28">
<color>64ff0000</color>
<colorMode>normal</colorMode>
<fill>1</fill>
<outline>1</outline>
</PolyStyle>
</Style>
<Placemark id="3">
<name>Impact σ1</name>
<visibility>1</visibility>
<styleUrl>#8</styleUrl>
<MultiGeometry id="2">
<Polygon id="4">
<outerBoundaryIs>
<LinearRing id="6">
<coordinates>1103.1172286537246,1837.8024088917573,0.0 1094.9984810133226,1842.5556499782087,0.0 1087.949600575892,1849.883623456037,0.0 1081.998406052192,1859.7574091617566,0.0 1077.168384088166,1872.1380397740918,0.0 1073.4785965738781,1886.9766546001874,0.0 1070.9436054149444,1904.214692406443,0.0 1069.5734150633416,1923.7841225329475,0.0 1069.3734330344068,1945.6077133794142,0.0 1070.3444485658454,1969.599337203022,0.0 1072.4826295029695,1995.6643100252697,0.0 1075.7795374224625,2023.699765306381,0.0 1080.2221609349797,2053.5950599125426,0.0 1085.792967035159,2085.2322107738055,0.0 1092.4699702963821,2118.486360509359,0.0 1100.22681963721,2153.226270182573,0.0 1109.0329023170614,2189.3148372411224,0.0 1118.8534647507154,2226.609636598125,0.0 1129.6497496648349,2264.9634827188916,0.0 1141.3791490552169,2304.2250104949894,0.0 1153.9953723411206,2344.239272613172,0.0 1167.4486290530408,2384.8483510616365,0.0 1181.6858253329438,2425.89198036027,0.0 1196.650773471469,2467.2081800552805,0.0 1212.2844136551482,2508.6338939820494,0.0 1228.5250470485075,2550.005633773316,0.0 1245.3085792911825,2591.1601240730724,0.0 1262.5687734490782,2631.9349469098056,0.0 1280.237511421286,2672.1691826860233,0.0 1298.2450627711078,2711.70404525439,0.0 1316.5203599202337,2750.383508574109,0.0 1334.9912786200055,2788.054922474424,0.0 1353.5849225928748,2824.569615095102,0.0 1372.2279112207088,2859.783479626345,0.0 1390.8466691445649,2893.5575430325334,0.0 1409.3677166330187,2925.7585145153043,0.0 1427.7179595730954,2956.2593115514396,0.0 1445.8249779393389,2984.939561429527,0.0 1463.617311602567,3011.6860763060567,0.0 1481.0247423503558,3036.393299906132,0.0 1497.9785710062422,3058.96372410586,0.0 1514.411888553988,3079.3082737523705,0.0 1530.2598401969026,3097.3466582027486,0.0 1545.4598813100906,3113.007688194524,0.0 1559.9520242755168,3126.2295567971614,0.0 1573.6790752257268,3136.9600833357854,0.0 1586.5868597619135,3145.156919324457,0.0 1598.6244367555187,3150.787715596309,0.0 1609.7442993895934,3153.830249970922,0.0 1619.9025626465038,3154.2725149551206,0.0 1629.0591365020434,3152.1127651310644,0.0 1637.1778841424455,3147.359524044613,0.0 1644.226764579876,3140.0315505667845,0.0 1650.1779591035759,3130.157764861065,0.0 1655.007981067602,3117.77713424873,0.0 1658.6977685818897,3102.9385194226343,0.0 1661.2327597408237,3085.700481616379,0.0 1662.6029500924267,3066.1310514898746,0.0 1662.8029321213612,3044.3074606434075,0.0 1661.8319165899227,3020.3158368197996,0.0 1659.6937356527985,2994.250863997552,0.0 1656.3968277333056,2966.2154087164404,0.0 1651.9542042207884,2936.320114110279,0.0 1646.383398120609,2904.682963249016,0.0 1639.7063948593857,2871.4288135134625,0.0 1631.9495455185581,2836.6889038402487,0.0 1623.143462838707,2800.6003367816993,0.0 1613.3229004050527,2763.305537424697,0.0 1602.5266154909332,2724.9516913039297,0.0 1590.7972161005512,2685.6901635278323,0.0 1578.1809928146474,2645.6759014096497,0.0 1564.727736102727,2605.0668229611847,0.0 1550.4905398228243,2564.0231936625514,0.0 1535.5255916842991,2522.706993967541,0.0 1519.8919515006196,2481.281280040772,0.0 1503.6513181072605,2439.909540249506,0.0 1486.8677858645856,2398.7550499497493,0.0 1469.6075917066898,2357.980227113016,0.0 1451.9388537344823,2317.7459913367984,0.0 1433.9313023846603,2278.2111287684315,0.0 1415.6560052355344,2239.531665448713,0.0 1397.1850865357628,2201.860251548398,0.0 1378.5914425628937,2165.34555892772,0.0 1359.9484539350592,2130.131694396476,0.0 1341.3296960112032,2096.3576309902883,0.0 1322.8086485227493,2064.1566595075174,0.0 1304.4584055826729,2033.655862471382,0.0 1286.3513872164294,2004.9756125932952,0.0 1268.5590535532012,1978.229097716765,0.0 1251.151622805412,1953.5218741166893,0.0 1234.1977941495259,1930.9514499169616,0.0 1217.76447660178,1910.6069002704514,0.0 1201.9165249588657,1892.568515820073,0.0 1186.7164838456777,1876.9074858282981,0.0 1172.2243408802512,1863.68561722566,0.0 1158.4972899300412,1852.9550906870368,0.0 1145.5895053938546,1844.7582546983645,0.0 1133.5519284002494,1839.1274584265125,0.0 1122.4320657661747,1836.0849240518999,0.0 -8.267624328036598,39.399689834676806,0.0</coordinates>
</LinearRing>
</outerBoundaryIs>
</Polygon>
</MultiGeometry>
</Placemark>
<Placemark id="12">
<name>Impact σ2</name>
<visibility>1</visibility>
<styleUrl>#17</styleUrl>
<MultiGeometry id="11">
<Polygon id="13">
<outerBoundaryIs>
<LinearRing id="15">
<coordinates>1103.1172286537246,1837.8024088917573,0.0 1094.9984810133226,1842.5556499782087,0.0 1087.949600575892,1849.883623456037,0.0 1081.998406052192,1859.7574091617566,0.0 1077.168384088166,1872.1380397740918,0.0 1073.4785965738781,1886.9766546001874,0.0 1070.9436054149444,1904.214692406443,0.0 1069.5734150633416,1923.7841225329475,0.0 1069.3734330344068,1945.6077133794142,0.0 1070.3444485658454,1969.599337203022,0.0 1072.4826295029695,1995.6643100252697,0.0 1075.7795374224625,2023.699765306381,0.0 1080.2221609349797,2053.5950599125426,0.0 1085.792967035159,2085.2322107738055,0.0 1092.4699702963821,2118.486360509359,0.0 1100.22681963721,2153.226270182573,0.0 1109.0329023170614,2189.3148372411224,0.0 1118.8534647507154,2226.609636598125,0.0 1129.6497496648349,2264.9634827188916,0.0 1141.3791490552169,2304.2250104949894,0.0 1153.9953723411206,2344.239272613172,0.0 1167.4486290530408,2384.8483510616365,0.0 1181.6858253329438,2425.89198036027,0.0 1196.650773471469,2467.2081800552805,0.0 1212.2844136551482,2508.6338939820494,0.0 1228.5250470485075,2550.005633773316,0.0 1245.3085792911825,2591.1601240730724,0.0 1262.5687734490782,2631.9349469098056,0.0 1280.237511421286,2672.1691826860233,0.0 1298.2450627711078,2711.70404525439,0.0 1316.5203599202337,2750.383508574109,0.0 1334.9912786200055,2788.054922474424,0.0 1353.5849225928748,2824.569615095102,0.0 1372.2279112207088,2859.783479626345,0.0 1390.8466691445649,2893.5575430325334,0.0 1409.3677166330187,2925.7585145153043,0.0 1427.7179595730954,2956.2593115514396,0.0 1445.8249779393389,2984.939561429527,0.0 1463.617311602567,3011.6860763060567,0.0 1481.0247423503558,3036.393299906132,0.0 1497.9785710062422,3058.96372410586,0.0 1514.411888553988,3079.3082737523705,0.0 1530.2598401969026,3097.3466582027486,0.0 1545.4598813100906,3113.007688194524,0.0 1559.9520242755168,3126.2295567971614,0.0 1573.6790752257268,3136.9600833357854,0.0 1586.5868597619135,3145.156919324457,0.0 1598.6244367555187,3150.787715596309,0.0 1609.7442993895934,3153.830249970922,0.0 1619.9025626465038,3154.2725149551206,0.0 1629.0591365020434,3152.1127651310644,0.0 1637.1778841424455,3147.359524044613,0.0 1644.226764579876,3140.0315505667845,0.0 1650.1779591035759,3130.157764861065,0.0 1655.007981067602,3117.77713424873,0.0 1658.6977685818897,3102.9385194226343,0.0 1661.2327597408237,3085.700481616379,0.0 1662.6029500924267,3066.1310514898746,0.0 1662.8029321213612,3044.3074606434075,0.0 1661.8319165899227,3020.3158368197996,0.0 1659.6937356527985,2994.250863997552,0.0 1656.3968277333056,2966.2154087164404,0.0 1651.9542042207884,2936.320114110279,0.0 1646.383398120609,2904.682963249016,0.0 1639.7063948593857,2871.4288135134625,0.0 1631.9495455185581,2836.6889038402487,0.0 1623.143462838707,2800.6003367816993,0.0 1613.3229004050527,2763.305537424697,0.0 1602.5266154909332,2724.9516913039297,0.0 1590.7972161005512,2685.6901635278323,0.0 1578.1809928146474,2645.6759014096497,0.0 1564.727736102727,2605.0668229611847,0.0 1550.4905398228243,2564.0231936625514,0.0 1535.5255916842991,2522.706993967541,0.0 1519.8919515006196,2481.281280040772,0.0 1503.6513181072605,2439.909540249506,0.0 1486.8677858645856,2398.7550499497493,0.0 1469.6075917066898,2357.980227113016,0.0 1451.9388537344823,2317.7459913367984,0.0 1433.9313023846603,2278.2111287684315,0.0 1415.6560052355344,2239.531665448713,0.0 1397.1850865357628,2201.860251548398,0.0 1378.5914425628937,2165.34555892772,0.0 1359.9484539350592,2130.131694396476,0.0 1341.3296960112032,2096.3576309902883,0.0 1322.8086485227493,2064.1566595075174,0.0 1304.4584055826729,2033.655862471382,0.0 1286.3513872164294,2004.9756125932952,0.0 1268.5590535532012,1978.229097716765,0.0 1251.151622805412,1953.5218741166893,0.0 1234.1977941495259,1930.9514499169616,0.0 1217.76447660178,1910.6069002704514,0.0 1201.9165249588657,1892.568515820073,0.0 1186.7164838456777,1876.9074858282981,0.0 1172.2243408802512,1863.68561722566,0.0 1158.4972899300412,1852.9550906870368,0.0 1145.5895053938546,1844.7582546983645,0.0 1133.5519284002494,1839.1274584265125,0.0 1122.4320657661747,1836.0849240518999,0.0 -8.267624328036598,39.399689834676806,0.0</coordinates>
</LinearRing>
</outerBoundaryIs>
</Polygon>
</MultiGeometry>
</Placemark>
<Placemark id="21">
<name>Impact σ3</name>
<visibility>1</visibility>
<styleUrl>#26</styleUrl>
<MultiGeometry id="20">
<Polygon id="22">
<outerBoundaryIs>
<LinearRing id="24">
<coordinates>1103.1172286537246,1837.8024088917573,0.0 1094.9984810133226,1842.5556499782087,0.0 1087.949600575892,1849.883623456037,0.0 1081.998406052192,1859.7574091617566,0.0 1077.168384088166,1872.1380397740918,0.0 1073.4785965738781,1886.9766546001874,0.0 1070.9436054149444,1904.214692406443,0.0 1069.5734150633416,1923.7841225329475,0.0 1069.3734330344068,1945.6077133794142,0.0 1070.3444485658454,1969.599337203022,0.0 1072.4826295029695,1995.6643100252697,0.0 1075.7795374224625,2023.699765306381,0.0 1080.2221609349797,2053.5950599125426,0.0 1085.792967035159,2085.2322107738055,0.0 1092.4699702963821,2118.486360509359,0.0 1100.22681963721,2153.226270182573,0.0 1109.0329023170614,2189.3148372411224,0.0 1118.8534647507154,2226.609636598125,0.0 1129.6497496648349,2264.9634827188916,0.0 1141.3791490552169,2304.2250104949894,0.0 1153.9953723411206,2344.239272613172,0.0 1167.4486290530408,2384.8483510616365,0.0 1181.6858253329438,2425.89198036027,0.0 1196.650773471469,2467.2081800552805,0.0 1212.2844136551482,2508.6338939820494,0.0 1228.5250470485075,2550.005633773316,0.0 1245.3085792911825,2591.1601240730724,0.0 1262.5687734490782,2631.9349469098056,0.0 1280.237511421286,2672.1691826860233,0.0 1298.2450627711078,2711.70404525439,0.0 1316.5203599202337,2750.383508574109,0.0 1334.9912786200055,2788.054922474424,0.0 1353.5849225928748,2824.569615095102,0.0 1372.2279112207088,2859.783479626345,0.0 1390.8466691445649,2893.5575430325334,0.0 1409.3677166330187,2925.7585145153043,0.0 1427.7179595730954,2956.2593115514396,0.0 1445.8249779393389,2984.939561429527,0.0 1463.617311602567,3011.6860763060567,0.0 1481.0247423503558,3036.393299906132,0.0 1497.9785710062422,3058.96372410586,0.0 1514.411888553988,3079.3082737523705,0.0 1530.2598401969026,3097.3466582027486,0.0 1545.4598813100906,3113.007688194524,0.0 1559.9520242755168,3126.2295567971614,0.0 1573.6790752257268,3136.9600833357854,0.0 1586.5868597619135,3145.156919324457,0.0 1598.6244367555187,3150.787715596309,0.0 1609.7442993895934,3153.830249970922,0.0 1619.9025626465038,3154.2725149551206,0.0 1629.0591365020434,3152.1127651310644,0.0 1637.1778841424455,3147.359524044613,0.0 1644.226764579876,3140.0315505667845,0.0 1650.1779591035759,3130.157764861065,0.0 1655.007981067602,3117.77713424873,0.0 1658.6977685818897,3102.9385194226343,0.0 1661.2327597408237,3085.700481616379,0.0 1662.6029500924267,3066.1310514898746,0.0 1662.8029321213612,3044.3074606434075,0.0 1661.8319165899227,3020.3158368197996,0.0 1659.6937356527985,2994.250863997552,0.0 1656.3968277333056,2966.2154087164404,0.0 1651.9542042207884,2936.320114110279,0.0 1646.383398120609,2904.682963249016,0.0 1639.7063948593857,2871.4288135134625,0.0 1631.9495455185581,2836.6889038402487,0.0 1623.143462838707,2800.6003367816993,0.0 1613.3229004050527,2763.305537424697,0.0 1602.5266154909332,2724.9516913039297,0.0 1590.7972161005512,2685.6901635278323,0.0 1578.1809928146474,2645.6759014096497,0.0 1564.727736102727,2605.0668229611847,0.0 1550.4905398228243,2564.0231936625514,0.0 1535.5255916842991,2522.706993967541,0.0 1519.8919515006196,2481.281280040772,0.0 1503.6513181072605,2439.909540249506,0.0 1486.8677858645856,2398.7550499497493,0.0 1469.6075917066898,2357.980227113016,0.0 1451.9388537344823,2317.7459913367984,0.0 1433.9313023846603,2278.2111287684315,0.0 1415.6560052355344,2239.531665448713,0.0 1397.1850865357628,2201.860251548398,0.0 1378.5914425628937,2165.34555892772,0.0 1359.9484539350592,2130.131694396476,0.0 1341.3296960112032,2096.3576309902883,0.0 1322.8086485227493,2064.1566595075174,0.0 1304.4584055826729,2033.655862471382,0.0 1286.3513872164294,2004.9756125932952,0.0 1268.5590535532012,1978.229097716765,0.0 1251.151622805412,1953.5218741166893,0.0 1234.1977941495259,1930.9514499169616,0.0 1217.76447660178,1910.6069002704514,0.0 1201.9165249588657,1892.568515820073,0.0 1186.7164838456777,1876.9074858282981,0.0 1172.2243408802512,1863.68561722566,0.0 1158.4972899300412,1852.9550906870368,0.0 1145.5895053938546,1844.7582546983645,0.0 1133.5519284002494,1839.1274584265125,0.0 1122.4320657661747,1836.0849240518999,0.0 -8.267624328036598,39.399689834676806,0.0</coordinates>
</LinearRing>
</outerBoundaryIs>
</Polygon>
</MultiGeometry>
</Placemark>
</Document>
</kml>
Loading
Loading