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

Commit

Permalink
Fixed namespace collision between RMVS and SyMBA variable NTENC
Browse files Browse the repository at this point in the history
  • Loading branch information
@daminton
daminton committed Jul 13, 2021
1 parent dffc972 commit 5c6df05
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
12 changes: 6 additions & 6 deletions examples/rmvs_swifter_comparison/9pl_18tp_encounters/swiftest_rmvs_vs_swifter_rmvs.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,9 +461,9 @@
"array([ 1, 2, 3, 4, 5, 6, 7, 8, 101, 102, 103, 104, 105, 106,\n",
" 107, 108, 109, 110, 111, 112, 113, 114, 115, 116])\n",
"Coordinates:\n",
" * id (id) int64 1 2 3 4 5 6 7 8 101 ... 109 110 111 112 113 114 115 116</pre><div class='xr-wrap' hidden><div class='xr-header'><div class='xr-obj-type'>xarray.DataArray</div><div class='xr-array-name'>'id'</div><ul class='xr-dim-list'><li><span class='xr-has-index'>id</span>: 24</li></ul></div><ul class='xr-sections'><li class='xr-section-item'><div class='xr-array-wrap'><input id='section-38ea691e-fa68-4063-b10c-dfd7d4a10e22' class='xr-array-in' type='checkbox' checked><label for='section-38ea691e-fa68-4063-b10c-dfd7d4a10e22' 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>1 2 3 4 5 6 7 8 101 102 ... 107 108 109 110 111 112 113 114 115 116</span></div><div class='xr-array-data'><pre>array([ 1, 2, 3, 4, 5, 6, 7, 8, 101, 102, 103, 104, 105, 106,\n",
" 107, 108, 109, 110, 111, 112, 113, 114, 115, 116])</pre></div></div></li><li class='xr-section-item'><input id='section-422f26f9-508f-4cbf-a669-1277d780ddaa' class='xr-section-summary-in' type='checkbox' checked><label for='section-422f26f9-508f-4cbf-a669-1277d780ddaa' class='xr-section-summary' >Coordinates: <span>(1)</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 class='xr-has-index'>id</span></div><div class='xr-var-dims'>(id)</div><div class='xr-var-dtype'>int64</div><div class='xr-var-preview xr-preview'>1 2 3 4 5 6 ... 112 113 114 115 116</div><input id='attrs-d2b04dd5-4e48-437c-af4d-8c2bea8dff59' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-d2b04dd5-4e48-437c-af4d-8c2bea8dff59' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-73fd9c9f-624b-4220-8421-411d15bfc4fe' class='xr-var-data-in' type='checkbox'><label for='data-73fd9c9f-624b-4220-8421-411d15bfc4fe' 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([ 1, 2, 3, 4, 5, 6, 7, 8, 101, 102, 103, 104, 105, 106,\n",
" 107, 108, 109, 110, 111, 112, 113, 114, 115, 116])</pre></div></li></ul></div></li><li class='xr-section-item'><input id='section-921f6eba-15ca-4482-87fb-59648441c249' class='xr-section-summary-in' type='checkbox' disabled ><label for='section-921f6eba-15ca-4482-87fb-59648441c249' 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>"
" * id (id) int64 1 2 3 4 5 6 7 8 101 ... 109 110 111 112 113 114 115 116</pre><div class='xr-wrap' hidden><div class='xr-header'><div class='xr-obj-type'>xarray.DataArray</div><div class='xr-array-name'>'id'</div><ul class='xr-dim-list'><li><span class='xr-has-index'>id</span>: 24</li></ul></div><ul class='xr-sections'><li class='xr-section-item'><div class='xr-array-wrap'><input id='section-6f0798cf-d700-4f18-8113-243687413171' class='xr-array-in' type='checkbox' checked><label for='section-6f0798cf-d700-4f18-8113-243687413171' 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>1 2 3 4 5 6 7 8 101 102 ... 107 108 109 110 111 112 113 114 115 116</span></div><div class='xr-array-data'><pre>array([ 1, 2, 3, 4, 5, 6, 7, 8, 101, 102, 103, 104, 105, 106,\n",
" 107, 108, 109, 110, 111, 112, 113, 114, 115, 116])</pre></div></div></li><li class='xr-section-item'><input id='section-c5e0919b-05dd-4489-bdb7-53d6736199d1' class='xr-section-summary-in' type='checkbox' checked><label for='section-c5e0919b-05dd-4489-bdb7-53d6736199d1' class='xr-section-summary' >Coordinates: <span>(1)</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 class='xr-has-index'>id</span></div><div class='xr-var-dims'>(id)</div><div class='xr-var-dtype'>int64</div><div class='xr-var-preview xr-preview'>1 2 3 4 5 6 ... 112 113 114 115 116</div><input id='attrs-a73a685e-3486-4d4f-803b-ea77d839c338' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-a73a685e-3486-4d4f-803b-ea77d839c338' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-2b28e3de-84e8-4882-a575-095f7c6b9cc8' class='xr-var-data-in' type='checkbox'><label for='data-2b28e3de-84e8-4882-a575-095f7c6b9cc8' 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([ 1, 2, 3, 4, 5, 6, 7, 8, 101, 102, 103, 104, 105, 106,\n",
" 107, 108, 109, 110, 111, 112, 113, 114, 115, 116])</pre></div></li></ul></div></li><li class='xr-section-item'><input id='section-35cb2c1d-82ce-456f-a05f-a21672bd1385' class='xr-section-summary-in' type='checkbox' disabled ><label for='section-35cb2c1d-82ce-456f-a05f-a21672bd1385' 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 'id' (id: 24)>\n",
Expand Down Expand Up @@ -846,10 +846,10 @@
" 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.])\n",
"Coordinates:\n",
" id int64 4\n",
" * time (d) (time (d)) float64 0.0 11.0 22.0 33.0 ... 330.0 341.0 352.0 363.0</pre><div class='xr-wrap' hidden><div class='xr-header'><div class='xr-obj-type'>xarray.DataArray</div><div class='xr-array-name'>'px'</div><ul class='xr-dim-list'><li><span class='xr-has-index'>time (d)</span>: 34</li></ul></div><ul class='xr-sections'><li class='xr-section-item'><div class='xr-array-wrap'><input id='section-0f123cd9-e819-4ef3-a897-d5202b244066' class='xr-array-in' type='checkbox' checked><label for='section-0f123cd9-e819-4ef3-a897-d5202b244066' 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 0.0</span></div><div class='xr-array-data'><pre>array([0., 0., 0., 0., 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., 0., 0., 0., 0.])</pre></div></div></li><li class='xr-section-item'><input id='section-deafe412-130b-448e-b219-f5c2076d57b4' class='xr-section-summary-in' type='checkbox' checked><label for='section-deafe412-130b-448e-b219-f5c2076d57b4' 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'>int64</div><div class='xr-var-preview xr-preview'>4</div><input id='attrs-f56aa9ca-ad8f-4ab2-897d-066903932c1b' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-f56aa9ca-ad8f-4ab2-897d-066903932c1b' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-58c2b934-7264-490f-9f25-0a2f8bde2047' class='xr-var-data-in' type='checkbox'><label for='data-58c2b934-7264-490f-9f25-0a2f8bde2047' 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(4)</pre></div></li><li class='xr-var-item'><div class='xr-var-name'><span class='xr-has-index'>time (d)</span></div><div class='xr-var-dims'>(time (d))</div><div class='xr-var-dtype'>float64</div><div class='xr-var-preview xr-preview'>0.0 11.0 22.0 ... 341.0 352.0 363.0</div><input id='attrs-1c129537-6880-4f4f-a786-f9f3e0da1062' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-1c129537-6880-4f4f-a786-f9f3e0da1062' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-f80a2113-dce8-4194-980b-b374d05cc1f8' class='xr-var-data-in' type='checkbox'><label for='data-f80a2113-dce8-4194-980b-b374d05cc1f8' 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., 11., 22., 33., 44., 55., 66., 77., 88., 99., 110., 121.,\n",
" * time (d) (time (d)) float64 0.0 11.0 22.0 33.0 ... 330.0 341.0 352.0 363.0</pre><div class='xr-wrap' hidden><div class='xr-header'><div class='xr-obj-type'>xarray.DataArray</div><div class='xr-array-name'>'px'</div><ul class='xr-dim-list'><li><span class='xr-has-index'>time (d)</span>: 34</li></ul></div><ul class='xr-sections'><li class='xr-section-item'><div class='xr-array-wrap'><input id='section-90877911-fb7b-4c19-96b7-1909e81ede9d' class='xr-array-in' type='checkbox' checked><label for='section-90877911-fb7b-4c19-96b7-1909e81ede9d' 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 0.0</span></div><div class='xr-array-data'><pre>array([0., 0., 0., 0., 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., 0., 0., 0., 0.])</pre></div></div></li><li class='xr-section-item'><input id='section-100bc5a7-d865-47e0-bbbe-203b1b0966aa' class='xr-section-summary-in' type='checkbox' checked><label for='section-100bc5a7-d865-47e0-bbbe-203b1b0966aa' 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'>int64</div><div class='xr-var-preview xr-preview'>4</div><input id='attrs-88b7cbd1-50b0-4591-a442-2e1ffea5e62f' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-88b7cbd1-50b0-4591-a442-2e1ffea5e62f' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-17ac65f5-1b18-47c1-9984-aa9435c1910d' class='xr-var-data-in' type='checkbox'><label for='data-17ac65f5-1b18-47c1-9984-aa9435c1910d' 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(4)</pre></div></li><li class='xr-var-item'><div class='xr-var-name'><span class='xr-has-index'>time (d)</span></div><div class='xr-var-dims'>(time (d))</div><div class='xr-var-dtype'>float64</div><div class='xr-var-preview xr-preview'>0.0 11.0 22.0 ... 341.0 352.0 363.0</div><input id='attrs-8f67fedb-a812-4a3e-8598-953419e7b239' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-8f67fedb-a812-4a3e-8598-953419e7b239' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-e94f37f1-6163-4df3-b38e-27808e7dc067' class='xr-var-data-in' type='checkbox'><label for='data-e94f37f1-6163-4df3-b38e-27808e7dc067' 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., 11., 22., 33., 44., 55., 66., 77., 88., 99., 110., 121.,\n",
" 132., 143., 154., 165., 176., 187., 198., 209., 220., 231., 242., 253.,\n",
" 264., 275., 286., 297., 308., 319., 330., 341., 352., 363.])</pre></div></li></ul></div></li><li class='xr-section-item'><input id='section-d1987832-8127-4485-9a06-f2d59fef0773' class='xr-section-summary-in' type='checkbox' disabled ><label for='section-d1987832-8127-4485-9a06-f2d59fef0773' 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>"
" 264., 275., 286., 297., 308., 319., 330., 341., 352., 363.])</pre></div></li></ul></div></li><li class='xr-section-item'><input id='section-01673a12-0d6d-41bd-966d-8090e3bdfdd5' class='xr-section-summary-in' type='checkbox' disabled ><label for='section-01673a12-0d6d-41bd-966d-8090e3bdfdd5' 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 'px' (time (d): 34)>\n",
Expand Down
12 changes: 6 additions & 6 deletions src/modules/rmvs_classes.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ module rmvs_classes
implicit none

