Skip to content

Commit cb88e69

Browse files
committed
Merge remote-tracking branch 'origin/develop' into enh/parallel_montecarlo
2 parents 3a08f48 + 4531ed5 commit cb88e69

Some content is hidden

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

76 files changed

+2268
-4219
lines changed

.github/workflows/test_pytest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ${{ matrix.os }}
1919
strategy:
2020
matrix:
21-
os: [ubuntu-latest, macos-latest, windows-latest]
21+
os: [ubuntu-latest, macos-latest]
2222
python-version: [3.9, 3.12]
2323
env:
2424
OS: ${{ matrix.os }}

.vscode/settings.json

Lines changed: 89 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@
1414
"cSpell.language": "en-US",
1515
"cSpell.words": [
1616
"Abdulklech",
17+
"addsurface",
1718
"adjugate",
1819
"akima",
1920
"allclose",
2021
"altitudemode",
2122
"Alves",
2223
"amax",
24+
"angularpos",
2325
"arange",
2426
"arccos",
2527
"arcsin",
@@ -34,11 +36,20 @@
3436
"autopep",
3537
"autouse",
3638
"axhline",
39+
"axisymmetric",
3740
"axup",
3841
"axvline",
42+
"axvspan",
43+
"Barrowman",
44+
"Baruh",
3945
"behaviour",
46+
"Bigl",
47+
"Bigr",
4048
"bijective",
49+
"bmatrix",
50+
"boldsymbol",
4151
"brentq",
52+
"bysource",
4253
"Calebe",
4354
"calisto",
4455
"Calisto",
@@ -52,29 +63,41 @@
5263
"cftime",
5364
"changealphaint",
5465
"Chassikos",
66+
"chisquare",
5567
"clabel",
5668
"clalpha",
5769
"cmap",
5870
"cmcens",
5971
"coeff",
6072
"coeffs",
73+
"Colab",
6174
"colorbar",
6275
"colormaps",
6376
"contourf",
6477
"conusnest",
78+
"copybutton",
6579
"cstride",
6680
"csys",
6781
"datapoints",
82+
"datetime",
83+
"dcsys",
6884
"ddot",
85+
"deepcopy",
6986
"deletechars",
7087
"dimgrey",
7188
"discretizes",
7289
"disp",
90+
"displaystyle",
91+
"docstrings",
92+
"Doretto",
7393
"dtype",
94+
"dunder",
95+
"Dyllon",
7496
"ECMWF",
7597
"edgecolor",
7698
"epsabs",
7799
"epsrel",
100+
"eqsv",
78101
"errstate",
79102
"evals",
80103
"exponentiated",
@@ -85,16 +108,22 @@
85108
"fftfreq",
86109
"figsize",
87110
"filt",
111+
"firstsimulation",
112+
"flightcsys",
113+
"Fluxogram",
88114
"fmax",
89115
"fmin",
116+
"fontawesome",
90117
"fontsize",
91118
"freestream",
92119
"funcified",
93120
"funcify",
121+
"functionusage",
94122
"GEFS",
95123
"genfromtxt",
96124
"geopotential",
97125
"geopotentials",
126+
"Geospatial",
98127
"getdata",
99128
"getfixturevalue",
100129
"Giorgio",
@@ -103,42 +132,71 @@
103132
"Glauert",
104133
"gmaps",
105134
"Gomes",
135+
"Gonçalvez",
106136
"grav",
137+
"Guilherme",
138+
"Haim",
107139
"hemis",
108140
"hgtprs",
109141
"hgtsfc",
110142
"HIRESW",
143+
"HRES",
111144
"hspace",
145+
"htmlhelp",
146+
"hybridmotor",
112147
"ICONEU",
113148
"idxmax",
149+
"IGRA",
114150
"imageio",
115151
"imread",
116152
"intc",
117153
"interp",
118154
"Interquartile",
119155
"intp",
156+
"ipynb",
120157
"ipywidgets",
121158
"isbijective",
122159
"isin",
160+
"ivar",
123161
"jsonpickle",
162+
"Junqueira",
124163
"jupyter",
164+
"Kaleb",
125165
"Karman",
126166
"linalg",
127167
"linestyle",
128168
"linewidth",
169+
"linspace",
170+
"liquidmotor",
129171
"loadtxt",
172+
"lognormal",
130173
"LSODA",
131174
"lvhaack",
132175
"Mandioca",
176+
"Marte",
177+
"Masatoshi",
178+
"Mateus",
179+
"mathbf",
180+
"Matheus",
181+
"mathjax",
182+
"mathrm",
133183
"mathutils",
184+
"matplotlib",
134185
"maxdepth",
135186
"mbar",
136187
"meshgrid",
188+
"Mesoscale",
189+
"Meteo",
190+
"Meteomatics",
137191
"Metrum",
192+
"modindex",
138193
"mult",
139194
"multiprocess",
140195
"Mumma",
141196
"NASADEM",
197+
"nbformat",
198+
"nbsphinx",
199+
"NCEP",
142200
"NDAP",
143201
"ndarray",
144202
"NDRT",
@@ -147,58 +205,87 @@
147205
"newmultigeometry",
148206
"newpolygon",
149207
"nfev",
208+
"Niskanen",
150209
"NOAA",
151210
"NOAA's",
152211
"noaaruc",
212+
"noaarucsounding",
153213
"num2pydate",
214+
"numfig",
215+
"numpy",
216+
"numref",
154217
"outerboundaryis",
218+
"overshootable",
155219
"planform",
156220
"polystyle",
157221
"powerseries",
222+
"Prandtl",
158223
"Projeto",
159224
"prometheus",
225+
"pydata",
226+
"pylint",
227+
"PYPI",
228+
"pyplot",
229+
"pyproject",
160230
"pytz",
161231
"Rdot",
162232
"referece",
163233
"relativetoground",
234+
"repr",
164235
"reynolds",
236+
"rightarrow",
165237
"ROABs",
166238
"rocketpy",
239+
"rocketusage",
167240
"rstride",
168241
"rtol",
242+
"rtype",
169243
"rucsoundings",
170244
"rwork",
171245
"savetxt",
172246
"savgol",
247+
"SBMT",
173248
"scilimits",
174249
"searchsorted",
175250
"seealso",
251+
"setrail",
176252
"simplekml",
177253
"SIRGAS",
254+
"solidmotor",
178255
"somgl",
179256
"Somigliana",
257+
"Sorban",
258+
"sqrd",
180259
"SRTM",
181260
"SRTMGL",
261+
"Stano",
182262
"subintervals",
263+
"suptitle",
183264
"ticklabel",
265+
"timedelta",
184266
"timezonefinder",
185267
"tmpprs",
186268
"toctree",
187269
"trapz",
188270
"TRHEDDS",
271+
"triggerdetails",
189272
"triggerfunc",
190273
"twinx",
274+
"typehints",
191275
"udot",
192276
"ufunc",
193277
"ugrdprs",
278+
"Unidimensional",
194279
"USGS",
195280
"uwyo",
196281
"vectorize",
197282
"vgrdprs",
283+
"viewcode",
198284
"viridis",
199285
"vmax",
200286
"vmin",
201287
"vonkarman",
288+
"Wanderley",
202289
"Weibull",
203290
"windrose",
204291
"wireframe",
@@ -210,6 +297,7 @@
210297
"ylim",
211298
"zdir",
212299
"zlabel",
213-
"zlim"
300+
"zlim",
301+
"zorder"
214302
]
215303
}

