Skip to content

Commit

Permalink
[184_lead_contamination], issue #184, Changes from 10** to np.power f…
Browse files Browse the repository at this point in the history
…or all the classes of the module. Verification of the good handling of array-like elements.
  • Loading branch information
Sami Amestas committed Jul 26, 2024
1 parent 311b621 commit a8ec760
Showing 1 changed file with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Module with the definition of some coumpounds properties
for contamination assessment"""
from math import log
import numpy as np
from typing import List
from scipy.constants import atm
from ..interface import PropertyInterface
Expand Down Expand Up @@ -35,7 +35,7 @@ def correlation(self, T: float, p: float = atm,
float:
pressure in :math:`[Pa]`
"""
return 10**((- 7270 / T) + 9.06)
return np.power(10,(- 7270 / T) + 9.06)

@property
def name(self) -> str:
Expand Down Expand Up @@ -257,7 +257,7 @@ def correlation(self, T: float, p: float = atm,
float:
pressure in :math:`[Pa]`
"""
return 10**((- 8691 / T) + 13.814)
return np.power(10,(- 8691 / T) + 13.814)

@property
def name(self) -> str:
Expand Down Expand Up @@ -331,7 +331,7 @@ def correlation(self, T: float, p: float = atm,
float:
pressure in :math:`[Pa]`
"""
return 10**((- 9087 / T) + 31.897 - 6.16 * log(T))
return np.power(10,(- 9087 / T) - 6.16 * np.log(T) + 31.897)

@property
def name(self) -> str:
Expand Down Expand Up @@ -479,7 +479,7 @@ def correlation(self, T: float, p: float = atm,
float:
Henry constant in :math:`[Pa]`
"""
return LeadIodineVapourPressureKonings1996.correlation(T,p)
return LeadIodineVapourPressureKonings1996().correlation(T,p)

@property
def name(self) -> str:
Expand Down Expand Up @@ -553,7 +553,7 @@ def correlation(self, T: float, p: float = atm,
float:
Henry constant in :math:`[Pa]`
"""
return LeadIodineVapourPressureKnacke1991.correlation(T,p)
return LeadIodineVapourPressureKnacke1991().correlation(T,p)

@property
def name(self) -> str:
Expand Down Expand Up @@ -627,7 +627,7 @@ def correlation(self, T: float, p: float = atm,
float:
Henry constant in :math:`[Pa]`
"""
return 10**((- 4979.5799 / T) - 9.3234247 * log(T) + 0.0044733132 * T
return np.power(10,(- 4979.5799 / T) - 9.3234247 * np.log(T) + 0.0044733132 * T
- 8.684092 * 10**(-7) * T**(2) + 34.573234)

@property
Expand Down Expand Up @@ -702,7 +702,7 @@ def correlation(self, T: float, p: float = atm,
float:
activity coefficient in :math:`[-]`
"""
return 10**(-1.5)
return np.power(10,-1.5)

@property
def name(self) -> str:
Expand Down Expand Up @@ -776,7 +776,7 @@ def correlation(self, T: float, p: float = atm,
float:
pressure in :math:`[Pa]`
"""
return LeadCaesiumActivityCoefficientHandbook.correlation(T,p) * LeadCaesiumHenryConstantYamshchikov2001.correlation(T,p)
return LeadCaesiumActivityCoefficientHandbook().correlation(T,p) * LeadCaesiumHenryConstantYamshchikov2001().correlation(T,p)

@property
def name(self) -> str:
Expand Down

0 comments on commit a8ec760

Please sign in to comment.