From 2d32ce66c8980a110c8033954823ba4631077608 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Mon, 18 Mar 2024 16:27:54 +0100 Subject: [PATCH 1/5] Fix DataFrame.select when no set index --- src/ansys/dpf/post/dataframe.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/ansys/dpf/post/dataframe.py b/src/ansys/dpf/post/dataframe.py index 7239aac66..2688487fa 100644 --- a/src/ansys/dpf/post/dataframe.py +++ b/src/ansys/dpf/post/dataframe.py @@ -350,15 +350,16 @@ def select(self, **kwargs) -> DataFrame: indexes=row_indexes, ) + set_index = None if "time" in fc.labels: set_index = SetIndex(values=fc.get_available_ids_for_label("time")) - else: - set_index = SetIndex(values=[]) + # else: + # set_index = SetIndex(values=[]) + + column_indexes = [results_index] + if set_index: + column_indexes.append(set_index) - column_indexes = [ - results_index, - set_index, - ] if isinstance(fc, PropertyFieldsContainer): column_indexes = [results_index] From 9fa20b93ff3f6eaa0bcf51d1f0ac9af71c1f4f4c Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Wed, 20 Mar 2024 11:13:50 +0100 Subject: [PATCH 2/5] Remove dead code --- src/ansys/dpf/post/dataframe.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/ansys/dpf/post/dataframe.py b/src/ansys/dpf/post/dataframe.py index 2688487fa..2a8130498 100644 --- a/src/ansys/dpf/post/dataframe.py +++ b/src/ansys/dpf/post/dataframe.py @@ -353,8 +353,6 @@ def select(self, **kwargs) -> DataFrame: set_index = None if "time" in fc.labels: set_index = SetIndex(values=fc.get_available_ids_for_label("time")) - # else: - # set_index = SetIndex(values=[]) column_indexes = [results_index] if set_index: From 16f9c2d2a646a2fc1b3b46d191cf97dff8355252 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Wed, 20 Mar 2024 11:19:03 +0100 Subject: [PATCH 3/5] Add test --- tests/test_dataframe.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/test_dataframe.py b/tests/test_dataframe.py index 81793c94f..e67d05f29 100644 --- a/tests/test_dataframe.py +++ b/tests/test_dataframe.py @@ -116,6 +116,15 @@ def test_dataframe_select(df): # print(df2) +def test_dataframe_select_no_set_index(): + simulation = post.StaticMechanicalSimulation(examples.find_simple_bar()) + df = simulation.mesh.coordinates + df2 = df.select(components="X") + assert len(df2.index) == 2 + assert df2.index.components.values == ["X"] + assert len(df2.mesh_index.values) == len(df.mesh_index.values) + + @pytest.mark.skipif( not SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_0, reason="Fluid capabilities added with ansys-dpf-server 2024.1.pre0.", From acbe885a754908a71810ce351ad286f826482901 Mon Sep 17 00:00:00 2001 From: PProfizi Date: Tue, 19 Nov 2024 09:47:55 +0100 Subject: [PATCH 4/5] Fix MeshIndex.values evaluation --- src/ansys/dpf/post/index.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ansys/dpf/post/index.py b/src/ansys/dpf/post/index.py index d7a46976a..0ec0b0e69 100644 --- a/src/ansys/dpf/post/index.py +++ b/src/ansys/dpf/post/index.py @@ -152,7 +152,7 @@ def __init__( def _evaluate_values(self): """Evaluates the values of the MeshIndex.""" - if self._scoping_ref is not None: + if self._scoping_ref() is not None: self._values = self._scoping_ref().ids else: # Merge the fields container scoping From ee444fc1a6136407efe1f5ba52b5709ef8918322 Mon Sep 17 00:00:00 2001 From: PProfizi Date: Tue, 19 Nov 2024 14:53:48 +0100 Subject: [PATCH 5/5] Fix MeshIndex.values evaluation --- src/ansys/dpf/post/index.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ansys/dpf/post/index.py b/src/ansys/dpf/post/index.py index 0ec0b0e69..6c798664d 100644 --- a/src/ansys/dpf/post/index.py +++ b/src/ansys/dpf/post/index.py @@ -152,7 +152,7 @@ def __init__( def _evaluate_values(self): """Evaluates the values of the MeshIndex.""" - if self._scoping_ref() is not None: + if self._scoping_ref is not None and self._scoping_ref() is not None: self._values = self._scoping_ref().ids else: # Merge the fields container scoping