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.

Sign up for GitHub

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

MNT: refactoring the data folder (#721) #726

Merged
merged 2 commits into from
Nov 9, 2024
Merged

MNT: refactoring the data folder (#721) #726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59072c5
MNT: refactoring the data folder (#721)
Gui-FernandesBR Nov 9, 2024
bf5d4f5
Merge branch 'master' into develop
Gui-FernandesBR Nov 9, 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
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ A sample Motor object can be created by the following code:

```python
Pro75M1670 = SolidMotor(
thrust_source="data/motors/Cesaroni_M1670.eng",
thrust_source="data/motors/cesaroni/Cesaroni_M1670.eng",
dry_mass=1.815,
dry_inertia=(0.125, 0.125, 0.002),
center_of_dry_mass_position=0.317,
Expand Down Expand Up @@ -218,8 +218,8 @@ calisto = Rocket(
radius=0.0635,
mass=14.426, # without motor
inertia=(6.321, 6.321, 0.034),
power_off_drag="data/calisto/powerOffDragCurve.csv",
power_on_drag="data/calisto/powerOnDragCurve.csv",
power_off_drag="data/rockets/calisto/powerOffDragCurve.csv",
power_on_drag="data/rockets/calisto/powerOnDragCurve.csv",
center_of_mass_without_motor=0,
coordinate_system_orientation="tail_to_nose",
)
Expand Down
0 tests/fixtures/airfoils/NACA0012-radians.txt → data/airfoils/NACA0012-radians.txt
View file
Open in desktop
File renamed without changes.
0 ...s/fixtures/airfoils/e473-10e6-degrees.csv → data/airfoils/e473-10e6-degrees.csv
View file
Open in desktop
File renamed without changes.
59 changes: 0 additions & 59 deletions data/calisto/NACA0012-radians.csv
View file
Open in desktop

This file was deleted.

0 ...a_Lui/bella_lui_motor_AeroTech_K828FJ.eng → data/motors/aerotech/AeroTech_K828FJ.eng
View file
Open in desktop
File renamed without changes.
0 .../ndrt_2020_motor_Cesaroni_4895L1395-P.eng → .../motors/cesaroni/Cesaroni_4895L1395-P.eng
View file
Open in desktop
File renamed without changes.
0 data/motors/Cesaroni_M1670.eng → data/motors/cesaroni/Cesaroni_M1670.eng
View file
Open in desktop
File renamed without changes.
0 ...fixtures/motor/Cesaroni_M1670_shifted.eng → ...otors/cesaroni/Cesaroni_M1670_shifted.eng
View file
Open in desktop
File renamed without changes.
0 data/motors/keron/thrustCurve.csv → ...rs/projeto-jupiter/keron_thrust_curve.csv
View file
Open in desktop
File renamed without changes.
0 data/motors/mandioca/thrustCurve.csv → ...projeto-jupiter/mandioca_thrust_curve.csv
View file
Open in desktop
File renamed without changes.
0 ...la_Lui/bella_lui_flight_data_filtered.csv → ...la_Lui/bella_lui_flight_data_filtered.csv
View file
Open in desktop
File renamed without changes.
0 ...tance/NDRT_2020/ndrt_2020_flight_data.csv → ...ckets/NDRT_2020/ndrt_2020_flight_data.csv
View file
Open in desktop
File renamed without changes.
0 data/astg/DragCoeffOR_off.csv → data/rockets/astg/DragCoeffOR_off.csv
View file
Open in desktop
File renamed without changes.
0 data/astg/DragCoeffOR_on.csv → data/rockets/astg/DragCoeffOR_on.csv
View file
Open in desktop
File renamed without changes.
0 data/astg/altimeter_halcyon.csv → data/rockets/astg/altimeter_halcyon.csv
View file
Open in desktop
File renamed without changes.
0 data/astg/engine_Halcyon_4thHotfire.eng → ...ockets/astg/engine_Halcyon_4thHotfire.eng
View file
Open in desktop
File renamed without changes.
0 data/astg/gnss_halcyon.csv → data/rockets/astg/gnss_halcyon.csv
View file
Open in desktop
File renamed without changes.
0 data/berkeley/ExampleTankGasMassData.csv → ...ckets/berkeley/ExampleTankGasMassData.csv
View file
Open in desktop
File renamed without changes.
0 data/berkeley/ExampleTankLiquidMassData.csv → ...ts/berkeley/ExampleTankLiquidMassData.csv
View file
Open in desktop
File renamed without changes.
0 data/berkeley/Test135GasMass.csv → data/rockets/berkeley/Test135GasMass.csv
View file
Open in desktop
File renamed without changes.
0 data/berkeley/Test135LoxMass.csv → data/rockets/berkeley/Test135LoxMass.csv
View file
Open in desktop
File renamed without changes.
0 data/SEBLM/drag.csv → data/rockets/berkeley/drag.csv
View file
Open in desktop
File renamed without changes.
0 data/berkeley/loxMFR.csv → data/rockets/berkeley/loxMFR.csv
View file
Open in desktop
File renamed without changes.
0 data/berkeley/loxMass.csv → data/rockets/berkeley/loxMass.csv
View file
Open in desktop
File renamed without changes.
0 data/berkeley/loxUllage.csv → data/rockets/berkeley/loxUllage.csv
View file
Open in desktop
File renamed without changes.
0 data/SEBLM/pressurantMass.csv → data/rockets/berkeley/pressurantMass.csv
View file
Open in desktop
File renamed without changes.
0 data/SEBLM/pressurantMassFiltered.csv → ...ckets/berkeley/pressurantMassFiltered.csv
View file
Open in desktop
File renamed without changes.
0 data/SEBLM/test124_Lox_Volume.csv → data/rockets/berkeley/test124_Lox_Volume.csv
View file
Open in desktop
File renamed without changes.
0 data/SEBLM/test124_Pressurant_PT.csv → ...ockets/berkeley/test124_Pressurant_PT.csv
View file
Open in desktop
File renamed without changes.
0 data/SEBLM/test124_Propane_Volume.csv → ...ckets/berkeley/test124_Propane_Volume.csv
View file
Open in desktop
File renamed without changes.
0 data/SEBLM/test124_Thrust_Curve.csv → ...rockets/berkeley/test124_Thrust_Curve.csv
View file
Open in desktop
File renamed without changes.
0 data/calisto/air_brakes_cd.csv → data/rockets/calisto/air_brakes_cd.csv
View file
Open in desktop
File renamed without changes.
0 data/calisto/powerOffDragCurve.csv → data/rockets/calisto/powerOffDragCurve.csv
View file
Open in desktop
File renamed without changes.
0 data/calisto/powerOnDragCurve.csv → data/rockets/calisto/powerOnDragCurve.csv
View file
Open in desktop
File renamed without changes.
0 data/juno3/README.txt → data/rockets/juno3/README.txt
View file
Open in desktop
File renamed without changes.
0 data/juno3/cots_GNSS.csv → data/rockets/juno3/cots_GNSS.csv
View file
Open in desktop
File renamed without changes.
0 data/juno3/cots_altimeter.csv → data/rockets/juno3/cots_altimeter.csv
View file
Open in desktop
File renamed without changes.
0 data/juno3/drag_curve.csv → data/rockets/juno3/drag_curve.csv
View file
Open in desktop
File renamed without changes.
0 data/juno3/srad_telemetry.csv → data/rockets/juno3/srad_telemetry.csv
View file
Open in desktop
File renamed without changes.
0 data/polito/altimeter_cavour.csv → data/rockets/polito/altimeter_cavour.csv
View file
Open in desktop
File renamed without changes.
0 data/polito/drag_coefficient_power_off.csv → ...ets/polito/drag_coefficient_power_off.csv
View file
Open in desktop
File renamed without changes.
0 data/polito/drag_coefficient_power_on.csv → ...kets/polito/drag_coefficient_power_on.csv
View file
Open in desktop
File renamed without changes.
0 ...24-serial-5115-flight-0001-TeleMetrum.csv → ...24-serial-5115-flight-0001-TeleMetrum.csv
View file
Open in desktop
File renamed without changes.
0 ...6-24-serial-6583-flight-0003-TeleMega.csv → ...6-24-serial-6583-flight-0003-TeleMega.csv
View file
Open in desktop
File renamed without changes.
0 data/valetudo/Cd_PowerOff_RASAero.csv → .../rockets/valetudo/Cd_PowerOff_RASAero.csv
View file
Open in desktop
File renamed without changes.
0 data/valetudo/Cd_PowerOn_RASAero.csv → data/rockets/valetudo/Cd_PowerOn_RASAero.csv
View file
Open in desktop
File renamed without changes.
0 ...nalysis_inputs/Valetudo_basemap_final.jpg → ...ckets/valetudo/Valetudo_basemap_final.jpg
View file
Open in desktop
File renamed without changes
Loading
Loading