From cf204c83f3983b65994998229f3154fa465af553 Mon Sep 17 00:00:00 2001 From: Joy Zhang Date: Thu, 6 Jun 2024 09:28:44 -0700 Subject: [PATCH] fix `mASM2d` --- qsdsan/data/_masm2d.xlsx | Bin 18185 -> 20265 bytes qsdsan/processes/_asm2d.py | 10 ++++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/qsdsan/data/_masm2d.xlsx b/qsdsan/data/_masm2d.xlsx index 2ce17ae9eea3be8004b4954b878104df044eae61..3a671c5129340fb4cdc6fad57394b205cd8f48ab 100644 GIT binary patch delta 10751 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 DJ+mhD diff --git a/qsdsan/processes/_asm2d.py b/qsdsan/processes/_asm2d.py index 16bdb10f..8f020149 100644 --- a/qsdsan/processes/_asm2d.py +++ b/qsdsan/processes/_asm2d.py @@ -16,7 +16,7 @@ from ..utils import ospath, data_path __all__ = ('create_asm2d_cmps', 'ASM2d', - 'create_masm2d_cmps', ) + 'create_masm2d_cmps', 'mASM2d') _path = ospath.join(data_path, 'process_data/_asm2d.tsv') _load_components = settings.get_default_chemicals @@ -421,7 +421,7 @@ def __new__(cls, components=None, Monod = lambda S, K: S/(S+K) rhos = np.zeros(19) # 19 biological processes, no precipitation/dissociation or gas stripping yet -def rhos_masm2d(state_arr, params, acceptor_dependent_decay=True): +def _rhos_masm2d(state_arr, params, acceptor_dependent_decay=True): if 'ks' not in params: k_h, mu_H, mu_PAO, mu_AUT, \ q_fe, q_PHA, q_PP, \ @@ -588,18 +588,19 @@ def __new__(cls, components=None, path=None, parameters=cls._stoichio_params, compile=False) - if path == _path: + if path == _mpath: _p12 = Process('anox_storage_PP', 'S_PO4 + [K_XPP]S_K + [Mg_XPP]S_Mg +[Y_PHA]X_PHA + [?]S_NO3 -> X_PP + [?]S_N2 + [?]S_NH4 + [?]S_IC', components=cmps, ref_component='X_PP', - conserved_for=('C', 'N', 'P', 'NOD',)) + conserved_for=('C', 'N', 'NOD', 'COD')) _p14 = Process('PAO_anox_growth', '[1/Y_PAO]X_PHA + [?]S_NO3 + [?]S_PO4 -> X_PAO + [?]S_N2 + [?]S_NH4 + [?]S_IC', components=cmps, ref_component='X_PAO', conserved_for=('C', 'N', 'P', 'NOD', 'COD')) + self.insert(11, _p12) self.insert(13, _p14) @@ -613,6 +614,7 @@ def __new__(cls, components=None, path=None, f_XI_H, f_XI_PAO, f_XI_AUT, cmps.X_PP.i_K, cmps.X_PP.i_Mg) dct['_parameters'] = dict(zip(cls._stoichio_params, stoichio_vals)) + rhos_masm2d = lambda state_arr, params: _rhos_masm2d(state_arr, params, cls.decay_dependon_electron_acceptor) self.set_rate_function(rhos_masm2d) kinetic_vals = (k_h, mu_H, mu_PAO, mu_AUT, q_fe, q_PHA, q_PP,