diff --git a/src/ansys/dpf/core/dpf_operator.py b/src/ansys/dpf/core/dpf_operator.py index ed5f69182ad..162b4675626 100644 --- a/src/ansys/dpf/core/dpf_operator.py +++ b/src/ansys/dpf/core/dpf_operator.py @@ -279,14 +279,8 @@ def connect(self, pin, inpt, pin_out=0): elif isinstance(inpt, list): 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 diff --git a/src/ansys/dpf/core/meshed_region.py b/src/ansys/dpf/core/meshed_region.py index 7b278657dcd..29fb7e2ff9b 100644 --- a/src/ansys/dpf/core/meshed_region.py +++ b/src/ansys/dpf/core/meshed_region.py @@ -406,23 +406,8 @@ def named_selection( A scoping containing the IDs of the entities in the named selection. The location depends on the type of entities targeted by the named selection. """ - if server_meet_version("2.1", self._server): - out = self._api.meshed_region_get_named_selection_scoping(self, named_selection) - out_scoping = scoping.Scoping(scoping=out, server=self._server) - else: - if hasattr(self, "_stream_provider"): - from ansys.dpf.core.dpf_operator import Operator - - op = Operator("scoping_provider_by_ns", server=self._server) - op.connect(1, named_selection) - op.connect(3, self._stream_provider, 0) - out_scoping = op.get_output(0, types.scoping) - else: - raise Exception( - "Getting a named selection from a meshed region is " - "only implemented for meshed region created from a " - "model for server version 2.0. Please update your server." - ) + out = self._api.meshed_region_get_named_selection_scoping(self, named_selection) + out_scoping = scoping.Scoping(scoping=out, server=self._server) if server: # Copy the scoping to another server out_scoping = out_scoping.deep_copy(server=server) diff --git a/src/ansys/dpf/core/session.py b/src/ansys/dpf/core/session.py index bf2f6f7f83a..bb2166366ef 100644 --- a/src/ansys/dpf/core/session.py +++ b/src/ansys/dpf/core/session.py @@ -231,8 +231,7 @@ def __init__(self, server=None): self._internal_obj = self._api.session_new() self._handler = None - if server_meet_version("3.0", server): - self.add_progress_system() + self.add_progress_system() self._released = False diff --git a/src/ansys/dpf/core/workflow.py b/src/ansys/dpf/core/workflow.py index 2e9b8eaa357..68988f81925 100644 --- a/src/ansys/dpf/core/workflow.py +++ b/src/ansys/dpf/core/workflow.py @@ -217,14 +217,8 @@ def connect(self, pin_name, inpt, pin_out=0): elif isinstance(inpt, list): 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 @@ -450,7 +444,7 @@ def get_output(self, pin_name, output_type): output_type : core.type enum Type of the requested output. """ - if server_meet_version("3.0", self._server) and self.progress_bar: + if self.progress_bar: # handle progress bar self._server.session.add_workflow(self, "workflow") self._progress_thread = self._server.session.listen_to_progress() diff --git a/tests/test_cache.py b/tests/test_cache.py index 76dedaff63a..6b3517aca20 100644 --- a/tests/test_cache.py +++ b/tests/test_cache.py @@ -78,7 +78,4 @@ # res_info.unit_system # assert len(res_info._cache.cached) == 1 # res_info.physics_type -# if server_meet_version("3.0", ds._server): -# assert len(res_info._cache.cached) == 2 -# else: -# assert len(res_info._cache.cached) == 1 +# assert len(res_info._cache.cached) == 2