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.

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

Kgen update #35

Closed
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
18 changes: 18 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,24 @@
Release History
---------------

0.4.8 (2023-03-15)
------------
Set minumum required Kgen version to 0.2.0.

0.4.7 (2023-03-14)
------------
Updates to work with Kgen 0.2.0.

**Minor breaking change**: All TX quantities have been renamed to XT (i.e. TF and TS are not FT and ST to be consistent with BT nomenclature)

0.4.6 (2023-03)
------------
Fix Omega Units

0.4.4 (2023-03)
------------
Fix OmegaC

0.4.3 (2023-02-07)
------------
Omega calculation.
Expand Down
2 changes: 1 addition & 1 deletion cbsyst/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
from cbsyst.helpers import data_out, Bunch, pH_scale_converter
from kgen import calc_Ks

VERSION = '0.4.7-dev'
VERSION = '0.4.8'
13 changes: 13 additions & 0 deletions cbsyst/classes.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
class const:
def __init__(self, T, S, P, Mg=None, Ca=None, TS=None, TF=None, TB=None, mode='calculate'):
if TS is None:
TS = calc_TS(S)
if TF is None:
TF = calc_TF(S)

self.TS = TS
self.TF = TF
self.Mg = Mg
self.Ca = Ca

self.Ks = calc_Ks(T=T, S=S, P=P, Mg=Mg, Ca=Ca, TS=TS, TF=TF, MyAMI_Mode=mode)
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ scipy>=0.18
pandas>=0.19
uncertainties>=3.0
tqdm>=4.14
kgen>=0.0.2
kgen>=0.0.2,<=0.2
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ install_requires =
pandas >=0.19
uncertainties >=3.0
tqdm >=4.14
kgen >=0.0.2
kgen >=0.2.0
python_requires = >=3.7
packages = find:

Expand Down