Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion burnman/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
and accepting our donation of BurnMan as an official project.

"""
from __future__ import absolute_import

import importlib.metadata

# Low level utility functions
Expand Down
1 change: 0 additions & 1 deletion burnman/classes/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
BurnMan object classes
"""

from __future__ import absolute_import

from . import material
from . import perplex
Expand Down
2 changes: 0 additions & 2 deletions burnman/classes/anisotropy.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
# Copyright (C) 2012 - 2021 by the BurnMan team, released under the GNU
# GPL v2 or later.

from __future__ import absolute_import
from __future__ import print_function

import numpy as np

Expand Down
2 changes: 1 addition & 1 deletion burnman/classes/averaging_schemes.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (C) 2012 - 2017 by the BurnMan team, released under the GNU
# GPL v2 or later.

from __future__ import absolute_import

import numpy as np
import warnings

Expand Down
2 changes: 0 additions & 2 deletions burnman/classes/combinedmineral.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
# GPL v2 or later.


from __future__ import absolute_import

import numpy as np

from .mineral import Mineral, material_property
Expand Down
3 changes: 1 addition & 2 deletions burnman/classes/composite.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
# Copyright (C) 2012 - 2021 by the BurnMan team, released under the GNU
# GPL v2 or later.

from __future__ import absolute_import
from __future__ import print_function

import numpy as np
from sympy import Matrix, nsimplify
import warnings
Expand Down
2 changes: 0 additions & 2 deletions burnman/classes/composition.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import print_function

# This file is part of BurnMan - a thermoelastic and thermodynamic toolkit for
# the Earth and Planetary Sciences
# Copyright (C) 2012 - 2018 by the BurnMan team, released under the GNU
Expand Down
2 changes: 0 additions & 2 deletions burnman/classes/elasticsolution.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
# GPL v2 or later.


from __future__ import absolute_import

import numpy as np
from sympy import Matrix, nsimplify
import scipy.optimize as opt
Expand Down
1 change: 0 additions & 1 deletion burnman/classes/elasticsolutionmodel.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# Copyright (C) 2012 - 2022 by the BurnMan team, released under the GNU
# GPL v2 or later.

from __future__ import absolute_import

import importlib
import warnings
Expand Down
2 changes: 0 additions & 2 deletions burnman/classes/layer.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import print_function

# 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
Expand Down
2 changes: 0 additions & 2 deletions burnman/classes/material.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import print_function

# 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
Expand Down
2 changes: 0 additions & 2 deletions burnman/classes/mineral.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
# GPL v2 or later.


from __future__ import absolute_import
from __future__ import print_function
import warnings

import numpy as np
Expand Down
3 changes: 1 addition & 2 deletions burnman/classes/mineral_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
This module provides several helper minerals/materials.

