Merge pull request #74 from rahil-makadia/dev

full de441 kernel mapping; mac wheels are back

.github/workflows/cpp_tests.yml

@@ -9,6 +9,7 @@ on:
       - 'include/**'
       - 'src/**'
       - 'tests/cpp/**'
+      - 'grss/version.txt'
 
 jobs:
   prop-only:
@@ -18,7 +19,9 @@ jobs:
         uses: actions/checkout@v4
       - name: Build GRSS library
         run: |
-          sudo apt-get install doxygen
+          cd ./extern/
+          python3 get_cspice.py
+          cd ..
           source initialize.sh
           source build_cpp.sh -clean
       - name: Run tests

.github/workflows/docs.yml

@@ -4,6 +4,12 @@ on:
     branches:
       - main
       - dev
+    paths:
+      - '.github/workflows/docs.yml'
+      - 'docs/**'
+      - 'include/**'
+      - 'src/**'
+      - 'grss/**'
 
 jobs:
   sphinx:
@@ -19,7 +25,7 @@ jobs:
         run: |
           python3 -m pip install --upgrade pip
           sudo apt-get install pandoc doxygen
-          source initialize.sh
+          pip3 install "pybind11[global]>=2.10.0"
           pip3 install .
       - name: Build docs
         run: |
@@ -31,7 +37,7 @@ jobs:
           make clean html
           cd ..
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           publish_branch: gh-pages
           github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pypi.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest] #, macos-latest]
+        os: [ubuntu-latest, macos-latest]
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -30,15 +30,8 @@ jobs:
         uses: maxim-lobanov/setup-xcode@v1.6.0
         with:
           xcode-version: '15.1.0'
-      - name: Install doxygen
-        if: matrix.os == 'ubuntu-latest'
-        run: sudo apt-get install doxygen
-      - name: Install doxygen
-        if: matrix.os == 'macos-latest'
-        run: brew install doxygen
-      - name: Initialize repository
-        run: |
-          source initialize.sh
+      - name: Get Pybind11
+        run: pip3 install "pybind11[global]>=2.10.0"
       - name: Build python distributions
         run: source build_python.sh
       - name: Upload distribution for next job
@@ -55,11 +48,11 @@ jobs:
         with:
           name: dist-ubuntu-latest
           path: dist
-      # - name: Download MacOS distribution from previous job
-      #   uses: actions/download-artifact@master
-      #   with:
-      #     name: dist-macos-latest
-      #     path: dist
+      - name: Download MacOS distribution from previous job
+        uses: actions/download-artifact@master
+        with:
+          name: dist-macos-latest
+          path: dist
       - name: Show files
         run: ls -l dist
       - name: Publish to Test PyPI

.github/workflows/python_tests.yml

@@ -24,8 +24,7 @@ jobs:
       - name: Install GRSS (including dependencies)
         run: |
           python3 -m pip install --upgrade pip
-          sudo apt-get install doxygen
-          source initialize.sh
+          pip3 install "pybind11[global]>=2.10.0"
           pip3 install .
       - name: Run tests
         run: |

build_cpp.sh

@@ -16,11 +16,12 @@ if [[ $clean -eq 1 ]]; then
     rm -rf build
 fi
 mkdir -p build
-cd build
 if [[ $docs -eq 1 ]]; then
-    cmake -DBUILD_DOCS=ON ..
+    DOCFLAG="-DBUILD_DOCS=ON"
 else
-    cmake -DBUILD_DOCS=OFF ..
+    DOCFLAG="-DBUILD_DOCS=OFF"
 fi
+cmake $DOCFLAG -Dpybind11_DIR=$(pybind11-config --cmakedir) -DPYTHON_EXECUTABLE=$(which python) -B./build -S.
+cd build
 make
 cd ..

grss/kernels/get_kernels.py

@@ -22,16 +22,16 @@
 # de440 planets + de441 big16
 mb440_exists = os.path.exists(f'{script_dir}/de440.bsp')
 sb441s_exists = os.path.exists(f'{script_dir}/sb441-n16s.bsp')
-mb441_exists = os.path.exists(f'{script_dir}/de441_part-2.bsp')
+mb441_exists = os.path.exists(f'{script_dir}/de441.bsp')
 sb441_exists = os.path.exists(f'{script_dir}/sb441-n16.bsp')
 if (not mb440_exists or not mb441_exists or not sb441s_exists or not sb441_exists):
     print('Downloading DE440/441 planet and big16 asteroid kernels...')
     os.system((f'curl --silent --show-error -o {script_dir}/de440.bsp '
-                f'{NAIF_SITE}/spk/planets/de440.bsp'))
+                f'{SSD_SITE}/eph/planets/bsp/de440.bsp'))
     os.system((f'curl --silent --show-error -o {script_dir}/sb441-n16s.bsp '
                 f'{SSD_SITE}/xfr/sb441-n16s.bsp'))
