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

Commit

Permalink
Merge branch 'debug' into OOPTides
Browse files Browse the repository at this point in the history
  • Loading branch information
@daminton
daminton committed Aug 6, 2021
2 parents 27f9da5 + 7f1f5bd commit 1836096
Show file tree
Hide file tree
Showing 12 changed files with 120 additions and 115 deletions.
2 changes: 2 additions & 0 deletions examples/symba_swifter_comparison/1pl_1tp_encounter/init_cond.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
swiftest_cb = "cb.swiftest.in"
swiftest_bin = "bin.swiftest.dat"
swiftest_enc = "enc.swiftest.dat"
swiftest_dis = "discard.swiftest.dat"

MU2KG = swiftest.MSun
TU2S = swiftest.YR2S
Expand Down Expand Up @@ -168,6 +169,7 @@
print(f'CHK_QMIN_COORD HELIO')
print(f'CHK_QMIN_RANGE {rmin} {rmax}')
print(f'ENC_OUT {swiftest_enc}')
print(f'DISCARD_OUT {swiftest_dis}')
print(f'EXTRA_FORCE no')
print(f'BIG_DISCARD no')
print(f'ROTATION no')
Expand Down
1 change: 1 addition & 0 deletions examples/symba_swifter_comparison/1pl_1tp_encounter/param.swiftest.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ CHK_QMIN 0.004650467260962157
CHK_QMIN_COORD HELIO
CHK_QMIN_RANGE 0.004650467260962157 1000.0
ENC_OUT enc.swiftest.dat
DISCARD_OUT discard.swiftest.dat
EXTRA_FORCE no
BIG_DISCARD no
ROTATION no
Expand Down
10 changes: 5 additions & 5 deletions examples/symba_swifter_comparison/1pl_1tp_encounter/swiftest_vs_swifter.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@
{
"data": {
"text/plain": [
"[<matplotlib.lines.Line2D at 0x2b31ee4cdf90>,\n",
" <matplotlib.lines.Line2D at 0x2b31ee4b2ad0>]"
"[<matplotlib.lines.Line2D at 0x2b7e02a67990>,\n",
" <matplotlib.lines.Line2D at 0x2b7e027a4610>]"
]
},
"execution_count": 6,
Expand Down Expand Up @@ -484,7 +484,7 @@
" 0., 0., 0., nan])\n",
"Coordinates:\n",
" id float64 100.0\n",
" * time (y) (time (y)) float64 0.0 0.0006845 0.001369 ... 0.1342 0.1348 0.1355</pre><div class='xr-wrap' hidden><div class='xr-header'><div class='xr-obj-type'>xarray.DataArray</div><div class='xr-array-name'>'vx'</div><ul class='xr-dim-list'><li><span class='xr-has-index'>time (y)</span>: 199</li></ul></div><ul class='xr-sections'><li class='xr-section-item'><div class='xr-array-wrap'><input id='section-5ea19fa3-f091-4c77-92fb-79cb8cae80c4' class='xr-array-in' type='checkbox' checked><label for='section-5ea19fa3-f091-4c77-92fb-79cb8cae80c4' title='Show/hide data repr'><svg class='icon xr-icon-database'><use xlink:href='#icon-database'></use></svg></label><div class='xr-array-preview xr-preview'><span>0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 ... 0.0 0.0 0.0 0.0 0.0 0.0 0.0 nan</span></div><div class='xr-array-data'><pre>array([ 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.,\n",
" * time (y) (time (y)) float64 0.0 0.0006845 0.001369 ... 0.1342 0.1348 0.1355</pre><div class='xr-wrap' hidden><div class='xr-header'><div class='xr-obj-type'>xarray.DataArray</div><div class='xr-array-name'>'vx'</div><ul class='xr-dim-list'><li><span class='xr-has-index'>time (y)</span>: 199</li></ul></div><ul class='xr-sections'><li class='xr-section-item'><div class='xr-array-wrap'><input id='section-a199c89d-3e81-4f8e-ba29-4020926af36c' class='xr-array-in' type='checkbox' checked><label for='section-a199c89d-3e81-4f8e-ba29-4020926af36c' title='Show/hide data repr'><svg class='icon xr-icon-database'><use xlink:href='#icon-database'></use></svg></label><div class='xr-array-preview xr-preview'><span>0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 ... 0.0 0.0 0.0 0.0 0.0 0.0 0.0 nan</span></div><div class='xr-array-data'><pre>array([ 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.,\n",
" 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.,\n",
" 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.,\n",
" 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.,\n",
Expand All @@ -499,7 +499,7 @@
" 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.,\n",
" 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.,\n",
" 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.,\n",
" 0., 0., 0., nan])</pre></div></div></li><li class='xr-section-item'><input id='section-9665fe02-da60-4c9d-9693-d803a5b3f8bf' class='xr-section-summary-in' type='checkbox' checked><label for='section-9665fe02-da60-4c9d-9693-d803a5b3f8bf' class='xr-section-summary' >Coordinates: <span>(2)</span></label><div class='xr-section-inline-details'></div><div class='xr-section-details'><ul class='xr-var-list'><li class='xr-var-item'><div class='xr-var-name'><span>id</span></div><div class='xr-var-dims'>()</div><div class='xr-var-dtype'>float64</div><div class='xr-var-preview xr-preview'>100.0</div><input id='attrs-9387ac8f-7a2b-4643-ba54-02a51d1940dd' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-9387ac8f-7a2b-4643-ba54-02a51d1940dd' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-7c2f57de-ebd8-4751-937a-2b02ff8b33b2' class='xr-var-data-in' type='checkbox'><label for='data-7c2f57de-ebd8-4751-937a-2b02ff8b33b2' title='Show/Hide data repr'><svg class='icon xr-icon-database'><use xlink:href='#icon-database'></use></svg></label><div class='xr-var-attrs'><dl class='xr-attrs'></dl></div><div class='xr-var-data'><pre>array(100.)</pre></div></li><li class='xr-var-item'><div class='xr-var-name'><span class='xr-has-index'>time (y)</span></div><div class='xr-var-dims'>(time (y))</div><div class='xr-var-dtype'>float64</div><div class='xr-var-preview xr-preview'>0.0 0.0006845 ... 0.1348 0.1355</div><input id='attrs-ba2fd59d-8e4b-4ef1-99b5-211b6423532b' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-ba2fd59d-8e4b-4ef1-99b5-211b6423532b' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-8c20b78e-5a14-4a1e-9986-ec179f285718' class='xr-var-data-in' type='checkbox'><label for='data-8c20b78e-5a14-4a1e-9986-ec179f285718' title='Show/Hide data repr'><svg class='icon xr-icon-database'><use xlink:href='#icon-database'></use></svg></label><div class='xr-var-attrs'><dl class='xr-attrs'></dl></div><div class='xr-var-data'><pre>array([0. , 0.000684, 0.001369, 0.002053, 0.002738, 0.003422, 0.004107,\n",
" 0., 0., 0., nan])</pre></div></div></li><li class='xr-section-item'><input id='section-d0848dfc-851f-4956-a0b1-f5a1f32a6699' class='xr-section-summary-in' type='checkbox' checked><label for='section-d0848dfc-851f-4956-a0b1-f5a1f32a6699' class='xr-section-summary' >Coordinates: <span>(2)</span></label><div class='xr-section-inline-details'></div><div class='xr-section-details'><ul class='xr-var-list'><li class='xr-var-item'><div class='xr-var-name'><span>id</span></div><div class='xr-var-dims'>()</div><div class='xr-var-dtype'>float64</div><div class='xr-var-preview xr-preview'>100.0</div><input id='attrs-4a705fc7-d8be-471b-a559-c91f0c318115' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-4a705fc7-d8be-471b-a559-c91f0c318115' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-d64e78bb-8c03-42a2-97fa-7b48ebad1557' class='xr-var-data-in' type='checkbox'><label for='data-d64e78bb-8c03-42a2-97fa-7b48ebad1557' title='Show/Hide data repr'><svg class='icon xr-icon-database'><use xlink:href='#icon-database'></use></svg></label><div class='xr-var-attrs'><dl class='xr-attrs'></dl></div><div class='xr-var-data'><pre>array(100.)</pre></div></li><li class='xr-var-item'><div class='xr-var-name'><span class='xr-has-index'>time (y)</span></div><div class='xr-var-dims'>(time (y))</div><div class='xr-var-dtype'>float64</div><div class='xr-var-preview xr-preview'>0.0 0.0006845 ... 0.1348 0.1355</div><input id='attrs-731d066a-8ede-44f8-8890-0a445c0483e2' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-731d066a-8ede-44f8-8890-0a445c0483e2' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-ae24cb00-0707-4ad7-8cfe-dae84b6f7fb5' class='xr-var-data-in' type='checkbox'><label for='data-ae24cb00-0707-4ad7-8cfe-dae84b6f7fb5' title='Show/Hide data repr'><svg class='icon xr-icon-database'><use xlink:href='#icon-database'></use></svg></label><div class='xr-var-attrs'><dl class='xr-attrs'></dl></div><div class='xr-var-data'><pre>array([0. , 0.000684, 0.001369, 0.002053, 0.002738, 0.003422, 0.004107,\n",
" 0.004791, 0.005476, 0.00616 , 0.006845, 0.007529, 0.008214, 0.008898,\n",
" 0.009582, 0.010267, 0.010951, 0.011636, 0.01232 , 0.013005, 0.013689,\n",
" 0.014374, 0.015058, 0.015743, 0.016427, 0.017112, 0.017796, 0.01848 ,\n",
Expand Down Expand Up @@ -527,7 +527,7 @@
" 0.119781, 0.120465, 0.12115 , 0.121834, 0.122519, 0.123203, 0.123888,\n",
" 0.124572, 0.125257, 0.125941, 0.126626, 0.12731 , 0.127995, 0.128679,\n",
" 0.129363, 0.130048, 0.130732, 0.131417, 0.132101, 0.132786, 0.13347 ,\n",
" 0.134155, 0.134839, 0.135524])</pre></div></li></ul></div></li><li class='xr-section-item'><input id='section-c34113fa-6461-4cdd-948c-ef723ad7c9c2' class='xr-section-summary-in' type='checkbox' disabled ><label for='section-c34113fa-6461-4cdd-948c-ef723ad7c9c2' class='xr-section-summary' title='Expand/collapse section'>Attributes: <span>(0)</span></label><div class='xr-section-inline-details'></div><div class='xr-section-details'><dl class='xr-attrs'></dl></div></li></ul></div></div>"
" 0.134155, 0.134839, 0.135524])</pre></div></li></ul></div></li><li class='xr-section-item'><input id='section-d5c33d5a-f466-4abf-9db4-2007c9b775a1' class='xr-section-summary-in' type='checkbox' disabled ><label for='section-d5c33d5a-f466-4abf-9db4-2007c9b775a1' class='xr-section-summary' title='Expand/collapse section'>Attributes: <span>(0)</span></label><div class='xr-section-inline-details'></div><div class='xr-section-details'><dl class='xr-attrs'></dl></div></li></ul></div></div>"
],
"text/plain": [
"<xarray.DataArray 'vx' (time (y): 199)>\n",
Expand Down
4 changes: 2 additions & 2 deletions examples/symba_swifter_comparison/8pl_16tp_encounters/cb.swiftest.in
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0
0.00029591220819207774
0.004650467260962157
0.0
0.0
4.7535806948127355e-12
-2.2473967953572827e-18
2 changes: 2 additions & 0 deletions examples/symba_swifter_comparison/8pl_16tp_encounters/init_cond.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/symba_swifter_comparison/8pl_16tp_encounters/param.swifter.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions examples/symba_swifter_comparison/8pl_16tp_encounters/param.swiftest.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -31,6 +32,4 @@ ROTATION NO
TIDES NO
ENERGY NO
GR NO
YARKOVSKY NO
YORP NO
MTINY 1e-12
48 changes: 24 additions & 24 deletions examples/symba_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.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
48 changes: 24 additions & 24 deletions examples/symba_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.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
Loading

0 comments on commit 1836096

Please sign in to comment.