"""
from __future__ import absolute_import
from __future__ import print_function


from .material import Material, material_property
from .composite import Composite
Expand Down
2 changes: 0 additions & 2 deletions burnman/classes/perplex.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
# Copyright (C) 2012 - 2023 by the BurnMan team, released under the GNU
# GPL v2 or later.

from __future__ import absolute_import
from __future__ import print_function

import numpy as np
from scipy.interpolate import RegularGridInterpolator
Expand Down
2 changes: 0 additions & 2 deletions burnman/classes/planet.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import print_function

# 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
Expand Down
1 change: 0 additions & 1 deletion burnman/classes/polytope.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# Copyright (C) 2012 - 2021 by the BurnMan team, released under the GNU
# GPL v2 or later.

from __future__ import absolute_import

import importlib
import numpy as np
Expand Down
2 changes: 0 additions & 2 deletions burnman/classes/seismic.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
# GPL v2 or later.


from __future__ import absolute_import

import numpy as np
import warnings
import scipy.integrate
Expand Down
2 changes: 0 additions & 2 deletions burnman/classes/solution.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
# GPL v2 or later.


from __future__ import absolute_import

import numpy as np
from sympy import Matrix, nsimplify
from collections import OrderedDict
Expand Down
1 change: 0 additions & 1 deletion burnman/classes/solutionmodel.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# Copyright (C) 2012 - 2022 by the BurnMan team, released under the GNU
# GPL v2 or later.

from __future__ import absolute_import

import importlib
import numpy as np
Expand Down
2 changes: 1 addition & 1 deletion burnman/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2012 - 2017 by the BurnMan team, released under the GNU
# GPL v2 or later.

from __future__ import absolute_import

import scipy.constants

"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ def rfloat(x, m=1.0):
"Minerals from Stixrude & Lithgow-Bertelloni 2024 and references therein\n"
f"File autogenerated using HeFESTO_2024_to_burnman.py and {hefesto_path}\n"
'"""\n\n'
"from __future__ import absolute_import\n"
"\n"
"\n\n"
"from ..eos.slb import SLB3\n"
"from ..eos import debye\n"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ def rfloat(x, m=1.0):
"Minerals from Stixrude & Lithgow-Bertelloni 2022 and references therein\n"
f"File autogenerated using HeFESTO_to_burnman.py and {hefesto_path}\n"
'"""\n\n'
"from __future__ import absolute_import\n"
"\n"
"\n\n"
"from ..classes.mineral import Mineral\n"
"from ..classes.solution import Solution\n"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def process_stixrude():
print("File autogenerated using SLBdata_to_burnman.py")
print('"""')
print("")
print("from __future__ import absolute_import")
print("")
print("")
print("from ..mineral import Mineral")
print("from ..solution import Solution")
Expand Down
2 changes: 1 addition & 1 deletion burnman/eos/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@


"""
from __future__ import absolute_import


from .equation_of_state import EquationOfState
from .murnaghan import Murnaghan
Expand Down
1 change: 0 additions & 1 deletion burnman/eos/aa.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# This file is part of BurnMan - a thermoelastic and thermodynamic toolkit for the Earth and Planetary Sciences
# Copyright (C) 2012 - 2015 by the BurnMan team, released under the GNU GPL v2 or later.

from __future__ import absolute_import

import numpy as np
from scipy.optimize import brentq
Expand Down
2 changes: 0 additions & 2 deletions burnman/eos/birch_murnaghan.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import

# 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
Expand Down
2 changes: 0 additions & 2 deletions burnman/eos/birch_murnaghan_4th.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import

# 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.
Expand Down
2 changes: 1 addition & 1 deletion burnman/eos/brosh_calphad.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (C) 2012 - 2025 by the BurnMan team, released under the GNU
# GPL v2 or later.

from __future__ import absolute_import

import numpy as np
import warnings
import pkgutil
Expand Down
2 changes: 1 addition & 1 deletion burnman/eos/bukowinski_electronic.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (C) 2012 - 2024 by the BurnMan team, released under the GNU
# GPL v2 or later.

from __future__ import absolute_import

import numpy as np

"""
Expand Down
1 change: 0 additions & 1 deletion burnman/eos/cork.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
# TO DO: Correct heat capacity, volume where internal order-disorder is
# implemented (Landau and Bragg-Williams models)

from __future__ import absolute_import

import numpy as np

Expand Down
2 changes: 1 addition & 1 deletion burnman/eos/debye.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2012 - 2017 by the BurnMan team, released under the GNU
# GPL v2 or later.

from __future__ import absolute_import

import numpy as np

# Try to import the jit from numba. If it is
Expand Down
1 change: 0 additions & 1 deletion burnman/eos/dks_liquid.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Copyright (C) 2012 - 2015 by the BurnMan team, released under the GNU
# GPL v2 or later.

from __future__ import absolute_import

from os import path
import numpy as np
Expand Down
1 change: 0 additions & 1 deletion burnman/eos/dks_solid.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Copyright (C) 2012 - 2015 by the BurnMan team, released under the GNU
# GPL v2 or later.

from __future__ import absolute_import

import numpy as np
import scipy.optimize as opt
Expand Down
1 change: 0 additions & 1 deletion burnman/eos/einstein.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Copyright (C) 2012 - 2017 by the BurnMan team, released under the GNU
# GPL v2 or later.

from __future__ import absolute_import

