Skip to content

Commit

Permalink
Cosmetic fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
CaymanUnterborn committed Jan 7, 2016
1 parent 167e261 commit 8e0a7df
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion burnman/eos/birch_murnaghan_4th.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,4 @@ def validate_parameters(self, params):
if params['Kprime_0'] < 0. or params['Kprime_0'] > 10.:
warnings.warn( 'Unusual value for Kprime_0', stacklevel=2 )
if params['Kprime_prime_0'] > 0. or params['Kprime_prime_0'] < -10.:
warnings.warn( 'Unusual value for Kprime_prime_0', stacklevel=2 )
warnings.warn( 'Unusual value for Kprime_prime_0', stacklevel=2 )
2 changes: 1 addition & 1 deletion burnman/eos/vinet.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def shear_modulus(self,pressure, temperature, volume, params):
Returns shear modulus :math:`G` of the mineral. :math:`[Pa]`
Currently not included in the Vinet EOS, so omitted.
"""
return 0
return 0.

def heat_capacity_v(self,pressure, temperature, volume, params):
"""
Expand Down
4 changes: 4 additions & 0 deletions burnman/minerals/other.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ def __init__(self):
'q_0': 1.2 }
Mineral.__init__(self)


class Speziale_fe_periclase_LS(Mineral):
"""
Speziale et al. 2007, Mg#=83
Expand All @@ -112,6 +113,7 @@ def __init__(self):
'q_0': 1.2 }
Mineral.__init__(self)


class Liquid_Fe_Anderson(Mineral):
"""
Anderson & Ahrens, 1994 JGR
Expand All @@ -126,6 +128,8 @@ def __init__(self):
'molar_mass': 0.055845,
}
Mineral.__init__(self)


class Fe_Dewaele(Mineral):
"""
Dewaele et al., 2006, Physical Review Letters
Expand Down

0 comments on commit 8e0a7df

Please sign in to comment.