CHANGELOG.md

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,38 @@ Attention: The newest changes should be on top -->
3232

3333
### Added
3434

35+
- ENH: Rocket Axis Definition [#635](https://github.com/RocketPy-Team/RocketPy/pull/635)
36+
37+
### Changed
38+
3539
-
40+
- DOC: Fix documentation warnings [#645](https://github.com/RocketPy-Team/RocketPy/pull/645)
41+
- DOC: New Environment class docs pages [#644](https://github.com/RocketPy-Team/RocketPy/pull/644)
42+
43+
### Fixed
44+
45+
46+
47+
## [v1.4.2] - 2024-08-03
48+
49+
You can install this version by running `pip install rocketpy==1.4.2`
3650

3751
### Changed
38-
52+
53+
- REL: Bump versioning to RocketPy v1.4.2 [#648](https://github.com/RocketPy-Team/RocketPy/pull/648)
3954
- ENH: Adding rocket radius to RailButtons class [#643](https://github.com/RocketPy-Team/RocketPy/pull/643)
4055

4156
### Fixed
4257

43-
-
58+
- BUG: Time Node Merge Not Including Controllers [#647](https://github.com/RocketPy-Team/RocketPy/pull/647)
4459

4560
## [v1.4.1] - 2024-07-20
4661

4762
You can install this version by running `pip install rocketpy==1.4.1`
4863

4964
### Changed
5065

51-
- Bumps rocketpy version to 1.4.1 [#646](https://github.com/RocketPy-Team/RocketPy/pull/646)
66+
- REL: Bumps rocketpy version to 1.4.1 [#646](https://github.com/RocketPy-Team/RocketPy/pull/646)
5267
- ENH: Insert apogee state into solution list during flight simulation [#638](https://github.com/RocketPy-Team/RocketPy/pull/638)
5368
- MNT: Refactor AeroSurfaces [#634](https://github.com/RocketPy-Team/RocketPy/pull/634)
5469
- ENH: Environment class major refactor may 2024 [#605](https://github.com/RocketPy-Team/RocketPy/pull/605)

0 commit comments

Comments
 (0)