update watertap with new get_solver function

docs/how_to_guides/how_to_run_models_in_a_py_script.rst

@@ -69,7 +69,7 @@ Example: Python file with recommended structure
    # Import RO model
    from watertap.unit_models.reverse_osmosis_0D import ReverseOsmosis0D
    # import the solver
-   from idaes.core.solvers import get_solver
+   from watertap.core.solvers import get_solver
 
 
    # Put all the model constructors, initialization, and solver in a separate function
@@ -128,7 +128,7 @@ Example: the same code without recommended structure (may cause errors on Window
    # Import RO model
    from watertap.unit_models.reverse_osmosis_0D import ReverseOsmosis0D
    # import the solver
-   from idaes.core.solvers import get_solver
+   from watertap.core.solvers import get_solver
 
    # Create a concrete model, flowsheet, and NaCl property parameter block.
    m = ConcreteModel()

docs/how_to_guides/how_to_run_zero_order_model.rst

@@ -8,7 +8,7 @@ The example script shown below is for the dual media filtration zero-order model
    from pyomo.environ import ConcreteModel
 
    from idaes.core import FlowsheetBlock
-   from idaes.core.solvers import get_solver
+   from watertap.core.solvers import get_solver
 
    from watertap.core.wt_database import Database
    from watertap.core.zero_order_properties import WaterParameterBlock

docs/how_to_guides/how_to_scale_a_model.rst

@@ -165,7 +165,7 @@ The scaling factors are automatically passed-in when using the default WaterTAP
 
 .. testcode:: [scaling_factor]
 
-    from idaes.core.solvers import get_solver
+    from watertap.core.solvers import get_solver
     # Create default WaterTAP solver object
     opt = get_solver()
     # Solve model m

docs/how_to_guides/how_to_use_MCAS_property_model.rst

@@ -20,7 +20,7 @@ users to model the chemical and physical properties of simple systems without th
     # Import flowsheet block from IDAES core
     from idaes.core import FlowsheetBlock
     # Import solver from IDAES core
-    from idaes.core.solvers import get_solver
+    from watertap.core.solvers import get_solver
     # Import MCAS property model
     import watertap.property_models.multicomp_aq_sol_prop_pack as props
     # Import utility tool for calculating scaling factors

docs/how_to_guides/how_to_use_a_property_model.rst

@@ -18,7 +18,7 @@ users to model the chemical and physical properties of simple systems without th
     # Import flowsheet block from IDAES core
     from idaes.core import FlowsheetBlock
     # Import solver from IDAES core
-    from idaes.core.solvers import get_solver
+    from watertap.core.solvers import get_solver
     # Import NaCl property model
     import watertap.property_models.NaCl_prop_pack as props
     # Import utility tool for calculating scaling factors

docs/how_to_guides/how_to_use_unit_test_harness.rst

@@ -30,7 +30,7 @@ assumes a test file is being created for an anaerobic digester.
     from pyomo.environ import ConcreteModel
 
     from idaes.core import FlowsheetBlock, UnitModelCostingBlock
-    from idaes.core.solvers import get_solver
+    from watertap.core.solvers import get_solver
     import idaes.core.util.scaling as iscale
 
     from watertap.costing import WaterTAPCosting

tutorials/BSM2.ipynb

@@ -64,7 +64,7 @@
     "from pyomo.network import Arc, SequentialDecomposition\n",
     "from idaes.core import FlowsheetBlock\n",
     "import idaes.logger as idaeslog\n",
-    "from idaes.core.solvers import get_solver\n",
+    "from watertap.core.solvers import get_solver\n",
     "import idaes.core.util.scaling as iscale"
    ]
   },

tutorials/assets_parameter_sweep_demo/parameter_sweep_demo_script.py

@@ -9,7 +9,7 @@
 # information, respectively. These files are also available online at the URL
 # "https://github.com/watertap-org/watertap/"
 #################################################################################
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 from watertap.examples.flowsheets.RO_with_energy_recovery.RO_with_energy_recovery import (
     optimize,
 )

tutorials/introduction.ipynb

