Skip to content

Commit a5938c5

Browse files
committed
Merge remote-tracking branch 'origin/develop' into enh/save-graphs
2 parents c5264a2 + 2b63cd9 commit a5938c5

File tree

130 files changed

+80270
-783
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+80270
-783
lines changed

.github/workflows/test_pytest.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ jobs:
2626
steps:
2727
- uses: actions/checkout@v4
2828
- name: Set up Python
29-
uses: actions/setup-python@v2
29+
uses: actions/setup-python@v4
3030
with:
3131
python-version: ${{ matrix.python-version }}
3232

3333
- name: Cache Python dependencies
34-
uses: actions/cache@v2
34+
uses: actions/cache@v3
3535
with:
3636
path: ~/.cache/pip
3737
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements-tests.txt') }}
@@ -64,7 +64,7 @@ jobs:
6464
run: pytest tests/acceptance --cov=rocketpy --cov-append --cov-report=xml
6565

6666
- name: Upload coverage to artifacts
67-
uses: actions/upload-artifact@v2
67+
uses: actions/upload-artifact@v3
6868
with:
6969
name: coverage
7070
path: coverage.xml
@@ -75,9 +75,9 @@ jobs:
7575
steps:
7676
- uses: actions/checkout@v4
7777
- name: Download all coverage reports
78-
uses: actions/download-artifact@v2
78+
uses: actions/download-artifact@v3
7979
- name: Upload to Codecov
80-
uses: codecov/codecov-action@v2
80+
uses: codecov/codecov-action@v4
8181
with:
8282
token: ${{ secrets.CODECOV_TOKEN }}
8383
files: |

.pylintrc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,7 @@ good-names=FlightPhases,
225225
motor_I_11_derivative_at_t,
226226
M3_forcing,
227227
M3_damping,
228-
CM_to_CDM,
229-
CM_to_CPM,
228+
CDM_to_CPM,
230229
center_of_mass_without_motor_to_CDM,
231230
motor_center_of_dry_mass_to_CDM,
232231
generic_motor_cesaroni_M1520,
@@ -360,6 +359,9 @@ max-statements=25
360359
# Minimum number of public methods for a class (see R0903).
361360
min-public-methods=0
362361

362+
# Maximum number of positional arguments (see R0917).
363+
max-positional-arguments = 25
364+
363365

364366
[EXCEPTIONS]
365367

.vscode/settings.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
"Dyllon",
9797
"ECMWF",
9898
"edgecolor",
99+
"EOMs",
99100
"epsabs",
100101
"epsrel",
101102
"eqsv",
@@ -132,11 +133,14 @@
132133
"github",
133134
"Glauert",
134135
"gmaps",
136+
"Gnss",
135137
"Gomes",
136138
"Gonçalvez",
137139
"grav",
138140
"Guilherme",
139141
"Haim",
142+
"headlength",
143+
"headwidth",
140144
"hemis",
141145
"hgtprs",
142146
"hgtsfc",
@@ -148,6 +152,7 @@
148152
"ICONEU",
149153
"idxmax",
150154
"IGRA",
155+
"Ilya",
151156
"imageio",
152157
"imread",
153158
"imshow",
@@ -156,15 +161,19 @@
156161
"Interquartile",
157162
"intp",
158163
"ipynb",
164+
"ipython",
159165
"ipywidgets",
160166
"isbijective",
161167
"isin",
168+
"isort",
162169
"ivar",
163170
"jsonpickle",
164171
"Junqueira",
165172
"jupyter",
166173
"Kaleb",
167174
"Karman",
175+
"Krasser",
176+
"labelrotation",
168177
"linalg",
169178
"linestyle",
170179
"linewidth",
@@ -212,6 +221,7 @@
212221
"noaaruc",
213222
"noaarucsounding",
214223
"num2pydate",
224+
"numericalunits",
215225
"numfig",
216226
"numpy",
217227
"numref",
@@ -221,20 +231,25 @@
221231
"polystyle",
222232
"powerseries",
223233
"Prandtl",
234+
"prettytable",
224235
"Projeto",
225236
"prometheus",
226237
"pydata",
227238
"pylint",
228239
"PYPI",
229240
"pyplot",
230241
"pyproject",
242+
"pytest",
231243
"pytz",
244+
"quantile",
232245
"Rdot",
233246
"referece",
234247
"relativetoground",
235248
"repr",
249+
"reversesort",
236250
"reynolds",
237251
"rightarrow",
252+
"rmul",
238253
"ROABs",
239254
"rocketpy",
240255
"rocketusage",
@@ -252,6 +267,7 @@
252267
"setrail",
253268
"simplekml",
254269
"SIRGAS",
270+
"Sobol",
255271
"solidmotor",
256272
"somgl",
257273
"Somigliana",
@@ -260,9 +276,12 @@
260276
"SRTM",
261277
"SRTMGL",
262278
"Stano",
279+
"statsmodels",
263280
"STFT",
264281
"subintervals",
265282
"suptitle",
283+
"supxlabel",
284+
"supylabel",
266285
"ticklabel",
267286
"timedelta",
268287
"timezonefinder",
@@ -280,6 +299,7 @@
280299
"Unidimensional",
281300
"USGS",
282301
"uwyo",
302+
"valetudo",
283303
"vectorize",
284304
"vgrdprs",
285305
"viewcode",

