Skip to content
This repository was archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
Merge branch 'debug'
Browse files Browse the repository at this point in the history
  • Loading branch information
@daminton
daminton committed Aug 11, 2021
2 parents ef05eb5 + f033af9 commit 9ad34a3
Show file tree
Hide file tree
Showing 31 changed files with 717 additions and 576 deletions.
6 changes: 4 additions & 2 deletions examples/rmvs_swifter_comparison/8pl_16tp_encounters/init_cond.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@
swiftest_cb = "cb.swiftest.in"
swiftest_bin = "bin.swiftest.dat"
swiftest_enc = "enc.swiftest.dat"
swiftest_disc = "discard.swiftest.out"

sim = swiftest.Simulation()

sim.param['T0'] = 0.0
sim.param['DT'] = 1.0
sim.param['TSTOP'] = 365.25e1
sim.param['TSTOP'] = 365.25e2
sim.param['ISTEP_OUT'] = 10
sim.param['ISTEP_DUMP'] = 10
sim.param['CHK_QMIN_COORD'] = "HELIO"
Expand Down Expand Up @@ -84,7 +85,7 @@
for i in pl.id:
pli = pl.sel(id=i)
rstart = 2 * np.double(pli['Radius']) # Start the test particles at a multiple of the planet radius away
vstart = 1.5 * np.sqrt(2 * np.double(pli['Mass']) / rstart) # Start the test particle velocities at a multiple of the escape speed
vstart = 1.5 * np.sqrt(2 * np.double(pli['GMass']) / rstart) # Start the test particle velocities at a multiple of the escape speed
xvstart = np.array([rstart / np.sqrt(2.0), rstart / np.sqrt(2.0), 0.0, vstart, 0.0, 0.0])
# The positions and velocities of each pair of test particles will be in reference to a planet
plvec = np.array([np.double(pli['px']),
Expand Down Expand Up @@ -124,6 +125,7 @@
sim.param['CB_IN'] = swiftest_cb
sim.param['BIN_OUT'] = swiftest_bin
sim.param['ENC_OUT'] = swiftest_enc
sim.param['DISCARD_OUT'] = swiftest_disc
sim.save(swiftest_input)

sim.param['PL_IN'] = swifter_pl
Expand Down
4 changes: 2 additions & 2 deletions examples/rmvs_swifter_comparison/8pl_16tp_encounters/param.swifter.in
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
! VERSION Swifter parameter file converted from Swiftest
T0 0.0
TSTOP 3652.5
TSTOP 36525.0
DT 1.0
ISTEP_OUT 10
ISTEP_DUMP 10
Expand All @@ -11,13 +11,13 @@ IN_TYPE ASCII
PL_IN pl.swifter.in
TP_IN tp.in
BIN_OUT bin.swifter.dat
ENC_OUT enc.swifter.dat
CHK_QMIN 0.004650467260962157
CHK_RMIN 0.004650467260962157
CHK_RMAX 1000.0
CHK_EJECT 1000.0
CHK_QMIN_COORD HELIO
CHK_QMIN_RANGE 0.004650467260962157 1000.0
ENC_OUT enc.swifter.dat
EXTRA_FORCE NO
BIG_DISCARD NO
CHK_CLOSE YES
Expand Down
8 changes: 3 additions & 5 deletions examples/rmvs_swifter_comparison/8pl_16tp_encounters/param.swiftest.in
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
! VERSION Swiftest parameter input
T0 0.0
TSTOP 3652.5
TSTOP 36525.0
DT 1.0
ISTEP_OUT 10
ISTEP_DUMP 10
Expand All @@ -12,7 +12,6 @@ PL_IN pl.swiftest.in
TP_IN tp.in
CB_IN cb.swiftest.in
BIN_OUT bin.swiftest.dat
ENC_OUT enc.swiftest.dat
CHK_QMIN 0.004650467260962157
CHK_RMIN 0.004650467260962157
CHK_RMAX 1000.0
Expand All @@ -22,7 +21,9 @@ CHK_QMIN_RANGE 0.004650467260962157 1000.0
MU2KG 1.988409870698051e+30
TU2S 86400
DU2M 149597870700.0
ENC_OUT enc.swiftest.dat
EXTRA_FORCE NO
DISCARD_OUT discard.swiftest.out
BIG_DISCARD NO
CHK_CLOSE YES
RHILL_PRESENT YES
Expand All @@ -31,6 +32,3 @@ ROTATION NO
TIDES NO
ENERGY NO
GR NO
YARKOVSKY NO
YORP NO
MTINY 0.0
48 changes: 24 additions & 24 deletions examples/rmvs_swifter_comparison/8pl_16tp_encounters/pl.in
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
8
1 4.9125474498983623693e-11 0.001475124456355905224
1 4.9125474498983623693e-11 0.0014751244935834097723
1.6306381826061645943e-05
-0.30949970210807342674 0.1619004125820537876 0.041620272188990829754
-0.018820805516945871005 -0.023743802865467341506 -0.00021385162925667799668
2 7.243452483873646905e-10 0.006759069616556246028
-0.37723213134178928962 0.033583006382262102496 0.037347605390151236704
-0.008342765357522348782 -0.026815373891535949219 -0.0014259978126226569104
2 7.243452483873646905e-10 0.006759064884572926305
4.0453784346544178454e-05
-0.5567137338251560985 -0.46074173273652380134 0.02580196630219121906
0.012753121506668980284 -0.015678149412530151263 -0.0009510907726656827677
3 8.9970113821660187435e-10 0.010044908171483009529
-0.48772324783973242113 -0.53438159383885197595 0.020810210727290629623
0.014797158412775200664 -0.013730742274988789325 -0.0010423161661001279551
3 8.9970113821660187435e-10 0.01004492566381686821
4.25875607065040958e-05
0.6978790186886838498 -0.73607603319120218366 3.261671020506711323e-05
0.012205130808798069983 0.0117727888369263504476 -6.0385404652521189453e-07
4 9.549535102761465607e-11 0.0072466797341124641736
0.75635861236241797023 -0.674672320414933413 2.9482164814591560215e-05
0.0111724732704936106226 0.0127745538308708106445 -6.4922715710692383536e-07
4 9.549535102761465607e-11 0.007246661019460395855
2.265740805092889601e-05
-1.617661473167097963 0.38314370807747849534 0.04771055403546069218
-0.0027036789764029569086 -0.012421968497550240837 -0.00019400613558421780209
5 2.825345908631354893e-07 0.35527079166215922855
-1.6298746849997449715 0.3207423054955682029 0.04670239471945906301
-0.0021807443711779391643 -0.012535287802970449672 -0.00020920945169970240392
5 2.825345908631354893e-07 0.3552709189640263194
0.00046732617030490929307
4.1527454588897487753 -2.8347492039446908763 -0.081136554176388195336
0.0041683967523185880624 0.0065946899141205552256 -0.00012065009272080269359
6 8.459715183006415395e-08 0.43765832419088212185
4.173466317007961557 -2.8016935252076420326 -0.081737437087388009616
0.0041198995131368296857 0.0066275220486694394126 -0.000119701756809504006665
6 8.459715183006415395e-08 0.43765971211410006393
0.00038925687730393611812
6.39471595410062843 -7.621162747287802297 -0.121992225877669294154
0.0039680130835247464163 0.0035798698934692090544 -0.00022010758050265331019
7 1.2920249163736673626e-08 0.46960112247450473807
6.414531809550852337 -7.603234575912382276 -0.12309230194363039723
0.0039583234912346160553 0.003591394820962775982 -0.00021992254044702681153
7 1.2920249163736673626e-08 0.4696151691794380732
0.00016953449859497231466
14.793135356927480828 13.074218343364380601 -0.14311846037737518955
-0.0026297294662822792016 0.0027702756265410048361 4.4212949669357180555e-05
8 1.5243589003230834323e-08 0.78136567314580814177
14.779979482167510341 13.088063528768900667 -0.14289732557134240953
-0.0026326202792006140295 0.002767798188238951903 4.424098699891899271e-05
8 1.5243589003230834323e-08 0.7813830605782720197
0.000164587904124493665
29.568629894896030663 -4.5543028991960081697 -0.58771107137394917874
0.00046181040300440859715 0.0031288137434451902125 -7.498349850432879627e-05
29.57093474400743105 -4.53865809805519671 -0.5880859062837571205
0.00046012900387533010914 0.0031291067120909890273 -7.4950441013985698475e-05
48 changes: 24 additions & 24 deletions examples/rmvs_swifter_comparison/8pl_16tp_encounters/pl.swifter.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,35 @@
0 0.00029591220819207775568
0.0 0.0 0.0
0.0 0.0 0.0
1 4.9125474498983623693e-11 0.001475124456355905224
1 4.9125474498983623693e-11 0.0014751244935834097723
1.6306381826061645943e-05
-0.30949970210807342674 0.1619004125820537876 0.041620272188990829754
-0.018820805516945871005 -0.023743802865467341506 -0.00021385162925667799668
2 7.243452483873646905e-10 0.006759069616556246028
-0.37723213134178928962 0.033583006382262102496 0.037347605390151236704
-0.008342765357522348782 -0.026815373891535949219 -0.0014259978126226569104
2 7.243452483873646905e-10 0.006759064884572926305
4.0453784346544178454e-05
-0.5567137338251560985 -0.46074173273652380134 0.02580196630219121906
0.012753121506668980284 -0.015678149412530151263 -0.0009510907726656827677
3 8.9970113821660187435e-10 0.010044908171483009529
-0.48772324783973242113 -0.53438159383885197595 0.020810210727290629623
0.014797158412775200664 -0.013730742274988789325 -0.0010423161661001279551
3 8.9970113821660187435e-10 0.01004492566381686821
4.25875607065040958e-05
0.6978790186886838498 -0.73607603319120218366 3.261671020506711323e-05
0.012205130808798069983 0.0117727888369263504476 -6.0385404652521189453e-07
4 9.549535102761465607e-11 0.0072466797341124641736
0.75635861236241797023 -0.674672320414933413 2.9482164814591560215e-05
0.0111724732704936106226 0.0127745538308708106445 -6.4922715710692383536e-07
4 9.549535102761465607e-11 0.007246661019460395855
2.265740805092889601e-05
-1.617661473167097963 0.38314370807747849534 0.04771055403546069218
-0.0027036789764029569086 -0.012421968497550240837 -0.00019400613558421780209
5 2.825345908631354893e-07 0.35527079166215922855
-1.6298746849997449715 0.3207423054955682029 0.04670239471945906301
-0.0021807443711779391643 -0.012535287802970449672 -0.00020920945169970240392
5 2.825345908631354893e-07 0.3552709189640263194
0.00046732617030490929307
4.1527454588897487753 -2.8347492039446908763 -0.081136554176388195336
0.0041683967523185880624 0.0065946899141205552256 -0.00012065009272080269359
6 8.459715183006415395e-08 0.43765832419088212185
4.173466317007961557 -2.8016935252076420326 -0.081737437087388009616
0.0041198995131368296857 0.0066275220486694394126 -0.000119701756809504006665
6 8.459715183006415395e-08 0.43765971211410006393
0.00038925687730393611812
6.39471595410062843 -7.621162747287802297 -0.121992225877669294154
0.0039680130835247464163 0.0035798698934692090544 -0.00022010758050265331019
7 1.2920249163736673626e-08 0.46960112247450473807
6.414531809550852337 -7.603234575912382276 -0.12309230194363039723
0.0039583234912346160553 0.003591394820962775982 -0.00021992254044702681153
7 1.2920249163736673626e-08 0.4696151691794380732
0.00016953449859497231466
14.793135356927480828 13.074218343364380601 -0.14311846037737518955
-0.0026297294662822792016 0.0027702756265410048361 4.4212949669357180555e-05
8 1.5243589003230834323e-08 0.78136567314580814177
14.779979482167510341 13.088063528768900667 -0.14289732557134240953
-0.0026326202792006140295 0.002767798188238951903 4.424098699891899271e-05
8 1.5243589003230834323e-08 0.7813830605782720197
0.000164587904124493665
29.568629894896030663 -4.5543028991960081697 -0.58771107137394917874
0.00046181040300440859715 0.0031288137434451902125 -7.498349850432879627e-05
29.57093474400743105 -4.53865809805519671 -0.5880859062837571205
0.00046012900387533010914 0.0031291067120909890273 -7.4950441013985698475e-05
48 changes: 24 additions & 24 deletions examples/rmvs_swifter_comparison/8pl_16tp_encounters/pl.swiftest.in
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
8
1 4.9125474498983623693e-11 0.001475124456355905224
1 4.9125474498983623693e-11 0.0014751244935834097723
1.6306381826061645943e-05
-0.30949970210807342674 0.1619004125820537876 0.041620272188990829754
-0.018820805516945871005 -0.023743802865467341506 -0.00021385162925667799668
2 7.243452483873646905e-10 0.006759069616556246028
-0.37723213134178928962 0.033583006382262102496 0.037347605390151236704
-0.008342765357522348782 -0.026815373891535949219 -0.0014259978126226569104
2 7.243452483873646905e-10 0.006759064884572926305
4.0453784346544178454e-05
-0.5567137338251560985 -0.46074173273652380134 0.02580196630219121906
0.012753121506668980284 -0.015678149412530151263 -0.0009510907726656827677
3 8.9970113821660187435e-10 0.010044908171483009529
-0.48772324783973242113 -0.53438159383885197595 0.020810210727290629623
0.014797158412775200664 -0.013730742274988789325 -0.0010423161661001279551
3 8.9970113821660187435e-10 0.01004492566381686821
4.25875607065040958e-05
0.6978790186886838498 -0.73607603319120218366 3.261671020506711323e-05
0.012205130808798069983 0.0117727888369263504476 -6.0385404652521189453e-07
4 9.549535102761465607e-11 0.0072466797341124641736
0.75635861236241797023 -0.674672320414933413 2.9482164814591560215e-05
0.0111724732704936106226 0.0127745538308708106445 -6.4922715710692383536e-07
4 9.549535102761465607e-11 0.007246661019460395855
2.265740805092889601e-05
-1.617661473167097963 0.38314370807747849534 0.04771055403546069218
-0.0027036789764029569086 -0.012421968497550240837 -0.00019400613558421780209
5 2.825345908631354893e-07 0.35527079166215922855
-1.6298746849997449715 0.3207423054955682029 0.04670239471945906301
-0.0021807443711779391643 -0.012535287802970449672 -0.00020920945169970240392
5 2.825345908631354893e-07 0.3552709189640263194
0.00046732617030490929307
4.1527454588897487753 -2.8347492039446908763 -0.081136554176388195336
0.0041683967523185880624 0.0065946899141205552256 -0.00012065009272080269359
6 8.459715183006415395e-08 0.43765832419088212185
4.173466317007961557 -2.8016935252076420326 -0.081737437087388009616
0.0041198995131368296857 0.0066275220486694394126 -0.000119701756809504006665
6 8.459715183006415395e-08 0.43765971211410006393
0.00038925687730393611812
6.39471595410062843 -7.621162747287802297 -0.121992225877669294154
0.0039680130835247464163 0.0035798698934692090544 -0.00022010758050265331019
7 1.2920249163736673626e-08 0.46960112247450473807
6.414531809550852337 -7.603234575912382276 -0.12309230194363039723
0.0039583234912346160553 0.003591394820962775982 -0.00021992254044702681153
7 1.2920249163736673626e-08 0.4696151691794380732
0.00016953449859497231466
14.793135356927480828 13.074218343364380601 -0.14311846037737518955
-0.0026297294662822792016 0.0027702756265410048361 4.4212949669357180555e-05
8 1.5243589003230834323e-08 0.78136567314580814177
14.779979482167510341 13.088063528768900667 -0.14289732557134240953
-0.0026326202792006140295 0.002767798188238951903 4.424098699891899271e-05
8 1.5243589003230834323e-08 0.7813830605782720197
0.000164587904124493665
29.568629894896030663 -4.5543028991960081697 -0.58771107137394917874
0.00046181040300440859715 0.0031288137434451902125 -7.498349850432879627e-05
29.57093474400743105 -4.53865809805519671 -0.5880859062837571205
0.00046012900387533010914 0.0031291067120909890273 -7.4950441013985698475e-05
64 changes: 32 additions & 32 deletions examples/rmvs_swifter_comparison/8pl_16tp_encounters/tp.in
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
16
101
-0.30947664140174180325 0.16192347328838543885 0.041620272188990829754
-0.01621725604493672035 -0.023743802865467341506 -0.00021385162925667799668
-0.37720907063545766613 0.033606067088593753744 0.037347605390151236704
-0.0057392158855131963913 -0.026815373891535949219 -0.0014259978126226569104
102
-0.30952276281440505024 0.16187735187572213635 0.041620272188990829754
-0.021424354988955021661 -0.023743802865467341506 -0.00021385162925667799668
-0.37725519204812091312 0.033559945675930451248 0.037347605390151236704
-0.010946314829531501173 -0.026815373891535949219 -0.0014259978126226569104
103
-0.55665652353468386693 -0.46068452244605162527 0.02580196630219121906
0.019100355212014374223 -0.015678149412530151263 -0.0009510907726656827677
-0.48766603754926024505 -0.53432438354837974437 0.020810210727290629623
0.021144392118120594604 -0.013730742274988789325 -0.0010423161661001279551
104
-0.5567709441156283301 -0.4607989430269959774 0.02580196630219121906
0.0064058878013235863447 -0.015678149412530151263 -0.0009510907726656827677
-0.4877804581302045972 -0.53443880412932420754 0.020810210727290629623
0.008449924707429806725 -0.013730742274988789325 -0.0010423161661001279551
105
0.6979392465946233637 -0.7360158052852626698 3.261671020506711323e-05
0.019099571043071944532 0.0117727888369263504476 -6.0385404652521189453e-07
0.7564188402683574841 -0.6746120925089938991 2.9482164814591560215e-05
0.018066913504767485171 0.0127745538308708106445 -6.4922715710692383536e-07
106
0.6978187907827443359 -0.73613626109714169754 3.261671020506711323e-05
0.005310690574524194567 0.0117727888369263504476 -6.0385404652521189453e-07
0.75629838445647845635 -0.67473254832087292687 2.9482164814591560215e-05
0.0042780330362197352065 0.0127745538308708106445 -6.4922715710692383536e-07
107
-1.6176294307533440886 0.38317575049123231423 0.04771055403546069218
0.00037580012182093606998 -0.012421968497550240837 -0.00019400613558421780209
-1.6298426425859910971 0.3207743479093220218 0.04670239471945906301
0.00089873472704595381427 -0.012535287802970449672 -0.00020920945169970240392
108
-1.6176935155808518374 0.38311166566372467646 0.04771055403546069218
-0.005783158074626849887 -0.012421968497550240837 -0.00019400613558421780209
-1.6299067274134988459 0.32071026308181438402 0.04670239471945906301
-0.005260223469401832143 -0.012535287802970449672 -0.00020920945169970240392
109
4.1534063578978459574 -2.834088304936593694 -0.081136554176388195336
0.041050613953966016978 0.0065946899141205552256 -0.00012065009272080269359
4.174127216016058739 -2.8010326261995448505 -0.081737437087388009616
0.041002116714784257734 0.0066275220486694394126 -0.000119701756809504006665
110
4.152084559881651593 -2.8354101029527880584 -0.081136554176388195336
-0.032713820449328842588 0.0065946899141205552256 -0.00012065009272080269359
4.1728054179998643747 -2.8023544242157392148 -0.081737437087388009616
-0.032762317688510601832 0.0066275220486694394126 -0.000119701756809504006665
111
6.395266446455758924 -7.620612254932671803 -0.121992225877669294154
0.026081181967058334609 0.0035798698934692090544 -0.00022010758050265331019
6.415082301905982831 -7.602684083557251782 -0.12309230194363039723
0.026071492374768204248 0.003591394820962775982 -0.00021992254044702681153
112
6.394165461745497936 -7.621713239642932791 -0.121992225877669294154
-0.01814515580000884351 0.0035798698934692090544 -0.00022010758050265331019
6.413981317195721843 -7.60378506826751277 -0.12309230194363039723
-0.018154845392298973872 0.003591394820962775982 -0.00021992254044702681153
113
14.793375114914683266 13.074458101351583039 -0.14311846037737518955
0.0104650340723796142495 0.0027702756265410048361 4.4212949669357180555e-05
14.780219240154712779 13.088303286756103105 -0.14289732557134240953
0.010462143259461278988 0.002767798188238951903 4.424098699891899271e-05
114
14.79289559894027839 13.073978585377178163 -0.14311846037737518955
-0.015724493004944172653 0.0027702756265410048361 4.4212949669357180555e-05
14.779739724180307903 13.087823770781698229 -0.14289732557134240953
-0.015727383817862507914 0.002767798188238951903 4.424098699891899271e-05
115
29.568862657342247502 -4.5540701367497931074 -0.58771107137394917874
0.0148974462162825404404 0.0031288137434451902125 -7.498349850432879627e-05
29.571167506453647889 -4.538425335608981648 -0.5880859062837571205
0.01489576481715346179 0.0031291067120909890273 -7.4950441013985698475e-05
116
29.568397132449813824 -4.554535661642223232 -0.58771107137394917874
-0.013973825410273721728 0.0031288137434451902125 -7.498349850432879627e-05
29.570701981561214211 -4.5388908605014117725 -0.5880859062837571205
-0.013975506809402800379 0.0031291067120909890273 -7.4950441013985698475e-05
1 change: 1 addition & 0 deletions examples/symba_energy_momentum/param.supercatastrophic_headon.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ CHK_RMIN 0.005
CHK_RMAX 1e6
CHK_EJECT -1.0 ! ignore this check
CHK_QMIN -1.0 ! ignore this check
DISCARD_OUT discard.supercatastrophic_headon.out
ENC_OUT enc.supercatastrophic_headon.dat
EXTRA_FORCE no ! no extra user-defined forces
BIG_DISCARD no ! output all planets if anything discarded
Expand Down
1 change: 0 additions & 1 deletion examples/symba_mars_disk/param.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ CHK_EJECT 3389500000.0
CHK_QMIN 3389500.0
CHK_QMIN_COORD HELIO
CHK_QMIN_RANGE 3389500.0 338950000000.0
ENC_OUT /dev/null
EXTRA_FORCE no
BIG_DISCARD no
RHILL_PRESENT yes
Expand Down
Loading

0 comments on commit 9ad34a3

Please sign in to comment.