@@ -73,7 +73,7 @@
    "outputs": [],
    "source": [
     "from pyomo.environ import ConcreteModel, Var, Reals, Objective, Constraint, value, units\n",
-    "from idaes.core.solvers import get_solver"
+    "from watertap.core.solvers import get_solver"
    ]
   },
   {

tutorials/nawi_spring_meeting2023.ipynb

@@ -79,7 +79,7 @@
     "from idaes.core.util.initialization import propagate_state\n",
     "\n",
     "# Import function to get default solver\n",
-    "from idaes.core.solvers import get_solver\n",
+    "from watertap.core.solvers import get_solver\n",
     "\n",
     "# Import function to check degrees of freedom\n",
     "from idaes.core.util.model_statistics import degrees_of_freedom\n",

tutorials/parameter_sweep_demo.ipynb

@@ -173,7 +173,7 @@
     "# Make the necessary imports\n",
     "from pprint import pprint\n",
     "from IPython import get_ipython\n",
-    "from idaes.core.solvers import get_solver\n",
+    "from watertap.core.solvers import get_solver\n",
     "from watertap.examples.flowsheets.RO_with_energy_recovery.RO_with_energy_recovery import (\n",
     "    optimize,\n",
     ")\n",

tutorials/reverse_osmosis_0D.ipynb

@@ -29,7 +29,7 @@
     "# Import flowsheet block from IDAES core\n",
     "from idaes.core import FlowsheetBlock\n",
     "# Import function to get default solver\n",
-    "from idaes.core.solvers import get_solver\n",
+    "from watertap.core.solvers import get_solver\n",
     "# Import function to check degrees of freedom\n",
     "from idaes.core.util.model_statistics import degrees_of_freedom\n",
     "# Import utility function for calculating scaling factors\n",

tutorials/unit_model_customization_example.ipynb

@@ -56,7 +56,7 @@
     "from idaes.core import FlowsheetBlock\n",
     "from idaes.core.util.scaling import calculate_scaling_factors, set_scaling_factor\n",
     "from idaes.core.util.model_statistics import degrees_of_freedom\n",
-    "from idaes.core.solvers import get_solver\n",
+    "from watertap.core.solvers import get_solver\n",
     "from idaes.core.util.scaling import constraint_scaling_transform\n",
     "from idaes.core.util.initialization import propagate_state\n",
     "from idaes.models.unit_models import Feed, Product\n",

watertap/conftest.py

@@ -46,7 +46,7 @@ def for_item(cls, item: Item) -> Container["MarkerSpec"]:
 def _handle_requires_idaes_solver(
     solver: Optional = None, action: Optional[Callable[[str], None]] = pytest.xfail
 ) -> None:
-    from idaes.core.solvers import get_solver
+    from watertap.core.solvers import get_solver
     from idaes.config import bin_directory
 
     solver = solver or get_solver()

watertap/core/plugins/tests/test_solvers.py

@@ -20,7 +20,7 @@
     set_scaling_factor,
     constraints_with_scale_factor_generator,
 )
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 from watertap.core.plugins.solvers import IpoptWaterTAP, _pyomo_nl_writer_log
 
 

watertap/core/tests/test_zero_order_diso.py

