Skip to content

Revert 117 develop #137

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

Jump to bottom
Merged
MateusStano merged 76 commits into from
Feb 15, 2022
Merged

Revert 117 develop #137

MateusStano merged 76 commits into from
Feb 15, 2022

Conversation

@MateusStano
Copy link
Member

@MateusStano MateusStano commented Feb 15, 2022

Accidentally merged #117

FranzYuri and others added 30 commits November 5, 2021 02:50
@FranzYuri
Update Environment.py
eab9be8
commit on 'enh/utc_time'
5a0decf
commit on 'enh/utc_time'
73962a1
@FranzYuri
Update requirements.txt
c322a49
commit on 'enh/utc_time'
8ad3df6
@giovaniceotto
FEAT: add pytz to setup.py install requirements
4d37d86
@giovaniceotto
MAINT: minor code refactoring
ac46cf0
@giovaniceotto
FEAT: added time zone argument to Env.init
16c1107
@giovaniceotto
MAINT: rename time_zone to timeZone, following current camelCase stan…
658f478 
…dard
@giovaniceotto
Maint: rename local_date to LocalDate to follow camelCase
6394b0f
@giovaniceotto
BUG: fix conversion between local and UTC time zone using astimezone
756381d
@giovaniceotto
MAINT: minor code refactoring
4ed5fc0
@giovaniceotto
MAINT: fix date time format in Env.allInfo()
f14b26d
@giovaniceotto
TST: fix failing tests due to minor bugs
f6120b1
@giovaniceotto
STY: apply black formatting
c284e81
@MateusStano
Fixed airfoil lift calculation
746311d
@MateusStano
Merge branch 'develop' into bug/airfoil-lift-calculation
03e35d9
@MateusStano
Merge pull request #1 from MateusStano/bug/airfoil-lift-calculation
af21461 
Fixed airfoil lift calculation
@MateusStano
Add files via upload
a2724b1
@MateusStano
Fixed documentation link and text
f74a5b9
@MateusStano
Update Rocket.py
d81ae0c
@MateusStano
Update Rocket.py
8b79cb9
@MateusStano
Removed 'extrapolation' from Function objects based on a callable
7f419d6
@MateusStano
Merge branch 'develop' into develop
54fd3ca
@FranzYuri
Merge branch 'develop' into enh/utc_time
6436b64
@MateusStano
Update Rocket.py
7d8ddbd
@FranzYuri
Merge branch 'develop' into enh/utc_time
0060dcb
@lint-action
Fix code style issues with Black
f458d30
@FranzYuri
Merge pull request #110 from Projeto-Jupiter/enh/utc_time
4caf4e0 
Enh/utc time
@MateusStano
Applied Black formatting
086922a
Robert and others added 25 commits February 9, 2022 18:32
merge fix
0820a1f
@MateusStano
Added/Fixed suggested changes
920f653
@MateusStano
Merge branch 'Projeto-Jupiter:develop' into develop
1248c3e
@MateusStano
Added pytest for rolling flight
f3bbe34
@MrGribel
Merge pull request #127 from skrobchik/master
b115cc5 
Check for optional package requirement: netCDF4
@giovaniceotto
MAINT: add a rocket tail to static margin stability test
38a1cbf
@giovaniceotto
MAINT: move helper function so that it can be used with other tests i…
dbe2191 
…n the future
@giovaniceotto
MAINT: simplify stability test ifs and asserts
cc165de
@giovaniceotto
MAINT: implement pytest parametrize to simplify static margin stabili…
d49b633 
…ty test
@giovaniceotto
BUG: fix duplicate angle of attack in component lift calculation
15d0b4d
@Gui-FernandesBR
Delete stability_check.ipynb
4e7338e
@MateusStano
Reformated M3d equation.
56e421c 
Changed Ymac to Yma.
Corrected the PDF
@MateusStano
Merge branch 'develop' into bug/Cld-diveded-by-zero
56bd8fa
@MateusStano
Removed cantAngleRad != 0 check on rollParameters
0acce21
@MateusStano
Merge branch 'bug/Cld-diveded-by-zero' of https://github.com/MateusSt…
10a9b8e 
…ano/RocketPy into bug/Cld-diveded-by-zero
@MateusStano
Merge pull request #122 from MateusStano/bug/Cld-diveded-by-zero
324abec 
BUG: Cld divided by zero
@Gui-FernandesBR
Merge branch 'develop' into bug/issue-115-static-margin-stability
3dd62c8
@lint-action
Fix code style issues with Black
cf47bfa
@Gui-FernandesBR
Merge pull request #125 from Projeto-Jupiter/bug/issue-115-static-mar…
98f2191 
…gin-stability

Bug: Issue 115 static margin stability
@Gui-FernandesBR
Delete TODO.md
a68475f 
I'm deleting this on develop branch, I've saved old version offline. 
I'm sorry I'll not follow Pull request workflow for this one
@Lucas-KB
BUG: remove absolute value from lift calculation
09573c7
@giovaniceotto
BUG: set infinite speed of sound in stability static margin test
fbef6d3
@giovaniceotto
MAINT: black formatting
861001d
@MateusStano
Merge branch 'develop' into develop
5d8d8a1
@MateusStano
Revert "WIP: Airfoil fins normal force coefficient derivative calcula…
6bbc3fe 
…tion."
@MateusStano MateusStano merged commit 5d62c82 into master Feb 15, 2022
@giovaniceotto giovaniceotto mentioned this pull request Feb 15, 2022
Merged
@giovaniceotto giovaniceotto deleted the revert-117-develop branch February 15, 2022 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@giovaniceotto giovaniceotto Awaiting requested review from giovaniceotto

Assignees

@MateusStano MateusStano

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@MateusStano @FranzYuri @giovaniceotto @lint-action @Lucas-KB @MrGribel @Gui-FernandesBR