Fixed initial conditions generator for SyMBA 1pl_1tp test

MintonGroup · Aug 6, 2021 · e39c330 · e39c330
1 parent 0248506
commit e39c330
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/examples/symba_swifter_comparison/1pl_1tp_encounter/init_cond.py b/examples/symba_swifter_comparison/1pl_1tp_encounter/init_cond.py
@@ -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
@@ -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')

diff --git a/examples/symba_swifter_comparison/1pl_1tp_encounter/param.swiftest.in b/examples/symba_swifter_comparison/1pl_1tp_encounter/param.swiftest.in
@@ -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

diff --git a/examples/symba_swifter_comparison/1pl_1tp_encounter/swiftest_vs_swifter.ipynb b/examples/symba_swifter_comparison/1pl_1tp_encounter/swiftest_vs_swifter.ipynb
@@ -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,
@@ -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",
@@ -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",
@@ -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",