From 22649076769af8946eca0322d796d57fa7fd96b4 Mon Sep 17 00:00:00 2001
From: Prithwish Mukherjee <109645853+prmukherj@users.noreply.github.com>
Date: Tue, 16 Jul 2024 19:33:01 +0530
Subject: [PATCH] Maint/update wrt field data in pyfluent (#410)

---
 src/ansys/fluent/visualization/_config.py     |  2 +-
 .../visualization/post_data_extractor.py      | 45 ++++++++++++-------
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/ansys/fluent/visualization/_config.py b/src/ansys/fluent/visualization/_config.py
index 73f9a7fa..858c48d4 100644
--- a/src/ansys/fluent/visualization/_config.py
+++ b/src/ansys/fluent/visualization/_config.py
@@ -14,7 +14,7 @@ def get_config() -> dict:
     return _global_config.copy()
 
 
-def set_config(blocking: bool = False, set_view_on_display: str = None):
+def set_config(blocking: bool = True, set_view_on_display: str = None):
     """Set visualization configuration.
 
     Parameters
diff --git a/src/ansys/fluent/visualization/post_data_extractor.py b/src/ansys/fluent/visualization/post_data_extractor.py
index b6775b94..dca104d7 100644
--- a/src/ansys/fluent/visualization/post_data_extractor.py
+++ b/src/ansys/fluent/visualization/post_data_extractor.py
@@ -8,7 +8,7 @@
     GraphicsDefn,
     PlotDefn,
 )
-from ansys.fluent.core.services.field_data import _FieldDataConstants
+from ansys.fluent.core.services.field_data import SurfaceDataType, _FieldDataConstants
 import numpy as np
 
 
@@ -69,7 +69,12 @@ def _fetch_mesh_data(self, obj, *args, **kwargs):
             for id in surfaces_info[surf]["surface_id"]
         ]
 
-        transaction.add_surfaces_request(surface_ids, *args, **kwargs)
+        transaction.add_surfaces_request(
+            surfaces=surface_ids,
+            data_types=[SurfaceDataType.Vertices, SurfaceDataType.FacesConnectivity],
+            *args,
+            **kwargs,
+        )
         try:
             fields = transaction.get_fields()
             # 0 is old tag
@@ -124,10 +129,15 @@ def _fetch_contour_data(self, obj, *args, **kwargs):
             for id in surfaces_info[surf]["surface_id"]
         ]
         # get scalar field data
-        transaction.add_surfaces_request(surface_ids=surface_ids, *args, **kwargs)
+        transaction.add_surfaces_request(
+            surfaces=surface_ids,
+            data_types=[SurfaceDataType.Vertices, SurfaceDataType.FacesConnectivity],
+            *args,
+            **kwargs,
+        )
         transaction.add_scalar_fields_request(
             field_name=field,
-            surface_ids=surface_ids,
+            surfaces=surface_ids,
             node_value=node_values,
             boundary_value=boundary_values,
         )
@@ -185,9 +195,7 @@ def _fetch_pathlines_data(self, obj, *args, **kwargs):
             for surf in map(obj._api_helper.remote_surface_name, obj.surfaces_list())
             for id in surfaces_info[surf]["surface_id"]
         ]
-        transaction.add_pathlines_fields_request(
-            surface_ids=surface_ids, field_name=field
-        )
+        transaction.add_pathlines_fields_request(surfaces=surface_ids, field_name=field)
 
         try:
             fields = transaction.get_fields()
@@ -219,15 +227,20 @@ def _fetch_vector_data(self, obj, *args, **kwargs):
             for id in surfaces_info[surf]["surface_id"]
         ]
 
-        transaction.add_surfaces_request(surface_ids=surface_ids, *args, **kwargs)
+        transaction.add_surfaces_request(
+            surfaces=surface_ids,
+            data_types=[SurfaceDataType.Vertices, SurfaceDataType.FacesConnectivity],
+            *args,
+            **kwargs,
+        )
         transaction.add_scalar_fields_request(
-            surface_ids=surface_ids,
+            surfaces=surface_ids,
             field_name=field,
             node_value=False,
             boundary_value=False,
         )
         transaction.add_vector_fields_request(
-            surface_ids=surface_ids, field_name=obj.vectors_of()
+            surfaces=surface_ids, field_name=obj.vectors_of()
         )
         try:
             fields = transaction.get_fields()
@@ -337,14 +350,16 @@ def _fetch_xy_data(self, obj):
 
         # get scalar field data
         transaction.add_surfaces_request(
-            surface_ids=surface_ids,
-            provide_faces=False,
-            provide_vertices=True if node_values else False,
-            provide_faces_centroid=False if node_values else True,
+            surfaces=surface_ids,
+            data_types=(
+                [SurfaceDataType.Vertices]
+                if node_values
+                else [SurfaceDataType.FacesCentroid]
+            ),
         )
         transaction.add_scalar_fields_request(
             field_name=field,
-            surface_ids=surface_ids,
+            surfaces=surface_ids,
             node_value=node_values,
             boundary_value=boundary_values,
         )