From fbfc519c8cd7fdbc615237dc737a0ffe80d674fb Mon Sep 17 00:00:00 2001 From: Ludovico Bianchi Date: Mon, 9 Dec 2024 09:17:13 -0600 Subject: [PATCH] Update imports to use get_solver() from watertap_solvers --- src/reaktoro_pse/core/tests/test_reaktoro_builder.py | 2 +- src/reaktoro_pse/examples/biogas_combustion.py | 2 +- .../reaktoro_pse_to_phreeqc_comparison/standard_model.py | 2 +- src/reaktoro_pse/examples/simple_desalination.py | 2 +- src/reaktoro_pse/examples/simple_ion_exchange.py | 2 +- src/reaktoro_pse/examples/thermal_precipitation.py | 2 +- src/reaktoro_pse/parallel_tools/tests/test_manager.py | 2 +- src/reaktoro_pse/tests/test_reaktoro_block.py | 2 +- .../tutorials/basic_reaktoro_block_interaction.ipynb | 2 +- src/reaktoro_pse/tutorials/integration_with_ro.ipynb | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/reaktoro_pse/core/tests/test_reaktoro_builder.py b/src/reaktoro_pse/core/tests/test_reaktoro_builder.py index c9c4d42..fe563c3 100644 --- a/src/reaktoro_pse/core/tests/test_reaktoro_builder.py +++ b/src/reaktoro_pse/core/tests/test_reaktoro_builder.py @@ -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 diff --git a/src/reaktoro_pse/examples/biogas_combustion.py b/src/reaktoro_pse/examples/biogas_combustion.py index a761654..287c908 100644 --- a/src/reaktoro_pse/examples/biogas_combustion.py +++ b/src/reaktoro_pse/examples/biogas_combustion.py @@ -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 diff --git a/src/reaktoro_pse/examples/reaktoro_pse_to_phreeqc_comparison/standard_model.py b/src/reaktoro_pse/examples/reaktoro_pse_to_phreeqc_comparison/standard_model.py index 75af141..99dd04b 100644 --- a/src/reaktoro_pse/examples/reaktoro_pse_to_phreeqc_comparison/standard_model.py +++ b/src/reaktoro_pse/examples/reaktoro_pse_to_phreeqc_comparison/standard_model.py @@ -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 diff --git a/src/reaktoro_pse/examples/simple_desalination.py b/src/reaktoro_pse/examples/simple_desalination.py index 7ad74c3..7bc208b 100644 --- a/src/reaktoro_pse/examples/simple_desalination.py +++ b/src/reaktoro_pse/examples/simple_desalination.py @@ -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 diff --git a/src/reaktoro_pse/examples/simple_ion_exchange.py b/src/reaktoro_pse/examples/simple_ion_exchange.py index d309344..851c890 100644 --- a/src/reaktoro_pse/examples/simple_ion_exchange.py +++ b/src/reaktoro_pse/examples/simple_ion_exchange.py @@ -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 diff --git a/src/reaktoro_pse/examples/thermal_precipitation.py b/src/reaktoro_pse/examples/thermal_precipitation.py index 986b043..e26876a 100644 --- a/src/reaktoro_pse/examples/thermal_precipitation.py +++ b/src/reaktoro_pse/examples/thermal_precipitation.py @@ -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 diff --git a/src/reaktoro_pse/parallel_tools/tests/test_manager.py b/src/reaktoro_pse/parallel_tools/tests/test_manager.py index 1a34170..addf873 100644 --- a/src/reaktoro_pse/parallel_tools/tests/test_manager.py +++ b/src/reaktoro_pse/parallel_tools/tests/test_manager.py @@ -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): diff --git a/src/reaktoro_pse/tests/test_reaktoro_block.py b/src/reaktoro_pse/tests/test_reaktoro_block.py index a51984d..6c256a1 100644 --- a/src/reaktoro_pse/tests/test_reaktoro_block.py +++ b/src/reaktoro_pse/tests/test_reaktoro_block.py @@ -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 diff --git a/src/reaktoro_pse/tutorials/basic_reaktoro_block_interaction.ipynb b/src/reaktoro_pse/tutorials/basic_reaktoro_block_interaction.ipynb index 506df63..7ed6789 100644 --- a/src/reaktoro_pse/tutorials/basic_reaktoro_block_interaction.ipynb +++ b/src/reaktoro_pse/tutorials/basic_reaktoro_block_interaction.ipynb @@ -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", diff --git a/src/reaktoro_pse/tutorials/integration_with_ro.ipynb b/src/reaktoro_pse/tutorials/integration_with_ro.ipynb index d6d43a4..2309453 100644 --- a/src/reaktoro_pse/tutorials/integration_with_ro.ipynb +++ b/src/reaktoro_pse/tutorials/integration_with_ro.ipynb @@ -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",