diff --git a/examples/whm_swifter_comparison/init_cond.py b/examples/whm_swifter_comparison/init_cond.py index cc86e7635..9f9b3f98d 100755 --- a/examples/whm_swifter_comparison/init_cond.py +++ b/examples/whm_swifter_comparison/init_cond.py @@ -20,6 +20,7 @@ sim.param['OUT_FORM'] = "XV" sim.param['OUT_STAT'] = "UNKNOWN" sim.param['GR'] = 'NO' +sim.param['RHILL_PRESENT'] = 'NO' bodyid = { "Sun": 0, diff --git a/examples/whm_swifter_comparison/param.swifter.in b/examples/whm_swifter_comparison/param.swifter.in index 417c3ab04..8ea0e8771 100644 --- a/examples/whm_swifter_comparison/param.swifter.in +++ b/examples/whm_swifter_comparison/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 +RHILL_PRESENT NO J2 4.7535806948127355e-12 J4 -2.2473967953572827e-18 diff --git a/examples/whm_swifter_comparison/param.swiftest.in b/examples/whm_swifter_comparison/param.swiftest.in index 13fdad2ec..d6b863f5d 100644 --- a/examples/whm_swifter_comparison/param.swiftest.in +++ b/examples/whm_swifter_comparison/param.swiftest.in @@ -25,7 +25,7 @@ DU2M 149597870700.0 EXTRA_FORCE NO BIG_DISCARD NO CHK_CLOSE YES -RHILL_PRESENT YES +RHILL_PRESENT NO FRAGMENTATION NO ROTATION NO TIDES NO diff --git a/examples/whm_swifter_comparison/pl.swifter.in b/examples/whm_swifter_comparison/pl.swifter.in index 7f71ec655..f39e7af56 100644 --- a/examples/whm_swifter_comparison/pl.swifter.in +++ b/examples/whm_swifter_comparison/pl.swifter.in @@ -2,35 +2,35 @@ 0 39.476926408897625196 0.0 0.0 0.0 0.0 0.0 0.0 -1 6.5537098095653139645e-06 0.0014751244276585862212 +1 6.5537098095653139645e-06 1.6306381826061645943e-05 --0.28963231309350817577 0.18505777632553971346 0.041690199036696552748 --7.636449781071190374 -8.230711833761744002 0.027897889786567415562 -2 9.663313399581537916e-05 0.006759070712609563929 +-0.30949970210807342674 0.1619004125820537876 0.041620272188990829754 +-6.8742992150644793847 -8.672423996611946485 -0.078109307586001638286 +2 9.663313399581537916e-05 4.0453784346544178454e-05 --0.56924731086399205093 -0.4448853077740749229 0.026742834854114529153 -4.4970878201205087762 -5.8559309604734073535 -0.33987302067212196325 -3 0.000120026935827952453094 0.01004490423927810557 +-0.5567137338251560985 -0.46074173273652380134 0.02580196630219121906 +4.6580776303108450487 -5.726444072926637749 -0.3473859047161406309 +3 0.000120026935827952453094 4.25875607065040958e-05 -0.68557554005930954055 -0.74774392436574432796 3.3215781231472978855e-05 -4.529549698952863699 4.223187462606770848 -0.00021705351084307017903 -4 1.2739802010675941456e-05 0.0072466832516755644343 +0.6978790186886838498 -0.73607603319120218366 3.261671020506711323e-05 +4.4579240279134950613 4.300011122687349501 -0.00022055769049333364448 +4 1.2739802010675941456e-05 2.265740805092889601e-05 --1.6149058006556089584 0.39555322375610602048 0.047903023702369727788 --1.0254865811345536522 -4.5279792592715677134 -0.0697376753600697812 -5 0.037692251088985676735 0.35527077279847234866 +-1.617661473167097963 0.38314370807747849534 0.04771055403546069218 +-0.98751874613118001086 -4.5371239937302254657 -0.07086074102213555221 +5 0.037692251088985676735 0.00046732617030490929307 -4.1485722284141921534 -2.8413405904412840641 -0.081015809697524809874 -1.5260372589993542462 2.4062964793298095964 -0.044136376192527556195 -6 0.011285899820091272997 0.43765804755160246957 +4.1527454588897487753 -2.8347492039446908763 -0.081136554176388195336 +1.5225069137843642898 2.4087104911325327961 -0.044067446366273183833 +6 0.011285899820091272997 0.00038925687730393611812 -6.3907469739591356017 -7.624741463389934637 -0.12177209989682470648 -1.450023133321789527 1.3067045786330910449 -0.08040773079473842075 -7 0.0017236589478267730203 0.46959835521706382437 +6.39471595410062843 -7.621162747287802297 -0.121992225877669294154 +1.4493167787574136286 1.3075474785896286071 -0.08039429377859412155 +7 0.0017236589478267730203 0.00016953449859497231466 -14.795764797253550427 13.071447820107550797 -0.14316267052797140846 --0.9602974676407360823 1.012024061970291078 0.016146735322636888151 -8 0.0020336100526728302319 0.7813622435281695686 +14.793135356927480828 13.074218343364380601 -0.14311846037737518955 +-0.9605086875596024784 1.0118431725941020164 0.016148779866732710198 +8 0.0020336100526728302319 0.000164587904124493665 -29.568167916428858888 -4.5574316836467883007 -0.58763608457780613925 -0.16879901777383137264 1.1427778220120381962 -0.027390131426610687076 +29.568629894896030663 -4.5543028991960081697 -0.58771107137394917874 +0.16867624969736024011 1.1427992197933557251 -0.027387722828706092838 diff --git a/examples/whm_swifter_comparison/pl.swiftest.in b/examples/whm_swifter_comparison/pl.swiftest.in index 06c393c46..b624d25ba 100644 --- a/examples/whm_swifter_comparison/pl.swiftest.in +++ b/examples/whm_swifter_comparison/pl.swiftest.in @@ -1,33 +1,33 @@ 8 -1 6.5537098095653139645e-06 0.0014751244276585862212 +1 6.5537098095653139645e-06 1.6306381826061645943e-05 --0.28963231309350817577 0.18505777632553971346 0.041690199036696552748 --7.636449781071190374 -8.230711833761744002 0.027897889786567415562 -2 9.663313399581537916e-05 0.006759070712609563929 +-0.30949970210807342674 0.1619004125820537876 0.041620272188990829754 +-6.8742992150644793847 -8.672423996611946485 -0.078109307586001638286 +2 9.663313399581537916e-05 4.0453784346544178454e-05 --0.56924731086399205093 -0.4448853077740749229 0.026742834854114529153 -4.4970878201205087762 -5.8559309604734073535 -0.33987302067212196325 -3 0.000120026935827952453094 0.01004490423927810557 +-0.5567137338251560985 -0.46074173273652380134 0.02580196630219121906 +4.6580776303108450487 -5.726444072926637749 -0.3473859047161406309 +3 0.000120026935827952453094 4.25875607065040958e-05 -0.68557554005930954055 -0.74774392436574432796 3.3215781231472978855e-05 -4.529549698952863699 4.223187462606770848 -0.00021705351084307017903 -4 1.2739802010675941456e-05 0.0072466832516755644343 +0.6978790186886838498 -0.73607603319120218366 3.261671020506711323e-05 +4.4579240279134950613 4.300011122687349501 -0.00022055769049333364448 +4 1.2739802010675941456e-05 2.265740805092889601e-05 --1.6149058006556089584 0.39555322375610602048 0.047903023702369727788 --1.0254865811345536522 -4.5279792592715677134 -0.0697376753600697812 -5 0.037692251088985676735 0.35527077279847234866 +-1.617661473167097963 0.38314370807747849534 0.04771055403546069218 +-0.98751874613118001086 -4.5371239937302254657 -0.07086074102213555221 +5 0.037692251088985676735 0.00046732617030490929307 -4.1485722284141921534 -2.8413405904412840641 -0.081015809697524809874 -1.5260372589993542462 2.4062964793298095964 -0.044136376192527556195 -6 0.011285899820091272997 0.43765804755160246957 +4.1527454588897487753 -2.8347492039446908763 -0.081136554176388195336 +1.5225069137843642898 2.4087104911325327961 -0.044067446366273183833 +6 0.011285899820091272997 0.00038925687730393611812 -6.3907469739591356017 -7.624741463389934637 -0.12177209989682470648 -1.450023133321789527 1.3067045786330910449 -0.08040773079473842075 -7 0.0017236589478267730203 0.46959835521706382437 +6.39471595410062843 -7.621162747287802297 -0.121992225877669294154 +1.4493167787574136286 1.3075474785896286071 -0.08039429377859412155 +7 0.0017236589478267730203 0.00016953449859497231466 -14.795764797253550427 13.071447820107550797 -0.14316267052797140846 --0.9602974676407360823 1.012024061970291078 0.016146735322636888151 -8 0.0020336100526728302319 0.7813622435281695686 +14.793135356927480828 13.074218343364380601 -0.14311846037737518955 +-0.9605086875596024784 1.0118431725941020164 0.016148779866732710198 +8 0.0020336100526728302319 0.000164587904124493665 -29.568167916428858888 -4.5574316836467883007 -0.58763608457780613925 -0.16879901777383137264 1.1427778220120381962 -0.027390131426610687076 +29.568629894896030663 -4.5543028991960081697 -0.58771107137394917874 +0.16867624969736024011 1.1427992197933557251 -0.027387722828706092838 diff --git a/examples/whm_swifter_comparison/tp.swifter.in b/examples/whm_swifter_comparison/tp.swifter.in index e91b52c9c..8a66912f4 100644 --- a/examples/whm_swifter_comparison/tp.swifter.in +++ b/examples/whm_swifter_comparison/tp.swifter.in @@ -1,13 +1,13 @@ 4 101 -2.1229161119197987873 1.8522237100026059942 -0.33259854925516180169 --2.5472645182622320396 2.6008026042341226758 0.5514976560945522932 +2.1159283340247889704 1.8593322968487970837 -0.33108647801775120678 +-2.557303042640355446 2.5920133227445458545 0.5530693963730075664 102 -3.054386355288102095 -0.9095218820160763107 0.36697667872479622364 -0.4222440438063146342 2.6085624551380790432 -1.8425471496071408667 +3.055528708824450046 -0.9023759798915096386 0.36193041623852567623 +0.4122422441588732561 2.6115158464246720372 -1.8437451126910543971 103 --0.27747800994574201017 -3.1378821872210798105 0.72389993067619795575 -3.09473043735936102 0.16643076629286349722 -0.16359842504957606916 +-0.26900389298636068203 -3.1374127668516589296 0.7234488489303841918 +3.0956076496295565968 0.17648254651685860603 -0.16591700615421532186 104 --1.9125286108430290533 -1.0693208643153691018 0.26467515987932982435 -2.3353854076771408592 -3.6840315362407642648 -0.17400766828131512544 +-1.9061083760262669262 -1.0793924233562111059 0.26419511130887440853 +2.3545884478521155142 -3.673223720899393644 -0.17666743480430943436 diff --git a/examples/whm_swifter_comparison/tp.swiftest.in b/examples/whm_swifter_comparison/tp.swiftest.in index e91b52c9c..8a66912f4 100644 --- a/examples/whm_swifter_comparison/tp.swiftest.in +++ b/examples/whm_swifter_comparison/tp.swiftest.in @@ -1,13 +1,13 @@ 4 101 -2.1229161119197987873 1.8522237100026059942 -0.33259854925516180169 --2.5472645182622320396 2.6008026042341226758 0.5514976560945522932 +2.1159283340247889704 1.8593322968487970837 -0.33108647801775120678 +-2.557303042640355446 2.5920133227445458545 0.5530693963730075664 102 -3.054386355288102095 -0.9095218820160763107 0.36697667872479622364 -0.4222440438063146342 2.6085624551380790432 -1.8425471496071408667 +3.055528708824450046 -0.9023759798915096386 0.36193041623852567623 +0.4122422441588732561 2.6115158464246720372 -1.8437451126910543971 103 --0.27747800994574201017 -3.1378821872210798105 0.72389993067619795575 -3.09473043735936102 0.16643076629286349722 -0.16359842504957606916 +-0.26900389298636068203 -3.1374127668516589296 0.7234488489303841918 +3.0956076496295565968 0.17648254651685860603 -0.16591700615421532186 104 --1.9125286108430290533 -1.0693208643153691018 0.26467515987932982435 -2.3353854076771408592 -3.6840315362407642648 -0.17400766828131512544 +-1.9061083760262669262 -1.0793924233562111059 0.26419511130887440853 +2.3545884478521155142 -3.673223720899393644 -0.17666743480430943436