Skip to content

Commit 484d996

Browse files
authored
Remove code specific to DPF=<3.0 (#2027)
1 parent 150a2a0 commit 484d996

File tree

5 files changed

+9
-40
lines changed

5 files changed

+9
-40
lines changed

src/ansys/dpf/core/dpf_operator.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -279,14 +279,8 @@ def connect(self, pin, inpt, pin_out=0):
279279
elif isinstance(inpt, list):
280280
from ansys.dpf.core import collection
281281

282-
if server_meet_version("3.0", self._server):
283-
inpt = collection.CollectionBase.integral_collection(inpt, self._server)
284-
self._api.operator_connect_collection_as_vector(self, pin, inpt)
285-
else:
286-
if all(isinstance(x, int) for x in inpt):
287-
self._api.operator_connect_vector_int(self, pin, inpt, len(inpt))
288-
else:
289-
self._api.operator_connect_vector_double(self, pin, inpt, len(inpt))
282+
inpt = collection.CollectionBase.integral_collection(inpt, self._server)
283+
self._api.operator_connect_collection_as_vector(self, pin, inpt)
290284
elif isinstance(inpt, dict):
291285
from ansys.dpf.core import label_space
292286

src/ansys/dpf/core/meshed_region.py

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -406,23 +406,8 @@ def named_selection(
406406
A scoping containing the IDs of the entities in the named selection.
407407
The location depends on the type of entities targeted by the named selection.
408408
"""
409-
if server_meet_version("2.1", self._server):
410-
out = self._api.meshed_region_get_named_selection_scoping(self, named_selection)
411-
out_scoping = scoping.Scoping(scoping=out, server=self._server)
412-
else:
413-
if hasattr(self, "_stream_provider"):
414-
from ansys.dpf.core.dpf_operator import Operator
415-
416-
op = Operator("scoping_provider_by_ns", server=self._server)
417-
op.connect(1, named_selection)
418-
op.connect(3, self._stream_provider, 0)
419-
out_scoping = op.get_output(0, types.scoping)
420-
else:
421-
raise Exception(
422-
"Getting a named selection from a meshed region is "
423-
"only implemented for meshed region created from a "
424-
"model for server version 2.0. Please update your server."
425-
)
409+
out = self._api.meshed_region_get_named_selection_scoping(self, named_selection)
410+
out_scoping = scoping.Scoping(scoping=out, server=self._server)
426411
if server:
427412
# Copy the scoping to another server
428413
out_scoping = out_scoping.deep_copy(server=server)

src/ansys/dpf/core/session.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,7 @@ def __init__(self, server=None):
231231
self._internal_obj = self._api.session_new()
232232

233233
self._handler = None
234-
if server_meet_version("3.0", server):
235-
self.add_progress_system()
234+
self.add_progress_system()
236235

237236
self._released = False
238237

src/ansys/dpf/core/workflow.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -217,14 +217,8 @@ def connect(self, pin_name, inpt, pin_out=0):
217217
elif isinstance(inpt, list):
218218
from ansys.dpf.core import collection
219219

220-
if server_meet_version("3.0", self._server):
221-
inpt = collection.CollectionBase.integral_collection(inpt, self._server)
222-
self._api.work_flow_connect_collection_as_vector(self, pin_name, inpt)
223-
else:
224-
if all(isinstance(x, int) for x in inpt):
225-
self._api.work_flow_connect_vector_int(self, pin_name, inpt, len(inpt))
226-
else:
227-
self._api.work_flow_connect_vector_double(self, pin_name, inpt, len(inpt))
220+
inpt = collection.CollectionBase.integral_collection(inpt, self._server)
221+
self._api.work_flow_connect_collection_as_vector(self, pin_name, inpt)
228222
elif isinstance(inpt, dict):
229223
from ansys.dpf.core import label_space
230224

@@ -450,7 +444,7 @@ def get_output(self, pin_name, output_type):
450444
output_type : core.type enum
451445
Type of the requested output.
452446
"""
453-
if server_meet_version("3.0", self._server) and self.progress_bar:
447+
if self.progress_bar:
454448
# handle progress bar
455449
self._server.session.add_workflow(self, "workflow")
456450
self._progress_thread = self._server.session.listen_to_progress()

tests/test_cache.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,4 @@
7878
# res_info.unit_system
7979
# assert len(res_info._cache.cached) == 1
8080
# res_info.physics_type
81-
# if server_meet_version("3.0", ds._server):
82-
# assert len(res_info._cache.cached) == 2
83-
# else:
84-
# assert len(res_info._cache.cached) == 1
81+
# assert len(res_info._cache.cached) == 2

0 commit comments

Comments
 (0)