CHANGELOG.md

Lines changed: 61 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,80 @@ Attention: The newest changes should be on top -->
3232

3333
### Added
3434

35+
36+
37+
### Changed
38+
39+
40+
41+
### Fixed
42+
43+
44+
## [v1.6.1] - 2024-10-10
45+
46+
### Changed
47+
48+
- REL: v1.6.1 [#708](https://github.com/RocketPy-Team/RocketPy/pull/708)
49+
- DEP: deprecate NOAA's RuC sounding [#706](https://github.com/RocketPy-Team/RocketPy/pull/706)
50+
51+
### Fixed
52+
53+
- BUG: Fix Motor Zero Dry Mass Check [#710](https://github.com/RocketPy-Team/RocketPy/pull/710)
54+
- BUG: Fix Environment.max_expected_height for custom atmosphere [#707](https://github.com/RocketPy-Team/RocketPy/pull/707)
55+
- BUG: Initialize _Controller Init Parameters [#703](https://github.com/RocketPy-Team/RocketPy/pull/703)
56+
- BUG: Rail Buttons Not Accepted in Add Surfaces [#701](https://github.com/RocketPy-Team/RocketPy/pull/701)
57+
- BUG: Vector encoding breaks MonteCarlo export. [#704](https://github.com/RocketPy-Team/RocketPy/pull/704)
58+
- BUG: Single Point Functions Can Not Be Defined [#700](https://github.com/RocketPy-Team/RocketPy/pull/700)
59+
- BUG: savetxt Not Accepting lambda Functions [#698](https://github.com/RocketPy-Team/RocketPy/pull/698)
60+
61+
## [v1.6.0] - 2024-09-29
62+
63+
### Added
64+
65+
- REL: v1.6.0 [#697](https://github.com/RocketPy-Team/RocketPy/pull/697)
66+
- ENH: Generic Surfaces and Generic Linear Surfaces [#680](https://github.com/RocketPy-Team/RocketPy/pull/680)
67+
- ENH: Free-Form Fins [#694](https://github.com/RocketPy-Team/RocketPy/pull/694)
68+
- ENH: Expand Polation Options for ND Functions. [#691](https://github.com/RocketPy-Team/RocketPy/pull/691)
69+
70+
## [v1.5.0] - 2024-09-15
71+
72+
### Added
73+
74+
- ENH: Adds Sensors classes [#683](https://github.com/RocketPy-Team/RocketPy/pull/683)
75+
- DOC: Cavour Flight Example [#682](https://github.com/RocketPy-Team/RocketPy/pull/682)
76+
- DOC: Halcyon Flight Example [#681](https://github.com/RocketPy-Team/RocketPy/pull/681)
77+
- ENH: Adds GenericMotor.load_from_eng_file() method [#676](https://github.com/RocketPy-Team/RocketPy/pull/676)
78+
- ENH: Introducing local sensitivity analysis [#575](https://github.com/RocketPy-Team/RocketPy/pull/575)
3579
- ENH: Add STFT function to Function class [#620](https://github.com/RocketPy-Team/RocketPy/pull/620)
3680
- ENH: Rocket Axis Definition [#635](https://github.com/RocketPy-Team/RocketPy/pull/635)
3781
- ENH: Implement optional plot saving [#597](https://github.com/RocketPy-Team/RocketPy/pull/597)
3882

3983
### Changed
4084

41-
- DOC: Fix documentation dependencies [#651](https://github.com/RocketPy-Team/RocketPy/pull/651)
42-
- DOC: Fix documentation warnings [#645](https://github.com/RocketPy-Team/RocketPy/pull/645)
4385
- DOC: New Environment class docs pages [#644](https://github.com/RocketPy-Team/RocketPy/pull/644)
4486

4587
### Fixed
4688

89+
- ENH: Fix Orientation Param of Inertial Sensors [#688](https://github.com/RocketPy-Team/RocketPy/pull/688)
90+
- BUG: Zero Mass Flow Rate in Liquid Motors breaks Exhaust Velocity [#677](https://github.com/RocketPy-Team/RocketPy/pull/677)
91+
- DOC: Fix documentation dependencies [#651](https://github.com/RocketPy-Team/RocketPy/pull/651)
92+
- DOC: Fix documentation warnings [#645](https://github.com/RocketPy-Team/RocketPy/pull/645)
93+
- BUG: Rotational EOMs Not Relative To CDM [#674](https://github.com/RocketPy-Team/RocketPy/pull/674)
4794
- BUG: Pressure ISA Extrapolation as "linear" [#675](https://github.com/RocketPy-Team/RocketPy/pull/675)
4895
- BUG: fix the Frequency Response plot of Flight class [#653](https://github.com/RocketPy-Team/RocketPy/pull/653)
4996

97+
## [v1.4.3] - 2024-09-11
98+
99+
You can install this version by running `pip install rocketpy==1.4.3`
100+
101+
### Changed
102+
103+
- REL: Bump versioning to RocketPy v1.4.3 [#687](https://github.com/RocketPy-Team/RocketPy/pull/687)
104+
105+
### Fixed
106+
107+
- BUG: Rollback Prandtl-Glauert corrections for Tail and Nose. [#685](https://github.com/RocketPy-Team/RocketPy/pull/685)
108+
50109
## [v1.4.2] - 2024-08-03
51110

52111
You can install this version by running `pip install rocketpy==1.4.2`

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ RocketPy is the next-generation trajectory simulation solution for High-Power Ro
3333

3434
2. **Accurate Weather Modeling**
3535
- Supports International Standard Atmosphere (1976)
36-
- Custom atmospheric profiles and Soundings (Wyoming, NOAARuc)
36+
- Custom atmospheric profiles and Soundings (Wyoming)
3737
- Weather forecasts, reanalysis, and ensembles for realistic scenarios
3838

3939
3. **Aerodynamic Models**
@@ -329,6 +329,9 @@ RocketPy extends its gratitude to the following institutions for their support a
329329
<a href="https://github.com/Space-Enterprise-at-Berkeley">
330330
<img align=top alt="Space Enterprise at Berkeley Logo" src="https://raw.githubusercontent.com/RocketPy-Team/RocketPy/master/docs/static/institutional/space_enterprise_at_berkeley.jpeg" height="150px">
331331
</a>
332+
<a href="https://www.instagram.com/faradayupv">
333+
<img align=top alt="Faraday Rocketry UPV Logo" src="https://raw.githubusercontent.com/RocketPy-Team/RocketPy/master/docs/static/institutional/faraday_team_logo.jpg" height="150px">
334+
</a>
332335
</div>
333336

334337
## Individual Contributors

data/astg/DragCoeffOR_off.csv

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
0.15,0.402
2+
0.3,0.406
3+
0.5,0.416
4+
0.7,0.436
5+
0.8,0.45

data/astg/DragCoeffOR_on.csv

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
0.15,0.402
2+
0.3,0.406
3+
0.5,0.416
4+
0.7,0.436
5+
0.8,0.45

0 commit comments

Comments
 (0)