diff --git a/examples/Basic_Simulation/initial_conditions.py b/examples/Basic_Simulation/initial_conditions.py index 9bb279b51..3683ae077 100644 --- a/examples/Basic_Simulation/initial_conditions.py +++ b/examples/Basic_Simulation/initial_conditions.py @@ -23,7 +23,7 @@ from numpy.random import default_rng # Initialize the simulation object as a variable -sim = swiftest.Simulation(tstart=0.0, tstop=1.0e3, dt=0.010, tstep_out=1.0e0, fragmentation=True, minimum_fragment_mass = 2.5e-11, mtiny=2.5e-8) +sim = swiftest.Simulation(tstart=0.0, tstop=1.0e3, dt=0.005, tstep_out=1.0e0, dump_cadence=0, fragmentation=True, minimum_fragment_mass = 2.5e-11, mtiny=2.5e-8) # Add the modern planets and the Sun using the JPL Horizons Database sim.add_solar_system_body(["Sun","Mercury","Venus","Earth","Mars","Jupiter","Saturn","Uranus","Neptune","Pluto"]) diff --git a/examples/whm_gr_test/swiftest_relativity.ipynb b/examples/whm_gr_test/swiftest_relativity.ipynb index 113e10f81..0e5f26360 100644 --- a/examples/whm_gr_test/swiftest_relativity.ipynb +++ b/examples/whm_gr_test/swiftest_relativity.ipynb @@ -30,9 +30,7 @@ "Fetching ephemerides data for Jupiter from JPL/Horizons\n", "Fetching ephemerides data for Saturn from JPL/Horizons\n", "Fetching ephemerides data for Uranus from JPL/Horizons\n", - "Fetching ephemerides data for Neptune from JPL/Horizons\n", - "Writing initial conditions to file init_cond.nc\n", - "Writing parameter inputs to file /home/daminton/git_debug/swiftest/examples/whm_gr_test/param.gr.in\n" + "Fetching ephemerides data for Neptune from JPL/Horizons\n" ] }, { @@ -394,7 +392,7 @@ "Coordinates:\n", " * name (name) <U32 'Sun' 'Mercury' 'Venus' ... 'Uranus' 'Neptune'\n", " * time (time) float64 0.0\n", - "Data variables: (12/14)\n", + "Data variables: (12/15)\n", " particle_type (name) <U32 'Central Body' 'Massive Body' ... 'Massive Body'\n", " id (name) int64 0 1 2 3 4 5 6 7 8\n", " a (time, name) float64 nan 0.3871 0.7233 ... 9.532 19.24 30.04\n", @@ -402,33 +400,33 @@ " inc (time, name) float64 nan 7.003 3.394 ... 2.488 0.773 1.771\n", " capom (time, name) float64 nan 48.3 76.6 ... 113.6 74.01 131.8\n", " ... ...\n", - " Gmass (time, name) float64 39.48 6.554e-06 ... 0.001724 0.002034\n", " radius (time, name) float64 0.00465 1.631e-05 ... 0.0001646\n", " j2rp2 (time, name) float64 4.754e-12 nan nan nan ... nan nan nan\n", " j4rp4 (time, name) float64 -2.247e-18 nan nan nan ... nan nan nan\n", " ntp (time) int64 0\n", - " npl (time) int64 8
array(['Sun', 'Mercury', 'Venus', 'Earth', 'Mars', 'Jupiter', 'Saturn',\n", - " 'Uranus', 'Neptune'], dtype='<U32')
array([0.])
array(['Central Body', 'Massive Body', 'Massive Body', 'Massive Body',\n", + " npl (time) int64 8\n", + " nplm (time) int64 8
array(['Sun', 'Mercury', 'Venus', 'Earth', 'Mars', 'Jupiter', 'Saturn',\n", + " 'Uranus', 'Neptune'], dtype='<U32')
array([0.])
array(['Central Body', 'Massive Body', 'Massive Body', 'Massive Body',\n", " 'Massive Body', 'Massive Body', 'Massive Body', 'Massive Body',\n", - " 'Massive Body'], dtype='<U32')
array([0, 1, 2, 3, 4, 5, 6, 7, 8])
array([[ nan, 0.38709858, 0.72332976, 0.99999049, 1.52371193,\n", - " 5.2027278 , 9.53201195, 19.24498838, 30.03895991]])
array([[ nan, 0.2056234 , 0.00671761, 0.016714 , 0.09344151,\n", - " 0.04824498, 0.0548633 , 0.04796175, 0.00895557]])
array([[ nan, 7.00330251e+00, 3.39443927e+00, 3.63786261e-03,\n", + " 'Massive Body'], dtype='<U32')
array([0, 1, 2, 3, 4, 5, 6, 7, 8])
array([[ nan, 0.38709858, 0.72332976, 0.99999049, 1.52371193,\n", + " 5.2027278 , 9.53201195, 19.24498838, 30.03895991]])
array([[ nan, 0.2056234 , 0.00671761, 0.016714 , 0.09344151,\n", + " 0.04824498, 0.0548633 , 0.04796175, 0.00895557]])
array([[ nan, 7.00330251e+00, 3.39443927e+00, 3.63786261e-03,\n", " 1.84744167e+00, 1.30363113e+00, 2.48790636e+00, 7.73010260e-01,\n", - " 1.77111935e+00]])
array([[ nan, 48.29611837, 76.60235892, 175.0251726 ,\n", + " 1.77111935e+00]])
array([[ nan, 48.29611837, 76.60235892, 175.0251726 ,\n", " 49.47285721, 100.51925884, 113.63057817, 74.01258098,\n", - " 131.82211597]])
array([[ nan, 29.20442404, 54.96037946, 287.96196288,\n", + " 131.82211597]])
array([[ nan, 29.20442404, 54.96037946, 287.96196288,\n", " 286.73797713, 273.58984029, 339.54673564, 93.59554912,\n", - " 284.47484297]])
array([[ nan, 338.33948747, 200.47893396, 114.3482934 ,\n", + " 284.47484297]])
array([[ nan, 338.33948747, 200.47893396, 114.3482934 ,\n", " 209.33967735, 129.55367007, 290.89958066, 262.86586373,\n", - " 308.45137205]])
array([[3.94769264e+01, 6.55370981e-06, 9.66331340e-05, 1.20026936e-04,\n", + " 308.45137205]])
array([[3.94769264e+01, 6.55370981e-06, 9.66331340e-05, 1.20026936e-04,\n", " 1.27398020e-05, 3.76922511e-02, 1.12858998e-02, 1.72365895e-03,\n", - " 2.03361005e-03]])
array([[4.65046726e-03, 1.63063818e-05, 4.04537843e-05, 4.25875607e-05,\n", + " 2.03361005e-03]])
array([[4.65046726e-03, 1.63063818e-05, 4.04537843e-05, 4.25875607e-05,\n", " 2.26574081e-05, 4.67326170e-04, 3.89256877e-04, 1.69534499e-04,\n", - " 1.64587904e-04]])
array([[4.75358069e-12, nan, nan, nan,\n", + " 1.64587904e-04]])
array([[4.75358069e-12, nan, nan, nan,\n", " nan, nan, nan, nan,\n", - " nan]])
array([[-2.2473968e-18, nan, nan, nan,\n", + " nan]])
array([[-2.2473968e-18, nan, nan, nan,\n", " nan, nan, nan, nan,\n", - " nan]])
array([0])
array([8])
array([0])
array([8])
array([8])
array(['Sun', 'Mercury', 'Venus', 'Earth', 'Mars', 'Jupiter', 'Saturn',\n", - " 'Uranus', 'Neptune'], dtype='<U32')
array([0.])
array(['Central Body', 'Massive Body', 'Massive Body', 'Massive Body',\n", + " npl (time) int64 8\n", + " nplm (time) int64 8
array(['Sun', 'Mercury', 'Venus', 'Earth', 'Mars', 'Jupiter', 'Saturn',\n", + " 'Uranus', 'Neptune'], dtype='<U32')
array([0.])
array(['Central Body', 'Massive Body', 'Massive Body', 'Massive Body',\n", " 'Massive Body', 'Massive Body', 'Massive Body', 'Massive Body',\n", - " 'Massive Body'], dtype='<U32')
array([0, 1, 2, 3, 4, 5, 6, 7, 8])
array([[ nan, 0.38709858, 0.72332976, 0.99999049, 1.52371193,\n", - " 5.2027278 , 9.53201195, 19.24498838, 30.03895991]])
array([[ nan, 0.2056234 , 0.00671761, 0.016714 , 0.09344151,\n", - " 0.04824498, 0.0548633 , 0.04796175, 0.00895557]])
array([[ nan, 7.00330251e+00, 3.39443927e+00, 3.63786261e-03,\n", + " 'Massive Body'], dtype='<U32')
array([0, 1, 2, 3, 4, 5, 6, 7, 8])
array([[ nan, 0.38709858, 0.72332976, 0.99999049, 1.52371193,\n", + " 5.2027278 , 9.53201195, 19.24498838, 30.03895991]])
array([[ nan, 0.2056234 , 0.00671761, 0.016714 , 0.09344151,\n", + " 0.04824498, 0.0548633 , 0.04796175, 0.00895557]])
array([[ nan, 7.00330251e+00, 3.39443927e+00, 3.63786261e-03,\n", " 1.84744167e+00, 1.30363113e+00, 2.48790636e+00, 7.73010260e-01,\n", - " 1.77111935e+00]])
array([[ nan, 48.29611837, 76.60235892, 175.0251726 ,\n", + " 1.77111935e+00]])
array([[ nan, 48.29611837, 76.60235892, 175.0251726 ,\n", " 49.47285721, 100.51925884, 113.63057817, 74.01258098,\n", - " 131.82211597]])
array([[ nan, 29.20442404, 54.96037946, 287.96196288,\n", + " 131.82211597]])
array([[ nan, 29.20442404, 54.96037946, 287.96196288,\n", " 286.73797713, 273.58984029, 339.54673564, 93.59554912,\n", - " 284.47484297]])
array([[ nan, 338.33948747, 200.47893396, 114.3482934 ,\n", + " 284.47484297]])
array([[ nan, 338.33948747, 200.47893396, 114.3482934 ,\n", " 209.33967735, 129.55367007, 290.89958066, 262.86586373,\n", - " 308.45137205]])
array([[3.94769264e+01, 6.55370981e-06, 9.66331340e-05, 1.20026936e-04,\n", + " 308.45137205]])
array([[3.94769264e+01, 6.55370981e-06, 9.66331340e-05, 1.20026936e-04,\n", " 1.27398020e-05, 3.76922511e-02, 1.12858998e-02, 1.72365895e-03,\n", - " 2.03361005e-03]])
array([[4.65046726e-03, 1.63063818e-05, 4.04537843e-05, 4.25875607e-05,\n", + " 2.03361005e-03]])
array([[4.65046726e-03, 1.63063818e-05, 4.04537843e-05, 4.25875607e-05,\n", " 2.26574081e-05, 4.67326170e-04, 3.89256877e-04, 1.69534499e-04,\n", - " 1.64587904e-04]])
array([[4.75358069e-12, nan, nan, nan,\n", + " 1.64587904e-04]])
array([[4.75358069e-12, nan, nan, nan,\n", " nan, nan, nan, nan,\n", - " nan]])
array([[-2.2473968e-18, nan, nan, nan,\n", + " nan]])
array([[-2.2473968e-18, nan, nan, nan,\n", " nan, nan, nan, nan,\n", - " nan]])
array([0])
array([8])
array([0])
array([8])
array([8])