Skip to content

Commit

Permalink
Merge branch 'develop' into doc/new-flight-example-for-rocketpy-recru…
Browse files Browse the repository at this point in the history
…itment
  • Loading branch information
ArthurJWH authored Nov 30, 2024
2 parents eb0741d + d93666a commit 1fbc15c
Show file tree
Hide file tree
Showing 96 changed files with 38,307 additions and 1,878 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 2 additions & 0 deletions .github/clear-local-branches.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Delete local branches that no longer exists on remote (windows command line)
git branch -vv | Where-Object { $_ -match 'gone\]' } | ForEach-Object { $_.Trim().Split()[0] } | ForEach-Object { git branch -D $_ }
16 changes: 10 additions & 6 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true,
"autoDocstring.docstringFormat": "numpy",
"cSpell.enableFiletypes": [
"python",
"jupyter",
"markdown",
"restructuredtext"
],
"cSpell.enabledFileTypes": {
"plaintext": true,
"python": true,
"jupyter": true,
"markdown": true,
"tex": true,
"rst": true
},
"cSpell.language": "en-US",
"cSpell.words": [
"Abdulklech",
Expand Down Expand Up @@ -231,6 +233,7 @@
"polystyle",
"powerseries",
"Prandtl",
"pressurant",
"prettytable",
"Projeto",
"prometheus",
Expand Down Expand Up @@ -263,6 +266,7 @@
"SBMT",
"scilimits",
"searchsorted",
"seblm",
"seealso",
"setrail",
"simplekml",
Expand Down
27 changes: 24 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,36 @@ Attention: The newest changes should be on top -->

### Added

-

### Changed

-
- MNT: Refactor Tank's testing Assertion with CAD data. [#678](https://github.com/RocketPy-Team/RocketPy/pull/678)

### Fixed

-

## [v1.7.0] - 2024-11-30

### Added

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

### Changed

- REL: update version to 1.7.0 in configuration files [#741](https://github.com/RocketPy-Team/RocketPy/pull/741)
- MNT: Place filename save parameter to the end. [#739](https://github.com/RocketPy-Team/RocketPy/pull/739)
- DOC: improvements to developers documentation [#732](https://github.com/RocketPy-Team/RocketPy/pull/732)

### Fixed

- BUG: Allow multiple sets of stochastic fins [#737](https://github.com/RocketPy-Team/RocketPy/pull/737)
- BUG: forecast and reanalysis models - Update ECMWF dictionary values [#736](https://github.com/RocketPy-Team/RocketPy/pull/736)
- BUG: forecast and reanalysis models - move wind_speed to correct position [#735](https://github.com/RocketPy-Team/RocketPy/pull/735)
- BUG: Sideslip Angle and Damping Coefficient Calculation [#729](https://github.com/RocketPy-Team/RocketPy/pull/729)
- DOC: fixed documentation about spherical caps [#728](https://github.com/RocketPy-Team/RocketPy/pull/728)

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

Expand Down
319 changes: 319 additions & 0 deletions data/rockets/camoes/actuation.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,319 @@
0,0
3.8,1
3.85,1
3.9,1
3.95,1
4,1
4.05,1
4.1,1
4.15,1
4.2,1
4.25,1
4.3,1
4.3,1
4.4,1
4.4,1
4.5,1
4.5,1
4.6,1
4.6,1
4.7,1
4.7,1
4.8,1
4.8,1
4.9,1
4.9,1
5,1
5,1
5.1,1
5.1,1
5.2,1
5.2,1
5.3,1
5.3,1
5.4,1
5.4,1
5.5,1
5.5,1
5.6,1
5.6,1
5.7,1
5.7,1
5.8,1
5.8,1
5.9,1
5.9,1
6,1
6,1
6.1,1
6.1,1
6.2,1
6.2,1
6.3,1
6.3,1
6.4,1
6.4,1
6.5,1
6.5,1
6.6,1
6.6,1
6.7,1
6.7,1
6.8,1
6.8,1
6.9,1
6.9,1
7,1
7,1
7.1,1
7.1,1
7.2,1
7.2,1
7.3,1
7.3,1
7.4,1
7.4,1
7.5,1
7.5,1
7.6,1
7.6,1
7.7,1
7.7,1
7.8,1
7.8,1
7.9,1
7.9,1
8,1
8,1
8.1,1
8.1,1
8.2,1
8.2,1
8.3,1
8.3,1
8.4,1
8.4,1
8.5,1
8.5,1
8.6,1
8.6,1
8.7,1
8.7,1
8.8,1
8.8,1
8.9,1
8.9,1
9,1
9,1
9.1,1
9.1,1
9.2,1
9.2,1
9.3,1
9.3,1
9.4,1
9.4,1
9.5,1
9.5,1
9.6,1
9.6,1
9.7,1
9.7,1
9.8,1
9.8,1
9.9,1
9.9,1
10,1
10,1
10.1,1
10.1,1
10.2,1
10.2,1
10.3,1
10.3,1
10.4,1
10.4,1
10.5,1
10.5,1
10.6,1
10.6,1
10.7,1
10.7,1
10.8,1
10.8,1
10.9,1
10.9,1
11,1
11,1
11.1,1
11.1,1
11.2,1
11.2,1
11.3,1
11.3,1
11.4,0.945512279810771
11.4,0.945512279810771
11.5,0.89911207467799
11.5,0.89911207467799
11.6,0.860859806396753
11.6,0.860859806396753
11.7,0.824816548506214
11.7,0.824816548506214
11.8,0.792272288208803
11.8,0.792272288208803
11.9,0.749162228401252
11.9,0.749162228401252
12,0.721885650313102
12,0.721885650313102
12.1,0.696723333263171
12.1,0.696723333263171
12.2,0.672635158450319
12.2,0.672635158450319
12.3,0.650479838668804
12.3,0.650479838668804
12.4,0.631052398611268
12.4,0.631052398611268
12.5,0.613884939879965
12.5,0.613884939879965
12.6,0.597928778049878
12.6,0.597928778049878
12.7,0.582768490751696
12.7,0.582768490751696
12.8,0.568334080919908
12.8,0.568334080919908
12.9,0.543124281338941
12.9,0.543124281338941
13,0.533011853400899
13,0.533011853400899
13.1,0.524027782802142
13.1,0.524027782802142
13.2,0.515808837808458
13.2,0.515808837808458
13.3,0.508105990777546
13.3,0.508105990777546
13.4,0.500774963585474
13.4,0.500774963585474
13.5,0.49374836528636
13.5,0.49374836528636
13.6,0.486978825952231
13.6,0.486978825952231
13.7,0.467360954933026
13.7,0.467360954933026
13.8,0.461638265483169
13.8,0.461638265483169
13.9,0.456204865930494
13.9,0.456204865930494
14,0.451080873133615
14,0.451080873133615
14.1,0.435183304130795
14.1,0.435183304130795
14.2,0.431684544047949
14.2,0.431684544047949
14.3,0.428350214015284
14.3,0.428350214015284
14.4,0.42519066513626
14.4,0.42519066513626
14.5,0.422209369334739
14.5,0.422209369334739
14.6,0.419398744956558
14.6,0.419398744956558
14.7,0.416737062036246
14.7,0.416737062036246
14.8,0.414196844919841
14.8,0.414196844919841
14.9,0.411752846696865
14.9,0.411752846696865
15,0.409388041714355
15,0.409388041714355
15.1,0.396868676263716
15.1,0.396868676263716
15.2,0.395220001961076
15.2,0.395220001961076
15.3,0.393637399678915
15.3,0.393637399678915
15.4,0.392136370642273
15.4,0.392136370642273
15.5,0.390727242485821
15.5,0.390727242485821
15.6,0.389417345006361
15.6,0.389417345006361
15.7,0.388207537110014
15.7,0.388207537110014
15.8,0.387089260184126
15.8,0.387089260184126
15.9,0.386057302384121
15.9,0.386057302384121
16,0.385094831240076
16,0.385094831240076
16.1,0.384187364331569
16.1,0.384187364331569
16.2,0.383322263401633
16.2,0.383322263401633
16.3,0.382490396793678
16.3,0.382490396793678
16.4,0.381686987007564
16.4,0.381686987007564
16.5,0.380911621890668
16.5,0.380911621890668
16.6,0.369871496291607
16.6,0.369871496291607
16.7,0.369786615866136
16.7,0.369786615866136
16.8,0.369721702912554
16.8,0.369721702912554
16.9,0.369684519632152
16.9,0.369684519632152
17,0.369681766038088
17,0.369681766038088
17.1,0.369718237132289
17.1,0.369718237132289
17.2,0.369796566386489
17.2,0.369796566386489
17.3,0.369917315802678
17.3,0.369917315802678
17.4,0.370079327967953
17.4,0.370079327967953
17.5,0.370280247552733
17.5,0.370280247552733
17.6,0.370517094690705
17.6,0.370517094690705
17.7,0.370786815710908
17.7,0.370786815710908
17.8,0.371086748990564
17.8,0.371086748990564
17.9,0.371414945318463
17.9,0.371414945318463
18,0.371770434925475
18,0.371770434925475
18.1,0.372153227572751
18.1,0.372153227572751
18.2,0.372564340673654
18.2,0.372564340673654
18.3,0.373005662362356
18.3,0.373005662362356
18.4,0.373479829874597
18.4,0.373479829874597
18.5,0.373990017420709
18.5,0.373990017420709
18.6,0.374539797593505
18.6,0.374539797593505
18.7,0.375132942374121
18.7,0.375132942374121
18.8,0.375773296890453
18.8,0.375773296890453
18.9,0.376464731541775
18.9,0.376464731541775
19,0.377210941973353
19,0.377210941973353
19.1,0.378015490693897
19.1,0.378015490693897
19.2,0.37888171205048
19.2,0.37888171205048
19.3,0.379812690382747
19.3,0.379812690382747
19.4,0.380811276267422
19.4,0.380811276267422
19.5,0.381880005622348
19.5,0.381880005622348
19.6,0.383021156095001
19.6,0.383021156095001
Loading

0 comments on commit 1fbc15c

Please sign in to comment.