diff --git a/examples/symba_swifter_comparison/9pl_18tp_encounters/cb.in b/examples/symba_swifter_comparison/9pl_18tp_encounters/cb.in index 81c636655..673a79459 100644 --- a/examples/symba_swifter_comparison/9pl_18tp_encounters/cb.in +++ b/examples/symba_swifter_comparison/9pl_18tp_encounters/cb.in @@ -1,5 +1,5 @@ 0 -0.00029591220819207774 +0.0002959122081920778 0.004650467260962157 4.7535806948127355e-12 -2.2473967953572827e-18 diff --git a/examples/symba_swifter_comparison/9pl_18tp_encounters/cb.swiftest.in b/examples/symba_swifter_comparison/9pl_18tp_encounters/cb.swiftest.in index 81c636655..673a79459 100644 --- a/examples/symba_swifter_comparison/9pl_18tp_encounters/cb.swiftest.in +++ b/examples/symba_swifter_comparison/9pl_18tp_encounters/cb.swiftest.in @@ -1,5 +1,5 @@ 0 -0.00029591220819207774 +0.0002959122081920778 0.004650467260962157 4.7535806948127355e-12 -2.2473967953572827e-18 diff --git a/examples/symba_swifter_comparison/9pl_18tp_encounters/param.swifter.in b/examples/symba_swifter_comparison/9pl_18tp_encounters/param.swifter.in index aa33eeaa4..d87472e35 100644 --- a/examples/symba_swifter_comparison/9pl_18tp_encounters/param.swifter.in +++ b/examples/symba_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 +RHILL_PRESENT YES J2 4.7535806948127355e-12 J4 -2.2473967953572827e-18 -RHILL_PRESENT YES diff --git a/examples/symba_swifter_comparison/9pl_18tp_encounters/param.swiftest.in b/examples/symba_swifter_comparison/9pl_18tp_encounters/param.swiftest.in index 6504c9637..06edc324b 100644 --- a/examples/symba_swifter_comparison/9pl_18tp_encounters/param.swiftest.in +++ b/examples/symba_swifter_comparison/9pl_18tp_encounters/param.swiftest.in @@ -25,6 +25,7 @@ DU2M 149597870700.0 EXTRA_FORCE NO BIG_DISCARD NO CHK_CLOSE YES +RHILL_PRESENT YES FRAGMENTATION NO ROTATION NO TIDES NO diff --git a/examples/symba_swifter_comparison/9pl_18tp_encounters/pl.in b/examples/symba_swifter_comparison/9pl_18tp_encounters/pl.in index bd980fc4b..d85d737f5 100644 --- a/examples/symba_swifter_comparison/9pl_18tp_encounters/pl.in +++ b/examples/symba_swifter_comparison/9pl_18tp_encounters/pl.in @@ -1,33 +1,33 @@ 8 -1 4.9125474498983623693e-11 +1 4.9125474498983625056e-11 1.6306381826061645943e-05 -0.33206272695596028566 0.07436707001147663254 -0.02438290851908785084 --0.0115920916602103591525 0.028710618792657981169 0.0034094833969203438596 -2 7.243452483873646905e-10 +-0.032433320146471017464 0.30732647407569840814 0.0280888997405028297 +-0.033622812072399158034 -0.0019305604712619159943 0.0029264451427202888868 +2 7.243452483873647106e-10 4.0453784346544178454e-05 --0.7188115337296047125 -0.0118554711069603201795 0.041316403191083782287 -0.00021427347881133320621 -0.020313576971905909774 -0.00029114855617710840843 -3 8.9970113821660187435e-10 +-0.6608991468450423623 -0.28805695486041710263 0.034183953683804932377 +0.007943018642097033136 -0.018635382188272479886 -0.00071410720992500279457 +3 8.997011382166018993e-10 4.25875607065040958e-05 -0.35677088372527121507 -0.95189300879814897627 4.4027442504036787155e-05 -0.015830039028334789986 0.0059737936889703449964 -3.3484113013969089573e-07 -4 9.549535102761465607e-11 +0.5665449483756358484 -0.84285201543201082597 3.8152874628327130158e-05 +0.0139986033055793102076 0.009533392738922031109 -5.008237574040859916e-07 +4 9.549535102761465872e-11 2.265740805092889601e-05 --1.5233712071242269115 0.6723825347339112968 0.051459143378398922164 --0.0051275613251079554117 -0.011607719813367209372 -0.000117479966462153095864 -5 2.825345908631354893e-07 +-1.5854600237231359916 0.50600057977052448344 0.049495356229978339224 +-0.0037325822023031099417 -0.0121364162752466003825 -0.00016278089870573419053 +5 2.8253459086313549713e-07 0.00046732617030490929307 -4.049944927347420176 -2.9910878677758190314 -0.078187280837353656526 -0.0043972077687938898594 0.006432188574295680597 -0.00012509257442073270106 -6 8.459715183006415395e-08 +4.1105798235203270252 -2.9003636368897538489 -0.07992066204197022239 +0.0042645403767569648595 0.006527961423420942065 -0.00012252307659855749943 +6 8.45971518300641563e-08 0.00038925687730393611812 -6.298929503477405767 -7.706413024510769816 -0.11669919842191249504 -0.0040140666547768266703 0.0035242303011843410798 -0.00022097170940726839814 -7 1.2920249163736673626e-08 +6.3549393159832749944 -7.6568459312514027815 -0.11978932080537739446 +0.0039872926987931916337 0.0035567518157804990653 -0.00022047226166396519348 +7 1.2920249163736673984e-08 0.00016953449859497231466 -14.856082147529010129 13.007589275314199284 -0.14417795763685259391 --0.0026158276515510360365 0.0027821364817078499815 4.40781085949555924e-05 -8 1.5243589003230834323e-08 +14.81940372833062014 13.046490834898889943 -0.14356031024960910769 +-0.002623943559850705834 0.002775224845039696818 4.4157032104701469965e-05 +8 1.5243589003230834746e-08 0.000164587904124493665 -29.55744967800954015 -4.629377558152945049 -0.58590957207831262377 -0.00046987400245862169295 0.0031274056019462009859 -7.51415892482447254e-05 +29.563994989459040141 -4.5855881090096284325 -0.5869609072731380994 +0.00046517035659338968386 0.0031282283842968541462 -7.504927375628088796e-05 diff --git a/examples/symba_swifter_comparison/9pl_18tp_encounters/pl.swifter.in b/examples/symba_swifter_comparison/9pl_18tp_encounters/pl.swifter.in index 701e9a14f..ba4f47b86 100644 --- a/examples/symba_swifter_comparison/9pl_18tp_encounters/pl.swifter.in +++ b/examples/symba_swifter_comparison/9pl_18tp_encounters/pl.swifter.in @@ -1,36 +1,36 @@ 9 -0 0.00029591220819207775568 +0 0.00029591220819207776388 0.0 0.0 0.0 0.0 0.0 0.0 -1 4.9125474498983623693e-11 0.0014751243077781048702 +1 4.9125474498983625056e-11 0.3870979888395936208 1.6306381826061645943e-05 -0.33206272695596028566 0.07436707001147663254 -0.02438290851908785084 --0.0115920916602103591525 0.028710618792657981169 0.0034094833969203438596 -2 7.243452483873646905e-10 0.006759104275397271956 +-0.032433320146471017464 0.30732647407569840814 0.0280888997405028297 +-0.033622812072399158034 -0.0019305604712619159943 0.0029264451427202888868 +2 7.243452483873647106e-10 0.7233257098327222634 4.0453784346544178454e-05 --0.7188115337296047125 -0.0118554711069603201795 0.041316403191083782287 -0.00021427347881133320621 -0.020313576971905909774 -0.00029114855617710840843 -3 8.9970113821660187435e-10 0.010044787321379672528 +-0.6608991468450423623 -0.28805695486041710263 0.034183953683804932377 +0.007943018642097033136 -0.018635382188272479886 -0.00071410720992500279457 +3 8.997011382166018993e-10 1.000013777403204962 4.25875607065040958e-05 -0.35677088372527121507 -0.95189300879814897627 4.4027442504036787155e-05 -0.015830039028334789986 0.0059737936889703449964 -3.3484113013969089573e-07 -4 9.549535102761465607e-11 0.007246743835971885302 +0.5665449483756358484 -0.84285201543201082597 3.8152874628327130158e-05 +0.0139986033055793102076 0.009533392738922031109 -5.008237574040859916e-07 +4 9.549535102761465872e-11 1.523730802569037035 2.265740805092889601e-05 --1.5233712071242269115 0.6723825347339112968 0.051459143378398922164 --0.0051275613251079554117 -0.011607719813367209372 -0.000117479966462153095864 -5 2.825345908631354893e-07 0.35527126534549128905 +-1.5854600237231359916 0.50600057977052448344 0.049495356229978339224 +-0.0037325822023031099417 -0.0121364162752466003825 -0.00016278089870573419053 +5 2.8253459086313549713e-07 5.2035172582389037643 0.00046732617030490929307 -4.049944927347420176 -2.9910878677758190314 -0.078187280837353656526 -0.0043972077687938898594 0.006432188574295680597 -0.00012509257442073270106 -6 8.459715183006415395e-08 0.4376527512949726007 +4.1105798235203270252 -2.9003636368897538489 -0.07992066204197022239 +0.0042645403767569648595 0.006527961423420942065 -0.00012252307659855749943 +6 8.45971518300641563e-08 9.581689367400855417 0.00038925687730393611812 -6.298929503477405767 -7.706413024510769816 -0.11669919842191249504 -0.0040140666547768266703 0.0035242303011843410798 -0.00022097170940726839814 -7 1.2920249163736673626e-08 0.4695362423191493196 +6.3549393159832749944 -7.6568459312514027815 -0.11978932080537739446 +0.0039872926987931916337 0.0035567518157804990653 -0.00022047226166396519348 +7 1.2920249163736673984e-08 19.232766114773518495 0.00016953449859497231466 -14.856082147529010129 13.007589275314199284 -0.14417795763685259391 --0.0026158276515510360365 0.0027821364817078499815 4.40781085949555924e-05 -8 1.5243589003230834323e-08 0.7812870996943599397 +14.81940372833062014 13.046490834898889943 -0.14356031024960910769 +-0.002623943559850705834 0.002775224845039696818 4.4157032104701469965e-05 +8 1.5243589003230834746e-08 30.285501702709421323 0.000164587904124493665 -29.55744967800954015 -4.629377558152945049 -0.58590957207831262377 -0.00046987400245862169295 0.0031274056019462009859 -7.51415892482447254e-05 +29.563994989459040141 -4.5855881090096284325 -0.5869609072731380994 +0.00046517035659338968386 0.0031282283842968541462 -7.504927375628088796e-05 diff --git a/examples/symba_swifter_comparison/9pl_18tp_encounters/pl.swiftest.in b/examples/symba_swifter_comparison/9pl_18tp_encounters/pl.swiftest.in index bd980fc4b..d85d737f5 100644 --- a/examples/symba_swifter_comparison/9pl_18tp_encounters/pl.swiftest.in +++ b/examples/symba_swifter_comparison/9pl_18tp_encounters/pl.swiftest.in @@ -1,33 +1,33 @@ 8 -1 4.9125474498983623693e-11 +1 4.9125474498983625056e-11 1.6306381826061645943e-05 -0.33206272695596028566 0.07436707001147663254 -0.02438290851908785084 --0.0115920916602103591525 0.028710618792657981169 0.0034094833969203438596 -2 7.243452483873646905e-10 +-0.032433320146471017464 0.30732647407569840814 0.0280888997405028297 +-0.033622812072399158034 -0.0019305604712619159943 0.0029264451427202888868 +2 7.243452483873647106e-10 4.0453784346544178454e-05 --0.7188115337296047125 -0.0118554711069603201795 0.041316403191083782287 -0.00021427347881133320621 -0.020313576971905909774 -0.00029114855617710840843 -3 8.9970113821660187435e-10 +-0.6608991468450423623 -0.28805695486041710263 0.034183953683804932377 +0.007943018642097033136 -0.018635382188272479886 -0.00071410720992500279457 +3 8.997011382166018993e-10 4.25875607065040958e-05 -0.35677088372527121507 -0.95189300879814897627 4.4027442504036787155e-05 -0.015830039028334789986 0.0059737936889703449964 -3.3484113013969089573e-07 -4 9.549535102761465607e-11 +0.5665449483756358484 -0.84285201543201082597 3.8152874628327130158e-05 +0.0139986033055793102076 0.009533392738922031109 -5.008237574040859916e-07 +4 9.549535102761465872e-11 2.265740805092889601e-05 --1.5233712071242269115 0.6723825347339112968 0.051459143378398922164 --0.0051275613251079554117 -0.011607719813367209372 -0.000117479966462153095864 -5 2.825345908631354893e-07 +-1.5854600237231359916 0.50600057977052448344 0.049495356229978339224 +-0.0037325822023031099417 -0.0121364162752466003825 -0.00016278089870573419053 +5 2.8253459086313549713e-07 0.00046732617030490929307 -4.049944927347420176 -2.9910878677758190314 -0.078187280837353656526 -0.0043972077687938898594 0.006432188574295680597 -0.00012509257442073270106 -6 8.459715183006415395e-08 +4.1105798235203270252 -2.9003636368897538489 -0.07992066204197022239 +0.0042645403767569648595 0.006527961423420942065 -0.00012252307659855749943 +6 8.45971518300641563e-08 0.00038925687730393611812 -6.298929503477405767 -7.706413024510769816 -0.11669919842191249504 -0.0040140666547768266703 0.0035242303011843410798 -0.00022097170940726839814 -7 1.2920249163736673626e-08 +6.3549393159832749944 -7.6568459312514027815 -0.11978932080537739446 +0.0039872926987931916337 0.0035567518157804990653 -0.00022047226166396519348 +7 1.2920249163736673984e-08 0.00016953449859497231466 -14.856082147529010129 13.007589275314199284 -0.14417795763685259391 --0.0026158276515510360365 0.0027821364817078499815 4.40781085949555924e-05 -8 1.5243589003230834323e-08 +14.81940372833062014 13.046490834898889943 -0.14356031024960910769 +-0.002623943559850705834 0.002775224845039696818 4.4157032104701469965e-05 +8 1.5243589003230834746e-08 0.000164587904124493665 -29.55744967800954015 -4.629377558152945049 -0.58590957207831262377 -0.00046987400245862169295 0.0031274056019462009859 -7.51415892482447254e-05 +29.563994989459040141 -4.5855881090096284325 -0.5869609072731380994 +0.00046517035659338968386 0.0031282283842968541462 -7.504927375628088796e-05 diff --git a/examples/symba_swifter_comparison/9pl_18tp_encounters/tp.in b/examples/symba_swifter_comparison/9pl_18tp_encounters/tp.in index c7cf002d6..e7424ed6f 100644 --- a/examples/symba_swifter_comparison/9pl_18tp_encounters/tp.in +++ b/examples/symba_swifter_comparison/9pl_18tp_encounters/tp.in @@ -1,49 +1,49 @@ 16 101 -0.33208578766229190915 0.07439013071780828379 -0.02438290851908785084 --0.008988542188201206762 0.028710618792657981169 0.0034094833969203438596 +-0.032410259440139366216 0.30734953478203003163 0.0280888997405028297 +-0.031019262600390007378 -0.0019305604712619159943 0.0029264451427202888868 102 -0.33203966624962866216 0.07434400930514498129 -0.02438290851908785084 --0.014195641132219511543 0.028710618792657981169 0.0034094833969203438596 +-0.032456380852802668713 0.30730341336936678465 0.0280888997405028297 +-0.03622636154440830869 -0.0019305604712619159943 0.0029264451427202888868 103 --0.7187543234391324809 -0.011798260816488121555 0.041316403191083782287 -0.0065615071841567274707 -0.020313576971905909774 -0.00029114855617710840843 +-0.6608419365545701307 -0.28799974456994492655 0.034183953683804932377 +0.014290252347442427075 -0.018635382188272479886 -0.00071410720992500279457 104 --0.71886874402007694407 -0.011912681397432518804 0.041316403191083782287 --0.006132960226534060408 -0.020313576971905909774 -0.00029114855617710840843 +-0.6609563571355145939 -0.2881141651508892787 0.034183953683804932377 +0.0015957849367516391964 -0.018635382188272479886 -0.00071410720992500279457 105 -0.35683111163121072895 -0.9518327808922094624 4.4027442504036787155e-05 -0.022724479262608666269 0.0059737936889703449964 -3.3484113013969089573e-07 +0.5666051762815753623 -0.8427917875260713121 3.8152874628327130158e-05 +0.020893043539853186491 0.009533392738922031109 -5.008237574040859916e-07 106 -0.3567106558193317012 -0.95195323670408849015 4.4027442504036787155e-05 -0.008935598794060913702 0.0059737936889703449964 -3.3484113013969089573e-07 +0.56648472046969633453 -0.84291224333795033985 3.8152874628327130158e-05 +0.0071041630713054347915 0.009533392738922031109 -5.008237574040859916e-07 107 --1.5233391647104730371 0.6724145771476651712 0.051459143378398922164 --0.0020480822268840624331 -0.011607719813367209372 -0.000117479966462153095864 +-1.5854279813093821172 0.50603262218427835784 0.049495356229978339224 +-0.00065310310407921696313 -0.0121364162752466003825 -0.00016278089870573419053 108 --1.5234032495379807859 0.6723504923201574224 0.051459143378398922164 --0.008207040423331847523 -0.011607719813367209372 -0.000117479966462153095864 +-1.585492066136889866 0.50596853735677060904 0.049495356229978339224 +-0.0068120613005270029203 -0.0121364162752466003825 -0.00016278089870573419053 109 -4.050605826355517358 -2.9904269687677218492 -0.078187280837353656526 -0.041279424970441319642 0.006432188574295680597 -0.00012509257442073270106 +4.1112407225284242074 -2.8997027378816566667 -0.07992066204197022239 +0.041146757578404392908 0.006527961423420942065 -0.00012252307659855749943 110 -4.049284028339322994 -2.9917487667839162135 -0.078187280837353656526 --0.032485009432853539924 0.006432188574295680597 -0.00012509257442073270106 +4.109918924512229843 -2.901024535897851031 -0.07992066204197022239 +-0.032617676824890466658 0.006527961423420942065 -0.00012252307659855749943 111 -6.299479995832536261 -7.7058625321556393217 -0.11669919842191249504 -0.02612723553831041573 0.0035242303011843410798 -0.00022097170940726839814 +6.3554898083384054885 -7.6562954388962722874 -0.11978932080537739446 +0.026100461582326782428 0.0035567518157804990653 -0.00022047226166396519348 112 -6.2983790111222752728 -7.70696351686590031 -0.11669919842191249504 --0.01809910222875676239 0.0035242303011843410798 -0.00022097170940726839814 +6.3543888236281445003 -7.6573964236065332756 -0.11978932080537739446 +-0.018125876184740395691 0.0035567518157804990653 -0.00022047226166396519348 113 -14.856321905516212567 13.007829033301401722 -0.14417795763685259391 -0.010478935887110856981 0.0027821364817078499815 4.40781085949555924e-05 +14.819643486317822578 13.046730592886092381 -0.14356031024960910769 +0.010470819978811187617 0.002775224845039696818 4.4157032104701469965e-05 114 -14.855842389541807691 13.007349517326996846 -0.14417795763685259391 --0.015710591190212928187 0.0027821364817078499815 4.40781085949555924e-05 +14.819163970343417702 13.046251076911687505 -0.14356031024960910769 +-0.015718707098512599285 0.002775224845039696818 4.4157032104701469965e-05 115 -29.55768244045575699 -4.6291447957067299868 -0.58590957207831262377 -0.014905509815736753265 0.0031274056019462009859 -7.51415892482447254e-05 +29.56422775190525698 -4.58535534656341337 -0.5869609072731380994 +0.014900806169871520443 0.0031282283842968541462 -7.504927375628088796e-05 116 -29.557216915563323312 -4.6296103205991601115 -0.58590957207831262377 --0.0139657618108195089035 0.0031274056019462009859 -7.51415892482447254e-05 +29.563762227012823303 -4.585820871455843495 -0.5869609072731380994 +-0.013970465456684741726 0.0031282283842968541462 -7.504927375628088796e-05 diff --git a/python/swiftest/swiftest/init_cond.py b/python/swiftest/swiftest/init_cond.py index 3316e7fe2..995b30194 100644 --- a/python/swiftest/swiftest/init_cond.py +++ b/python/swiftest/swiftest/init_cond.py @@ -195,12 +195,10 @@ def solar_system_horizons(plname, idval, param, ephemerides_start_date, ds): Rpl.append(planetradius[key] * DCONV) GMpl.append(GMcb[0] / MSun_over_Mpl[key]) # Generate planet value vectors - if (param['RHILL_PRESENT'] == 'yes'): - print("We are appending the Hill sphere") + if (param['RHILL_PRESENT'] == 'YES'): Rhill.append(pldata[key].elements()['a'][0] * (3 * MSun_over_Mpl[key]) ** (-THIRDLONG)) pvec = np.vstack([p1, p2, p3, p4, p5, p6, GMpl, Rpl, p7, p8, p9, p10, p11, p12, Rhill]) else: - print("Why aren't we appending the Hill sphere?") pvec = np.vstack([p1, p2, p3, p4, p5, p6, GMpl, Rpl, p7, p8, p9, p10, p11, p12]) else: pvec = np.vstack([p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12])