fix adm1p components

QSD-Group · Jun 5, 2024 · 4802c5e · 4802c5e
1 parent 71901c0
commit 4802c5e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/qsdsan/data/process_data/_masm2d.tsv b/qsdsan/data/process_data/_masm2d.tsv
@@ -0,0 +1,18 @@
+	S_O2	S_F	S_A	S_I	S_NH4	S_N2	S_NO3	S_PO4	S_IC	S_K	S_Mg	X_I	X_S	X_H	X_PAO	X_PP	X_PHA	X_AUT
+aero_hydrolysis		1-f_SI		f_SI	?			?	?				-1					
+anox_hydrolysis		1-f_SI		f_SI	?			?	?				-1					
+anae_hydrolysis		1-f_SI		f_SI	?			?	?				-1					
+hetero_growth_S_F	1-1/Y_H	(-1)/Y_H			?			?	?					1				
+hetero_growth_S_A	1-1/Y_H		(-1)/Y_H		?			?	?					1				
+denitri_S_F		(-1)/Y_H			?	(1-Y_H)/(20/7*Y_H)	(Y_H-1)/(20/7*Y_H)	?	?					1				
+denitri_S_A			(-1)/Y_H		?	(1-Y_H)/(20/7*Y_H)	(Y_H-1)/(20/7*Y_H)	?	?					1				
+ferment		-1	1		?			?	?									
+hetero_lysis					?			?	?			f_XI_H	1-f_XI_H	-1				
+storage_PHA			-1		?			Y_PO4	?	Y_PO4*K_XPP	Y_PO4*Mg_XPP					(-Y_PO4)	1	
+aero_storage_PP	(-Y_PHA)				?			-1	?	(-K_XPP)	(-Mg_XPP)					1	(-Y_PHA)	
+PAO_aero_growth_PHA	?				?			?	?						1		(-1)/Y_PAO	
+PAO_lysis					?			?	?			f_XI_PAO	1-f_XI_PAO		-1			
+PP_lysis					?			1	?	K_XPP	Mg_XPP					-1		
+PHA_lysis			1		?				?								-1	
+auto_aero_growth	(Y_A-32/7)/Y_A				?		1/Y_A	?	?									1
+auto_lysis					?			?	?			f_XI_AUT	1-f_XI_AUT					-1
diff --git a/qsdsan/processes/_adm1_p_extension.py b/qsdsan/processes/_adm1_p_extension.py
@@ -59,10 +59,10 @@ def create_adm1_p_extension_cmps(set_thermo=True):
 
     S_IP = c2d.S_PO4.copy('S_IP')
 
-    c1.S_su.i_mass = c1.X_ch.i_mass = 0.9375
-    c1.S_su.f_Vmass_Totmass = c1.X_ch.f_Vmass_Totmass = 0.68
-    c1.X_li.i_mass = 0.6375
-    c1.X_li.f_Vmass_Totmass = 1.
+    # c1.S_su.i_mass = c1.X_ch.i_mass = 0.9375
+    # c1.S_su.f_Vmass_Totmass = c1.X_ch.f_Vmass_Totmass = 0.68
+    # c1.X_li.i_mass = 0.6375
+    # c1.X_li.f_Vmass_Totmass = 1.
 
     c1.S_aa.i_C = c1.X_pr.i_C = 0.36890
     c1.S_aa.i_N = c1.X_pr.i_N = 0.11065