[cig-commits] [commit] master: added underscores to multiword functions (3a4dc2f)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/burnman

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/fb1efda477c84dda519a26fcd6480eef1f23c1cf...a2a7ea5dbd2bbbb7bb8c207b3e569e3967a4c47b

>---------------------------------------------------------------

commit 3a4dc2f1abd9bd5c6ed2acbc4879c70000cac9dd
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Sat Dec 13 14:58:40 2014 -0800

    added underscores to multiword functions


>---------------------------------------------------------------

3a4dc2f1abd9bd5c6ed2acbc4879c70000cac9dd
 burnman/chemicalpotentials.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/burnman/chemicalpotentials.py b/burnman/chemicalpotentials.py
index e967494..d9b2f27 100644
--- a/burnman/chemicalpotentials.py
+++ b/burnman/chemicalpotentials.py
@@ -16,7 +16,7 @@ import burnman.constants as constants
 
 # It can also calculate fugacities relative to other bulk compositions
 
-def chemicalpotentials(assemblage, component_formulae):
+def chemical_potentials(assemblage, component_formulae):
     """
     The compositional space of the components does not have to be a 
     superset of the compositional space of the assemblage. Nor do they have to
@@ -102,12 +102,12 @@ def fugacity(component_formula, standard_material, assemblage):
             the standard material
 
     """
-    chemical_potential=chemicalpotentials(assemblage, [component_formula])[0]
+    chemical_potential=chemical_potentials(assemblage, [component_formula])[0]
 
     fugacity=np.exp((chemical_potential - standard_material.gibbs)/(constants.gas_constant*assemblage[0].temperature))
     return fugacity
 
-def relativefugacity(component_formula, standard_material, assemblage, reference_assemblage):
+def relative_fugacity(component_formula, standard_material, assemblage, reference_assemblage):
     """
         Parameters
         ----------
@@ -133,8 +133,8 @@ def relativefugacity(component_formula, standard_material, assemblage, reference
             with respect to the reference_assemblage 
 
     """
-    chemical_potential=chemicalpotentials(assemblage, [component_formula])[0]
-    reference_chemical_potential=chemicalpotentials(reference_assemblage, [component_formula])[0]
+    chemical_potential=chemical_potentials(assemblage, [component_formula])[0]
+    reference_chemical_potential=chemical_potentials(reference_assemblage, [component_formula])[0]
 
     relative_fugacity=np.exp((chemical_potential - reference_chemical_potential)/(constants.gas_constant*assemblage[0].temperature))
     return relative_fugacity