[cig-commits] [commit] inversion, master, validate_MT_params: Unify how R is imported (a8c6a1a)

[cig_noreply at geodynamics.org]

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

On branches: inversion,master,validate_MT_params
Link       : https://github.com/geodynamics/burnman/compare/80c2a295c42dfdb38f83f6c1334bf7d8f97a8463...409647ff05dfad6a686198cac1481bd46b5e2e62

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

commit a8c6a1a9020c7f5f87ba92c3cf8c47ede08eacc1
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Tue Dec 9 10:16:21 2014 -0800

    Unify how R is imported


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

a8c6a1a9020c7f5f87ba92c3cf8c47ede08eacc1
 burnman/cork.py          | 3 +--
 burnman/einstein.py      | 3 +--
 burnman/modified_tait.py | 3 +--
 burnman/solidsolution.py | 3 +--
 burnman/solutionmodel.py | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/burnman/cork.py b/burnman/cork.py
index 51eaa5d..8d29a13 100644
--- a/burnman/cork.py
+++ b/burnman/cork.py
@@ -9,11 +9,10 @@ import numpy as np
 import scipy.optimize as opt
 
 import burnman.equation_of_state as eos
-from burnman.constants import gas_constant
+from burnman.constants import R
 
 T_0=298.15 # Standard temperature = 25 C
 P_0=1.e5 # Standard pressure = 1.e5 Pa
-R=gas_constant # J/K/mol
 
 def cork_variables(cork, cork_P, cork_T, temperature):
     a=cork[0][0]*cork_T**(2.5)/cork_P + cork[0][1]*cork_T**(1.5)/cork_P*temperature
diff --git a/burnman/einstein.py b/burnman/einstein.py
index 59045df..edc8dc1 100644
--- a/burnman/einstein.py
+++ b/burnman/einstein.py
@@ -3,13 +3,12 @@
 # Released under GPL v2 or later.
 
 import numpy as np
-from burnman.constants import gas_constant
+from burnman.constants import R
 
 """
 Functions for the Einstein model of a solid.
 """
 
-R = gas_constant
 
 def thermal_energy(T, einstein_T, n):
     """
diff --git a/burnman/modified_tait.py b/burnman/modified_tait.py
index 985b597..aae91a0 100644
--- a/burnman/modified_tait.py
+++ b/burnman/modified_tait.py
@@ -10,11 +10,10 @@ import scipy.optimize as opt
 
 import burnman.equation_of_state as eos
 import burnman.einstein as einstein
-from burnman.constants import gas_constant
+from burnman.constants import R
 
 T_0=298.15 # Standard temperature = 25 C
 P_0=1.e5 # Standard pressure = 1.e5 Pa
-R=gas_constant # J/K/mol
 
 # see Holland and Powell, 2011
 def einstein_temperature(S, n):
diff --git a/burnman/solidsolution.py b/burnman/solidsolution.py
index 4f852e7..e03676c 100644
--- a/burnman/solidsolution.py
+++ b/burnman/solidsolution.py
@@ -6,10 +6,9 @@ import numpy as np
 from burnman.mineral import Mineral
 from burnman.processchemistry import ProcessSolidSolutionChemistry
 from burnman.solutionmodel import SolutionModel
-from burnman.constants import gas_constant
+from burnman.constants import R
 import warnings
 
-R = gas_constant # J/K/mol
 kd = lambda x,y : 1 if x==y else 0
 
 class SolidSolution(Mineral):
diff --git a/burnman/solutionmodel.py b/burnman/solutionmodel.py
index f13ff1f..ad97188 100644
--- a/burnman/solutionmodel.py
+++ b/burnman/solutionmodel.py
@@ -6,9 +6,8 @@ import numpy as np
 import warnings
 import burnman
 from burnman.processchemistry import *
-from burnman.constants import gas_constant
+from burnman.constants import R
 
-R = gas_constant # J/K/mol
 kd = lambda x,y : 1 if x==y else 0
 class SolutionModel:
     """