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

Commit

Permalink
Fixed problems involving fill, spill, append, and resize methods on p…
Browse files Browse the repository at this point in the history 
…article info objects using a set of new copy subroutines. Testing seems to indicate that it is finally working
  • Loading branch information
@daminton
daminton committed Aug 28, 2021
1 parent aa003bf commit 76ddac9
Show file tree
Hide file tree
Showing 11 changed files with 1,717 additions and 1,601 deletions.
2,992 changes: 1,496 additions & 1,496 deletions examples/symba_mars_disk/mars.in
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/symba_mars_disk/param.in
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
!Parameter file for the SyMBA-RINGMOONS test
T0 0.0
TSTOP 10000.0
TSTOP 100000.0
DT 600.0
CB_IN cb.in
PL_IN mars.in
Expand Down
33 changes: 18 additions & 15 deletions examples/symba_mars_disk/testnetcdf.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": 3,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -405,33 +405,36 @@
" stroke: currentColor;\n",
" fill: currentColor;\n",
"}\n",
"</style><pre class='xr-text-repr-fallback'>&lt;xarray.DataArray &#x27;name&#x27; (id: 1521)&gt;\n",
"array([&#x27;Mars&#x27;, &#x27;Body2&#x27;, &#x27;Body3&#x27;, ..., &#x27;UNNAMED&#x27;, &#x27;UNNAMED&#x27;, &#x27;UNNAMED&#x27;],\n",
" dtype=&#x27;&lt;U15&#x27;)\n",
"</style><pre class='xr-text-repr-fallback'>&lt;xarray.DataArray &#x27;origin_type&#x27; (id: 1521)&gt;\n",
"array([&#x27;Initial conditions&#x27;, &#x27;Initial conditions&#x27;, &#x27;Initial conditions&#x27;,\n",
" ..., &#x27;Supercatastrophic&#x27;, &#x27;Supercatastrophic&#x27;, &#x27;Supercatastrophic&#x27;],\n",
" dtype=&#x27;&lt;U18&#x27;)\n",
"Coordinates:\n",
" * id (id) int32 0 1 2 3 4 5 6 7 ... 1514 1515 1516 1517 1518 1519 1520</pre><div class='xr-wrap' hidden><div class='xr-header'><div class='xr-obj-type'>xarray.DataArray</div><div class='xr-array-name'>'name'</div><ul class='xr-dim-list'><li><span class='xr-has-index'>id</span>: 1521</li></ul></div><ul class='xr-sections'><li class='xr-section-item'><div class='xr-array-wrap'><input id='section-fd42189d-be65-4f30-8b6f-44336a8ae934' class='xr-array-in' type='checkbox' checked><label for='section-fd42189d-be65-4f30-8b6f-44336a8ae934' 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>&#x27;Mars&#x27; &#x27;Body2&#x27; &#x27;Body3&#x27; &#x27;Body4&#x27; ... &#x27;UNNAMED&#x27; &#x27;UNNAMED&#x27; &#x27;UNNAMED&#x27;</span></div><div class='xr-array-data'><pre>array([&#x27;Mars&#x27;, &#x27;Body2&#x27;, &#x27;Body3&#x27;, ..., &#x27;UNNAMED&#x27;, &#x27;UNNAMED&#x27;, &#x27;UNNAMED&#x27;],\n",
" dtype=&#x27;&lt;U15&#x27;)</pre></div></div></li><li class='xr-section-item'><input id='section-c3403c70-dcfb-4729-af60-9e4b16107fe6' class='xr-section-summary-in' type='checkbox' checked><label for='section-c3403c70-dcfb-4729-af60-9e4b16107fe6' 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'>int32</div><div class='xr-var-preview xr-preview'>0 1 2 3 4 ... 1517 1518 1519 1520</div><input id='attrs-a3659a13-f1b4-4e97-9e24-d4258b156b04' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-a3659a13-f1b4-4e97-9e24-d4258b156b04' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-017a187a-a23d-40b9-9d64-78c5880fe044' class='xr-var-data-in' type='checkbox'><label for='data-017a187a-a23d-40b9-9d64-78c5880fe044' 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, 1, 2, ..., 1518, 1519, 1520], dtype=int32)</pre></div></li></ul></div></li><li class='xr-section-item'><input id='section-ba16413b-a131-42bf-92c3-18eb8be5a187' class='xr-section-summary-in' type='checkbox' disabled ><label for='section-ba16413b-a131-42bf-92c3-18eb8be5a187' 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) int32 0 1 2 3 4 5 6 7 ... 1514 1515 1516 1517 1518 1519 1520</pre><div class='xr-wrap' hidden><div class='xr-header'><div class='xr-obj-type'>xarray.DataArray</div><div class='xr-array-name'>'origin_type'</div><ul class='xr-dim-list'><li><span class='xr-has-index'>id</span>: 1521</li></ul></div><ul class='xr-sections'><li class='xr-section-item'><div class='xr-array-wrap'><input id='section-c153e8ba-ab4a-43b9-a848-889ec7cbc01f' class='xr-array-in' type='checkbox' checked><label for='section-c153e8ba-ab4a-43b9-a848-889ec7cbc01f' 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>&#x27;Initial conditions&#x27; &#x27;Initial conditions&#x27; ... &#x27;Supercatastrophic&#x27;</span></div><div class='xr-array-data'><pre>array([&#x27;Initial conditions&#x27;, &#x27;Initial conditions&#x27;, &#x27;Initial conditions&#x27;,\n",
" ..., &#x27;Supercatastrophic&#x27;, &#x27;Supercatastrophic&#x27;, &#x27;Supercatastrophic&#x27;],\n",
" dtype=&#x27;&lt;U18&#x27;)</pre></div></div></li><li class='xr-section-item'><input id='section-7c76bcd6-3fe3-4307-baa6-ac24afde34da' class='xr-section-summary-in' type='checkbox' checked><label for='section-7c76bcd6-3fe3-4307-baa6-ac24afde34da' 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'>int32</div><div class='xr-var-preview xr-preview'>0 1 2 3 4 ... 1517 1518 1519 1520</div><input id='attrs-71fee60c-896c-414f-be77-298d92df0ccf' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-71fee60c-896c-414f-be77-298d92df0ccf' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-2de9dc79-c3d7-4c4d-ace1-52658484ce12' class='xr-var-data-in' type='checkbox'><label for='data-2de9dc79-c3d7-4c4d-ace1-52658484ce12' 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, 1, 2, ..., 1518, 1519, 1520], dtype=int32)</pre></div></li></ul></div></li><li class='xr-section-item'><input id='section-f38b70eb-f1ba-4f6d-8f99-e2d421b8d92a' class='xr-section-summary-in' type='checkbox' disabled ><label for='section-f38b70eb-f1ba-4f6d-8f99-e2d421b8d92a' 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 'name' (id: 1521)>\n",
"array(['Mars', 'Body2', 'Body3', ..., 'UNNAMED', 'UNNAMED', 'UNNAMED'],\n",
" dtype='<U15')\n",
"<xarray.DataArray 'origin_type' (id: 1521)>\n",
"array(['Initial conditions', 'Initial conditions', 'Initial conditions',\n",
" ..., 'Supercatastrophic', 'Supercatastrophic', 'Supercatastrophic'],\n",
" dtype='<U18')\n",
"Coordinates:\n",
" * id (id) int32 0 1 2 3 4 5 6 7 ... 1514 1515 1516 1517 1518 1519 1520"
]
},
"execution_count": 6,
"execution_count": 3,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"sim.ds['name']"
"sim.ds['origin_type']"
]
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": 4,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -440,7 +443,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": 5,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -800,7 +803,7 @@
"</style><pre class='xr-text-repr-fallback'>&lt;xarray.DataArray &#x27;name&#x27; ()&gt;\n",
"array(b&#x27;1322&#x27;, dtype=&#x27;|S32&#x27;)\n",
"Coordinates:\n",
" id int32 1321</pre><div class='xr-wrap' hidden><div class='xr-header'><div class='xr-obj-type'>xarray.DataArray</div><div class='xr-array-name'>'name'</div></div><ul class='xr-sections'><li class='xr-section-item'><div class='xr-array-wrap'><input id='section-87d3e1b3-5d0a-4369-88b8-ae2c3c3d1331' class='xr-array-in' type='checkbox' checked><label for='section-87d3e1b3-5d0a-4369-88b8-ae2c3c3d1331' 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>b&#x27;1322&#x27;</span></div><div class='xr-array-data'><pre>array(b&#x27;1322&#x27;, dtype=&#x27;|S32&#x27;)</pre></div></div></li><li class='xr-section-item'><input id='section-18f11108-ad53-422d-b3eb-c1e6d46f0c7b' class='xr-section-summary-in' type='checkbox' checked><label for='section-18f11108-ad53-422d-b3eb-c1e6d46f0c7b' 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>id</span></div><div class='xr-var-dims'>()</div><div class='xr-var-dtype'>int32</div><div class='xr-var-preview xr-preview'>1321</div><input id='attrs-6b425d40-53d7-4976-8f36-b53d5cd1b8b5' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-6b425d40-53d7-4976-8f36-b53d5cd1b8b5' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-f3c915d6-6885-4824-9ef0-ec9ffa75626a' class='xr-var-data-in' type='checkbox'><label for='data-f3c915d6-6885-4824-9ef0-ec9ffa75626a' 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(1321, dtype=int32)</pre></div></li></ul></div></li><li class='xr-section-item'><input id='section-d219ffd5-629c-4105-8586-2eb0b9de97cc' class='xr-section-summary-in' type='checkbox' disabled ><label for='section-d219ffd5-629c-4105-8586-2eb0b9de97cc' 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 int32 1321</pre><div class='xr-wrap' hidden><div class='xr-header'><div class='xr-obj-type'>xarray.DataArray</div><div class='xr-array-name'>'name'</div></div><ul class='xr-sections'><li class='xr-section-item'><div class='xr-array-wrap'><input id='section-63d00b89-d047-4c3d-ac5d-3682c7506b0b' class='xr-array-in' type='checkbox' checked><label for='section-63d00b89-d047-4c3d-ac5d-3682c7506b0b' 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>b&#x27;1322&#x27;</span></div><div class='xr-array-data'><pre>array(b&#x27;1322&#x27;, dtype=&#x27;|S32&#x27;)</pre></div></div></li><li class='xr-section-item'><input id='section-0e0edde2-8791-4380-99e3-a755cc8bf6a7' class='xr-section-summary-in' type='checkbox' checked><label for='section-0e0edde2-8791-4380-99e3-a755cc8bf6a7' 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>id</span></div><div class='xr-var-dims'>()</div><div class='xr-var-dtype'>int32</div><div class='xr-var-preview xr-preview'>1321</div><input id='attrs-454bf202-8951-4e87-aa92-3373dfb65d3b' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-454bf202-8951-4e87-aa92-3373dfb65d3b' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-c6e11a72-defd-4526-8af6-63b3110ea69b' class='xr-var-data-in' type='checkbox'><label for='data-c6e11a72-defd-4526-8af6-63b3110ea69b' 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(1321, dtype=int32)</pre></div></li></ul></div></li><li class='xr-section-item'><input id='section-5c20dba8-70c0-4044-8046-a120d2605392' class='xr-section-summary-in' type='checkbox' disabled ><label for='section-5c20dba8-70c0-4044-8046-a120d2605392' 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 'name' ()>\n",
Expand All @@ -809,7 +812,7 @@
" id int32 1321"
]
},
"execution_count": 4,
"execution_count": 5,
"metadata": {},
"output_type": "execute_result"
}
Expand Down
Loading

0 comments on commit 76ddac9

Please sign in to comment.