Accept rank-1 NumPy arrays for workflow and operator inputs which accept lists

src/ansys/dpf/core/dpf_operator.py

@@ -26,6 +26,7 @@
 import os
 import traceback
 import warnings
+import numpy
 
 from enum import Enum
 from ansys.dpf.core.check_version import (
@@ -38,6 +39,7 @@
 from ansys.dpf.core.inputs import Inputs
 from ansys.dpf.core.mapping_types import types
 from ansys.dpf.core.common import types_enum_to_types
+from ansys.dpf.core.misc import get_array_length
 from ansys.dpf.core.outputs import Output, Outputs, _Outputs
 from ansys.dpf.core import server as server_module
 from ansys.dpf.core.operator_specification import Specification
@@ -276,17 +278,11 @@ def connect(self, pin, inpt, pin_out=0):
             self._api.operator_connect_operator_output(self, pin, inpt, pin_out)
         elif isinstance(inpt, Output):
             self._api.operator_connect_operator_output(self, pin, inpt._operator, inpt._pin)
-        elif isinstance(inpt, list):
+        elif isinstance(inpt, (list, numpy.ndarray)):
             from ansys.dpf.core import collection
 
-            if server_meet_version("3.0", self._server):
-                inpt = collection.CollectionBase.integral_collection(inpt, self._server)
-                self._api.operator_connect_collection_as_vector(self, pin, inpt)
-            else:
-                if all(isinstance(x, int) for x in inpt):
-                    self._api.operator_connect_vector_int(self, pin, inpt, len(inpt))
-                else:
-                    self._api.operator_connect_vector_double(self, pin, inpt, len(inpt))
+            inpt = collection.CollectionBase.integral_collection(inpt, self._server)
+            self._api.operator_connect_collection_as_vector(self, pin, inpt)
         elif isinstance(inpt, dict):
             from ansys.dpf.core import label_space
 

src/ansys/dpf/core/misc.py

@@ -29,6 +29,10 @@
 from pathlib import Path
 
 from pkgutil import iter_modules
+from typing import Union
+
+import numpy
+
 from ansys.dpf.core import errors
 from ansys.dpf.gate._version import __ansys_version__
 from ansys.dpf.gate import load_api
@@ -213,3 +217,10 @@
         ``True`` if the environment is setup to use the PIM API, ``False`` otherwise.
     """
     return "ANSYS_PLATFORM_INSTANCEMANAGEMENT_CONFIG" in os.environ
+
+
+def get_array_length(array: Union[list, numpy.ndarray]):
+    """Return the length of a flat array (size of numpy array or length of a list."""
+    if isinstance(array, numpy.ndarray):
+        return array.size
+    return len(array)

src/ansys/dpf/core/workflow.py

@@ -31,6 +31,8 @@
 from enum import Enum
 from typing import Union
 
+import numpy
+
 from ansys import dpf
 from ansys.dpf.core import dpf_operator, inputs, outputs
 from ansys.dpf.core.check_version import (
@@ -39,6 +41,7 @@
     server_meet_version_and_raise,
 )
 from ansys.dpf.core import server as server_module
+from ansys.dpf.core.misc import get_array_length
 from ansys.dpf.gate import (
     workflow_abstract_api,
     workflow_grpcapi,
@@ -214,17 +217,11 @@ def connect(self, pin_name, inpt, pin_out=0):
             self._api.work_flow_connect_operator_output(self, pin_name, inpt, pin_out)
         elif isinstance(inpt, dpf_operator.Output):
             self._api.work_flow_connect_operator_output(self, pin_name, inpt._operator, inpt._pin)
-        elif isinstance(inpt, list):
+        elif isinstance(inpt, (list, numpy.ndarray)):
             from ansys.dpf.core import collection
 
-            if server_meet_version("3.0", self._server):
-                inpt = collection.CollectionBase.integral_collection(inpt, self._server)
-                self._api.work_flow_connect_collection_as_vector(self, pin_name, inpt)
-            else:
-                if all(isinstance(x, int) for x in inpt):
-                    self._api.work_flow_connect_vector_int(self, pin_name, inpt, len(inpt))
-                else:
-                    self._api.work_flow_connect_vector_double(self, pin_name, inpt, len(inpt))
+            inpt = collection.CollectionBase.integral_collection(inpt, self._server)
+            self._api.work_flow_connect_collection_as_vector(self, pin_name, inpt)
         elif isinstance(inpt, dict):
             from ansys.dpf.core import label_space
 

tests/test_operator.py

@@ -27,6 +27,7 @@
 import weakref
 from pathlib import Path
 
+import numpy
 import numpy as np
 import pytest
 import copy
@@ -93,6 +94,14 @@ def test_connect_list_operator(velocity_acceleration):
     assert fcOut.get_available_ids_for_label() == [1, 2]
 
 
+def test_connect_array_operator(velocity_acceleration):
+    model = dpf.core.Model(velocity_acceleration)
+    op = model.operator("U")
+    op.connect(0, numpy.array([1, 2], numpy.int32))
+    fcOut = op.get_output(0, dpf.core.types.fields_container)
+    assert fcOut.get_available_ids_for_label() == [1, 2]
+
+
 def test_connect_list_operator_builtin(velocity_acceleration):
     model = dpf.core.Model(velocity_acceleration)
     disp = model.results.displacement()

tests/test_workflow.py

@@ -22,6 +22,7 @@
 
 from pathlib import Path
 
+import numpy
 import numpy as np
 import pytest
 import platform
@@ -137,6 +138,19 @@ def test_connect_list_workflow(velocity_acceleration, server_type):
     assert f_out.get_available_ids_for_label() == [1, 2]
 
 
+def test_connect_array_workflow(velocity_acceleration, server_type):
+    wf = dpf.core.Workflow(server=server_type)
+    wf.progress_bar = False
+    model = dpf.core.Model(velocity_acceleration, server=server_type)
+    op = model.operator("U")
+    wf.add_operator(op)
+    wf.set_input_name("time_scoping", op, 0)
+    wf.set_output_name("field", op, 0)
+    wf.connect("time_scoping", numpy.array([1, 2], numpy.int32))
+    f_out = wf.get_output("field", dpf.core.types.fields_container)
+    assert f_out.get_available_ids_for_label() == [1, 2]
+
+
 def test_connect_fieldscontainer_workflow(server_type):
     wf = dpf.core.Workflow(server=server_type)
     wf.progress_bar = False