[cig-commits] [commit] solid_solution_molar_mass: Add set_method to solid solution (b2c5363)

[cig_noreply at geodynamics.org]

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

On branch  : solid_solution_molar_mass
Link       : https://github.com/geodynamics/burnman/compare/0000000000000000000000000000000000000000...fe211b4b277a753e04e153250e4ed8b270dee9b7

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

commit b2c53637ce6357c5db88a35ceeec24cf5f6cd8ca
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Sun Dec 28 21:45:23 2014 -0800

    Add set_method to solid solution


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

b2c53637ce6357c5db88a35ceeec24cf5f6cd8ca
 burnman/solidsolution.py    | 5 +++++
 tests/test_solidsolution.py | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/burnman/solidsolution.py b/burnman/solidsolution.py
index 9a29d69..6b4a905 100644
--- a/burnman/solidsolution.py
+++ b/burnman/solidsolution.py
@@ -71,6 +71,11 @@ class SolidSolution(Mineral):
 	molar_mass = sum([ self.base_material[i][0].params['molar_mass'] * self.molar_fraction[i] for i in range(self.n_endmembers) ])
         return molar_mass
 
+    def set_method(self, method):
+        for i in range(self.n_endmembers):
+            self.base_material[i][0].set_method(method)
+        self.method = self.base_material[0][0].method
+
     def set_state(self, pressure, temperature):
         self.pressure=pressure
         self.temperature=temperature
diff --git a/tests/test_solidsolution.py b/tests/test_solidsolution.py
index 5580489..8fe8839 100644
--- a/tests/test_solidsolution.py
+++ b/tests/test_solidsolution.py
@@ -201,5 +201,9 @@ class test_solidsolution(BurnManTest):
 
         self.assertArraysAlmostEqual(site_fill, ones)
 
+    def test_set_method(self):
+       ss = olivine_ss()
+       ss.set_method('mtait')
+
 if __name__ == '__main__':
     unittest.main()