Return modified inputs

Author: FedericoNegri

src/ansys/dpf/post/harmonic_mechanical_simulation.py

@@ -37,11 +37,9 @@ def _get_result_workflow(
         selection: Union[Selection, None] = None,
         expand_cyclic: Union[bool, List[Union[int, List[int]]]] = True,
         phase_angle_cyclic: Union[float, None] = None,
-    ) -> dpf.Workflow:
+    ) -> (dpf.Workflow, Union[str, list[str], None], str):
         """Generate (without evaluating) the Workflow to extract results."""
-        comp, to_extract, columns = self._create_components(
-            base_name, category, components
-        )
+        comp, to_extract, _ = self._create_components(base_name, category, components)
 
         # Initialize a workflow
         wf = dpf.Workflow(server=self._model._server)
@@ -209,7 +207,7 @@ def _get_result_workflow(
         wf.set_output_name("out", out)
         wf.progress_bar = False
 
-        return wf
+        return wf, comp, base_name
 
     def _get_result(
         self,
@@ -354,7 +352,7 @@ def _get_result(
             skin=skin,
         )
 
-        wf = self._get_result_workflow(
+        wf, comp, base_name = self._get_result_workflow(
             base_name=base_name,
             location=location,
             category=category,
@@ -372,7 +370,7 @@ def _get_result(
 
         disp_wf = self._generate_disp_workflow(fc, selection)
 
-        comp, _, columns = self._create_components(base_name, category, components)
+        _, _, columns = self._create_components(base_name, category, components)
 
         # Test for empty results
         if (len(fc) == 0) or all([len(f) == 0 for f in fc]):

src/ansys/dpf/post/modal_mechanical_simulation.py

@@ -26,13 +26,10 @@ def _get_result_workflow(
         selection: Union[Selection, None] = None,
         expand_cyclic: Union[bool, List[Union[int, List[int]]]] = True,
         phase_angle_cyclic: Union[float, None] = None,
-    ) -> dpf.Workflow:
+    ) -> (dpf.Workflow, Union[str, list[str], None], str):
         """Generate (without evaluating) the Workflow to extract results."""
         comp, to_extract, _ = self._create_components(base_name, category, components)
 
-        # Initialize a workflow
-        wf = dpf.Workflow(server=self._model._server)
-
         force_elemental_nodal = self._requires_manual_averaging(
             base_name=base_name,
             location=location,
@@ -169,7 +166,7 @@ def _get_result_workflow(
         wf.set_output_name("out", out)
         wf.progress_bar = False
 
-        return wf
+        return wf, comp, base_name
 
     def _get_result(
         self,
@@ -293,7 +290,7 @@ def _get_result(
             skin=skin,
         )
 
-        wf = self._get_result_workflow(
+        wf, comp, base_name = self._get_result_workflow(
             base_name=base_name,
             location=location,
             category=category,
@@ -316,7 +313,7 @@ def _get_result(
                 _WfNames.mesh, dpf.types.meshed_region
             )
 
-        comp, _, columns = self._create_components(base_name, category, components)
+        _, _, columns = self._create_components(base_name, category, components)
         return self._create_dataframe(
             fc, location, columns, comp, base_name, disp_wf, submesh
         )

src/ansys/dpf/post/static_mechanical_simulation.py

@@ -26,7 +26,7 @@ def _get_result_workflow(
         selection: Union[Selection, None] = None,
         expand_cyclic: Union[bool, List[Union[int, List[int]]]] = True,
         phase_angle_cyclic: Union[float, None] = None,
-    ) -> core.Workflow:
+    ) -> (core.Workflow, Union[str, list[str], None], str):
         """Generate (without evaluating) the Workflow to extract results."""
         comp, to_extract, _ = self._create_components(base_name, category, components)
 
@@ -166,7 +166,7 @@ def _get_result_workflow(
         wf.set_output_name("out", out)
         wf.progress_bar = False
 
-        return wf
+        return wf, comp, base_name
 
     def _get_result(
         self,
@@ -292,7 +292,7 @@ def _get_result(
             skin=skin,
         )
 
-        wf = self._get_result_workflow(
+        wf, comp, base_name = self._get_result_workflow(
             base_name=base_name,
             location=location,
             category=category,
@@ -314,7 +314,7 @@ def _get_result(
                 _WfNames.mesh, core.types.meshed_region
             )
 
-        comp, _, columns = self._create_components(base_name, category, components)
+        _, _, columns = self._create_components(base_name, category, components)
 
         return self._create_dataframe(
             fc, location, columns, comp, base_name, disp_wf, submesh

src/ansys/dpf/post/transient_mechanical_simulation.py

@@ -24,7 +24,7 @@ def _get_result_workflow(
         components: Union[str, List[str], int, List[int], None] = None,
         norm: bool = False,
         selection: Union[Selection, None] = None,
-    ) -> dpf.Workflow:
+    ) -> (dpf.Workflow, Union[str, list[str], None], str):
         """Generate (without evaluating) the Workflow to extract results."""
         comp, to_extract, _ = self._create_components(base_name, category, components)
 
@@ -166,7 +166,7 @@ def _get_result_workflow(
         wf.set_output_name("out", out)
         wf.progress_bar = False
 
-        return wf
+        return wf, comp, base_name
 
     def _get_result(
         self,
@@ -284,7 +284,7 @@ def _get_result(
             skin=skin,
         )
 
-        wf = self._get_result_workflow(
+        wf, comp, base_name = self._get_result_workflow(
             base_name=base_name,
             location=location,
             category=category,
@@ -305,7 +305,7 @@ def _get_result(
                 _WfNames.mesh, dpf.types.meshed_region
             )
 
-        comp, _, columns = self._create_components(base_name, category, components)
+        _, _, columns = self._create_components(base_name, category, components)
         return self._create_dataframe(
             fc, location, columns, comp, base_name, disp_wf=disp_wf, submesh=submesh
         )