Skip to content

Commit

Permalink
Merge pull request #749 from RocketPy-Team/develop
Browse files Browse the repository at this point in the history
DEV: Updates master for v1.7.1
  • Loading branch information
phmbressan authored Dec 7, 2024
2 parents 5cb88c3 + ed2a6a2 commit 25fcf17
Show file tree
Hide file tree
Showing 21 changed files with 1,413 additions and 1,248 deletions.
2 changes: 2 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@
"polystyle",
"powerseries",
"Prandtl",
"pressurant",
"prettytable",
"Projeto",
"prometheus",
Expand Down Expand Up @@ -265,6 +266,7 @@
"SBMT",
"scilimits",
"searchsorted",
"seblm",
"seealso",
"setrail",
"simplekml",
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,12 @@ Attention: The newest changes should be on top -->

### Changed

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

### Fixed

- BUG: Correctly update atmospheric conditions after changing date and location [#743](https://github.com/RocketPy-Team/RocketPy/pull/743)


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

Expand Down
8 changes: 6 additions & 2 deletions rocketpy/environment/environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,9 @@ def set_date(self, date, timezone="UTC"):
"Ensemble",
]:
self.set_atmospheric_model(
self.atmospheric_model_file, self.atmospheric_model_dict
type=self.atmospheric_model_type,
file=self.atmospheric_model_file,
dictionary=self.atmospheric_model_dict,
)

def set_location(self, latitude, longitude):
Expand Down Expand Up @@ -726,7 +728,9 @@ def set_location(self, latitude, longitude):
"Ensemble",
]:
self.set_atmospheric_model(
self.atmospheric_model_file, self.atmospheric_model_dict
type=self.atmospheric_model_type,
file=self.atmospheric_model_file,
dictionary=self.atmospheric_model_dict,
)

def set_gravity_model(self, gravity=None):
Expand Down
Loading

0 comments on commit 25fcf17

Please sign in to comment.