[cig-commits] [commit] master: include fixes (3cd8aed)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/53964ef9adcc1f8b89f9e48ae774c2ecb51f216a...6f75d3766c3c8e3bf6599b894e7bbe2993f57419

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

commit 3cd8aed0e65b0be5e2815fc8112a83a305e40277
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri Dec 12 13:47:41 2014 -0800

    include fixes


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

3cd8aed0e65b0be5e2815fc8112a83a305e40277
 burnman/eos/mie_grueneisen_debye.py | 4 ++--
 burnman/eos/slb.py                  | 2 +-
 misc/paper_benchmark.py             | 2 --
 misc/paper_opt_pv.py                | 4 ++--
 tests/benchmark.py                  | 6 +++---
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/burnman/eos/mie_grueneisen_debye.py b/burnman/eos/mie_grueneisen_debye.py
index 6bc0d26..d339049 100644
--- a/burnman/eos/mie_grueneisen_debye.py
+++ b/burnman/eos/mie_grueneisen_debye.py
@@ -5,8 +5,8 @@
 import numpy as np
 import scipy.optimize as opt
 
-import burnman.equation_of_state as eos
-import burnman.birch_murnaghan as bm
+import equation_of_state as eos
+import birch_murnaghan as bm
 import burnman.debye as debye
 import burnman.constants as constants
 
diff --git a/burnman/eos/slb.py b/burnman/eos/slb.py
index c4a50b8..d52e872 100644
--- a/burnman/eos/slb.py
+++ b/burnman/eos/slb.py
@@ -6,7 +6,7 @@ import numpy as np
 import scipy.optimize as opt
 import warnings
 
-import burnman.birch_murnaghan as bm
+import birch_murnaghan as bm
 import burnman.debye as debye
 import equation_of_state as eos
 
diff --git a/misc/paper_benchmark.py b/misc/paper_benchmark.py
index 658ee78..1c04002 100644
--- a/misc/paper_benchmark.py
+++ b/misc/paper_benchmark.py
@@ -17,8 +17,6 @@ if not os.path.exists('burnman') and os.path.exists('../burnman'):
 sys.path.insert(1,os.path.abspath('.'))
 import burnman
 
-import burnman.slb as slb
-
 figsize=(6,5)
 prop={'size':12}
 plt.rc('text', usetex=True)
diff --git a/misc/paper_opt_pv.py b/misc/paper_opt_pv.py
index 7f97ac3..6889a8e 100644
--- a/misc/paper_opt_pv.py
+++ b/misc/paper_opt_pv.py
@@ -77,9 +77,9 @@ if __name__ == "__main__":
 #        rock = burnman.composite ( [ (minerals.Murakami_etal_2012.fe_perovskite(), amount_perovskite),
 #                             (minerals.Murakami_etal_2012.fe_periclase(), 1.0 - amount_perovskite) ] )
         rock = burnman.Composite ( [ (minerals.SLB_2011_ZSB_2013.mg_fe_perovskite(0.07), amount_perovskite),
-                             (minerals.SLB_2011.ferropericlase(0.2), 1.0 - amount_perovskite) ] )
+                             (minerals.other.ferropericlase(0.2), 1.0 - amount_perovskite) ] )
 #        rock = burnman.composite ( [ (minerals.SLB_2011.mg_fe_perovskite(0.), amount_perovskite),
-#                             (minerals.SLB_2011.ferropericlase(1.0), 1.0 - amount_perovskite) ] )
+#                             (minerals.other.ferropericlase(1.0), 1.0 - amount_perovskite) ] )
         rock.set_method(method)
         temperature = burnman.geotherm.adiabatic(seis_p,1900,rock)
         print "Calculations are done for:"
diff --git a/tests/benchmark.py b/tests/benchmark.py
index 92052ca..4473c4c 100644
--- a/tests/benchmark.py
+++ b/tests/benchmark.py
@@ -8,9 +8,9 @@ if not os.path.exists('burnman') and os.path.exists('../burnman'):
 sys.path.insert(1,os.path.abspath('.')) 
 import burnman
 
-import burnman.birch_murnaghan as bm
-import burnman.mie_grueneisen_debye as mgd
-import burnman.slb as slb
+import burnman.eos.birch_murnaghan as bm
+import burnman.eos.mie_grueneisen_debye as mgd
+import burnman.eos.slb as slb
 import matplotlib.image as mpimg