Merge updates in conventional wastewater configurations

qsdsan/_process.py

@@ -694,6 +694,7 @@ def _rate_eq2func(self):
         def f(state_arr, params={}):
             states = dict(zip(var_kw, state_arr))
             return lamb(**states, **params)
+
         self.kinetics(function=f, parameters=self.parameters)
 
     def _normalize_stoichiometry(self, new_ref):

qsdsan/_sanunit.py

@@ -210,7 +210,7 @@ def __init__(self, ID='', ins=None, outs=(), thermo=None, init_with='WasteStream
 
         if not kwargs.get('skip_property_package_check'):
             self._assert_compatible_property_package()
-            
+
         self._utility_cost = None
 
         ##### qsdsan-specific #####

qsdsan/_waste_stream.py

@@ -633,7 +633,7 @@ def composite(self, variable, flow=False, exclude_gas=True,
         if specification:
             try:
                 specified_IDs = set(_get(all_cmps, specification))
-            except AttributeError: # no pre-defined groups
+            except AttributeError: # no predefined groups
                 try:
                     specified_IDs = _specific_groups[specification]
                 except KeyError: # specification not in the default ones
@@ -1073,7 +1073,7 @@ def get_VSS(self, include_colloidal=False):
         return VSS
 
     def get_ISS(self):
-        '''[float] Inorganic/involatile suspended solids, in mg/L.'''
+        '''[float] Inorganic/non-volatile suspended solids, in mg/L.'''
         return self.composite('solids', particle_size='x', volatile=False)
 
 
@@ -1219,7 +1219,11 @@ def scope(self, s):
         self._scope = s
 
     def _init_state(self):
-        self.state = np.append(self.conc.astype('float64'), self.get_total_flow('m3/d'))
+        if self.phase == 'l':
+            self.state = np.append(self.conc.astype('float64'), self.get_total_flow('m3/d'))
+        else:
+            Q = self.F_vol # m3/hr
+            self.state = np.append(self.mass.astype('float64')/Q*1e3, Q*24)
         self.dstate = np.zeros_like(self.state)
 
     def _state2flows(self):

qsdsan/data/process_data/_adm1_p_extension.tsv

@@ -0,0 +1,21 @@
+	S_su	S_aa	S_fa	S_va	S_bu	S_pro	S_ac	S_h2	S_ch4	S_IC	S_IN	S_IP	S_I	X_ch	X_pr	X_li	X_su	X_aa	X_fa	X_c4	X_pro	X_ac	X_h2	X_I	X_PHA	X_PP	X_PAO	S_K	S_Mg	X_MeOH	X_MeP
+hydrolysis_carbs	1									?	?	?		-1																	
+hydrolysis_proteins		1								?	?	?			-1																
+hydrolysis_lipids	1-f_fa_li		f_fa_li							?	?	?				-1															
+uptake_sugars	-1				(1-Y_su)*f_bu_su	(1-Y_su)*f_pro_su	(1-Y_su)*f_ac_su	(1-Y_su)*f_h2_su		?	?	?					Y_su														
+uptake_amino_acids		-1		(1-Y_aa)*f_va_aa	(1-Y_aa)*f_bu_aa	(1-Y_aa)*f_pro_aa	(1-Y_aa)*f_ac_aa	(1-Y_aa)*f_h2_aa		?	?	?						Y_aa													
+uptake_LCFA			-1				(1-Y_fa)*f_ac_fa	(1-Y_fa)*f_h2_fa		?	?	?							Y_fa												
+uptake_valerate				-1		(1-Y_c4)*f_pro_va	(1-Y_c4)*f_ac_va	(1-Y_c4)*f_h2_va		?	?	?								Y_c4											
+uptake_butyrate					-1		(1-Y_c4)*f_ac_bu	(1-Y_c4)*f_h2_bu		?	?	?								Y_c4											
+uptake_propionate						-1	(1-Y_pro)*f_ac_pro	(1-Y_pro)*f_h2_pro		?	?	?									Y_pro										
+uptake_acetate							-1		1-Y_ac	?	?	?										Y_ac									
+uptake_h2								-1	1-Y_h2	?	?	?											Y_h2								
+decay_Xsu										?	?	?	f_sI_xb	f_ch_xb	f_pr_xb	f_li_xb	-1							f_xI_xb							
+decay_Xaa										?	?	?	f_sI_xb	f_ch_xb	f_pr_xb	f_li_xb		-1						f_xI_xb							
+decay_Xfa										?	?	?	f_sI_xb	f_ch_xb	f_pr_xb	f_li_xb			-1					f_xI_xb							
+decay_Xc4										?	?	?	f_sI_xb	f_ch_xb	f_pr_xb	f_li_xb				-1				f_xI_xb							
+decay_Xpro										?	?	?	f_sI_xb	f_ch_xb	f_pr_xb	f_li_xb					-1			f_xI_xb							
+decay_Xac										?	?	?	f_sI_xb	f_ch_xb	f_pr_xb	f_li_xb						-1		f_xI_xb							
+decay_Xh2										?	?	?	f_sI_xb	f_ch_xb	f_pr_xb	f_li_xb							-1	f_xI_xb							
+lysis_XPAO										?	?	?	f_sI_xb	f_ch_xb	f_pr_xb	f_li_xb								f_xI_xb			-1				
+lysis_XPHA				f_va_PHA	f_bu_PHA	f_pro_PHA	f_ac_PHA			?	?	?													-1						

qsdsan/processes/__init__.py

@@ -17,6 +17,7 @@
 from ._asm1 import *
 from ._asm2d import *
 from ._adm1 import *
+from ._adm1_p_extension import *
 from ._madm1 import *
 from ._decay import *
 from ._kinetic_reaction import *
@@ -27,6 +28,7 @@
     _asm1,
     _asm2d,
     _adm1,
+    _adm1_p_extension,
     _madm1,
     _decay,
     _kinetic_reaction,
@@ -37,6 +39,7 @@
     *_asm1.__all__,
     *_asm2d.__all__,
     *_adm1.__all__,
+    *_adm1_p_extension.__all__,
     *_madm1.__all__,
     *_decay.__all__,
     *_kinetic_reaction.__all__,