-    os.system((f'curl --silent --show-error -o {script_dir}/de441_part-2.bsp '
-                f'{NAIF_SITE}/spk/planets/de441_part-2.bsp'))
+    os.system((f'curl --silent --show-error -o {script_dir}/de441.bsp '
+                f'{SSD_SITE}/eph/planets/bsp/de441.bsp'))
     os.system((f'curl --silent --show-error -o {script_dir}/sb441-n16.bsp '
                 f'{SSD_SITE}/eph/small_bodies/asteroids_de441/sb441-n16.bsp'))
 

grss/version.txt

@@ -1 +1 @@
-4.1.1
+4.1.2

include/spk.h

@@ -31,7 +31,7 @@ struct SpkCacheItem {
  * It is set to 32, which is a bit of a buffer on the usual number of
  * 27 SpiceBodies in each PropSimulation (Sun+8planets+Moon+Pluto+16Asteriods).
  */
-#define SPK_CACHE_ITEM_SIZE 32
+#define SPK_CACHE_ITEM_SIZE 44
 
 /**
  * @brief Structure to hold a cache of SPK data.

initialize.sh

@@ -1,12 +1,10 @@
 #!/bin/bash
 
-# get cspice and install pybind11
-cd ./extern/
-python3 get_cspice.py
+# get pybind11
 pip3 install "pybind11[global]>=2.10.0"
 
 # get debiasing data and kernels
-cd ../grss/debias/
+cd grss/debias/
 python3 get_debiasing_data.py
 cd ../kernels/
 python3 get_kernels.py

pyproject.toml

@@ -67,13 +67,11 @@ dependencies = {file = "requirements.txt"}
 [tool.cibuildwheel]
 before-build = [
     "pip install pybind11",
-    "rm -rf build",
-    "mkdir build",
-    "pybind11_DIR=$(pybind11-config --cmakedir)",
-    "cmake -DBUILD_DOCS=OFF -Dpybind11_DIR=$pybind11_DIR -DPYTHON_EXECUTABLE=$(which python) -B./build -S.",
+    ". ./build_cpp.sh -clean",
 ]
 
 [tool.cibuildwheel.macos]
+environment = {MACOSX_DEPLOYMENT_TARGET = "14"}
 archs = ["arm64"]
 
 [tool.cibuildwheel.linux]

src/grss.cpp

@@ -928,7 +928,7 @@ PYBIND11_MODULE(libgrss, m) {
              &PropSimulation::set_integration_parameters, py::arg("tf"),
              py::arg("tEval") = std::vector<real>(),
              py::arg("tEvalUTC") = false, py::arg("evalApparentState") = false,
-             py::arg("convergedLightTims") = false,
+             py::arg("convergedLightTime") = false,
              py::arg("observerInfo") = std::vector<std::vector<real>>(),
              py::arg("adaptiveTimestep") = true, py::arg("dt0") = 0.0L,
              py::arg("dtMin") = 1.0e-4L, py::arg("dtChangeFactor") = 0.25L,

src/pck.cpp

@@ -121,7 +121,7 @@ PckInfo* pck_init(const std::string &path) {
             int m = bpc->num - 1;
             // New target?
             if (bpc->num == 0 || sum->code != bpc->targets[m].code) {
-                if (bpc->num <= bpc->allocatedNum) {
+                if (bpc->num == bpc->allocatedNum) {
                     bpc->allocatedNum += 4;  // increase space in batches of PCK_CACHE_ITEM_SIZE(4)
                     bpc->targets = (PckTarget *)realloc(
                         bpc->targets, bpc->allocatedNum * sizeof(PckTarget));

src/simulation.cpp

@@ -540,7 +540,7 @@ PropSimulation::PropSimulation(std::string name, real t0,
                        "Be sure that you need the coverage provided by DE441."
                     << std::endl;
                 kernel_sb = DEkernelPath + "sb441-n16.bsp";
-                kernel_mb = DEkernelPath + "de441_part-2.bsp";
+                kernel_mb = DEkernelPath + "de441.bsp";
             }
             real G = 6.6743e-11L /
                 (149597870700.0L * 149597870700.0L * 149597870700.0L) *

src/spk.cpp

@@ -118,7 +118,7 @@ SpkInfo* spk_init(const std::string &path) {
             int m = bsp->num - 1;
             // New target?
             if (bsp->num == 0 || sum->code != bsp->targets[m].code) {
-                if (bsp->num <= bsp->allocatedNum) {
+                if (bsp->num == bsp->allocatedNum) {
                     bsp->allocatedNum += SPK_CACHE_ITEM_SIZE;  // increase space in batches of SPK_CACHE_ITEM_SIZE
                     bsp->targets = (SpkTarget *)realloc(
                         bsp->targets, bsp->allocatedNum * sizeof(SpkTarget));

tests/cpp/prop/spk_map.cpp

@@ -122,7 +122,7 @@ int main(){
 
     kernel = 441;
     kernel_sb = "../../../grss/kernels/sb441-n16.bsp";
-    kernel_mb = "../../../grss/kernels/de441_part-2.bsp";
+    kernel_mb = "../../../grss/kernels/de441.bsp";
     spiceIds = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 199, 299, 301, 399,
                 // de440 asteroids
                 2000107, 2000001, 2000065, 2000511, 2000015, 2000031, 2000052, 2000010,