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.

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

add VMD, PGMD/CGMD #1466

Open
wants to merge 24 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
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
141 changes: 0 additions & 141 deletions docs/how_to_guides/how_to_use_debugging_solver_wrapper.rst

This file was deleted.

1 change: 0 additions & 1 deletion docs/how_to_guides/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ How To Guides
how_to_use_parameter_sweep_monte_carlo
how_to_run_differential_parameter_sweep
how_to_use_loopTool_to_explore_flowsheets
how_to_use_debugging_solver_wrapper
how_to_use_property_test_harness
how_to_use_ui_api
how_to_use_unit_test_harness
Expand Down
61 changes: 0 additions & 61 deletions watertap/core/util/model_debug_mode.py

This file was deleted.

106 changes: 0 additions & 106 deletions watertap/core/util/tests/test_model_debug_mode.py

This file was deleted.

47 changes: 20 additions & 27 deletions watertap/unit_models/MD/MD_channel_0D.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ def add_geometry(
def add_state_blocks(
self,
has_phase_equilibrium=None,
property_package_vapor=None,
property_package_args_vapor=None,
):
super().add_state_blocks(has_phase_equilibrium=has_phase_equilibrium)

Expand Down Expand Up @@ -91,13 +89,6 @@ def add_state_blocks(

add_object_reference(self, "properties", properties_dict)

self._add_interface_stateblock(has_phase_equilibrium)
self._add_vapor_stateblock(
property_package_vapor,
property_package_args_vapor,
has_phase_equilibrium=False,
)

def _add_pressure_change(self, pressure_change_type=PressureChangeType.calculated):
if pressure_change_type == PressureChangeType.fixed_per_stage:
return
Expand Down Expand Up @@ -231,25 +222,27 @@ def initialize(
raise ConfigurationError(
"Either hot_ch or cold_ch must be set in the configuration."
)
state_args_interface = self._get_state_args_interface(
state_args_properties_in, state_args_properties_out
)
self.properties_interface.initialize(
outlvl=outlvl,
optarg=optarg,
solver=solver,
state_args=state_args_interface,
)
if hasattr(self, "properties_interface"):
state_args_interface = self._get_state_args_interface(
state_args_properties_in, state_args_properties_out
)
self.properties_interface.initialize(
outlvl=outlvl,
optarg=optarg,
solver=solver,
state_args=state_args_interface,
)

state_args_vapor = self._get_state_args_vapor(
state_args_properties_in, state_args_properties_out
)
self.properties_vapor.initialize(
outlvl=outlvl,
optarg=optarg,
solver=solver,
state_args=state_args_vapor,
)
if hasattr(self, "properties_vapor"):
state_args_vapor = self._get_state_args_vapor(
state_args_properties_in, state_args_properties_out
)
self.properties_vapor.initialize(
outlvl=outlvl,
optarg=optarg,
solver=solver,
state_args=state_args_vapor,
)

init_log.info("Initialization Complete")

Expand Down
Loading
Loading