gkowal/amun-code
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into reconnection

Browse Source
This commit is contained in:
Grzegorz Kowal 2022-07-14 17:34:51 -03:00
commit 2a5c2b87e7
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/amunpy/src/amunpy/amun.py
View File

@ -471,7 +471,7 @@ class Amun:
tmp = self.__read_binary_data__('magz', chunk_number)
dset += tmp**2
dset *= 0.5
elif dataset == 'lorentz':
elif dataset == 'lore':
tmp = self.__read_binary_data__('velx', chunk_number)
dset = tmp**2
tmp = self.__read_binary_data__('vely', chunk_number)

3
python/amunpy/src/amunpy/amunxml.py
View File

@ -50,7 +50,8 @@ class AmunXML(Amun):
tree = ET.parse(mfile)
root = tree.getroot()
if self.version < 0:
self.version = int(float(root.attrib['version']))
if 'version' in root.attrib:
self.version = int(float(root.attrib['version']))
if root.tag == 'AMUNFile':
self.dataformat = 'AmunXML'
else:

2
sources/evolution.F90
View File

@ -82,7 +82,7 @@ module evolution
!
real(kind=8) , save :: atol = 1.0d-04
real(kind=8) , save :: rtol = 1.0d-04
real(kind=8) , save :: fac = 9.0d-01
real(kind=8) , save :: fac = 8.1d-01
real(kind=8) , save :: facmin = 1.0d-01
real(kind=8) , save :: facmax = 5.0d+00
real(kind=8) , save :: errtol = 1.0d+00