[cig-commits] [commit] inversion, master, validate_MT_params: style fixes (4e7538e)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Dec 12 18:28:08 PST 2014
Repository : https://github.com/geodynamics/burnman
On branches: inversion,master,validate_MT_params
Link : https://github.com/geodynamics/burnman/compare/80c2a295c42dfdb38f83f6c1334bf7d8f97a8463...409647ff05dfad6a686198cac1481bd46b5e2e62
>---------------------------------------------------------------
commit 4e7538e2be813c54f438cbc6e0ccc863fcfa6f58
Author: Timo Heister <timo.heister at gmail.com>
Date: Fri Dec 12 13:24:41 2014 -0800
style fixes
>---------------------------------------------------------------
4e7538e2be813c54f438cbc6e0ccc863fcfa6f58
burnman/data/raw_endmember_datasets/HPdata_to_burnman.py | 2 +-
burnman/molar_mass.py | 4 ++--
burnman/processchemistry.py | 4 ++--
burnman/seismic.py | 2 --
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/burnman/data/raw_endmember_datasets/HPdata_to_burnman.py b/burnman/data/raw_endmember_datasets/HPdata_to_burnman.py
index 9e48550..acdbb2f 100644
--- a/burnman/data/raw_endmember_datasets/HPdata_to_burnman.py
+++ b/burnman/data/raw_endmember_datasets/HPdata_to_burnman.py
@@ -42,7 +42,7 @@ def getmbr(ds, mbr):
atoms = 0.0
formula=''
for j in range(3,len(ds[i*4+3])-1,2):
- atoms = atoms + float(ds[i*4+3][j])
+ atoms += float(ds[i * 4 + 3][j])
formula=formula+components[int(ds[i*4+3][j-1])-1]+str(round(float(ds[i*4+3][j]),10))
if mbr.endswith('L'):
flag=-2
diff --git a/burnman/molar_mass.py b/burnman/molar_mass.py
index 0edd27e..1f6473a 100644
--- a/burnman/molar_mass.py
+++ b/burnman/molar_mass.py
@@ -38,10 +38,10 @@ for element in re.findall('[A-Z][^A-Z]*', formula):
else:
nel=float(list[1])
# Increment size of compound
- n=n+nel
+ n += nel
# Find atomic mass of element
- molar_mass=molar_mass+nel*el_mass[el_name.index(list[0])]
+ molar_mass += nel * el_mass[el_name.index(list[0])]
print 'number of atoms per formula unit:', n
print 'molar mass of formula unit:', molar_mass, 'kg'
diff --git a/burnman/processchemistry.py b/burnman/processchemistry.py
index 11e8b71..e4cb2d5 100644
--- a/burnman/processchemistry.py
+++ b/burnman/processchemistry.py
@@ -188,7 +188,7 @@ def ProcessSolidSolutionChemistry(formulae):
solution_formula[element_on_site]=solution_formula.get(element_on_site, 0.0) + list_multiplicity[site]*proportion_element_on_site
if element_on_site not in sites[site]:
- n_occupancies=n_occupancies+1
+ n_occupancies += 1
sites[site].append(element_on_site)
element_index=sites[site].index(element_on_site)
for parsed_mbr in range(len(list_occupancies)):
@@ -223,7 +223,7 @@ def ProcessSolidSolutionChemistry(formulae):
for element in range(len(list_occupancies[endmember][site])):
endmember_occupancies[endmember][n_element]=list_occupancies[endmember][site][element]
site_multiplicities[n_element]=list_multiplicity[site]
- n_element=n_element+1
+ n_element += 1
return solution_formulae, n_sites, sites, n_occupancies, endmember_occupancies, site_multiplicities
diff --git a/burnman/seismic.py b/burnman/seismic.py
index e7720b4..552ac27 100644
--- a/burnman/seismic.py
+++ b/burnman/seismic.py
@@ -3,8 +3,6 @@
# Released under GPL v2 or later.
import numpy as np
-import matplotlib.pyplot as plt
-
import tools
class Seismic1DModel(object):
More information about the CIG-COMMITS
mailing list