[cig-commits] [commit] add_thermodynamic_potentials: Patch up so that the new stuff works as a package (03872c9)

[cig_noreply at geodynamics.org]

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

On branch  : add_thermodynamic_potentials
Link       : https://github.com/geodynamics/burnman/compare/2e5646d93cedbbf8eae54cc37cffc14e0aa85180...d5ddad03ff9f30f5a4efaddb4e3ec585ea1a7c51

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

commit 03872c9fe8c1cf68be9a1831e16676016b88bc45
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Tue Sep 2 14:24:23 2014 -0700

    Patch up so that the new stuff works as a package


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

03872c9fe8c1cf68be9a1831e16676016b88bc45
 burnman/__init__.py                                    | 2 ++
 burnman/minerals/HP_2011.py                            | 2 +-
 burnman/minerals/HP_2011_ds62.py                       | 2 +-
 burnman/minerals/SLB_2011_w_solid_solutions.py         | 2 +-
 burnman/processchemistry.py                            | 7 +++++--
 burnman/test_solidsolution.py => test_solidsolution.py | 0
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/burnman/__init__.py b/burnman/__init__.py
index be71201..0a02c5b 100644
--- a/burnman/__init__.py
+++ b/burnman/__init__.py
@@ -33,6 +33,7 @@ from version import version as __version__
 from mineral import Mineral
 from material import Material
 from composite import Composite
+from solidsolution import SolidSolution
 from mineral_helpers import *
 
 #high level functions
@@ -45,6 +46,7 @@ import minerals
 #central user tools
 import seismic
 import averaging_schemes
+import solutionmodel
 import geotherm
 
 #miscellaneous
diff --git a/burnman/minerals/HP_2011.py b/burnman/minerals/HP_2011.py
index 3c61e5f..00a5ae8 100644
--- a/burnman/minerals/HP_2011.py
+++ b/burnman/minerals/HP_2011.py
@@ -30,7 +30,7 @@ There are also parameters which deal with internal order-disorder and Landau tra
 from burnman.mineral import Mineral
 from burnman.processchemistry import read_masses, dictionarize_formula, formula_mass
 
-atomic_masses=read_masses('data/input_masses/atomic_masses.dat')
+atomic_masses=read_masses()
 
 class stishovite (Mineral):
     def __init__(self):
diff --git a/burnman/minerals/HP_2011_ds62.py b/burnman/minerals/HP_2011_ds62.py
index bb291a8..a89168b 100644
--- a/burnman/minerals/HP_2011_ds62.py
+++ b/burnman/minerals/HP_2011_ds62.py
@@ -20,7 +20,7 @@ from burnman.solidsolution import SolidSolution
 from burnman.processchemistry import read_masses, dictionarize_formula, formula_mass
 from burnman.solutionmodel import *
 
-atomic_masses=read_masses('data/input_masses/atomic_masses.dat')
+atomic_masses=read_masses()
 
 # Mixed Holland and Powell sources (test only)
 class garnet(SolidSolution):
diff --git a/burnman/minerals/SLB_2011_w_solid_solutions.py b/burnman/minerals/SLB_2011_w_solid_solutions.py
index 8c116f1..12e4a1d 100644
--- a/burnman/minerals/SLB_2011_w_solid_solutions.py
+++ b/burnman/minerals/SLB_2011_w_solid_solutions.py
@@ -17,7 +17,7 @@ from burnman.solidsolution import SolidSolution
 from burnman.solutionmodel import *
 from burnman.processchemistry import read_masses, dictionarize_formula, formula_mass
 
-atomic_masses=read_masses('data/input_masses/atomic_masses.dat')
+atomic_masses=read_masses()
 
 '''
 SOLID SOLUTIONS
diff --git a/burnman/processchemistry.py b/burnman/processchemistry.py
index fe54aab..bee88c5 100644
--- a/burnman/processchemistry.py
+++ b/burnman/processchemistry.py
@@ -9,14 +9,17 @@
 import re
 import numpy as np
 from fractions import Fraction
+import pkgutil
 
-def read_masses(filename): 
+def read_masses(): 
     """
     A simple function to read a file with a two column list of 
     elements and their masses into a dictionary
     """
+    datastream = pkgutil.get_data('burnman', 'data/input_masses/atomic_masses.dat')
+    datalines = [ line.strip() for line in datastream.split('\n') if line.strip() ]
     lookup=dict()
-    for line in open(filename, "r"):
+    for line in datalines:
         data="%".join(line.split("%")[:1]).split()
         if data != []:
             lookup[data[0]]=float(data[1])
diff --git a/burnman/test_solidsolution.py b/test_solidsolution.py
similarity index 100%
rename from burnman/test_solidsolution.py
rename to test_solidsolution.py