import numpy as np
from .. import constants
Expand Down
1 change: 0 additions & 1 deletion burnman/eos/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Copyright (C) 2012 - 2017 by the BurnMan team, released under the GNU
# GPL v2 or later.

from __future__ import absolute_import

import inspect
from . import slb
Expand Down
2 changes: 0 additions & 2 deletions burnman/eos/hp.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import

# 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
Expand Down
2 changes: 0 additions & 2 deletions burnman/eos/macaw.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import

# This file is part of BurnMan - a thermoelastic and thermodynamic toolkit
# for the Earth and Planetary Sciences.
# Copyright (C) 2012 - 2024 by the BurnMan team, released under the GNU
Expand Down
1 change: 0 additions & 1 deletion burnman/eos/mie_grueneisen_debye.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Copyright (C) 2012 - 2017 by the BurnMan team, released under the GNU
# GPL v2 or later.

from __future__ import absolute_import

import numpy as np
import scipy.optimize as opt
Expand Down
1 change: 0 additions & 1 deletion burnman/eos/modified_tait.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Copyright (C) 2012 - 2017 by the BurnMan team, released under the GNU
# GPL v2 or later.

from __future__ import absolute_import

import warnings
import numpy as np
Expand Down
2 changes: 0 additions & 2 deletions burnman/eos/morse_potential.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import

# This file is part of BurnMan - a thermoelastic and thermodynamic toolkit for the Earth and Planetary Sciences
# Copyright (C) 2012 - 2015 by the BurnMan team, released under the GNU
# GPL v2 or later.
Expand Down
2 changes: 1 addition & 1 deletion burnman/eos/property_modifiers.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2012 - 2017 by the BurnMan team, released under the GNU
# GPL v2 or later.

from __future__ import absolute_import

import numpy as np
import scipy.optimize as opt
from ..constants import gas_constant
Expand Down
2 changes: 0 additions & 2 deletions burnman/eos/reciprocal_kprime.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import

# 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.
Expand Down
1 change: 0 additions & 1 deletion burnman/eos/slb.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# Copyright (C) 2012 - 2024 by the BurnMan team, released under the GNU
# GPL v2 or later.

from __future__ import absolute_import

import numpy as np
import scipy.optimize as opt
Expand Down
2 changes: 0 additions & 2 deletions burnman/eos/spock.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import

# This file is part of BurnMan - a thermoelastic and thermodynamic toolkit
# for the Earth and Planetary Sciences.
# Copyright (C) 2012 - 2024 by the BurnMan team, released under the GNU
Expand Down
2 changes: 1 addition & 1 deletion burnman/minerals/HHPH_2013.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
unlike those in the original paper.
File autogenerated using HHPHdata_to_burnman.py.
"""
from __future__ import absolute_import


from ..classes.mineral import Mineral
from ..utils.chemistry import dictionarize_formula, formula_mass
Expand Down
1 change: 0 additions & 1 deletion burnman/minerals/HP_2011_fluids.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
- cork_P is given in kbar: multiply by 1e8
"""

from __future__ import absolute_import

from ..classes.mineral import Mineral
from ..utils.chemistry import dictionarize_formula, formula_mass
Expand Down
2 changes: 1 addition & 1 deletion burnman/minerals/ICL_2018.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
Irving, Cottaar, Lekic (2018) Seismically determined elastic parameters for the outer core, Science Advances

"""
from __future__ import absolute_import


from ..classes import mineral_helpers as helpers
from ..classes.mineral import Mineral
Expand Down
1 change: 0 additions & 1 deletion burnman/minerals/KMFBZ_2017.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
Nature 543.7646 (2017): 543-546. doi:10.1038/nature21390
"""

from __future__ import absolute_import

from ..classes.mineral import Mineral
from ..classes.solution import Solution
Expand Down
2 changes: 1 addition & 1 deletion burnman/minerals/Matas_etal_2007.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

Minerals from Matas et al. 2007 and references therein. See Table 1 and 2.
"""
from __future__ import absolute_import


from ..classes.mineral import Mineral

Expand Down
Loading
Loading