Skip to content

Commit

Permalink
fixed np.float and made new version
Browse files Browse the repository at this point in the history
  • Loading branch information
speleophysics committed Oct 27, 2023
1 parent 484944d commit 9d3aa1d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions olm/general.py
Expand Up @@ -399,17 +399,17 @@ def __init__(self, constituents, concentrations, units, T=25., T_units='C', cond
else:
print("Units for " + ion + " are incorrect, must either be mg/L, mmol/L, or mol/L")
if T_units == 'C':
self.T_C = np.float(T)
self.T_C = np.float64(T)
self.T_K = CtoK(self.T_C)
elif T_units == 'K':
self.T_K = np.float(T)
self.T_K = np.float64(T)
self.T_C = KtoC(self.T_K)
else:
print("T_units must equal either C or K.")
if cond != None:
self.cond = np.float(cond)
self.cond = np.float64(cond)
if pH != None:
self.pH = np.float(pH)
self.pH = np.float64(pH)
#loop through ions and calculate activities
for key, ion_dict in self.ions.items():
if ('conc_mol' in ion_dict):
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Expand Up @@ -3,11 +3,11 @@


setup(name='olm-karst',
version='0.39',
version='0.40',
author='Matthew D. Covington',
author_email = 'mcoving@uark.edu',
url='https://github.com/speleophysics/olm/',
download_url = 'https://github.com/CovingtonResearchGroup/olm/archive/refs/tags/0.39a.tar.gz',
download_url = 'https://github.com/CovingtonResearchGroup/olm/archive/refs/tags/0.40.tar.gz',
packages=['olm', 'olm.USGS', 'olm.loggers'],
install_requires = ['numpy',
'scipy',
Expand Down

0 comments on commit 9d3aa1d

Please sign in to comment.