diff --git a/examples/symba_swifter_comparison/1pl_1pl_encounter/cb.swiftest.in b/examples/symba_swifter_comparison/1pl_1pl_encounter/cb.swiftest.in index d0ae0ed15..4c5d87040 100644 Binary files a/examples/symba_swifter_comparison/1pl_1pl_encounter/cb.swiftest.in and b/examples/symba_swifter_comparison/1pl_1pl_encounter/cb.swiftest.in differ diff --git a/examples/symba_swifter_comparison/1pl_1pl_encounter/init_cond.py b/examples/symba_swifter_comparison/1pl_1pl_encounter/init_cond.py index f63022624..7600320c2 100755 --- a/examples/symba_swifter_comparison/1pl_1pl_encounter/init_cond.py +++ b/examples/symba_swifter_comparison/1pl_1pl_encounter/init_cond.py @@ -132,7 +132,7 @@ plfile = FortranFile(swiftest_pl, 'w') plfile.write_record(npl) -plfile.write_record(plid1) +plfile.write_record(np.array([plid1, plid2])) plfile.write_record(np.vstack([p_pl1[0],p_pl2[0]])) plfile.write_record(np.vstack([p_pl1[1],p_pl2[1]])) plfile.write_record(np.vstack([p_pl1[2],p_pl2[2]])) diff --git a/examples/symba_swifter_comparison/1pl_1pl_encounter/param.swiftest.in b/examples/symba_swifter_comparison/1pl_1pl_encounter/param.swiftest.in index a7f91ba33..1866557b2 100644 --- a/examples/symba_swifter_comparison/1pl_1pl_encounter/param.swiftest.in +++ b/examples/symba_swifter_comparison/1pl_1pl_encounter/param.swiftest.in @@ -5,7 +5,7 @@ DT 0.0006844626967830253 CB_IN cb.swiftest.in PL_IN pl.swiftest.in TP_IN tp.swiftest.in -IN_TYPE REAL8 +IN_TYPE ASCII ISTEP_OUT 1 ISTEP_DUMP 1 BIN_OUT bin.swiftest.dat diff --git a/examples/symba_swifter_comparison/1pl_1pl_encounter/pl.swifter.in b/examples/symba_swifter_comparison/1pl_1pl_encounter/pl.swifter.in index 9f0548fc1..0eb21018b 100644 --- a/examples/symba_swifter_comparison/1pl_1pl_encounter/pl.swifter.in +++ b/examples/symba_swifter_comparison/1pl_1pl_encounter/pl.swifter.in @@ -1,5 +1,5 @@ 3 ! Planet input file generated using init_cond.py -1 39.476926408897625196 +1 39.47692640889762629 0.0 0.0 0.0 0.0 0.0 0.0 2 0.00012002693582795244940133 0.010044724833237892 diff --git a/examples/symba_swifter_comparison/1pl_1pl_encounter/pl.swiftest.in b/examples/symba_swifter_comparison/1pl_1pl_encounter/pl.swiftest.in index 51f919531..19c6d6e3a 100644 Binary files a/examples/symba_swifter_comparison/1pl_1pl_encounter/pl.swiftest.in and b/examples/symba_swifter_comparison/1pl_1pl_encounter/pl.swiftest.in differ diff --git a/examples/symba_swifter_comparison/1pl_1pl_encounter/tp.swiftest.in b/examples/symba_swifter_comparison/1pl_1pl_encounter/tp.swiftest.in index 64bf92f74..573541ac9 100644 Binary files a/examples/symba_swifter_comparison/1pl_1pl_encounter/tp.swiftest.in and b/examples/symba_swifter_comparison/1pl_1pl_encounter/tp.swiftest.in differ diff --git a/python/swiftest/tests/bin2xr/swiftest/bin2xr_swiftest.py b/python/swiftest/tests/bin2xr/swiftest/bin2xr_swiftest.py index 9a377876a..0a430c654 100644 --- a/python/swiftest/tests/bin2xr/swiftest/bin2xr_swiftest.py +++ b/python/swiftest/tests/bin2xr/swiftest/bin2xr_swiftest.py @@ -1,5 +1,4 @@ import swiftest -import swiftest.io as swio -param_file = "param.swiftest.in" sim = swiftest.Simulation(param_file="param.swiftest.in") -ds = swio.swiftest2xr(sim.param) \ No newline at end of file +sim.bin2xr() +sim.ds \ No newline at end of file diff --git a/python/swiftest/tests/bin2xr/swiftest/param.swiftest.in b/python/swiftest/tests/bin2xr/swiftest/param.swiftest.in index 6a9e599f9..a7f91ba33 100644 --- a/python/swiftest/tests/bin2xr/swiftest/param.swiftest.in +++ b/python/swiftest/tests/bin2xr/swiftest/param.swiftest.in @@ -1,31 +1,31 @@ -! VERSION Swiftest parameter file converted from Swift -BIG_DISCARD NO -BIN_OUT bin.dat -CB_IN cb.swiftest.in -CHK_CLOSE YES -CHK_QMIN 0.00468 -CHK_QMIN_COORD HELIO -CHK_QMIN_RANGE 4.68e-03 100.0 -CHK_RMAX 100.0 -CHK_RMIN 0.00468 -DT 5.0 -DU2M 149597870700.0 -ENC_OUT enc.dat -ENERGY NO -EXTRA_FORCE NO -FRAGMENTATION NO -GR NO -ISTEP_DUMP 7305000 -ISTEP_OUT 7305000 -MU2KG 1.988409870698051e+30 -OUT_FORM EL -OUT_STAT UNKNOWN -PL_IN pl.swiftest.in -ROTATION NO -T0 0.0 -TIDES NO -TP_IN tp.swiftest.in -TSTOP 365250000000.0 -TU2S 86400 -YARKOVSKY NO -YORP NO +! Swiftest input file generated using init_cond.py +T0 0 +TSTOP 0.15 +DT 0.0006844626967830253 +CB_IN cb.swiftest.in +PL_IN pl.swiftest.in +TP_IN tp.swiftest.in +IN_TYPE REAL8 +ISTEP_OUT 1 +ISTEP_DUMP 1 +BIN_OUT bin.swiftest.dat +OUT_TYPE REAL8 +OUT_FORM XV +OUT_STAT REPLACE +CHK_CLOSE yes +CHK_RMIN 0.004650467260962157 +CHK_RMAX 1000.0 +CHK_EJECT 1000.0 +CHK_QMIN 0.004650467260962157 +CHK_QMIN_COORD HELIO +CHK_QMIN_RANGE 0.004650467260962157 1000.0 +ENC_OUT enc.swiftest.dat +EXTRA_FORCE no +BIG_DISCARD no +ROTATION no +GR no +MU2KG 1.988409870698051e+30 +DU2M 149597870700.0 +TU2S 31557600.0 +RHILL_PRESENT yes +MTINY 1e-12 diff --git a/python/swiftest/tests/bin2xr/swiftest/pl.swiftest.in b/python/swiftest/tests/bin2xr/swiftest/pl.swiftest.in index b7814ac98..d8da7a92a 100644 Binary files a/python/swiftest/tests/bin2xr/swiftest/pl.swiftest.in and b/python/swiftest/tests/bin2xr/swiftest/pl.swiftest.in differ diff --git a/python/swiftest/tests/bin2xr/swiftest/tp.swiftest.in b/python/swiftest/tests/bin2xr/swiftest/tp.swiftest.in index b3b8f423c..64bf92f74 100644 Binary files a/python/swiftest/tests/bin2xr/swiftest/tp.swiftest.in and b/python/swiftest/tests/bin2xr/swiftest/tp.swiftest.in differ