clean up ADM1_p_extension

QSD-Group · May 10, 2024 · 8e27f89 · 8e27f89
1 parent 1ac9fe6
commit 8e27f89
Show file tree

Hide file tree

Showing 5 changed files with 248 additions and 588 deletions.
diff --git a/qsdsan/data/process_data/_adm1_p_extension.tsv b/qsdsan/data/process_data/_adm1_p_extension.tsv
@@ -17,5 +17,10 @@ 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							
+storage_Sva_in_XPHA				-1						?	?	?													1	-Y_PO4		Y_PO4*K_XPP	Y_PO4*Mg_XPP		
+storage_Sbu_in_XPHA					-1					?	?	?													1	-Y_PO4		Y_PO4*K_XPP	Y_PO4*Mg_XPP		
+storage_Spro_in_XPHA						-1				?	?	?													1	-Y_PO4		Y_PO4*K_XPP	Y_PO4*Mg_XPP		
+storage_Sac_in_XPHA							-1			?	?	?													1	-Y_PO4		Y_PO4*K_XPP	Y_PO4*Mg_XPP		
 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						
+lysis_XPP										?	?	?														-1		K_XPP	Mg_XPP		
+lysis_XPHA				f_va_PHA	f_bu_PHA	f_pro_PHA	f_ac_PHA			?	?	?													-1						
diff --git a/qsdsan/processes/__init__.py b/qsdsan/processes/__init__.py
@@ -32,6 +32,7 @@
     _madm1,
     _decay,
     _kinetic_reaction,
+    _pm2
     )
 
 __all__ = (

diff --git a/qsdsan/processes/_adm1.py b/qsdsan/processes/_adm1.py
@@ -24,10 +24,10 @@
 
 __all__ = ('create_adm1_cmps', 'ADM1',
            'non_compet_inhibit', 'substr_inhibit',
-           'T_correction_factor', 
+           'mass2mol_conversion', 'T_correction_factor', 
            'pH_inhibit', 'Hill_inhibit', 
            'rhos_adm1', 
-           'solve_pH',
+           'solve_pH', 'TempState',
            'dydt_Sh2_AD', 'grad_dydt_Sh2_AD')
 
 _path = ospath.join(data_path, 'process_data/_adm1.tsv')