public
integer(I4B), parameter :: NTENC = 10
integer(I4B), parameter :: NTPHENC = 3
integer(I4B), parameter :: NTPENC = NTENC * NTPHENC
real(DP), parameter :: RHSCALE = 3.5_DP
real(DP), parameter :: RHPSCALE = 1.0_DP
real(DP), parameter :: FACQDT = 2.0_DP
integer(I4B), private, parameter :: NTENC = 10
integer(I4B), private, parameter :: NTPHENC = 3
integer(I4B), private, parameter :: NTPENC = NTENC * NTPHENC
real(DP), private, parameter :: RHSCALE = 3.5_DP
real(DP), private, parameter :: RHPSCALE = 1.0_DP
real(DP), private, parameter :: FACQDT = 2.0_DP

!********************************************************************************************************************************
! rmvs_nbody_system class definitions and method interfaces
Expand Down
8 changes: 4 additions & 4 deletions src/modules/symba.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ module symba
use helio
implicit none

integer(I4B), public, parameter :: NENMAX = 32767
integer(I4B), public, parameter :: NTENC = 3
real(DP), public, parameter :: RHSCALE = 6.5_DP
real(DP), public, parameter :: RSHELL = 0.48075_DP
integer(I4B), private, parameter :: NENMAX = 32767
integer(I4B), private, parameter :: NTENC = 3
real(DP), private, parameter :: RHSCALE = 6.5_DP
real(DP), private, parameter :: RSHELL = 0.48075_DP

!********************************************************************************************************************************
! symba_tp class definitions and method interfaces
Expand Down
8 changes: 4 additions & 4 deletions src/modules/symba_classes.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ module symba_classes
use helio_classes, only : helio_cb, helio_pl, helio_tp, helio_nbody_system
implicit none

integer(I4B), parameter :: NENMAX = 32767
integer(I4B), parameter :: NTENC = 3
real(DP), parameter :: RHSCALE = 6.5_DP
real(DP), parameter :: RSHELL = 0.48075_DP
!integer(I4B), parameter :: NENMAX = 32767
!integer(I4B), parameter :: NTENC = 3
!real(DP), parameter :: RHSCALE = 6.5_DP
!real(DP), parameter :: RSHELL = 0.48075_DP
character(*), parameter :: PARTICLE_OUTFILE = 'particle.dat'
integer(I4B), parameter :: PARTICLEUNIT = 44 !! File unit number for the binary particle info output file

Expand Down

0 comments on commit 5c6df05

Please sign in to comment.