Merge branch 'master' into fix_mode_frequency_value_1699

Author: PProfizi

examples/02-modal_analyses/01-plot_and_animate_modes.py

@@ -72,4 +72,6 @@
 # To suppress window pop-up, set the `off_screen` argument to True.
 # ~~~~~~~~~~~~~~~~~~~~
 
-animation.animate_mode(disp, mode_number=1, save_as="tmp.gif", off_screen=True)
+animation.animate_mode(
+    disp, mode_number=1, save_as="tmp.gif", off_screen=True, deform_scale_factor=10.0
+)

src/ansys/dpf/core/data_sources.py

@@ -25,7 +25,7 @@
 from __future__ import annotations
 
 import os
-from pathlib import Path
+from pathlib import Path, PurePosixPath, PureWindowsPath
 import traceback
 from typing import TYPE_CHECKING, Union
 import warnings
@@ -159,7 +159,9 @@ def set_result_file_path(
         ['...tmp...file.rst']
 
         """
-        filepath = Path(filepath)
+        filepath = (
+            PurePosixPath(filepath) if self._server.os == "posix" else PureWindowsPath(filepath)
+        )
         extension = filepath.suffix
         # Handle .res files from CFX
         if key == "" and extension == ".res":
@@ -290,7 +292,7 @@ def set_domain_result_file_path(
         >>> my_data_sources.set_domain_result_file_path(path='/tmp/file1.rst', key='rst', domain_id=1)
 
         """
-        path = Path(path)
+        path = PurePosixPath(path) if self._server.os == "posix" else PureWindowsPath(path)
         if key:
             self._api.data_sources_set_domain_result_file_path_with_key_utf8(
                 self, str(path), key, domain_id
@@ -341,7 +343,9 @@ def add_file_path(
         # The filename needs to be a fully qualified file name
         # if not os.path.dirname(filepath)
 
-        filepath = Path(filepath)
+        filepath = (
+            PurePosixPath(filepath) if self._server.os == "posix" else PureWindowsPath(filepath)
+        )
         if not filepath.parent.name:
             # append local path
             filepath = Path.cwd() / filepath.name
@@ -391,7 +395,9 @@ def add_domain_file_path(
 
         """
         # The filename needs to be a fully qualified file name
-        filepath = Path(filepath)
+        filepath = (
+            PurePosixPath(filepath) if self._server.os == "posix" else PureWindowsPath(filepath)
+        )
         if not filepath.parent.name:
             # append local path
             filepath = Path.cwd() / filepath.name
@@ -424,7 +430,9 @@ def add_file_path_for_specified_result(
             The default is ``""``, in which case the key is found directly.
         """
         # The filename needs to be a fully qualified file name
-        filepath = Path(filepath)
+        filepath = (
+            PurePosixPath(filepath) if self._server.os == "posix" else PureWindowsPath(filepath)
+        )
         if not filepath.parent.name:
             # append local path
             filepath = Path.cwd() / filepath.name

src/ansys/dpf/core/field.py

@@ -30,6 +30,7 @@
 
 from ansys import dpf
 from ansys.dpf.core import dimensionality, errors, meshed_region, scoping, time_freq_support
+from ansys.dpf.core.available_result import Homogeneity
 from ansys.dpf.core.common import (
     _get_size_of_list,
     locations,
@@ -617,12 +618,18 @@ def unit(self):
             return self.field_definition.unit
 
     @unit.setter
-    def unit(self, value):
+    def unit(self, value: str | tuple[Homogeneity, str]):
         """Change the unit for the field.
 
+        A single string is interpreted as a known physical unit with an associated homogeneity.
+
+        For DPF 11.0 (2026 R1) and above: A tuple of two strings is interpreted as a homogeneity and a unit name.
+            If the homogeneity is :py:attr:`Homogeneity.dimensionless`, then the unit string is kept as a name.
+            Otherwise, the homogeneity is ignored, and the unit string interpreted as a known physical unit with an associated homogeneity.
+
         Parameters
         ----------
-        value : str
+        value:
             Units for the field.
 
         Examples
@@ -635,10 +642,24 @@ def unit(self, value):
         >>> my_field.unit
         'm'
 
+
+        Named dimensionless unit.
+
+        >>> from ansys.dpf import core as dpf
+        >>> from ansys.dpf.core.available_result import Homogeneity
+        >>> my_field = dpf.Field(10)
+        >>> my_field.unit = (Homogeneity.dimensionless, "dollars")
+        >>> print(my_field.unit)
+        'dollars'
+
+        Notes
+        -----
+        Setting a named dimensionless unit requires DPF 11.0 (2026 R1) or above.
+
         """
-        fielddef = self.field_definition
-        fielddef.unit = value
-        self.field_definition = fielddef
+        field_def = self.field_definition
+        field_def.unit = value
+        self.field_definition = field_def
 
     @property
     def dimensionality(self):

src/ansys/dpf/core/field_definition.py

@@ -22,11 +22,14 @@
 
 """FieldDefinition."""
 
+from __future__ import annotations
+
 import traceback
 import warnings
 
 from ansys.dpf.core import server as server_module
-from ansys.dpf.core.check_version import version_requires
+from ansys.dpf.core.available_result import Homogeneity
+from ansys.dpf.core.check_version import server_meet_version_and_raise, version_requires
 from ansys.dpf.core.common import natures, shell_layers
 from ansys.dpf.core.dimensionality import Dimensionality
 from ansys.dpf.gate import (
@@ -204,8 +207,44 @@ def is_of_quantity_type(self, quantity_type):
         return is_of_quantity_type
 
     @unit.setter
-    def unit(self, value):
-        self._api.csfield_definition_set_unit(self, value, None, 0, 0, 0)
+    def unit(self, value: str | tuple[Homogeneity, str]):
+        """Change the unit for the field definition.
+
+        A single string is interpreted as a known physical unit with an associated homogeneity.
+
+        For DPF 11.0 (2026 R1) and above: A tuple of two strings is interpreted as a homogeneity and a unit name.
+            If the homogeneity is :py:attr:`Homogeneity.dimensionless`, then the unit string is kept as a name.
+            Otherwise, the homogeneity is ignored, and the unit string interpreted as a known physical unit with an associated homogeneity.
+
+        Parameters
+        ----------
+        value:
+            Units for the field.
+
+        Notes
+        -----
+        Setting a named dimensionless unit requires DPF 11.0 (2026 R1) or above.
+
+        """
+        # setter with explicit homogeneity: homogeneity is taken into account if it is dimensionless
+        if (
+            isinstance(value, tuple)
+            and len(value) == 2
+            and isinstance(value[0], Homogeneity)
+            and isinstance(value[1], str)
+        ):
+            server_meet_version_and_raise(
+                required_version="11.0",
+                server=self._server,
+                msg="Setting a named dimensionless unit requires DPF 11.0 (2026 R1) or above.",
+            )
+            # csfield_definition_set_unit will ignore the homogeneity if it is not dimensionless
+            self._api.csfield_definition_set_unit(self, value[1], None, value[0].value, 0, 0)
+        # standard unit setter, using string interpreter
+        elif isinstance(value, str):
+            self._api.csfield_definition_set_unit(self, value, None, 0, 0, 0)
+        else:
+            raise ValueError("Unit setter supports either string or tuple(Homogeneity, str)")
 
     @location.setter
     def location(self, value):

src/ansys/dpf/core/model.py

@@ -429,11 +429,11 @@ def streams_provider(self):
         return self._stream_provider
 
     def _set_data_sources(self, var_inp):
-        from pathlib import Path
+        from pathlib import PurePath
 
         if isinstance(var_inp, dpf.core.DataSources):
             self._data_sources = var_inp
-        elif isinstance(var_inp, (str, Path)):
+        elif isinstance(var_inp, (str, PurePath)):
             self._data_sources = DataSources(var_inp, server=self._server)
         else:
             self._data_sources = DataSources(server=self._server)

tests/test_field.py

@@ -29,8 +29,10 @@
 from ansys import dpf
 from ansys.dpf import core
 from ansys.dpf.core import FieldDefinition, operators as ops
+from ansys.dpf.core.available_result import Homogeneity
 from ansys.dpf.core.check_version import server_meet_version
 from ansys.dpf.core.common import locations, shell_layers
+from ansys.dpf.gate.errors import DPFServerException, DpfVersionNotSupported
 import conftest
 from conftest import SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_8_0, running_docker
 
@@ -1417,3 +1419,28 @@ def test_deep_copy_big_field_remote(server_type, server_type_remote_process):
 
     out = dpf.core.core._deep_copy(field_a, server_type_remote_process)
     assert np.allclose(out.data, data)
+
+
+def test_set_units(server_type):
+    data = np.random.random(100)
+    field = dpf.core.field_from_array(data)
+    # use string setter with recognized string
+    field.unit = "m"
+    assert field.unit == "m"
+
+    if server_meet_version("11.0", server_type):
+        # use tuple(Homogeneity, string) setter
+        field.unit = (Homogeneity.dimensionless, "sones")
+        assert field.unit == "sones"
+    else:
+        with pytest.raises(DpfVersionNotSupported):
+            # use tuple(Homogeneity, string) setter
+            field.unit = (Homogeneity.dimensionless, "sones")
+
+    # use unrecognized string
+    with pytest.raises(DPFServerException):
+        field.unit = "sones"
+
+    # use wrong type of arguments
+    with pytest.raises(ValueError):
+        field.unit = 1.0