Skip to content
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.

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

Update assist and adam core #10

Merged
merged 2 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.pdm-python
find_orb/*
8 changes: 0 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,6 @@ pip install .

However, using PDM is recommended to ensure consistent and reproducible environments.

### Download Ephemeris Files

If using pdm, first activate the environement with: `eval $(pdm venv activate)`, then to download the assist ephemeris files, run:

```
python set_up_assist.py
```

You will also need to decide which OD platform you want to use. Currently only Find Orb is available.

### Install Find Orb
Expand Down
1,211 changes: 457 additions & 754 deletions pdm.lock

Large diffs are not rendered by default.

11 changes: 5 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,11 @@ authors = [
]
dependencies = [
"matplotlib",
"adam_core",
"adam_assist",
"adam_core>=0.3.4",
"adam_assist>=0.2.0",
"sorcha",
"jax",
"jaxlib",
"numpy>=1.24.4",
]
requires-python = ">=3.11"
requires-python = "<3.13,>=3.11"
readme = "README.md"
license = {text = "MIT"}

Expand Down Expand Up @@ -55,6 +52,8 @@ coverage = "pytest --cov=adam_impact_study --cov-report=xml"

[tool.pdm]
distribution = true
# We use our fork but sorcha wants to install vanilla assist
resolution.excludes = ["assist"]

[tool.black]
line-length = 88
Expand Down
3 changes: 0 additions & 3 deletions set_up_assist.py

This file was deleted.

2 changes: 1 addition & 1 deletion src/adam_impact_study/impacts_study.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

import pyarrow.compute as pc
import quivr as qv
from adam_assist import ASSISTPropagator
from adam_core.dynamics.impacts import calculate_impact_probabilities, calculate_impacts
from adam_core.propagator.adam_assist import ASSISTPropagator

from adam_impact_study.conversions import od_observations_to_ades_file
from adam_impact_study.fo_od import run_fo_od
Expand Down
2 changes: 1 addition & 1 deletion tests/test_impact_study.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from adam_core.dynamics.impacts import ImpactProbabilities
from adam_core.observers import Observers
from adam_core.orbits import Orbits
from adam_core.propagator.adam_assist import ASSISTPropagator
from adam_assist import ASSISTPropagator
from adam_core.time import Timestamp

from adam_impact_study.conversions import (
Expand Down
Loading