Merge pull request #428 from sannecottaar/cleanout_misc

clean out misc

Author: bobmyhill

contrib/CHRU2014/Readme.md

@@ -0,0 +1,2 @@
+This directory contains scripts to reproduce the figure in Cottaar, Heister, Rose, and Unterborn 2014. 
+helper_solid_solution.py contains functions that are now deprecated in the main code, but still needed to reproduce these figures. 

misc/colors.py renamed to contrib/CHRU2014/colors.py

@@ -115,7 +115,7 @@ def __init__(self, fe_num):
         HelperSolidSolution.__init__(self, endmembers, molar_fractions)
 
 # This is ferropericlase with the deprecated solid solution setup,
-# although it is still used in some of the /misc/paper* scripts
+# only used for the scripts in this folder
 
 
 class other_ferropericlase(HelperSolidSolution):

contrib/CHRU2014/helper_solid_solution.py

@@ -42,7 +42,7 @@
 
 import burnman
 from burnman import minerals
-import misc.colors as colors
+import contrib.CHRU2014.colors as colors
 
 if __name__ == "__main__":
     figsize = (8, 6)

contrib/CHRU2014/paper_averaging.py

@@ -33,7 +33,7 @@
 
 import scipy.optimize as opt
 import burnman
-import misc.colors as colors
+import contrib.CHRU2014.colors as colors
 
 import warnings
 

contrib/CHRU2014/paper_fit_data.py

@@ -24,7 +24,7 @@
 
 import burnman
 from contrib.CHRU2014.helper_solid_solution import HelperSolidSolution
-import misc.colors as colors
+import contrib.CHRU2014.colors as colors
 
 if __name__ == "__main__":
     fig = plt.figure(dpi=100, figsize=(12, 6))

contrib/CHRU2014/paper_incorrect_averaging.py

@@ -31,7 +31,7 @@
 from scipy import interpolate
 from scipy.stats import norm
 import matplotlib.mlab as mlab
-import misc.colors as colors
+import contrib.CHRU2014.colors as colors
 
 
 def make_rock():

contrib/CHRU2014/paper_onefit.py

@@ -37,7 +37,7 @@
 
 import burnman
 from contrib.CHRU2014.helper_solid_solution import SLB_2011_ZSB_2013_mg_fe_perovskite, other_ferropericlase
-import misc.colors as colors
+import contrib.CHRU2014.colors as colors
 
 if __name__ == "__main__":
 

contrib/CHRU2014/paper_opt_pv.py

@@ -23,7 +23,7 @@
     sys.path.insert(1, os.path.abspath('../..'))
 
 import burnman
-import misc.colors as colors
+import contrib.CHRU2014.colors as colors
 
 
 class my_perovskite(burnman.Mineral):