Merge branch 'master' into reconnection

This commit is contained in:
Grzegorz Kowal 2020-11-26 09:55:06 -03:00
commit ad048c1a1a

View File

@ -135,6 +135,10 @@ class AmunXML:
variables.append(var)
variables.append('level')
if 'dens' in variables:
variables.append('logd')
if 'pres' in variables:
variables.append('logp')
if all(v in variables for v in ['velx','vely','velz']):
variables.append('velo')
variables.append('divv')
@ -377,6 +381,12 @@ class AmunXML:
dset = np.zeros(cm)
for p in range(nb):
dset[...,p] = level[ids[p]]
elif var == 'logd':
dset = np.log10(self.read_binary_data(n, 'dens'))
dset = np.reshape(dset, cm)
elif var == 'logp':
dset = np.log10(self.read_binary_data(n, 'pres'))
dset = np.reshape(dset, cm)
elif var == 'velo':
tmp = self.read_binary_data(n, 'velx')
dset = tmp**2
@ -516,9 +526,7 @@ class AmunXML:
dset *= 1.0 / (self.attributes('adiabatic_index') - 1)
dset = np.reshape(dset, cm)
elif var == 'temp':
dset = self.read_binary_data(n, 'pres')
tmp = self.read_binary_data(n, 'pres')
dset /= tmp
dset = self.read_binary_data(n, 'pres') / self.read_binary_data(n, 'dens')
dset = np.reshape(dset, cm)
elif var == 'etot':
tmp = self.read_binary_data(n, 'velx')