Skip to content

Commit

Permalink
Merge branch 'algae' of https://github.com/QSD-Group/QSDsan into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
@yalinli2
yalinli2 committed Dec 10, 2024
2 parents a811f78 + 4ec854a commit dbf5616
Show file tree
Hide file tree
Showing 5 changed files with 1,045 additions and 4 deletions.
39 changes: 39 additions & 0 deletions qsdsan/data/process_data/_pm2asm2d.tsv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
X_CHL X_ALG X_CH X_LI S_CO2 S_A S_F S_O2 S_NH S_NO S_P X_N_ALG X_P_ALG S_N2 S_ALK S_I X_I X_S X_H X_AUT
photoadaptation 1
ammonium_uptake -1 1
phosphorus_uptake -1 1
growth_pho 1 ? 1 ? ?
carbohydrate_storage_pho 1 ? 1
lipid_storage_pho 1 ? 1
carbohydrate_growth_pho 1 (-Y_CH_PHO/Y_X_ALG_PHO) ? ? ? ?
lipid_growth_pho 1 (-Y_LI_PHO/Y_X_ALG_PHO) ? ? ? ?
carbohydrate_maintenance_pho -1 ? -1
lipid_maintenance_pho -1 ? -1
endogenous_respiration_pho -1 ? -1 ? ?
growth_ace 1 ? (-1)/Y_X_ALG_HET_ACE ? ? ?
carbohydrate_storage_ace 1 ? (-1)/Y_CH_ND_HET_ACE ?
lipid_storage_ace 1 ? (-1)/Y_LI_ND_HET_ACE ?
carbohydrate_growth_ace 1 (-Y_CH_NR_HET_ACE/Y_X_ALG_HET_ACE) ? ? ? ?
lipid_growth_ace 1 (-Y_LI_NR_HET_ACE/Y_X_ALG_HET_ACE) ? ? ? ?
carbohydrate_maintenance_ace -1 ? -1
lipid_maintenance_ace -1 ? -1
endogenous_respiration_ace -1 ? -1 ? ?
growth_glu 1 ? (-1)/Y_X_ALG_HET_GLU ? ? ?
carbohydrate_storage_glu 1 ? (-1)/Y_CH_ND_HET_GLU ?
lipid_storage_glu 1 ? (-1)/Y_LI_ND_HET_GLU ?
carbohydrate_growth_glu 1 (-Y_CH_NR_HET_GLU/Y_X_ALG_HET_GLU) ? ? ? ?
lipid_growth_glu 1 (-Y_LI_NR_HET_GLU/Y_X_ALG_HET_GLU) ? ? ? ?
carbohydrate_maintenance_glu -1 ? -1
lipid_maintenance_glu -1 ? -1
endogenous_respiration_glu -1 ? -1 ? ?
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)/Y_H 1-1/Y_H ? ? ? 1
hetero_growth_S_A (-1)/Y_H 1-1/Y_H ? ? ? 1
denitri_S_F (-1)/Y_H ? (Y_H-1)/(20/7*Y_H) ? (1-Y_H)/(20/7*Y_H) ? 1
denitri_S_A (-1)/Y_H ? (Y_H-1)/(20/7*Y_H) ? (1-Y_H)/(20/7*Y_H) ? 1
ferment 1 -1 ? ? ?
hetero_lysis ? ? ? f_XI_H 1-f_XI_H -1
auto_aero_growth (Y_A-32/7)/Y_A ? 1/Y_A ? ? 1
auto_lysis ? ? ? f_XI_AUT 1-f_XI_AUT -1
28 changes: 28 additions & 0 deletions qsdsan/data/process_data/_pm2asm2d_1.tsv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
X_CHL X_ALG X_CH X_LI S_CO2 S_A S_F S_O2 S_NH S_NO S_P X_N_ALG X_P_ALG S_N2 S_ALK S_I X_I X_S X_H X_AUT
photoadaptation 1
ammonium_uptake -1 1
phosphorus_uptake -1 1
growth_pho 1 ? 1 ? ?
carbohydrate_storage_pho 1 ? 1
lipid_storage_pho 1 ? 1
carbohydrate_growth_pho 1 (-Y_CH_PHO/Y_X_ALG_PHO) ? ? ? ?
lipid_growth_pho 1 (-Y_LI_PHO/Y_X_ALG_PHO) ? ? ? ?
carbohydrate_maintenance_pho -1 ? -1
lipid_maintenance_pho -1 ? -1
endogenous_respiration_pho -1 ? -1 ? ?
growth_ace 1 ? (-1)/Y_X_ALG_HET_ACE ? ? ?
carbohydrate_storage_ace 1 ? (-1)/Y_CH_ND_HET_ACE ?
lipid_storage_ace 1 ? (-1)/Y_LI_ND_HET_ACE ?
carbohydrate_growth_ace 1 (-Y_CH_NR_HET_ACE/Y_X_ALG_HET_ACE) ? ? ? ?
lipid_growth_ace 1 (-Y_LI_NR_HET_ACE/Y_X_ALG_HET_ACE) ? ? ? ?
carbohydrate_maintenance_ace -1 ? -1
lipid_maintenance_ace -1 ? -1
endogenous_respiration_ace -1 ? -1 ? ?
growth_glu 1 ? (-1)/Y_X_ALG_HET_GLU ? ? ?
carbohydrate_storage_glu 1 ? (-1)/Y_CH_ND_HET_GLU ?
lipid_storage_glu 1 ? (-1)/Y_LI_ND_HET_GLU ?
carbohydrate_growth_glu 1 (-Y_CH_NR_HET_GLU/Y_X_ALG_HET_GLU) ? ? ? ?
lipid_growth_glu 1 (-Y_LI_NR_HET_GLU/Y_X_ALG_HET_GLU) ? ? ? ?
carbohydrate_maintenance_glu -1 ? -1
lipid_maintenance_glu -1 ? -1
endogenous_respiration_glu -1 ? -1 ? ?
12 changes: 12 additions & 0 deletions qsdsan/data/process_data/_pm2asm2d_2.tsv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
X_CHL X_ALG X_CH X_LI S_CO2 S_A S_F S_O2 S_NH S_NO S_P X_N_ALG X_P_ALG S_N2 S_ALK S_I X_I X_S X_H 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)/Y_H 1-1/Y_H ? ? ? 1
hetero_growth_S_A (-1)/Y_H 1-1/Y_H ? ? ? 1
denitri_S_F (-1)/Y_H ? (Y_H-1)/(20/7*Y_H) ? (1-Y_H)/(20/7*Y_H) ? 1
denitri_S_A (-1)/Y_H ? (Y_H-1)/(20/7*Y_H) ? (1-Y_H)/(20/7*Y_H) ? 1
ferment 1 -1 ? ? ?
hetero_lysis ? ? ? f_XI_H 1-f_XI_H -1
auto_aero_growth (Y_A-32/7)/Y_A ? 1/Y_A ? ? 1
auto_lysis ? ? ? f_XI_AUT 1-f_XI_AUT -1
13 changes: 9 additions & 4 deletions qsdsan/processes/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
Joy Zhang <[email protected]>
Ga-Yeong Kim <[email protected]>
This module is under the University of Illinois/NCSA Open Source License.
Please refer to https://github.com/QSD-Group/QSDsan/blob/main/LICENSE.txt
for license details.
Expand Down Expand Up @@ -59,6 +61,7 @@ def __init__(self):

#%%
from ._aeration import *
from ._aerobic_digestion_addon import *
from ._asm1 import *
from ._asm2d import *
from ._adm1 import *
Expand All @@ -67,10 +70,11 @@ def __init__(self):
from ._decay import *
from ._kinetic_reaction import *
from ._pm2 import *
from ._aerobic_digestion_addon import *
from ._pm2asm2d import *

from . import (
_aeration,
_aerobic_digestion_addon,
_asm1,
_asm2d,
_adm1,
Expand All @@ -79,11 +83,12 @@ def __init__(self):
_decay,
_kinetic_reaction,
_pm2,
_aerobic_digestion_addon,
_pm2asm2d,
)

__all__ = (
*_aeration.__all__,
*_aerobic_digestion_addon.__all__,
*_asm1.__all__,
*_asm2d.__all__,
*_adm1.__all__,
Expand All @@ -92,5 +97,5 @@ def __init__(self):
*_decay.__all__,
*_kinetic_reaction.__all__,
*_pm2.__all__,
*_aerobic_digestion_addon.__all__,
)
*_pm2asm2d.__all__,
)
Loading

0 comments on commit dbf5616

Please sign in to comment.