Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] performance optimizations #83

Closed
wants to merge 2 commits into from
Closed

[WIP] performance optimizations #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
841a4b7
first stab at performance optimizations
tjhei Dec 13, 2014
ed9edf1
eos restructuring for performance reasons
tjhei Dec 13, 2014
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/debye.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def debye_fn_cheb(x):
else:
return ((val_infinity/x)/x)/x;


@jit
def thermal_energy(T, debye_T, n):
"""
calculate the thermal energy of a substance. Takes the temperature,
Expand Down
26 changes: 13 additions & 13 deletions burnman/eos/equation_of_state.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def density(self, pressure, temperature, params):
"""
return params["molar_mass"] / self.volume(pressure, temperature, params)

def grueneisen_parameter(self, pressure, temperature, volume, params):
def grueneisen_parameter(self, mineral):
"""
Parameters
----------
Expand All @@ -101,7 +101,7 @@ def grueneisen_parameter(self, pressure, temperature, volume, params):
"""
raise NotImplementedError("")

def isothermal_bulk_modulus(self, pressure, temperature, volume, params):
def isothermal_bulk_modulus(self, mineral):
"""
Parameters
----------
Expand All @@ -122,7 +122,7 @@ def isothermal_bulk_modulus(self, pressure, temperature, volume, params):
"""
raise NotImplementedError("")

def adiabatic_bulk_modulus(self, pressure, temperature, volume, params):
def adiabatic_bulk_modulus(self, mineral):
"""
Parameters
----------
Expand All @@ -143,7 +143,7 @@ def adiabatic_bulk_modulus(self, pressure, temperature, volume, params):
"""
raise NotImplementedError("")

def shear_modulus(self, pressure, temperature, volume, params):
def shear_modulus(self, mineral):
"""
Parameters
----------
Expand All @@ -164,7 +164,7 @@ def shear_modulus(self, pressure, temperature, volume, params):
"""
raise NotImplementedError("")

def heat_capacity_v(self, pressure, temperature, volume, params):
def heat_capacity_v(self, mineral):
"""
Parameters
----------
Expand All @@ -185,7 +185,7 @@ def heat_capacity_v(self, pressure, temperature, volume, params):
"""
raise NotImplementedError("")

def heat_capacity_p(self, pressure, temperature, volume, params):
def heat_capacity_p(self, mineral):
"""
Parameters
----------
Expand All @@ -206,7 +206,7 @@ def heat_capacity_p(self, pressure, temperature, volume, params):
"""
raise NotImplementedError("")

def thermal_expansivity(self, pressure, temperature, volume, params):
def thermal_expansivity(self, mineral):
"""
Parameters
----------
Expand All @@ -227,7 +227,7 @@ def thermal_expansivity(self, pressure, temperature, volume, params):
"""
raise NotImplementedError("")

def reference_temperature( self, params ):
def reference_temperature( self, params):
"""
Parameters
----------
Expand All @@ -245,7 +245,7 @@ def reference_temperature( self, params ):
else:
return 300.0

def gibbs_free_energy( self, pressure, temperature, volume, params ):
def gibbs_free_energy(self, mineral):
"""
Parameters
----------
Expand All @@ -266,7 +266,7 @@ def gibbs_free_energy( self, pressure, temperature, volume, params ):
"""
raise NotImplementedError("")

def helmholtz_free_energy( self, pressure, temperature, volume, params ):
def helmholtz_free_energy(self, mineral):
"""
Parameters
----------
Expand All @@ -285,14 +285,14 @@ def helmholtz_free_energy( self, pressure, temperature, volume, params ):
"""
raise NotImplementedError("")

def entropy( self, pressure, temperature, volume, params):
def entropy( self, mineral):
"""
Returns the entropy at the pressure and temperature of the mineral [J/K/mol]
"""

raise NotImplementedError("")

def enthalpy( self, pressure, temperature, volume, params ):
def enthalpy( self, mineral):
"""
Parameters
----------
Expand All @@ -310,7 +310,7 @@ def enthalpy( self, pressure, temperature, volume, params ):
"""
raise NotImplementedError("")

def internal_energy( self, pressure, temperature, volume, params ):
def internal_energy( self, mineral):
"""
Parameters
----------
Expand Down
Loading