Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New ADM1/ASM2d Translator #1058

Merged
merged 2 commits into from
Jun 21, 2023
Merged

New ADM1/ASM2d Translator #1058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18d25db
Create translator block for new ASM2d model and rename existing trans…
MarcusHolly Jun 14, 2023
801f60b
Merge branch 'main' into new_asm2d_translator
adam-a-a Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions watertap/examples/flowsheets/case_studies/electroNP/electroNP_flowsheet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
from watertap.property_models.activated_sludge.simple_modified_asm2d_properties import (
SimpleModifiedASM2dParameterBlock,
)
from watertap.unit_models.translators.translator_adm1_asm2d import Translator_ADM1_ASM2D
from watertap.unit_models.translators.translator_adm1_simple_asm2d import (
Translator_ADM1_Simple_ASM2D,
)
from watertap.unit_models.electroNP_ZO import ElectroNPZO
from idaes.core.util.tables import (
create_stream_table_dataframe,
Expand Down Expand Up @@ -76,7 +78,7 @@ def build_flowsheet():
)
m.fs.AD.costing = UnitModelCostingBlock(flowsheet_costing_block=m.fs.costing)

m.fs.translator_adm1_asm2d = Translator_ADM1_ASM2D(
m.fs.translator_adm1_asm2d = Translator_ADM1_Simple_ASM2D(
inlet_property_package=m.fs.props_ADM1,
outlet_property_package=m.fs.props_ASM2D,
reaction_package=m.fs.rxn_props_ADM1,
Expand Down
46 changes: 13 additions & 33 deletions watertap/unit_models/translators/tests/test_translator_adm1_asm2d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@

from idaes.core import (
FlowsheetBlock,
MaterialBalanceType,
EnergyBalanceType,
MomentumBalanceType,
)

from pyomo.environ import (
Expand All @@ -41,30 +38,27 @@
number_variables,
number_total_constraints,
number_unused_variables,
unused_variables_set,
)

from idaes.core.util.scaling import (
unscaled_variables_generator,
)

from idaes.core.util.testing import initialization_tester

from watertap.unit_models.translators.translator_adm1_asm2d import Translator_ADM1_ASM2D
from watertap.unit_models.translators.translator_adm1_asm2d import (
Translator_ADM1_ASM2D,
)
from watertap.property_models.anaerobic_digestion.modified_adm1_properties import (
ModifiedADM1ParameterBlock,
)

from watertap.property_models.activated_sludge.simple_modified_asm2d_properties import (
SimpleModifiedASM2dParameterBlock,
from watertap.property_models.activated_sludge.modified_asm2d_properties import (
ModifiedASM2dParameterBlock,
)

from watertap.property_models.anaerobic_digestion.modified_adm1_reactions import (
ModifiedADM1ReactionParameterBlock,
)


from pyomo.util.check_units import assert_units_consistent, assert_units_equivalent
from pyomo.util.check_units import assert_units_consistent

# -----------------------------------------------------------------------------
# Get default solver for testing
Expand All @@ -77,9 +71,7 @@ def test_config():

m.fs = FlowsheetBlock(dynamic=False)

m.fs.props_ASM2D = SimpleModifiedASM2dParameterBlock(
additional_solute_list=["S_K", "S_Mg"]
)
m.fs.props_ASM2D = ModifiedASM2dParameterBlock()
m.fs.props_ADM1 = ModifiedADM1ParameterBlock()
m.fs.ADM1_rxn_props = ModifiedADM1ReactionParameterBlock(
property_package=m.fs.props_ADM1
Expand Down Expand Up @@ -112,9 +104,7 @@ def asmadm(self):

m.fs = FlowsheetBlock(dynamic=False)

m.fs.props_ASM2D = SimpleModifiedASM2dParameterBlock(
additional_solute_list=["S_K", "S_Mg"]
)
m.fs.props_ASM2D = ModifiedASM2dParameterBlock()
m.fs.props_ADM1 = ModifiedADM1ParameterBlock()
m.fs.ADM1_rxn_props = ModifiedADM1ReactionParameterBlock(
property_package=m.fs.props_ADM1
Expand Down Expand Up @@ -182,15 +172,14 @@ def test_build(self, asmadm):
assert hasattr(asmadm.fs.unit.inlet, "cations")

assert hasattr(asmadm.fs.unit, "outlet")
assert len(asmadm.fs.unit.outlet.vars) == 5
assert len(asmadm.fs.unit.outlet.vars) == 4
assert hasattr(asmadm.fs.unit.outlet, "flow_vol")
assert hasattr(asmadm.fs.unit.outlet, "conc_mass_comp")
assert hasattr(asmadm.fs.unit.outlet, "temperature")
assert hasattr(asmadm.fs.unit.outlet, "pressure")
assert hasattr(asmadm.fs.unit.outlet, "alkalinity")

assert number_variables(asmadm) == 183
assert number_total_constraints(asmadm) == 24
assert number_variables(asmadm) == 180
assert number_total_constraints(asmadm) == 21

assert number_unused_variables(asmadm.fs.unit) == 12

Expand Down Expand Up @@ -259,12 +248,6 @@ def test_solution(self, asmadm):
assert pytest.approx(12.7727, rel=1e-3) == value(
asmadm.fs.unit.outlet.conc_mass_comp[0, "X_I"]
)
assert pytest.approx(1e-6, rel=1e-3) == value(
asmadm.fs.unit.outlet.conc_mass_comp[0, "X_MeOH"]
)
assert pytest.approx(1e-6, rel=1e-3) == value(
asmadm.fs.unit.outlet.conc_mass_comp[0, "X_MeP"]
)
assert pytest.approx(1e-6, rel=1e-3) == value(
asmadm.fs.unit.outlet.conc_mass_comp[0, "X_PAO"]
)
Expand All @@ -277,17 +260,14 @@ def test_solution(self, asmadm):
assert pytest.approx(25.4283, rel=1e-3) == value(
asmadm.fs.unit.outlet.conc_mass_comp[0, "X_S"]
)
assert pytest.approx(1e-6, rel=1e-3) == value(
asmadm.fs.unit.outlet.conc_mass_comp[0, "X_TSS"]
)
assert pytest.approx(0.02268, rel=1e-3) == value(
asmadm.fs.unit.outlet.conc_mass_comp[0, "S_K"]
)
assert pytest.approx(0.02893, rel=1e-3) == value(
asmadm.fs.unit.outlet.conc_mass_comp[0, "S_Mg"]
)
assert pytest.approx(0.028857, rel=1e-3) == value(
asmadm.fs.unit.outlet.alkalinity[0]
assert pytest.approx(0.34628, rel=1e-3) == value(
asmadm.fs.unit.outlet.conc_mass_comp[0, "S_IC"]
)

@pytest.mark.solver
Expand Down
Loading