enable connection of Result instance to operator (#102)

Author: cbellot000

ansys/dpf/core/dpf_operator.py

@@ -349,6 +349,7 @@ def eval(self, pin=None):
     def _find_outputs_corresponding_pins(
         self, type_names, inpt, pin, corresponding_pins
     ):
+        from ansys.dpf.core.results import Result
         for python_name in type_names:
             # appears to be an issue on Linux.  This check is here
             # because cpp mappings are a single type mapping and
@@ -358,11 +359,12 @@ def _find_outputs_corresponding_pins(
 
             if type(inpt).__name__ == python_name:
                 corresponding_pins.append(pin)
-            elif isinstance(inpt, _Outputs) or isinstance(inpt, Operator):
+            elif isinstance(inpt, (_Outputs, Operator, Result)):
                 if isinstance(inpt, Operator):
                     output_pin_available = inpt.outputs._get_given_output([python_name])
+                elif isinstance(inpt, Result):
+                    output_pin_available = inpt().outputs._get_given_output([python_name])
                 else:
-
                     output_pin_available = inpt._get_given_output([python_name])
                 for outputpin in output_pin_available:
                     corresponding_pins.append((pin, outputpin))

ansys/dpf/core/inputs.py

@@ -95,6 +95,8 @@ def connect(self, inpt):
             )
             raise TypeError(err_str)
 
+        from ansys.dpf.core.results import Result
+
         if isinstance(inpt, _Outputs):
             self._operator.connect(self._pin, inpt._operator, corresponding_pins[0][1])
             self._operator.inputs._connected_inputs[self._pin] = {
@@ -103,6 +105,11 @@ def connect(self, inpt):
         elif isinstance(inpt, Output):
             self._operator.connect(self._pin, inpt._operator, inpt._pin)
             self._operator.inputs._connected_inputs[self._pin] = {inpt._pin: inpt}
+        elif isinstance(inpt, Result):
+            self._operator.connect(self._pin, inpt(), corresponding_pins[0][1])
+            self._operator.inputs._connected_inputs[self._pin] = {
+                corresponding_pins[0][1]: inpt()
+                }
         else:
             self._operator.connect(self._pin, inpt)
             self._operator.inputs._connected_inputs[self._pin] = inpt
@@ -215,19 +222,27 @@ def connect(self, inpt):
                     err_str += f"   - {map_types_to_python[cpp_type]}\n"
             raise TypeError(err_str)
 
-        if not isinstance(inpt, _Outputs) and not isinstance(inpt, Output):
-            self._operator.connect(corresponding_pins[0], inpt)
-            self._connected_inputs[corresponding_pins[0]] = inpt
-        elif input_type_name == "Output":
+        from ansys.dpf.core.results import Result
+        if isinstance(inpt, Output):
             self._operator.connect(corresponding_pins[0], inpt._operator, inpt._pin)
             self._connected_inputs[corresponding_pins[0]] = {inpt._pin: inpt._operator}
-        else:
+        elif isinstance(inpt, _Outputs):
             self._operator.connect(
                 corresponding_pins[0][0], inpt._operator, corresponding_pins[0][1]
             )
             self._connected_inputs[corresponding_pins[0][0]] = {
                 corresponding_pins[0][1]: inpt._operator
             }
+        elif isinstance(inpt, Result):
+            self._operator.connect(
+                corresponding_pins[0][0], inpt(), corresponding_pins[0][1]
+            )
+            self._connected_inputs[corresponding_pins[0][0]] = {
+                corresponding_pins[0][1]: inpt()
+            }
+        else:
+            self._operator.connect(corresponding_pins[0], inpt)
+            self._connected_inputs[corresponding_pins[0]] = inpt
 
     def _add_input(self, pin, spec, count_ellipsis=-1):
         if spec is not None:

tests/test_operator.py

@@ -682,6 +682,36 @@ def test_connect_model(plate_msup):
     assert np.allclose(fc[0].data[0], [5.12304110e-14, 3.64308310e-04, 5.79805917e-06])
 
 
+def test_connect_result(plate_msup):
+    model = dpf.core.Model(plate_msup)
+    stress = model.results.stress
+    eqv = ops.invariant.von_mises_eqv_fc(stress)
+    out = eqv.outputs.fields_container()
+    eqv = ops.invariant.von_mises_eqv_fc()
+    eqv.inputs.fields_container.connect(stress)
+    out2 = eqv.outputs.fields_container()
+    assert len(out) == len(out2)
+    eqv = ops.invariant.von_mises_eqv_fc()
+    eqv.inputs.connect(stress)
+    out2 = eqv.outputs.fields_container()
+    assert len(out) == len(out2)
+
+
+def test_connect_result2(plate_msup):
+    model = dpf.core.Model(plate_msup)
+    disp = model.results.displacement
+    norm = ops.math.norm_fc(disp)
+    out = norm.outputs.fields_container()
+    norm = ops.math.norm_fc()
+    norm.inputs.fields_container.connect(disp)
+    out2 = norm.outputs.fields_container()
+    assert len(out) == len(out2)
+    norm = ops.math.norm_fc()
+    norm.inputs.connect(disp)
+    out2 = norm.outputs.fields_container()
+    assert len(out) == len(out2)
+
+
 def test_operator_several_output_types(plate_msup):
     inpt = dpf.core.Field(nentities=3)
     inpt.data = [1, 2, 3, 4, 5, 6, 7, 8, 9]