Merge branch 'v3' into OFTI_time_warning

sblunt · Jan 16, 2024 · 017f0bc · 017f0bc
2 parents c8facdf + 7c6dcd3
commit 017f0bc
Show file tree

Hide file tree

Showing 4 changed files with 85 additions and 119 deletions.
diff --git a/.github/workflows/run-notebooks.yml b/.github/workflows/run-notebooks.yml
@@ -32,5 +32,5 @@ jobs:
         python -m pip install . --no-build-isolation
     - name: Run tutorial notebooks
       run: |
-        py.test --nbmake docs/tutorials/*.ipynb
+        py.test --nbmake --nbmake-timeout=3000 docs/tutorials/*.ipynb
       
diff --git a/docs/index.rst b/docs/index.rst
@@ -54,6 +54,11 @@ User Guide:
 Changelog:
 ++++++++++
 
+**3.0.0 (TBD)**
+
+- discuss MCMC autocorrelation in MCMC tutorial (@michaelkmpoon)
+- add time warning if OFTI doesn't accept an orbit in first 60 s (@michaelkmpoon)
+
 **2.2.2 (2023-06-30)**
 
 - tests now overwrite any generated text files (@sblunt)

diff --git a/docs/tutorials/MCMC_tutorial.ipynb b/docs/tutorials/MCMC_tutorial.ipynb
diff --git a/orbitize/nbody.py b/orbitize/nbody.py
@@ -83,7 +83,7 @@ def calc_orbit(
         for j,t in enumerate(te):
             sim.integrate(t/365.25)
             #for the star and each planet in each epoch denoted by j,t find the RA, Dec, and RV
-            com = sim.calculate_com()
+            com = sim.com()
             ra_reb[j,0] = -(ps[0].x-com.x)# ra is negative x
             dec_reb[j,0] = ps[0].y-com.y
             vz[j,0] = ps[0].vz