From 7f1f5bddfefa854548214b8199e0bebe5880b2b5 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Fri, 6 Aug 2021 14:53:55 -0400 Subject: [PATCH] Fixed initial conditions for SyMBA 8pl_16tp test case --- .../8pl_16tp_encounters/cb.swiftest.in | 4 +- .../8pl_16tp_encounters/init_cond.py | 2 + .../8pl_16tp_encounters/param.swifter.in | 4 +- .../8pl_16tp_encounters/param.swiftest.in | 3 +- .../8pl_16tp_encounters/pl.in | 48 +++++++------- .../8pl_16tp_encounters/pl.swifter.in | 48 +++++++------- .../8pl_16tp_encounters/pl.swiftest.in | 48 +++++++------- .../8pl_16tp_encounters/tp.in | 64 +++++++++---------- 8 files changed, 111 insertions(+), 110 deletions(-) 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 2e8d49f62..81c636655 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 @@ 0 0.00029591220819207774 0.004650467260962157 -0.0 -0.0 +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 18ef4ce48..707c80b51 100755 --- a/examples/symba_swifter_comparison/8pl_16tp_encounters/init_cond.py +++ b/examples/symba_swifter_comparison/8pl_16tp_encounters/init_cond.py @@ -19,6 +19,7 @@ swiftest_cb = "cb.swiftest.in" swiftest_bin = "bin.swiftest.dat" swiftest_enc = "enc.swiftest.dat" +swiftest_dis = "discard.swiftest.dat" sim = swiftest.Simulation() @@ -125,6 +126,7 @@ sim.param['CB_IN'] = swiftest_cb sim.param['BIN_OUT'] = swiftest_bin sim.param['ENC_OUT'] = swiftest_enc +sim.param['DISCARD_OUT'] = swiftest_dis sim.save(swiftest_input) sim.param['PL_IN'] = swifter_pl 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 f9305cfa2..d87472e35 100644 --- a/examples/symba_swifter_comparison/8pl_16tp_encounters/param.swifter.in +++ b/examples/symba_swifter_comparison/8pl_16tp_encounters/param.swifter.in @@ -22,5 +22,5 @@ EXTRA_FORCE NO BIG_DISCARD NO CHK_CLOSE YES RHILL_PRESENT YES -J2 0.0 -J4 0.0 +J2 4.7535806948127355e-12 +J4 -2.2473967953572827e-18 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 e9ed6376c..c72e9f4b4 100644 --- a/examples/symba_swifter_comparison/8pl_16tp_encounters/param.swiftest.in +++ b/examples/symba_swifter_comparison/8pl_16tp_encounters/param.swiftest.in @@ -13,6 +13,7 @@ TP_IN tp.in CB_IN cb.swiftest.in BIN_OUT bin.swiftest.dat ENC_OUT enc.swiftest.dat +DISCARD_OUT discard.swiftest.dat CHK_QMIN 0.004650467260962157 CHK_RMIN 0.004650467260962157 CHK_RMAX 1000.0 @@ -31,6 +32,4 @@ ROTATION NO TIDES NO ENERGY NO GR NO -YARKOVSKY NO -YORP NO MTINY 1e-12 diff --git a/examples/symba_swifter_comparison/8pl_16tp_encounters/pl.in b/examples/symba_swifter_comparison/8pl_16tp_encounters/pl.in index 86a616119..207dd84f6 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 -1 4.9125474498983623693e-11 0.0014751239400086721089 +1 4.9125474498983623693e-11 0.001475124456355905224 1.6306381826061645943e-05 --0.09861361766419070307 0.29750596935836171042 0.03335708456145129036 --0.032353632540864457612 -0.0078122718370876240157 0.0023293874953380202045 -2 7.243452483873646905e-10 0.0067590794275223005208 +-0.30949970210807342674 0.1619004125820537876 0.041620272188990829754 +-0.018820805516945871005 -0.023743802865467341506 -0.00021385162925667799668 +2 7.243452483873646905e-10 0.006759069616556246028 4.0453784346544178454e-05 --0.6439817957564198947 -0.3248550380869373866 0.032702713983447248558 -0.008969709495375973937 -0.018153139924556138673 -0.0007667345025597138231 -3 8.9970113821660187435e-10 0.010044873080337524463 +-0.5567137338251560985 -0.46074173273652380134 0.02580196630219121906 +0.012753121506668980284 -0.015678149412530151263 -0.0009510907726656827677 +3 8.9970113821660187435e-10 0.010044908171483009529 4.25875607065040958e-05 -0.59421674333603324847 -0.82331253628773626296 3.7129329104855261984e-05 -0.013670550280388280365 0.010004295439859960809 -5.226292361234363611e-07 -4 9.549535102761465607e-11 0.0072467054748629370034 +0.6978790186886838498 -0.73607603319120218366 3.261671020506711323e-05 +0.012205130808798069983 0.0117727888369263504476 -6.0385404652521189453e-07 +4 9.549535102761465607e-11 0.0072466797341124641736 2.265740805092889601e-05 --1.592721551706784977 0.48166390206865000723 0.049163460846716633412 --0.0035287723306552309585 -0.01219974682608557931 -0.00016910795626524249315 -5 2.825345908631354893e-07 0.35527074967975702942 +-1.617661473167097963 0.38314370807747849534 0.04771055403546069218 +-0.0027036789764029569086 -0.012421968497550240837 -0.00019400613558421780209 +5 2.825345908631354893e-07 0.35527079166215922855 0.00046732617030490929307 -4.119089774477131094 -2.8872942462256898644 -0.080165336328135106125 -0.004245402942744468111 0.0065414198811065849687 -0.00012215100047356211078 -6 8.459715183006415395e-08 0.4376562090257202473 +4.1527454588897487753 -2.8347492039446908763 -0.081136554176388195336 +0.0041683967523185880624 0.0065946899141205552256 -0.00012065009272080269359 +6 8.459715183006415395e-08 0.43765832419088212185 0.00038925687730393611812 -6.3629100567525149756 -7.649727796147929304 -0.12023019299387090186 -0.0039834472120812329868 0.0035613826786502411278 -0.00022039988214595340028 -7 1.2920249163736673626e-08 0.4695793205674148502 +6.39471595410062843 -7.621162747287802297 -0.121992225877669294154 +0.0039680130835247464163 0.0035798698934692090544 -0.00022010758050265331019 +7 1.2920249163736673626e-08 0.46960112247450473807 0.00016953449859497231466 -14.814154683311180349 13.052040295401360126 -0.14347198499748289868 --0.002625101393275708784 0.0027742356008832688187 4.416821810149910185e-05 -8 1.5243589003230834323e-08 0.7813388398513013378 +14.793135356927480828 13.074218343364380601 -0.14311846037737518955 +-0.0026297294662822792016 0.0027702756265410048361 4.4212949669357180555e-05 +8 1.5243589003230834323e-08 0.78136567314580814177 0.000164587904124493665 -29.564924658285640646 -4.579331535234244299 -0.5871109926822926095 -0.00046449847307956888343 0.003128345390031967918 -7.5036135696161668576e-05 +29.568629894896030663 -4.5543028991960081697 -0.58771107137394917874 +0.00046181040300440859715 0.0031288137434451902125 -7.498349850432879627e-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 595cdc169..3179473c0 100644 --- a/examples/symba_swifter_comparison/8pl_16tp_encounters/pl.swifter.in +++ b/examples/symba_swifter_comparison/8pl_16tp_encounters/pl.swifter.in @@ -2,35 +2,35 @@ 0 0.00029591220819207775568 0.0 0.0 0.0 0.0 0.0 0.0 -1 4.9125474498983623693e-11 0.0014751239400086721089 +1 4.9125474498983623693e-11 0.001475124456355905224 1.6306381826061645943e-05 --0.09861361766419070307 0.29750596935836171042 0.03335708456145129036 --0.032353632540864457612 -0.0078122718370876240157 0.0023293874953380202045 -2 7.243452483873646905e-10 0.0067590794275223005208 +-0.30949970210807342674 0.1619004125820537876 0.041620272188990829754 +-0.018820805516945871005 -0.023743802865467341506 -0.00021385162925667799668 +2 7.243452483873646905e-10 0.006759069616556246028 4.0453784346544178454e-05 --0.6439817957564198947 -0.3248550380869373866 0.032702713983447248558 -0.008969709495375973937 -0.018153139924556138673 -0.0007667345025597138231 -3 8.9970113821660187435e-10 0.010044873080337524463 +-0.5567137338251560985 -0.46074173273652380134 0.02580196630219121906 +0.012753121506668980284 -0.015678149412530151263 -0.0009510907726656827677 +3 8.9970113821660187435e-10 0.010044908171483009529 4.25875607065040958e-05 -0.59421674333603324847 -0.82331253628773626296 3.7129329104855261984e-05 -0.013670550280388280365 0.010004295439859960809 -5.226292361234363611e-07 -4 9.549535102761465607e-11 0.0072467054748629370034 +0.6978790186886838498 -0.73607603319120218366 3.261671020506711323e-05 +0.012205130808798069983 0.0117727888369263504476 -6.0385404652521189453e-07 +4 9.549535102761465607e-11 0.0072466797341124641736 2.265740805092889601e-05 --1.592721551706784977 0.48166390206865000723 0.049163460846716633412 --0.0035287723306552309585 -0.01219974682608557931 -0.00016910795626524249315 -5 2.825345908631354893e-07 0.35527074967975702942 +-1.617661473167097963 0.38314370807747849534 0.04771055403546069218 +-0.0027036789764029569086 -0.012421968497550240837 -0.00019400613558421780209 +5 2.825345908631354893e-07 0.35527079166215922855 0.00046732617030490929307 -4.119089774477131094 -2.8872942462256898644 -0.080165336328135106125 -0.004245402942744468111 0.0065414198811065849687 -0.00012215100047356211078 -6 8.459715183006415395e-08 0.4376562090257202473 +4.1527454588897487753 -2.8347492039446908763 -0.081136554176388195336 +0.0041683967523185880624 0.0065946899141205552256 -0.00012065009272080269359 +6 8.459715183006415395e-08 0.43765832419088212185 0.00038925687730393611812 -6.3629100567525149756 -7.649727796147929304 -0.12023019299387090186 -0.0039834472120812329868 0.0035613826786502411278 -0.00022039988214595340028 -7 1.2920249163736673626e-08 0.4695793205674148502 +6.39471595410062843 -7.621162747287802297 -0.121992225877669294154 +0.0039680130835247464163 0.0035798698934692090544 -0.00022010758050265331019 +7 1.2920249163736673626e-08 0.46960112247450473807 0.00016953449859497231466 -14.814154683311180349 13.052040295401360126 -0.14347198499748289868 --0.002625101393275708784 0.0027742356008832688187 4.416821810149910185e-05 -8 1.5243589003230834323e-08 0.7813388398513013378 +14.793135356927480828 13.074218343364380601 -0.14311846037737518955 +-0.0026297294662822792016 0.0027702756265410048361 4.4212949669357180555e-05 +8 1.5243589003230834323e-08 0.78136567314580814177 0.000164587904124493665 -29.564924658285640646 -4.579331535234244299 -0.5871109926822926095 -0.00046449847307956888343 0.003128345390031967918 -7.5036135696161668576e-05 +29.568629894896030663 -4.5543028991960081697 -0.58771107137394917874 +0.00046181040300440859715 0.0031288137434451902125 -7.498349850432879627e-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 86a616119..207dd84f6 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 -1 4.9125474498983623693e-11 0.0014751239400086721089 +1 4.9125474498983623693e-11 0.001475124456355905224 1.6306381826061645943e-05 --0.09861361766419070307 0.29750596935836171042 0.03335708456145129036 --0.032353632540864457612 -0.0078122718370876240157 0.0023293874953380202045 -2 7.243452483873646905e-10 0.0067590794275223005208 +-0.30949970210807342674 0.1619004125820537876 0.041620272188990829754 +-0.018820805516945871005 -0.023743802865467341506 -0.00021385162925667799668 +2 7.243452483873646905e-10 0.006759069616556246028 4.0453784346544178454e-05 --0.6439817957564198947 -0.3248550380869373866 0.032702713983447248558 -0.008969709495375973937 -0.018153139924556138673 -0.0007667345025597138231 -3 8.9970113821660187435e-10 0.010044873080337524463 +-0.5567137338251560985 -0.46074173273652380134 0.02580196630219121906 +0.012753121506668980284 -0.015678149412530151263 -0.0009510907726656827677 +3 8.9970113821660187435e-10 0.010044908171483009529 4.25875607065040958e-05 -0.59421674333603324847 -0.82331253628773626296 3.7129329104855261984e-05 -0.013670550280388280365 0.010004295439859960809 -5.226292361234363611e-07 -4 9.549535102761465607e-11 0.0072467054748629370034 +0.6978790186886838498 -0.73607603319120218366 3.261671020506711323e-05 +0.012205130808798069983 0.0117727888369263504476 -6.0385404652521189453e-07 +4 9.549535102761465607e-11 0.0072466797341124641736 2.265740805092889601e-05 --1.592721551706784977 0.48166390206865000723 0.049163460846716633412 --0.0035287723306552309585 -0.01219974682608557931 -0.00016910795626524249315 -5 2.825345908631354893e-07 0.35527074967975702942 +-1.617661473167097963 0.38314370807747849534 0.04771055403546069218 +-0.0027036789764029569086 -0.012421968497550240837 -0.00019400613558421780209 +5 2.825345908631354893e-07 0.35527079166215922855 0.00046732617030490929307 -4.119089774477131094 -2.8872942462256898644 -0.080165336328135106125 -0.004245402942744468111 0.0065414198811065849687 -0.00012215100047356211078 -6 8.459715183006415395e-08 0.4376562090257202473 +4.1527454588897487753 -2.8347492039446908763 -0.081136554176388195336 +0.0041683967523185880624 0.0065946899141205552256 -0.00012065009272080269359 +6 8.459715183006415395e-08 0.43765832419088212185 0.00038925687730393611812 -6.3629100567525149756 -7.649727796147929304 -0.12023019299387090186 -0.0039834472120812329868 0.0035613826786502411278 -0.00022039988214595340028 -7 1.2920249163736673626e-08 0.4695793205674148502 +6.39471595410062843 -7.621162747287802297 -0.121992225877669294154 +0.0039680130835247464163 0.0035798698934692090544 -0.00022010758050265331019 +7 1.2920249163736673626e-08 0.46960112247450473807 0.00016953449859497231466 -14.814154683311180349 13.052040295401360126 -0.14347198499748289868 --0.002625101393275708784 0.0027742356008832688187 4.416821810149910185e-05 -8 1.5243589003230834323e-08 0.7813388398513013378 +14.793135356927480828 13.074218343364380601 -0.14311846037737518955 +-0.0026297294662822792016 0.0027702756265410048361 4.4212949669357180555e-05 +8 1.5243589003230834323e-08 0.78136567314580814177 0.000164587904124493665 -29.564924658285640646 -4.579331535234244299 -0.5871109926822926095 -0.00046449847307956888343 0.003128345390031967918 -7.5036135696161668576e-05 +29.568629894896030663 -4.5543028991960081697 -0.58771107137394917874 +0.00046181040300440859715 0.0031288137434451902125 -7.498349850432879627e-05 diff --git a/examples/symba_swifter_comparison/8pl_16tp_encounters/tp.in b/examples/symba_swifter_comparison/8pl_16tp_encounters/tp.in index ae7796698..c1e239467 100644 --- a/examples/symba_swifter_comparison/8pl_16tp_encounters/tp.in +++ b/examples/symba_swifter_comparison/8pl_16tp_encounters/tp.in @@ -1,49 +1,49 @@ 16 101 --0.09859055695785905182 0.2975290300646933339 0.03335708456145129036 --0.029750083068855306956 -0.0078122718370876240157 0.0023293874953380202045 +-0.30947664140174180325 0.16192347328838543885 0.041620272188990829754 +-0.01621725604493672035 -0.023743802865467341506 -0.00021385162925667799668 102 --0.09863667837052235432 0.29748290865203008693 0.03335708456145129036 --0.034957182012873608268 -0.0078122718370876240157 0.0023293874953380202045 +-0.30952276281440505024 0.16187735187572213635 0.041620272188990829754 +-0.021424354988955021661 -0.023743802865467341506 -0.00021385162925667799668 103 --0.6439245854659476631 -0.32479782779646521051 0.032702713983447248558 -0.0153169432007213678765 -0.018153139924556138673 -0.0007667345025597138231 +-0.55665652353468386693 -0.46068452244605162527 0.02580196630219121906 +0.019100355212014374223 -0.015678149412530151263 -0.0009510907726656827677 104 --0.6440390060468921263 -0.32491224837740956266 0.032702713983447248558 -0.002622475790030579998 -0.018153139924556138673 -0.0007667345025597138231 +-0.5567709441156283301 -0.4607989430269959774 0.02580196630219121906 +0.0064058878013235863447 -0.015678149412530151263 -0.0009510907726656827677 105 -0.59427697124197276235 -0.8232523083817967491 3.7129329104855261984e-05 -0.020564990514662154913 0.010004295439859960809 -5.226292361234363611e-07 +0.6979392465946233637 -0.7360158052852626698 3.261671020506711323e-05 +0.019099571043071944532 0.0117727888369263504476 -6.0385404652521189453e-07 106 -0.5941565154300937346 -0.82337276419367577684 3.7129329104855261984e-05 -0.0067761100461144049487 0.010004295439859960809 -5.226292361234363611e-07 +0.6978187907827443359 -0.73613626109714169754 3.261671020506711323e-05 +0.005310690574524194567 0.0117727888369263504476 -6.0385404652521189453e-07 107 --1.5926895092930311026 0.48169594448240382611 0.049163460846716633412 --0.00044929323243133797994 -0.01219974682608557931 -0.00016910795626524249315 +-1.6176294307533440886 0.38317575049123231423 0.04771055403546069218 +0.00037580012182093606998 -0.012421968497550240837 -0.00019400613558421780209 108 --1.5927535941205388514 0.48163185965489618834 0.049163460846716633412 --0.006608251428879123937 -0.01219974682608557931 -0.00016910795626524249315 +-1.6176935155808518374 0.38311166566372467646 0.04771055403546069218 +-0.005783158074626849887 -0.012421968497550240837 -0.00019400613558421780209 109 -4.119750673485228276 -2.8866333472175926822 -0.080165336328135106125 -0.041127620144391897894 0.0065414198811065849687 -0.00012215100047356211078 +4.1534063578978459574 -2.834088304936593694 -0.081136554176388195336 +0.041050613953966016978 0.0065946899141205552256 -0.00012065009272080269359 110 -4.118428875469033912 -2.8879551452337870465 -0.080165336328135106125 --0.032636814258902961672 0.0065414198811065849687 -0.00012215100047356211078 +4.152084559881651593 -2.8354101029527880584 -0.081136554176388195336 +-0.032713820449328842588 0.0065946899141205552256 -0.00012065009272080269359 111 -6.3634605491076454697 -7.64917730379279881 -0.12023019299387090186 -0.026096616095614821179 0.0035613826786502411278 -0.00022039988214595340028 +6.395266446455758924 -7.620612254932671803 -0.121992225877669294154 +0.026081181967058334609 0.0035798698934692090544 -0.00022010758050265331019 112 -6.3623595643973844815 -7.650278288503059798 -0.12023019299387090186 --0.01812972167145235694 0.0035613826786502411278 -0.00022039988214595340028 +6.394165461745497936 -7.621713239642932791 -0.121992225877669294154 +-0.01814515580000884351 0.0035798698934692090544 -0.00022010758050265331019 113 -14.814394441298382787 13.052280053388562564 -0.14347198499748289868 -0.010469662145386185101 0.0027742356008832688187 4.416821810149910185e-05 +14.793375114914683266 13.074458101351583039 -0.14311846037737518955 +0.0104650340723796142495 0.0027702756265410048361 4.4212949669357180555e-05 114 -14.813914925323977911 13.051800537414157688 -0.14347198499748289868 --0.015719864931937603536 0.0027742356008832688187 4.416821810149910185e-05 +14.79289559894027839 13.073978585377178163 -0.14311846037737518955 +-0.015724493004944172653 0.0027702756265410048361 4.4212949669357180555e-05 115 -29.565157420731857485 -4.579098772788029237 -0.5871109926822926095 -0.014900134286357700347 0.003128345390031967918 -7.5036135696161668576e-05 +29.568862657342247502 -4.5540701367497931074 -0.58771107137394917874 +0.0148974462162825404404 0.0031288137434451902125 -7.498349850432879627e-05 116 -29.564691895839423808 -4.5795642976804593616 -0.5871109926822926095 --0.0139711373401985618214 0.003128345390031967918 -7.5036135696161668576e-05 +29.568397132449813824 -4.554535661642223232 -0.58771107137394917874 +-0.013973825410273721728 0.0031288137434451902125 -7.498349850432879627e-05