Skip to content

Commit 12a04b4

Browse files
Gui-FernandesBRGui-FernandesBR
authored
Merge branch 'develop' into docs/faraday-2023-flight-sim
2 parents 5ac7c91 + 0414249 commit 12a04b4

File tree

17 files changed

+16521
-27
lines changed

17 files changed

+16521
-27
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ Attention: The newest changes should be on top -->
3333
### Added
3434

3535
- DOC: GENESIS Flight Example [#734](https://github.com/RocketPy-Team/RocketPy/pull/734)
36+
- DOC: Camoes Flight Example [#733](https://github.com/RocketPy-Team/RocketPy/pull/733)
37+
- ENH: Callback function for collecting additional data from Monte Carlo sims [#702](https://github.com/RocketPy-Team/RocketPy/pull/702)
3638
- ENH: Implement optional plot saving [#597](https://github.com/RocketPy-Team/RocketPy/pull/597)
3739

3840
### Changed
@@ -41,7 +43,7 @@ Attention: The newest changes should be on top -->
4143

4244
### Fixed
4345

44-
-
46+
- BUG: Sideslip Angle and Damping Coefficient Calculation [#729](https://github.com/RocketPy-Team/RocketPy/pull/729)
4547

4648
## [v1.6.2] - 2024-11-08
4749

‎data/rockets/camoes/actuation.csv‎

Lines changed: 319 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,319 @@
1+
0,0
2+
3.8,1
3+
3.85,1
4+
3.9,1
5+
3.95,1
6+
4,1
7+
4.05,1
8+
4.1,1
9+
4.15,1
10+
4.2,1
11+
4.25,1
12+
4.3,1
13+
4.3,1
14+
4.4,1
15+
4.4,1
16+
4.5,1
17+
4.5,1
18+
4.6,1
19+
4.6,1
20+
4.7,1
21+
4.7,1
22+
4.8,1
23+
4.8,1
24+
4.9,1
25+
4.9,1
26+
5,1
27+
5,1
28+
5.1,1
29+
5.1,1
30+
5.2,1
31+
5.2,1
32+
5.3,1
33+
5.3,1
34+
5.4,1
35+
5.4,1
36+
5.5,1
37+
5.5,1
38+
5.6,1
39+
5.6,1
40+
5.7,1
41+
5.7,1
42+
5.8,1
43+
5.8,1
44+
5.9,1
45+
5.9,1
46+
6,1
47+
6,1
48+
6.1,1
49+
6.1,1
50+
6.2,1
51+
6.2,1
52+
6.3,1
53+
6.3,1
54+
6.4,1
55+
6.4,1
56+
6.5,1
57+
6.5,1
58+
6.6,1
59+
6.6,1
60+
6.7,1
61+
6.7,1
62+
6.8,1
63+
6.8,1
64+
6.9,1
65+
6.9,1
66+
7,1
67+
7,1
68+
7.1,1
69+
7.1,1
70+
7.2,1
71+
7.2,1
72+
7.3,1
73+
7.3,1
74+
7.4,1
75+
7.4,1
76+
7.5,1
77+
7.5,1
78+
7.6,1
79+
7.6,1
80+
7.7,1
81+
7.7,1
82+
7.8,1
83+
7.8,1
84+
7.9,1
85+
7.9,1
86+
8,1
87+
8,1
88+
8.1,1
89+
8.1,1
90+
8.2,1
91+
8.2,1
92+
8.3,1
93+
8.3,1
94+
8.4,1
95+
8.4,1
96+
8.5,1
97+
8.5,1
98+
8.6,1
99+
8.6,1
100+
8.7,1
101+
8.7,1
102+
8.8,1
103+
8.8,1
104+
8.9,1
105+
8.9,1
106+
9,1
107+
9,1
108+
9.1,1
109+
9.1,1
110+
9.2,1
111+
9.2,1
112+
9.3,1
113+
9.3,1
114+
9.4,1
115+
9.4,1
116+
9.5,1
117+
9.5,1
118+
9.6,1
119+
9.6,1
120+
9.7,1
121+
9.7,1
122+
9.8,1
123+
9.8,1
124+
9.9,1
125+
9.9,1
126+
10,1
127+
10,1
128+
10.1,1
129+
10.1,1
130+
10.2,1
131+
10.2,1
132+
10.3,1
133+
10.3,1
134+
10.4,1
135+
10.4,1
136+
10.5,1
137+
10.5,1
138+
10.6,1
139+
10.6,1
140+
10.7,1
141+
10.7,1
142+
10.8,1
143+
10.8,1
144+
10.9,1
145+
10.9,1
146+
11,1
147+
11,1
148+
11.1,1
149+
11.1,1
150+
11.2,1
151+
11.2,1
152+
11.3,1
153+
11.3,1
154+
11.4,0.945512279810771
155+
11.4,0.945512279810771
156+
11.5,0.89911207467799
157+
11.5,0.89911207467799
158+
11.6,0.860859806396753
159+
11.6,0.860859806396753
160+
11.7,0.824816548506214
161+
11.7,0.824816548506214
162+
11.8,0.792272288208803
163+
11.8,0.792272288208803
164+
11.9,0.749162228401252
165+
11.9,0.749162228401252
166+
12,0.721885650313102
167+
12,0.721885650313102
168+
12.1,0.696723333263171
169+
12.1,0.696723333263171
170+
12.2,0.672635158450319
171+
12.2,0.672635158450319
172+
12.3,0.650479838668804
173+
12.3,0.650479838668804
174+
12.4,0.631052398611268
175+
12.4,0.631052398611268
176+
12.5,0.613884939879965
177+
12.5,0.613884939879965
178+
12.6,0.597928778049878
179+
12.6,0.597928778049878
180+
12.7,0.582768490751696
181+
12.7,0.582768490751696
182+
12.8,0.568334080919908
183+
12.8,0.568334080919908
184+
12.9,0.543124281338941
185+
12.9,0.543124281338941
186+
13,0.533011853400899
187+
13,0.533011853400899
188+
13.1,0.524027782802142
189+
13.1,0.524027782802142
190+
13.2,0.515808837808458
191+
13.2,0.515808837808458
192+
13.3,0.508105990777546
193+
13.3,0.508105990777546
194+
13.4,0.500774963585474
195+
13.4,0.500774963585474
196+
13.5,0.49374836528636
197+
13.5,0.49374836528636
198+
13.6,0.486978825952231
199+
13.6,0.486978825952231
200+
13.7,0.467360954933026
201+
13.7,0.467360954933026
202+
13.8,0.461638265483169
203+
13.8,0.461638265483169
204+
13.9,0.456204865930494
205+
13.9,0.456204865930494
206+
14,0.451080873133615
207+
14,0.451080873133615
208+
14.1,0.435183304130795
209+
14.1,0.435183304130795
210+
14.2,0.431684544047949
211+
14.2,0.431684544047949
212+
14.3,0.428350214015284
213+
14.3,0.428350214015284
214+
14.4,0.42519066513626
215+
14.4,0.42519066513626
216+
14.5,0.422209369334739
217+
14.5,0.422209369334739
218+
14.6,0.419398744956558
219+
14.6,0.419398744956558
220+
14.7,0.416737062036246
221+
14.7,0.416737062036246
222+
14.8,0.414196844919841
223+
14.8,0.414196844919841
224+
14.9,0.411752846696865
225+
14.9,0.411752846696865
226+
15,0.409388041714355
227+
15,0.409388041714355
228+
15.1,0.396868676263716
229+
15.1,0.396868676263716
230+
15.2,0.395220001961076
231+
15.2,0.395220001961076
232+
15.3,0.393637399678915
233+
15.3,0.393637399678915
234+
15.4,0.392136370642273
235+
15.4,0.392136370642273
236+
15.5,0.390727242485821
237+
15.5,0.390727242485821
238+
15.6,0.389417345006361
239+
15.6,0.389417345006361
240+
15.7,0.388207537110014
241+
15.7,0.388207537110014
242+
15.8,0.387089260184126
243+
15.8,0.387089260184126
244+
15.9,0.386057302384121
245+
15.9,0.386057302384121
246+
16,0.385094831240076
247+
16,0.385094831240076
248+
16.1,0.384187364331569
249+
16.1,0.384187364331569
250+
16.2,0.383322263401633
251+
16.2,0.383322263401633
252+
16.3,0.382490396793678
253+
16.3,0.382490396793678
254+
16.4,0.381686987007564
255+
16.4,0.381686987007564
256+
16.5,0.380911621890668
257+
16.5,0.380911621890668
258+
16.6,0.369871496291607
259+
16.6,0.369871496291607
260+
16.7,0.369786615866136
261+
16.7,0.369786615866136
262+
16.8,0.369721702912554
263+
16.8,0.369721702912554
264+
16.9,0.369684519632152
265+
16.9,0.369684519632152
266+
17,0.369681766038088
267+
17,0.369681766038088
268+
17.1,0.369718237132289
269+
17.1,0.369718237132289
270+
17.2,0.369796566386489
271+
17.2,0.369796566386489
272+
17.3,0.369917315802678
273+
17.3,0.369917315802678
274+
17.4,0.370079327967953
275+
17.4,0.370079327967953
276+
17.5,0.370280247552733
277+
17.5,0.370280247552733
278+
17.6,0.370517094690705
279+
17.6,0.370517094690705
280+
17.7,0.370786815710908
281+
17.7,0.370786815710908
282+
17.8,0.371086748990564
283+
17.8,0.371086748990564
284+
17.9,0.371414945318463
285+
17.9,0.371414945318463
286+
18,0.371770434925475
287+
18,0.371770434925475
288+
18.1,0.372153227572751
289+
18.1,0.372153227572751
290+
18.2,0.372564340673654
291+
18.2,0.372564340673654
292+
18.3,0.373005662362356
293+
18.3,0.373005662362356
294+
18.4,0.373479829874597
295+
18.4,0.373479829874597
296+
18.5,0.373990017420709
297+
18.5,0.373990017420709
298+
18.6,0.374539797593505
299+
18.6,0.374539797593505
300+
18.7,0.375132942374121
301+
18.7,0.375132942374121
302+
18.8,0.375773296890453
303+
18.8,0.375773296890453
304+
18.9,0.376464731541775
305+
18.9,0.376464731541775
306+
19,0.377210941973353
307+
19,0.377210941973353
308+
19.1,0.378015490693897
309+
19.1,0.378015490693897
310+
19.2,0.37888171205048
311+
19.2,0.37888171205048
312+
19.3,0.379812690382747
313+
19.3,0.379812690382747
314+
19.4,0.380811276267422
315+
19.4,0.380811276267422
316+
19.5,0.381880005622348
317+
19.5,0.381880005622348
318+
19.6,0.383021156095001
319+
19.6,0.383021156095001

0 commit comments

Comments
 (0)