From e39c330d601c47ef3bc1fa88f2396133ab26f6ad Mon Sep 17 00:00:00 2001 From: David A Minton Date: Fri, 6 Aug 2021 14:44:57 -0400 Subject: [PATCH] Fixed initial conditions generator for SyMBA 1pl_1tp test --- .../1pl_1tp_encounter/init_cond.py | 2 ++ .../1pl_1tp_encounter/param.swiftest.in | 1 + .../1pl_1tp_encounter/swiftest_vs_swifter.ipynb | 10 +++++----- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/examples/symba_swifter_comparison/1pl_1tp_encounter/init_cond.py b/examples/symba_swifter_comparison/1pl_1tp_encounter/init_cond.py index 338b5d5a8..6b9664542 100755 --- a/examples/symba_swifter_comparison/1pl_1tp_encounter/init_cond.py +++ b/examples/symba_swifter_comparison/1pl_1tp_encounter/init_cond.py @@ -20,6 +20,7 @@ swiftest_cb = "cb.swiftest.in" swiftest_bin = "bin.swiftest.dat" swiftest_enc = "enc.swiftest.dat" +swiftest_dis = "discard.swiftest.dat" MU2KG = swiftest.MSun TU2S = swiftest.YR2S @@ -168,6 +169,7 @@ print(f'CHK_QMIN_COORD HELIO') print(f'CHK_QMIN_RANGE {rmin} {rmax}') print(f'ENC_OUT {swiftest_enc}') +print(f'DISCARD_OUT {swiftest_dis}') print(f'EXTRA_FORCE no') print(f'BIG_DISCARD no') print(f'ROTATION no') diff --git a/examples/symba_swifter_comparison/1pl_1tp_encounter/param.swiftest.in b/examples/symba_swifter_comparison/1pl_1tp_encounter/param.swiftest.in index a7f91ba33..32cfb89bd 100644 --- a/examples/symba_swifter_comparison/1pl_1tp_encounter/param.swiftest.in +++ b/examples/symba_swifter_comparison/1pl_1tp_encounter/param.swiftest.in @@ -20,6 +20,7 @@ CHK_QMIN 0.004650467260962157 CHK_QMIN_COORD HELIO CHK_QMIN_RANGE 0.004650467260962157 1000.0 ENC_OUT enc.swiftest.dat +DISCARD_OUT discard.swiftest.dat EXTRA_FORCE no BIG_DISCARD no ROTATION no diff --git a/examples/symba_swifter_comparison/1pl_1tp_encounter/swiftest_vs_swifter.ipynb b/examples/symba_swifter_comparison/1pl_1tp_encounter/swiftest_vs_swifter.ipynb index 02d6b0bef..78c6cf2b0 100644 --- a/examples/symba_swifter_comparison/1pl_1tp_encounter/swiftest_vs_swifter.ipynb +++ b/examples/symba_swifter_comparison/1pl_1tp_encounter/swiftest_vs_swifter.ipynb @@ -81,8 +81,8 @@ { "data": { "text/plain": [ - "[,\n", - " ]" + "[,\n", + " ]" ] }, "execution_count": 6, @@ -484,7 +484,7 @@ " 0., 0., 0., nan])\n", "Coordinates:\n", " id float64 100.0\n", - " * time (y) (time (y)) float64 0.0 0.0006845 0.001369 ... 0.1342 0.1348 0.1355
    • " ], "text/plain": [ "\n",