Update parameter sweep tool to support indexed vars (#1387)

* Adding support for indexed variables in parameter sweep

* Adding test for indexed vars

idaes/core/util/parameter_sweep.py

@@ -625,13 +625,24 @@ def set_input_values(self, model, sample_id: int):
                     )
                 comp.set_value(v)
             elif ctype is Var:
-                if not comp.is_fixed():
-                    raise ValueError(
-                        f"Convergence testing found an input of type Var that "
-                        f"was not fixed ({comp.name}). Please make sure all "
-                        f"sampled inputs are either mutable params or fixed vars."
-                    )
-                comp.set_value(float(v))
+                try:
+                    if not comp.is_fixed():
+                        raise ValueError(
+                            f"Convergence testing found an input of type Var that "
+                            f"was not fixed ({comp.name}). Please make sure all "
+                            f"sampled inputs are either mutable params or fixed vars."
+                        )
+                    comp.set_value(float(v))
+                except AttributeError:
+                    # Component might be indexed, try iterating and setting value
+                    for i, c in comp.items():
+                        if not c.is_fixed():
+                            raise ValueError(
+                                f"Convergence testing found an input of type IndexedVar that "
+                                f"was not fixed ({comp.name}, index {i}). Please make sure all "
+                                f"sampled inputs are either mutable params or fixed vars."
+                            )
+                        c.set_value(float(v))
             else:
                 raise ValueError(
                     f"Failed to find a valid input component (must be "

idaes/core/util/tests/test_parameter_sweep.py

@@ -836,6 +836,40 @@ def bm():
         ):
             psweep.set_input_values(model, 0)
 
+    @pytest.mark.unit
+    def test_set_input_indexed_var(self):
+        def bm():
+            m = ConcreteModel()
+            m.v1 = Var([1, 2])
+            return m
+
+        spec2 = ParameterSweepSpecification()
+        spec2.set_sampling_method(UniformSampling)
+        spec2.add_sampled_input("v1", 0, 10)
+        spec2.set_sample_size([2])
+
+        psweep = ParameterSweepBase(
+            build_model=bm,
+            input_specification=spec2,
+        )
+
+        model = psweep.get_initialized_model()
+
+        with pytest.raises(
+            ValueError,
+            match="Convergence testing found an input of type IndexedVar that "
+            "was not fixed \(v1, index 1\). Please make sure all "
+            "sampled inputs are either mutable params or fixed vars.",
+        ):
+            psweep.set_input_values(model, 0)
+
+        model.v1.fix(20)
+
+        psweep.set_input_values(model, 0)
+
+        assert value(model.v1[1]) == 0
+        assert value(model.v1[2]) == 0
+
     @pytest.mark.unit
     def test_set_input_invalid_ctype(self):
         def bm():

idaes/models/unit_models/tests/test_heat_exchanger.py

@@ -28,7 +28,6 @@
     units as pyunits,
 )
 from pyomo.common.config import ConfigBlock
-from pyomo.util.check_units import assert_units_consistent, assert_units_equivalent
 
 from idaes.core import (
     FlowsheetBlock,

idaes/models/unit_models/tests/test_heat_exchanger_1D.py

@@ -24,7 +24,6 @@
     units as pyunits,
 )
 from pyomo.common.config import ConfigBlock
-from pyomo.util.check_units import assert_units_consistent, assert_units_equivalent
 import pyomo.common.unittest as unittest
 
 import idaes
@@ -55,7 +54,6 @@
 
 from idaes.core.util.exceptions import ConfigurationError, InitializationError
 from idaes.core.util.model_statistics import (
-    degrees_of_freedom,
     number_variables,
     number_total_constraints,
     number_unused_variables,