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

PYTHON: Update adiabatic index name.

Browse Source 
Signed-off-by: Grzegorz Kowal <grzegorz@amuncode.org>
This commit is contained in:
Grzegorz Kowal 2020-08-16 17:00:50 -03:00
parent 2327e6ffa5
commit 5886c2039a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/amunpy.py
View File

@ -149,7 +149,7 @@ class AmunXML:
variables.append('cury') variables.append('cury')
variables.append('curz') variables.append('curz')
variables.append('curr') variables.append('curr')
if 'pres' in variables and 'gamma' in self.attributes: if 'pres' in variables and 'adiabatic_index' in self.attributes:
variables.append('eint') variables.append('eint')
if all(v in variables for v in ['dens','pres']): if all(v in variables for v in ['dens','pres']):
variables.append('temp') variables.append('temp')
@ -513,7 +513,7 @@ class AmunXML:
dset = np.sqrt(dset) dset = np.sqrt(dset)
elif var == 'eint': elif var == 'eint':
dset = self.read_binary_data(n, 'pres') dset = self.read_binary_data(n, 'pres')
dset *= 1.0 / (self.attributes('gamma') - 1.0) dset *= 1.0 / (self.attributes('adiabatic_index') - 1)
dset = np.reshape(dset, cm) dset = np.reshape(dset, cm)
elif var == 'temp': elif var == 'temp':
dset = self.read_binary_data(n, 'pres') dset = self.read_binary_data(n, 'pres')
@ -530,7 +530,7 @@ class AmunXML:
tmp = self.read_binary_data(n, 'dens') tmp = self.read_binary_data(n, 'dens')
dset *= tmp dset *= tmp
tmp = self.read_binary_data(n, 'pres') tmp = self.read_binary_data(n, 'pres')
dset += 2.0 / (self.attributes('gamma') - 1.0) * tmp dset += 2.0 / (self.attributes('adiabatic_index') - 1) * tmp
if 'magn' in self.variables: if 'magn' in self.variables:
tmp = self.read_binary_data(n, 'magx') tmp = self.read_binary_data(n, 'magx')
dset = tmp**2 dset = tmp**2
@ -925,7 +925,7 @@ def amun_dataset(fname, vname, shrink = 1, interpolation = 'rebin', progress = F
nc = amun_attribute(fname, 'nprocs') nc = amun_attribute(fname, 'nprocs')
nl = amun_attribute(fname, 'nleafs') nl = amun_attribute(fname, 'nleafs')
if eos == 'adi': if eos == 'adi':
gm = amun_attribute(fname, 'gamma') gm = amun_attribute(fname, 'adiabatic_index')
# get block dimensions and the maximum level # get block dimensions and the maximum level
# #