[cig-commits] [commit] inversion, master, validate_MT_params: Minor edit (9596d37)

[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 9596d37c54181e4f10df76d8000d1ca103ec16c2
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Tue Aug 26 00:24:14 2014 +0200

    Minor edit


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

9596d37c54181e4f10df76d8000d1ca103ec16c2
 burnman/solidsolution.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/burnman/solidsolution.py b/burnman/solidsolution.py
index 1fbf462..c652b92 100644
--- a/burnman/solidsolution.py
+++ b/burnman/solidsolution.py
@@ -8,9 +8,6 @@ import numpy as np
 
 kd = lambda x,y : 1 if x==y else 0
 
-import burnman.symmetric_model as sym
-import burnman.asymmetric_model as asym
-
 class SolidSolution(Mineral):
     """
     This is the base class for all solid solutions. 
@@ -32,7 +29,8 @@ class SolidSolution(Mineral):
     and P derivatives in J/K/mol and m^3/(mol molecule).
     """
 
-    def __init__(self, base_material, molar_fraction, site_occupancy, interaction_parameter, van_laar_parameter):
+    # init sets up matrices to speed up calculations when P, T, X is defined.
+    def __init__(self, base_material, interaction_parameter):
         self.base_material = base_material
         self.molar_fraction = molar_fraction
         assert(len(base_material) == len(molar_fraction))