diff --git a/Makefile b/Makefile index a49f80756..0e2b361e6 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,6 @@ SWIFTEST_MODULES = swiftest_globals.f90 \ rmvs_classes.f90 \ helio_classes.f90 \ symba_classes.f90 \ - util.f90 \ module_nrutil.f90 \ swiftest.f90 diff --git a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/cb.swiftest.in b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/cb.swiftest.in index 2e8d49f62..81c636655 100644 --- a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/cb.swiftest.in +++ b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/cb.swiftest.in @@ -1,5 +1,5 @@ 0 0.00029591220819207774 0.004650467260962157 -0.0 -0.0 +4.7535806948127355e-12 +-2.2473967953572827e-18 diff --git a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/param.swifter.in b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/param.swifter.in index 627edf452..ab8bf65ca 100644 --- a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/param.swifter.in +++ b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/param.swifter.in @@ -21,6 +21,6 @@ CHK_QMIN_RANGE 0.004650467260962157 1000.0 EXTRA_FORCE NO BIG_DISCARD NO CHK_CLOSE YES -J2 0.0 -J4 0.0 +J2 4.7535806948127355e-12 +J4 -2.2473967953572827e-18 RHILL_PRESENT YES diff --git a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/swiftest_rmvs_vs_swifter_rmvs.ipynb b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/swiftest_rmvs_vs_swifter_rmvs.ipynb index 69f51f7d5..e8d0dbc26 100644 --- a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/swiftest_rmvs_vs_swifter_rmvs.ipynb +++ b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/swiftest_rmvs_vs_swifter_rmvs.ipynb @@ -100,391 +100,7 @@ }, { "cell_type": "code", - "execution_count": 8, - "metadata": {}, - "outputs": [ - { - "data": { - "text/html": [ - "
<xarray.DataArray 'id' (id: 24)>\n", - "array([ 1, 2, 3, 4, 5, 6, 7, 8, 101, 102, 103, 104, 105, 106,\n", - " 107, 108, 109, 110, 111, 112, 113, 114, 115, 116])\n", - "Coordinates:\n", - " * id (id) int64 1 2 3 4 5 6 7 8 101 ... 109 110 111 112 113 114 115 116
array([ 1, 2, 3, 4, 5, 6, 7, 8, 101, 102, 103, 104, 105, 106,\n", - " 107, 108, 109, 110, 111, 112, 113, 114, 115, 116])
array([ 1, 2, 3, 4, 5, 6, 7, 8, 101, 102, 103, 104, 105, 106,\n", - " 107, 108, 109, 110, 111, 112, 113, 114, 115, 116])
array([0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.,\n", - " 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.])
array(4)
array([ 0., 11., 22., 33., 44., 55., 66., 77., 88., 99., 110., 121.,\n", + " id int64 101\n", + " * time (d) (time (d)) float64 0.0 11.0 22.0 33.0 ... 330.0 341.0 352.0 363.0
array([0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.,\n", + " 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.])
array(101)
array([ 0., 11., 22., 33., 44., 55., 66., 77., 88., 99., 110., 121.,\n",
" 132., 143., 154., 165., 176., 187., 198., 209., 220., 231., 242., 253.,\n",
- " 264., 275., 286., 297., 308., 319., 330., 341., 352., 363.])