@@ -18,7 +18,7 @@
 from idaes.core import declare_process_block_class, FlowsheetBlock
 from idaes.core.util.model_statistics import degrees_of_freedom
 from idaes.core.util.testing import initialization_tester
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 import idaes.core.util.scaling as iscale
 from pyomo.environ import (
     check_optimal_termination,

watertap/core/tests/test_zero_order_electricity.py

@@ -17,7 +17,7 @@
 from types import MethodType
 from idaes.core import declare_process_block_class, FlowsheetBlock
 from idaes.core.util.model_statistics import degrees_of_freedom
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 from pyomo.environ import (
     check_optimal_termination,
     ConcreteModel,

watertap/core/tests/test_zero_order_pt.py

@@ -17,7 +17,7 @@
 from types import MethodType
 from idaes.core import declare_process_block_class, FlowsheetBlock
 from idaes.core.util.model_statistics import degrees_of_freedom
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 from pyomo.environ import ConcreteModel, value
 from pyomo.network import Port
 from pyomo.util.check_units import assert_units_consistent

watertap/core/tests/test_zero_order_sido.py

@@ -18,7 +18,7 @@
 from idaes.core import declare_process_block_class, FlowsheetBlock
 from idaes.core.util.model_statistics import degrees_of_freedom
 from idaes.core.util.testing import initialization_tester
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 import idaes.core.util.scaling as iscale
 from pyomo.environ import (
     check_optimal_termination,

watertap/core/tests/test_zero_order_sido_reactive.py

@@ -19,7 +19,7 @@
 from idaes.core import declare_process_block_class, FlowsheetBlock
 from idaes.core.util.model_statistics import degrees_of_freedom
 from idaes.core.util.testing import initialization_tester
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 import idaes.core.util.scaling as iscale
 from pyomo.environ import (
     check_optimal_termination,

watertap/core/tests/test_zero_order_siso.py

@@ -18,7 +18,7 @@
 from idaes.core import declare_process_block_class, FlowsheetBlock
 from idaes.core.util.model_statistics import degrees_of_freedom
 from idaes.core.util.testing import initialization_tester
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 import idaes.core.util.scaling as iscale
 from pyomo.environ import (
     check_optimal_termination,

watertap/core/util/model_diagnostics/ipopt_initialization.py

@@ -12,7 +12,7 @@
 
 import pyomo.environ as pyo
 from idaes.core.util.scaling import get_scaling_factor, __none_left_mult
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 
 
 def assert_no_initialization_perturbation(blk, optarg=None, solver=None):

watertap/core/util/model_diagnostics/tests/test_ipopt_initialization.py

@@ -12,7 +12,7 @@
 import pytest
 from pyomo.environ import Block, Var, SolverFactory
 
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 from watertap.core.util.model_diagnostics.ipopt_initialization import (
     generate_initialization_perturbation,
     print_initialization_perturbation,

watertap/core/util/tests/test_initialization.py

@@ -14,7 +14,7 @@
 
 from pyomo.environ import ConcreteModel, Var, Constraint
 
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 from idaes.core.util.exceptions import InitializationError
 from watertap.core.util.initialization import (
     check_dof,

watertap/core/util/tests/test_scaling.py

@@ -21,7 +21,7 @@
     calculate_scaling_factors,
 )
 import idaes.core.util.scaling as iscale
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 
 import watertap.property_models.NaCl_prop_pack as props
 

watertap/core/zero_order_diso.py

@@ -17,7 +17,7 @@
 from types import MethodType
 
 import idaes.logger as idaeslog
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 import idaes.core.util.scaling as iscale
 from idaes.core.util.exceptions import InitializationError
 

watertap/core/zero_order_pt.py

@@ -18,7 +18,7 @@
 from pyomo.environ import check_optimal_termination
 
 import idaes.logger as idaeslog
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 from idaes.core.util.model_statistics import number_activated_constraints
 from idaes.core.util.exceptions import InitializationError
 

watertap/core/zero_order_sido.py

@@ -16,7 +16,7 @@
 from types import MethodType
 
 import idaes.logger as idaeslog
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 import idaes.core.util.scaling as iscale
 from idaes.core.util.exceptions import InitializationError
 

watertap/core/zero_order_sido_reactive.py

@@ -17,7 +17,7 @@
 from types import MethodType
 
 import idaes.logger as idaeslog
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 import idaes.core.util.scaling as iscale
 from idaes.core.util.exceptions import InitializationError
 

watertap/core/zero_order_siso.py

@@ -17,7 +17,7 @@
 from types import MethodType
 
 import idaes.logger as idaeslog
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 import idaes.core.util.scaling as iscale
 from idaes.core.util.exceptions import InitializationError
 

watertap/costing/tests/test_util.py

@@ -16,7 +16,7 @@
 import idaes.core.util.model_statistics as istat
 
 from pyomo.util.check_units import assert_units_consistent
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 from watertap.costing.watertap_costing_package import WaterTAPCosting
 from watertap.costing.util import (
     cost_rectifier,

watertap/costing/tests/test_zero_order_costing.py

@@ -29,7 +29,7 @@
 from pyomo.common.config import ConfigValue
 
 from idaes.core import FlowsheetBlock, declare_process_block_class
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 from idaes.core import UnitModelCostingBlock
 from idaes.core.util.model_statistics import (
     degrees_of_freedom,

watertap/costing/unit_models/tests/test_electrolyzer.py

@@ -16,7 +16,7 @@
 
 from pyomo.util.check_units import assert_units_consistent
 from idaes.core import UnitModelCostingBlock
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 from idaes.core.util.testing import initialization_tester
 from watertap.costing import WaterTAPCosting
 from watertap.unit_models.tests.test_electrolyzer import build

watertap/costing/unit_models/tests/test_gac.py

@@ -18,7 +18,7 @@
 from idaes.core import (
     UnitModelCostingBlock,
 )
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 from idaes.core.util.testing import initialization_tester
 from watertap.costing import WaterTAPCosting
 from watertap.unit_models.tests.test_gac import build_crittenden

watertap/examples/custom_model_demo/demo_simple_filter.py

@@ -15,7 +15,7 @@
 from idaes.core.util.model_statistics import degrees_of_freedom
 
 import idaes.core.util.scaling as iscale
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 
 import watertap.examples.custom_model_demo.simple_prop_pack as props
 from watertap.examples.custom_model_demo.simple_filter import Filtration

watertap/examples/custom_model_demo/demo_simple_prop_pack.py

@@ -14,7 +14,7 @@
 from idaes.core.util.model_statistics import degrees_of_freedom
 from pyomo.util.check_units import assert_units_consistent
 import idaes.core.util.scaling as iscale
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 
 import watertap.examples.custom_model_demo.simple_prop_pack as props
 

watertap/examples/custom_model_demo/simple_prop_pack.py

@@ -49,7 +49,7 @@
 from idaes.core.util.exceptions import PropertyPackageError
 import idaes.core.util.scaling as iscale
 import idaes.logger as idaeslog
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 
 # Set up logger
 _log = idaeslog.getLogger(__name__)

watertap/examples/custom_model_demo/tests/test_demo_simple_filter.py

@@ -12,7 +12,7 @@
 import pytest
 
 from pyomo.environ import value
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 
 from watertap.examples.custom_model_demo.demo_simple_filter import main
 

watertap/examples/custom_model_demo/tests/test_demo_simple_prop_pack.py

@@ -12,7 +12,7 @@
 import pytest
 
 from pyomo.environ import value
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 
 from watertap.examples.custom_model_demo.demo_simple_prop_pack import main
 

watertap/examples/flowsheets/MD/MD_single_stage_continuous_recirculation.py

@@ -23,7 +23,7 @@
 )
 from pyomo.network import Arc
 from idaes.core import FlowsheetBlock
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 from idaes.core.util.model_statistics import degrees_of_freedom
 from idaes.core.util.initialization import (
     propagate_state,

watertap/examples/flowsheets/MD/tests/test_MD.py

@@ -16,7 +16,7 @@
     Var,
 )
 from idaes.core import FlowsheetBlock
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 from idaes.core.util.model_statistics import degrees_of_freedom
 from pyomo.util.check_units import assert_units_consistent
 from idaes.models.unit_models import Heater, Separator, Mixer, Product, Feed

watertap/examples/flowsheets/RO_with_energy_recovery/RO_with_energy_recovery.py

@@ -21,7 +21,7 @@
 )
 from pyomo.network import Arc
 from idaes.core import FlowsheetBlock
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 from idaes.core.util.model_statistics import degrees_of_freedom
 from idaes.core.util.initialization import solve_indexed_blocks, propagate_state
 from idaes.models.unit_models import Mixer, Separator, Product, Feed

watertap/examples/flowsheets/RO_with_energy_recovery/RO_with_energy_recovery_ui.py

@@ -9,7 +9,7 @@
 # information, respectively. These files are also available online at the URL
 # "https://github.com/watertap-org/watertap/"
 #################################################################################
-from idaes.core.solvers import get_solver
+from watertap.core.solvers import get_solver
 from watertap.ui.fsapi import FlowsheetInterface
 from watertap.examples.flowsheets.RO_with_energy_recovery.RO_with_energy_recovery import (
     build,