Skip to content

Commit 2510936

Browse files
Merge branch 'master' into rocketpy_encoders_refactor
2 parents b574253 + b3f1ede commit 2510936

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/models/environment.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ class EnvironmentModel(ApiBaseModel):
1515
latitude: float
1616
longitude: float
1717
elevation: Optional[float] = 0.0
18+
pressure: Optional[float | list[tuple[float, float]]] = None
19+
temperature: Optional[float | list[tuple[float, float]]] = None
20+
wind_u: Optional[float | list[tuple[float, float]]] = None
21+
wind_v: Optional[float | list[tuple[float, float]]] = None
1822

1923
# Optional parameters
2024
atmospheric_model_type: Literal[

src/services/environment.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ def from_env_model(cls, env: EnvironmentModel) -> Self:
3131
rocketpy_env.set_atmospheric_model(
3232
type=env.atmospheric_model_type,
3333
file=env.atmospheric_model_file,
34+
pressure=env.pressure,
35+
temperature=env.temperature,
36+
wind_u=env.wind_u,
37+
wind_v=env.wind_v,
3438
)
3539
return cls(environment=rocketpy_env)
3640

0 commit comments

Comments
 (0)