From 03c992667352abbe3668059680727753da0ef0bf Mon Sep 17 00:00:00 2001 From: David A Minton Date: Mon, 13 Sep 2021 17:25:38 -0400 Subject: [PATCH] Fixed input initial conditions for 8pl 16tp encounter test --- .../8pl_16tp_encounters/cb.in | 2 +- .../8pl_16tp_encounters/cb.swiftest.in | 2 +- .../8pl_16tp_encounters/init_cond.py | 7 ++++--- .../8pl_16tp_encounters/param.swifter.in | 6 +++--- .../8pl_16tp_encounters/param.swiftest.in | 6 +++--- .../8pl_16tp_encounters/pl.in | 16 ++++++++-------- .../8pl_16tp_encounters/pl.swifter.in | 18 +++++++++--------- .../8pl_16tp_encounters/pl.swiftest.in | 16 ++++++++-------- 8 files changed, 37 insertions(+), 36 deletions(-) diff --git a/examples/symba_swifter_comparison/8pl_16tp_encounters/cb.in b/examples/symba_swifter_comparison/8pl_16tp_encounters/cb.in index 01c5fb3dd..2df47f957 100644 --- a/examples/symba_swifter_comparison/8pl_16tp_encounters/cb.in +++ b/examples/symba_swifter_comparison/8pl_16tp_encounters/cb.in @@ -1,5 +1,5 @@ Sun -0.0002959122081920778 +0.00029591220819207774 0.004650467260962157 4.7535806948127355e-12 -2.2473967953572827e-18 diff --git a/examples/symba_swifter_comparison/8pl_16tp_encounters/cb.swiftest.in b/examples/symba_swifter_comparison/8pl_16tp_encounters/cb.swiftest.in index 01c5fb3dd..2df47f957 100644 --- a/examples/symba_swifter_comparison/8pl_16tp_encounters/cb.swiftest.in +++ b/examples/symba_swifter_comparison/8pl_16tp_encounters/cb.swiftest.in @@ -1,5 +1,5 @@ Sun -0.0002959122081920778 +0.00029591220819207774 0.004650467260962157 4.7535806948127355e-12 -2.2473967953572827e-18 diff --git a/examples/symba_swifter_comparison/8pl_16tp_encounters/init_cond.py b/examples/symba_swifter_comparison/8pl_16tp_encounters/init_cond.py index c51ff47cb..23b65080f 100755 --- a/examples/symba_swifter_comparison/8pl_16tp_encounters/init_cond.py +++ b/examples/symba_swifter_comparison/8pl_16tp_encounters/init_cond.py @@ -19,7 +19,7 @@ swiftest_pl = "pl.swiftest.in" swiftest_tp = "tp.swiftest.in" swiftest_cb = "cb.swiftest.in" -swiftest_bin = "bin.swiftest.dat" +swiftest_bin = "bin.swiftest.nc" swiftest_enc = "enc.swiftest.dat" swiftest_dis = "discard.swiftest.dat" @@ -28,8 +28,8 @@ sim.param['T0'] = 0.0 sim.param['DT'] = 1.0 sim.param['TSTOP'] = 365.25e1 -sim.param['ISTEP_OUT'] = 1 -sim.param['ISTEP_DUMP'] = 1 +sim.param['ISTEP_OUT'] = 10 +sim.param['ISTEP_DUMP'] = 10 sim.param['CHK_QMIN_COORD'] = "HELIO" sim.param['CHK_QMIN'] = swiftest.RSun / swiftest.AU2M sim.param['CHK_QMIN_RANGE'] = f"{swiftest.RSun / swiftest.AU2M} 1000.0" @@ -141,4 +141,5 @@ sim.param['TP_IN'] = swifter_tp sim.param['BIN_OUT'] = swifter_bin sim.param['ENC_OUT'] = swifter_enc +sim.param['OUT_TYPE'] = "REAL8" sim.save(swifter_input, codename="Swifter") diff --git a/examples/symba_swifter_comparison/8pl_16tp_encounters/param.swifter.in b/examples/symba_swifter_comparison/8pl_16tp_encounters/param.swifter.in index b8731386b..15fdfcbe3 100644 --- a/examples/symba_swifter_comparison/8pl_16tp_encounters/param.swifter.in +++ b/examples/symba_swifter_comparison/8pl_16tp_encounters/param.swifter.in @@ -2,10 +2,10 @@ T0 0.0 TSTOP 3652.5 DT 1.0 -ISTEP_OUT 11 -ISTEP_DUMP 1 +ISTEP_OUT 10 +ISTEP_DUMP 10 OUT_FORM XV -OUT_TYPE NETCDF_DOUBLE +OUT_TYPE REAL8 OUT_STAT UNKNOWN IN_TYPE ASCII PL_IN pl.swifter.in diff --git a/examples/symba_swifter_comparison/8pl_16tp_encounters/param.swiftest.in b/examples/symba_swifter_comparison/8pl_16tp_encounters/param.swiftest.in index bca11da6d..ad787b5bf 100644 --- a/examples/symba_swifter_comparison/8pl_16tp_encounters/param.swiftest.in +++ b/examples/symba_swifter_comparison/8pl_16tp_encounters/param.swiftest.in @@ -2,8 +2,8 @@ T0 0.0 TSTOP 3652.5 DT 1.0 -ISTEP_OUT 11 -ISTEP_DUMP 1 +ISTEP_OUT 10 +ISTEP_DUMP 10 OUT_FORM XV OUT_TYPE NETCDF_DOUBLE OUT_STAT UNKNOWN @@ -11,7 +11,7 @@ IN_TYPE ASCII PL_IN pl.swiftest.in TP_IN tp.swiftest.in CB_IN cb.swiftest.in -BIN_OUT bin.swiftest.dat +BIN_OUT bin.swiftest.nc CHK_QMIN 0.004650467260962157 CHK_RMIN 0.004650467260962157 CHK_RMAX 1000.0 diff --git a/examples/symba_swifter_comparison/8pl_16tp_encounters/pl.in b/examples/symba_swifter_comparison/8pl_16tp_encounters/pl.in index 72b1baa3b..93c1187e2 100644 --- a/examples/symba_swifter_comparison/8pl_16tp_encounters/pl.in +++ b/examples/symba_swifter_comparison/8pl_16tp_encounters/pl.in @@ -1,33 +1,33 @@ 8 -Mercury 4.9125474498983625056e-11 0.0014751323154597007903 +Mercury 4.9125474498983623693e-11 0.0014751323154597003982 1.6306381826061645943e-05 0.053584775529809842987 -0.4548355025417368247 -0.04208301187261995896 0.022298358665237189014 0.0047355207618514265702 -0.0016584224113858070382 -Venus 7.243452483873647106e-10 0.0067590814914530454873 +Venus 7.243452483873646905e-10 0.006759081491453044288 4.0453784346544178454e-05 0.12681182092868958922 -0.7161485778943049718 -0.017146261752773749032 0.01978070713081106144 0.0034557070729633850362 -0.00109402215681010293 -Earth 8.997011382166018993e-10 0.010044922299157372164 +Earth 8.9970113821660187435e-10 0.010044922299157369357 4.25875607065040958e-05 0.9913796310092216624 -0.17236385208280941006 4.574442303609438109e-06 0.0026673818939059660942 0.016885702625202340249 -8.2074388361713082097e-07 -Mars 9.549535102761465872e-11 0.007246507286611460043 +Mars 9.549535102761465607e-11 0.0072465072866114584993 2.265740805092889601e-05 -1.6436878725691590475 -0.09931688681832298582 0.038237939117251117105 0.0013642455487206960919 -0.0127728951275482699446 -0.00030115173687901287654 -Jupiter 2.8253459086313549713e-07 0.3552710784524730732 +Jupiter 2.825345908631354893e-07 0.35527107845247299128 0.00046732617030490929307 4.304060110247122317 -2.579516473452256875 -0.08558202993848706974 0.003792902202341501966 0.0068350794283332117623 -0.00011324814038141340017 -Saturn 8.45971518300641563e-08 0.4376659135625219704 +Saturn 8.459715183006415395e-08 0.43766591356252188504 0.00038925687730393611812 6.54409134618183419 -7.483470470167333133 -0.1303290586096018111 0.003893524262024787054 0.0036668581511023591937 -0.00021865564058601801348 -Uranus 1.2920249163736673984e-08 0.46971473227488383167 +Uranus 1.2920249163736673626e-08 0.46971473227488373932 0.00016953449859497231466 14.692788408572690528 13.179130291284799625 -0.14143429698462339772 -0.0026516826407085368304 0.0027513763836455209892 4.4427867883713361775e-05 -Neptune 1.5243589003230834746e-08 0.78149679568494038567 +Neptune 1.5243589003230834323e-08 0.7814967956849401736 0.000164587904124493665 29.58593540166936009 -4.435365846939811618 -0.5905556302070252839 0.0004489890080502080224 0.003131021601122137201 -7.4728898269552307757e-05 diff --git a/examples/symba_swifter_comparison/8pl_16tp_encounters/pl.swifter.in b/examples/symba_swifter_comparison/8pl_16tp_encounters/pl.swifter.in index c0567724d..611be7721 100644 --- a/examples/symba_swifter_comparison/8pl_16tp_encounters/pl.swifter.in +++ b/examples/symba_swifter_comparison/8pl_16tp_encounters/pl.swifter.in @@ -1,36 +1,36 @@ 9 -0 0.0002959122081920778 +0 0.00029591220819207774 0.0 0.0 0.0 0.0 0.0 0.0 -1 4.9125474498983625056e-11 0.0014751323154597007903 +1 4.9125474498983623693e-11 0.0014751323154597003982 1.6306381826061645943e-05 0.053584775529809842987 -0.4548355025417368247 -0.04208301187261995896 0.022298358665237189014 0.0047355207618514265702 -0.0016584224113858070382 -2 7.243452483873647106e-10 0.0067590814914530454873 +2 7.243452483873646905e-10 0.006759081491453044288 4.0453784346544178454e-05 0.12681182092868958922 -0.7161485778943049718 -0.017146261752773749032 0.01978070713081106144 0.0034557070729633850362 -0.00109402215681010293 -3 8.997011382166018993e-10 0.010044922299157372164 +3 8.9970113821660187435e-10 0.010044922299157369357 4.25875607065040958e-05 0.9913796310092216624 -0.17236385208280941006 4.574442303609438109e-06 0.0026673818939059660942 0.016885702625202340249 -8.2074388361713082097e-07 -4 9.549535102761465872e-11 0.007246507286611460043 +4 9.549535102761465607e-11 0.0072465072866114584993 2.265740805092889601e-05 -1.6436878725691590475 -0.09931688681832298582 0.038237939117251117105 0.0013642455487206960919 -0.0127728951275482699446 -0.00030115173687901287654 -5 2.8253459086313549713e-07 0.3552710784524730732 +5 2.825345908631354893e-07 0.35527107845247299128 0.00046732617030490929307 4.304060110247122317 -2.579516473452256875 -0.08558202993848706974 0.003792902202341501966 0.0068350794283332117623 -0.00011324814038141340017 -6 8.45971518300641563e-08 0.4376659135625219704 +6 8.459715183006415395e-08 0.43766591356252188504 0.00038925687730393611812 6.54409134618183419 -7.483470470167333133 -0.1303290586096018111 0.003893524262024787054 0.0036668581511023591937 -0.00021865564058601801348 -7 1.2920249163736673984e-08 0.46971473227488383167 +7 1.2920249163736673626e-08 0.46971473227488373932 0.00016953449859497231466 14.692788408572690528 13.179130291284799625 -0.14143429698462339772 -0.0026516826407085368304 0.0027513763836455209892 4.4427867883713361775e-05 -8 1.5243589003230834746e-08 0.78149679568494038567 +8 1.5243589003230834323e-08 0.7814967956849401736 0.000164587904124493665 29.58593540166936009 -4.435365846939811618 -0.5905556302070252839 0.0004489890080502080224 0.003131021601122137201 -7.4728898269552307757e-05 diff --git a/examples/symba_swifter_comparison/8pl_16tp_encounters/pl.swiftest.in b/examples/symba_swifter_comparison/8pl_16tp_encounters/pl.swiftest.in index 72b1baa3b..93c1187e2 100644 --- a/examples/symba_swifter_comparison/8pl_16tp_encounters/pl.swiftest.in +++ b/examples/symba_swifter_comparison/8pl_16tp_encounters/pl.swiftest.in @@ -1,33 +1,33 @@ 8 -Mercury 4.9125474498983625056e-11 0.0014751323154597007903 +Mercury 4.9125474498983623693e-11 0.0014751323154597003982 1.6306381826061645943e-05 0.053584775529809842987 -0.4548355025417368247 -0.04208301187261995896 0.022298358665237189014 0.0047355207618514265702 -0.0016584224113858070382 -Venus 7.243452483873647106e-10 0.0067590814914530454873 +Venus 7.243452483873646905e-10 0.006759081491453044288 4.0453784346544178454e-05 0.12681182092868958922 -0.7161485778943049718 -0.017146261752773749032 0.01978070713081106144 0.0034557070729633850362 -0.00109402215681010293 -Earth 8.997011382166018993e-10 0.010044922299157372164 +Earth 8.9970113821660187435e-10 0.010044922299157369357 4.25875607065040958e-05 0.9913796310092216624 -0.17236385208280941006 4.574442303609438109e-06 0.0026673818939059660942 0.016885702625202340249 -8.2074388361713082097e-07 -Mars 9.549535102761465872e-11 0.007246507286611460043 +Mars 9.549535102761465607e-11 0.0072465072866114584993 2.265740805092889601e-05 -1.6436878725691590475 -0.09931688681832298582 0.038237939117251117105 0.0013642455487206960919 -0.0127728951275482699446 -0.00030115173687901287654 -Jupiter 2.8253459086313549713e-07 0.3552710784524730732 +Jupiter 2.825345908631354893e-07 0.35527107845247299128 0.00046732617030490929307 4.304060110247122317 -2.579516473452256875 -0.08558202993848706974 0.003792902202341501966 0.0068350794283332117623 -0.00011324814038141340017 -Saturn 8.45971518300641563e-08 0.4376659135625219704 +Saturn 8.459715183006415395e-08 0.43766591356252188504 0.00038925687730393611812 6.54409134618183419 -7.483470470167333133 -0.1303290586096018111 0.003893524262024787054 0.0036668581511023591937 -0.00021865564058601801348 -Uranus 1.2920249163736673984e-08 0.46971473227488383167 +Uranus 1.2920249163736673626e-08 0.46971473227488373932 0.00016953449859497231466 14.692788408572690528 13.179130291284799625 -0.14143429698462339772 -0.0026516826407085368304 0.0027513763836455209892 4.4427867883713361775e-05 -Neptune 1.5243589003230834746e-08 0.78149679568494038567 +Neptune 1.5243589003230834323e-08 0.7814967956849401736 0.000164587904124493665 29.58593540166936009 -4.435365846939811618 -0.5905556302070252839 0.0004489890080502080224 0.003131021601122137201 -7.4728898269552307757e-05