diff --git a/.github/workflows/gha_ci.yml b/.github/workflows/gha_ci.yml index 58ea8722..0f65b609 100644 --- a/.github/workflows/gha_ci.yml +++ b/.github/workflows/gha_ci.yml @@ -13,6 +13,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Install Dependencies + run: sudo apt-get update && sudo apt-get install -y libpthread-stubs0-dev - name: Build run: bash tools/gha_conda_asan.sh conda_coverage: diff --git a/CMakeLists.txt b/CMakeLists.txt index 5aaeb04e..b8385d6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -174,7 +174,7 @@ find_package(fmt REQUIRED CONFIG) target_link_libraries(cascade PUBLIC fmt::fmt) # heyoka. -find_package(heyoka 6 REQUIRED CONFIG) +find_package(heyoka REQUIRED CONFIG) target_link_libraries(cascade PUBLIC heyoka::heyoka) # spdlog. @@ -183,7 +183,7 @@ target_link_libraries(cascade PRIVATE spdlog::spdlog) # Boost. # NOTE: need 1.73 for atomic_ref. -# NOTE: it seems this must to be after find_package(heyoka 6 REQUIRED CONFIG) else +# NOTE: it seems this must to be after find_package(heyoka REQUIRED CONFIG) else # cmake will complain of the missing target Boost::serialization find_package(Boost 1.73 REQUIRED CONFIG) target_link_libraries(cascade PUBLIC Boost::boost) diff --git a/cascade.py/dynamics/_mascon_asteroid.py b/cascade.py/dynamics/_mascon_asteroid.py index 300963f6..9aab6049 100644 --- a/cascade.py/dynamics/_mascon_asteroid.py +++ b/cascade.py/dynamics/_mascon_asteroid.py @@ -38,8 +38,7 @@ def mascon_asteroid(Gconst: float, points, masses, omega) -> typing.List[typing. Returns: The dynamics in the same units used by the input arguments. Can be used directly to instantiate a :class:`~cascade.sim`. """ - from heyoka import make_mascon_system - return make_mascon_system(Gconst, points, masses, omega) + return hy.model.mascon(Gconst, masses, points, omega) def mascon_asteroid_energy(state, Gconst: float, points, masses, omega): """Energy in the :class:`~cascade.dynamics.mascon_asteroid` dynamics. diff --git a/cascade.py/test.py b/cascade.py/test.py index 38cf3e42..1198fc5a 100644 --- a/cascade.py/test.py +++ b/cascade.py/test.py @@ -417,7 +417,7 @@ def run_test_suite(): retval = 0 suite = _ut.TestLoader().loadTestsFromTestCase(dynamics_test_case) - suite.addTests(_ut.makeSuite(sim_test_case)) + suite.addTests(_ut.TestLoader().loadTestsFromTestCase(sim_test_case)) test_result = _ut.TextTestRunner(verbosity=2).run(suite) diff --git a/cascade_devel.yml b/cascade_devel.yml index 850ee73b..eeef7e4a 100644 --- a/cascade_devel.yml +++ b/cascade_devel.yml @@ -11,10 +11,10 @@ dependencies: - tbb - libboost-devel >=1.86 - fmt - - heyoka =6* - - heyoka.py =6* + - heyoka =7* + - heyoka.py =7* - spdlog - pybind11 >=2.10 - - xtensor + - xtensor = 0.25 # v0.26 intrdouces breaking changes - xtensor-blas - hdf5 \ No newline at end of file diff --git a/doc/examples/itokawa_cubesats.ipynb b/doc/examples/itokawa_cubesats.ipynb index aff8525e..e9bc9b8e 100644 --- a/doc/examples/itokawa_cubesats.ipynb +++ b/doc/examples/itokawa_cubesats.ipynb @@ -7,7 +7,7 @@ "source": [ "# Swarming Itokawa with cubesats\n", "In this example we consider a rather advanced mission option inspired to us by the European Space Agency\n", - "[HERA mission](https://www.esa.int/Space_Safety/Hera). HERA is an interplanetary spacecraft that will explore the binary system named Didymos in 2025.\n", + "[HERA mission](https://www.heramission.space/). HERA is an interplanetary spacecraft that will explore the binary system named Didymos in 2025.\n", "In the case of HERA, two cubesats called Milani and [Juventas](https://www.heramission.space/hera-mission-juventas-cubesat), will detach from the main\n", "mother satellite to perform some detailed exploration of the system, including the exploartion of its gravity field.\n", "The use of cubesats to increase the mission scientific output, while minimizing risks connected to operating in a highly unknown environment,\n",