Merge pull request #430 from bobmyhill/migrate

moved averaging_schemes and geotherm

Author: bobmyhill

burnman/__init__.py

@@ -203,9 +203,7 @@
 from .classes.planet import Planet
 from .classes.polytope import MaterialPolytope
 from .classes import seismic
-
-from . import averaging_schemes
-from . import geotherm
+from .classes import averaging_schemes
 
 # Mineral library
 from . import minerals
@@ -215,14 +213,13 @@
 
 # Tools
 from . import tools
+from .tools import geotherm
 from .tools.equilibration import equilibrate
+from .tools.partitioning import calculate_nakajima_fp_pv_partition_coefficient
 
 # Optimization functions
 from .optimize import composition_fitting
 from .optimize import linear_fitting
 from .optimize import nonlinear_fitting
 from .optimize import nonlinear_solvers
 from .optimize import eos_fitting
-
-# Miscellaneous
-from .tools.partitioning import calculate_nakajima_fp_pv_partition_coefficient

burnman/averaging_schemes.py renamed to burnman/classes/averaging_schemes.py

@@ -1,4 +1,5 @@
-# This file is part of BurnMan - a thermoelastic and thermodynamic toolkit for the Earth and Planetary Sciences
+# This file is part of BurnMan - a thermoelastic and thermodynamic toolkit for
+# the Earth and Planetary Sciences
 # Copyright (C) 2012 - 2017 by the BurnMan team, released under the GNU
 # GPL v2 or later.
 
@@ -11,8 +12,8 @@
 from .mineral import Mineral, material_property
 from .solidsolution import SolidSolution
 from .solutionmodel import *
+from .averaging_schemes import reuss_average_function
 
-from ..averaging_schemes import reuss_average_function
 from ..tools.chemistry import sum_formulae
 from .. import constants
 

burnman/classes/combinedmineral.py

@@ -1,4 +1,5 @@
-# This file is part of BurnMan - a thermoelastic and thermodynamic toolkit for the Earth and Planetary Sciences
+# This file is part of BurnMan - a thermoelastic and thermodynamic toolkit for
+# the Earth and Planetary Sciences
 # Copyright (C) 2012 - 2021 by the BurnMan team, released under the GNU
 # GPL v2 or later.
 
@@ -11,10 +12,11 @@
 from .material import Material, material_property, cached_property
 from .mineral import Mineral
 from .solidsolution import SolidSolution
+from . import averaging_schemes
 
 from ..tools.reductions import independent_row_indices
 from ..tools.chemistry import sum_formulae, sort_element_list_to_IUPAC_order
-from .. import averaging_schemes
+
 
 def check_pairs(phases, fractions):
     if len(fractions) < 1:

burnman/classes/composite.py

@@ -9,7 +9,7 @@
 from scipy.integrate import quad
 from scipy.interpolate import UnivariateSpline, interp1d
 from burnman import constants
-from burnman import geotherm
+from burnman.tools import geotherm
 import warnings
 
 from .material import Material, material_property