feat: Extend use of VariableCatalog (#4033)

Extend use of VariableCatalog to include:
- additional pathline field for field data
- off line data files
#4032

---------

Co-authored-by: pyansys-ci-bot <[email protected]>

Author: seanpearsonuk

doc/changelog.d/4033.added.md

@@ -0,0 +1 @@
+Extend use of VariableCatalog

src/ansys/fluent/core/file_session.py

@@ -43,7 +43,11 @@
     _ReturnFieldData,
 )
 from ansys.fluent.core.filereader.case_file import CaseFile
-from ansys.fluent.core.filereader.data_file import DataFile
+from ansys.fluent.core.filereader.data_file import (
+    DataFile,
+    _to_scalar_field_name,
+    _to_vector_field_name,
+)
 from ansys.fluent.core.utils.deprecate import all_deprecators
 
 
@@ -113,7 +117,7 @@ def _get_scalar_field_data(
             )
         ]
         return self._returned_data._scalar_data(
-            kwargs.get("field_name"),
+            _to_scalar_field_name(kwargs.get("field_name")),
             kwargs.get("surfaces"),
             self.get_surface_ids(kwargs.get("surfaces")),
             scalar_field_data,
@@ -137,7 +141,7 @@ def _get_vector_field_data(
     ) -> Dict[int | str, np.array]:
         vector_field_data = self.data[(("type", "vector-field"),)]
         return self._returned_data._vector_data(
-            kwargs.get("field_name"),
+            _to_vector_field_name(kwargs.get("field_name")),
             kwargs.get("surfaces"),
             self.get_surface_ids(kwargs.get("surfaces")),
             vector_field_data,
@@ -151,10 +155,16 @@ def _get_pathlines_field_data(
             zones = []
         del zones
         pathlines_data = self.data[
-            (("type", "pathlines-field"), ("field", kwargs.get("field_name")))
+            (
+                ("type", "pathlines-field"),
+                (
+                    "field",
+                    _to_scalar_field_name(kwargs.get("field_name")),
+                ),
+            )
         ]
         return self._returned_data._pathlines_data(
-            kwargs.get("field_name"),
+            _to_scalar_field_name(kwargs.get("field_name")),
             kwargs.get("surfaces"),
             self.get_surface_ids(kwargs.get("surfaces")),
             pathlines_data,
@@ -848,6 +858,7 @@ def _get_vector_field_data(
         field_name: str,
         surfaces: List[int | str],
     ):
+        field_name = _to_vector_field_name(field_name)
         surface_ids = self.get_surface_ids(surfaces=surfaces)
         if (
             field_name.lower() != "velocity"

src/ansys/fluent/core/filereader/data_file.py

@@ -52,6 +52,16 @@
         "Missing dependencies, use 'pip install ansys-fluent-core[reader]' to install them."
     ) from exc
 
+from ansys.fluent.core.variable_strategies import (
+    FluentFieldDataNamingStrategy as vector_naming,
+)
+from ansys.fluent.core.variable_strategies import (
+    FluentSVarNamingStrategy as scalar_naming,
+)
+
+_to_scalar_field_name = scalar_naming().to_string if scalar_naming else lambda s: s
+_to_vector_field_name = vector_naming().to_string if vector_naming else lambda s: s
+
 
 class DataFile:
     """Class to read a Fluent case file.
@@ -186,6 +196,7 @@ def get_face_scalar_field_data(
         -------
             Numpy array containing scalar field data for a particular phase, field and surface.
         """
+        field_name = _to_scalar_field_name(field_name)
         if ":" in field_name:
             field_name = field_name.split(":")[1]
         min_id, max_id = self._case_file_handle.get_mesh().get_surface_locs(surface_id)

src/ansys/fluent/core/services/field_data.py

@@ -637,11 +637,16 @@ def _add_pathlines_fields_request(
             raise ValueError("For 'path-lines' `field_name` should be unique.")
         else:
             self._pathline_field_data.append(field_name)
+        additional_field_name = kwargs.get("additional_field_name")
+        if additional_field_name:
+            additional_field_name = self._allowed_scalar_field_names.valid_name(
+                additional_field_name
+            )
         self._fields_request.pathlinesFieldRequest.extend(
             self._fetched_data._pathlines_data(
                 field_name,
                 kwargs.get("surfaces"),
-                additionalField=kwargs.get("additional_field_name"),
+                additionalField=additional_field_name,
                 provideParticleTimeField=kwargs.get("provide_particle_time_field"),
                 dataLocation=(
                     FieldDataProtoModule.DataLocation.Nodes
@@ -1424,13 +1429,16 @@ def _get_pathlines_field_data(
             kwargs.get("field_name")
         )
         fields_request = get_fields_request()
+        additional_field_name = kwargs.get("additional_field_name")
+        if additional_field_name:
+            additional_field_name = self._allowed_scalar_field_names.valid_name(
+                additional_field_name
+            )
         fields_request.pathlinesFieldRequest.extend(
             self._fetched_data._pathlines_data(
                 field_name,
                 surface_ids,
-                additionalField=kwargs.get(
-                    "additional_field_name"
-                ),  # TODO an additional field name
+                additionalField=kwargs.get(additional_field_name),
                 provideParticleTimeField=kwargs.get("provide_particle_time_field"),
                 dataLocation=(
                     FieldDataProtoModule.DataLocation.Nodes

src/ansys/fluent/core/variable_strategies/svar.py

@@ -48,7 +48,7 @@ class FluentSVarNamingStrategy(MappingConversionStrategy):
             _c.STATIC_PRESSURE: "SV_P",
             # velocity
             _c.VELOCITY_X: "SV_U",
-            _c.VELOCITY_Y: "SV_U",
+            _c.VELOCITY_Y: "SV_V",
             _c.VELOCITY_Z: "SV_W",
             # density
             _c.DENSITY: "SV_DENSITY",