Skip to content

Commit

Permalink
Update imports to use get_solver() from watertap_solvers
Browse files Browse the repository at this point in the history
  • Loading branch information
lbianchi-lbl committed Dec 9, 2024
1 parent 7cb6bb2 commit fbfc519
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/reaktoro_pse/core/tests/test_reaktoro_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
)
from pyomo.environ import Block, assert_optimal_termination
from idaes.core.util.model_statistics import degrees_of_freedom
from watertap.core.solvers import get_solver
from watertap_solvers import get_solver


@pytest.fixture
Expand Down
2 changes: 1 addition & 1 deletion src/reaktoro_pse/examples/biogas_combustion.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
Constraint,
units as pyunits,
)
from watertap.core.solvers import get_solver
from watertap_solvers import get_solver
from pyomo.util.calc_var_value import calculate_variable_from_constraint

import idaes.core.util.scaling as iscale
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
Constraint,
units as pyunits,
)
from watertap.core.solvers import get_solver
from watertap_solvers import get_solver
from pyomo.util.calc_var_value import calculate_variable_from_constraint
import idaes.core.util.scaling as iscale

Expand Down
2 changes: 1 addition & 1 deletion src/reaktoro_pse/examples/simple_desalination.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
units as pyunits,
)

from watertap.core.solvers import get_solver
from watertap_solvers import get_solver
from pyomo.util.calc_var_value import calculate_variable_from_constraint

import idaes.core.util.scaling as iscale
Expand Down
2 changes: 1 addition & 1 deletion src/reaktoro_pse/examples/simple_ion_exchange.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
Constraint,
units as pyunits,
)
from watertap.core.solvers import get_solver
from watertap_solvers import get_solver
from pyomo.util.calc_var_value import calculate_variable_from_constraint

import idaes.core.util.scaling as iscale
Expand Down
2 changes: 1 addition & 1 deletion src/reaktoro_pse/examples/thermal_precipitation.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
assert_optimal_termination,
units as pyunits,
)
from watertap.core.solvers import get_solver
from watertap_solvers import get_solver
from pyomo.util.calc_var_value import calculate_variable_from_constraint
import reaktoro
import idaes.core.util.scaling as iscale
Expand Down
2 changes: 1 addition & 1 deletion src/reaktoro_pse/parallel_tools/tests/test_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
assert_optimal_termination,
units as pyunits,
)
from watertap.core.solvers import get_solver
from watertap_solvers import get_solver


def test_blockBuild_with_speciation_block(build_rkt_state_with_species):
Expand Down
2 changes: 1 addition & 1 deletion src/reaktoro_pse/tests/test_reaktoro_block.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
assert_optimal_termination,
units as pyunits,
)
from watertap.core.solvers import get_solver
from watertap_solvers import get_solver


@pytest.fixture
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
")\n",
"\n",
"from idaes.core.util.model_statistics import degrees_of_freedom\n",
"from watertap.core.solvers import get_solver\n",
"from watertap_solvers import get_solver\n",
"\n",
"from pyomo.util.calc_var_value import calculate_variable_from_constraint\n",
"\n",
Expand Down
2 changes: 1 addition & 1 deletion src/reaktoro_pse/tutorials/integration_with_ro.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
")\n",
"\n",
"from idaes.core.util.model_statistics import degrees_of_freedom\n",
"from watertap.core.solvers import get_solver\n",
"from watertap_solvers import get_solver\n",
"\n",
"from idaes.core.util.initialization import propagate_state\n",
"\n",
Expand Down

0 comments on commit fbfc519

Please sign in to comment.