From 61a46aaa7f5c1af6135b62c0d0794d3a0de89623 Mon Sep 17 00:00:00 2001 From: Oscar Branson Date: Thu, 29 Feb 2024 17:55:05 +0000 Subject: [PATCH] Updated default Ca and Mg values to prevent pitzer model running at default conditions. --- HISTORY.rst | 4 ++++ cbsyst/__init__.py | 2 +- cbsyst/cbsyst.py | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index a826b5f..1bf5e92 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,6 +3,10 @@ Release History --------------- +0.4.9 (2024-02-29) +------------ +Updated default Ca and Mg values to prevent pitzer model running at default conditions. + 0.4.8 (2023-03-15) ------------ Set minumum required Kgen version to 0.2.0. diff --git a/cbsyst/__init__.py b/cbsyst/__init__.py index a1c81a4..49c1343 100644 --- a/cbsyst/__init__.py +++ b/cbsyst/__init__.py @@ -2,4 +2,4 @@ from cbsyst.helpers import data_out, Bunch, pH_scale_converter from kgen import calc_Ks -VERSION = '0.4.8' +VERSION = '0.4.9' diff --git a/cbsyst/cbsyst.py b/cbsyst/cbsyst.py index c7f6e19..e67b8d0 100644 --- a/cbsyst/cbsyst.py +++ b/cbsyst/cbsyst.py @@ -17,7 +17,7 @@ def Csys( CO2=None, HCO3=None, CO3=None, pCO2=None, fCO2=None, BT=None, - Ca=None, Mg=None, + Ca=0.0102821, Mg=0.0528171, T_in=25.0, T_out=None, S_in=35.0, S_out=None, P_in=None, P_out=None, @@ -269,7 +269,7 @@ def Bsys( T_in=25.0, S_in=35.0, P_in=None, - Ca=None, + Ca=0.0102821, Mg=None, ST=None, FT=None, @@ -437,7 +437,7 @@ def ABsys( T_in=25.0, S_in=35.0, P_in=None, - Ca=None, + Ca=0.0102821, Mg=None, ST=None, FT=None, @@ -610,7 +610,7 @@ def CBsys( T_out=None, S_out=None, P_out=None, - Ca=None, + Ca=0.0102821, Mg=None, PT=0.0, SiT=0.0,