From 49c8fe6f71f7ca0f2d8bf45f1013506580294ec5 Mon Sep 17 00:00:00 2001 From: PProfizi Date: Tue, 17 Jun 2025 10:07:26 +0200 Subject: [PATCH 1/5] Redefine locations Enum in ansys.dpf.core.common --- src/ansys/dpf/core/common.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ansys/dpf/core/common.py b/src/ansys/dpf/core/common.py index 6eaa554b197..fb2d9c2ca39 100644 --- a/src/ansys/dpf/core/common.py +++ b/src/ansys/dpf/core/common.py @@ -28,11 +28,16 @@ from typing import Dict from ansys.dpf.core.misc import module_exists -from ansys.dpf.gate.common import ProgressBarBase, locations # noqa: F401 +from ansys.dpf.gate.common import ( + ProgressBarBase, # noqa: F401 + locations as locations_gate, +) from ansys.dpf.gate.dpf_vector import ( # noqa: F401 get_size_of_list as _get_size_of_list, ) +locations = locations_gate + def _camel_to_snake_case(name): return re.sub(r"(? Date: Tue, 17 Jun 2025 11:52:18 +0200 Subject: [PATCH 2/5] Redefine locations Enum in ansys.dpf.core.common --- src/ansys/dpf/core/common.py | 38 +++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/src/ansys/dpf/core/common.py b/src/ansys/dpf/core/common.py index fb2d9c2ca39..b079e58544a 100644 --- a/src/ansys/dpf/core/common.py +++ b/src/ansys/dpf/core/common.py @@ -36,7 +36,43 @@ get_size_of_list as _get_size_of_list, ) -locations = locations_gate + +class locations(locations_gate, Enum): + """Contains strings for scoping and field locations. + + Attributes + ---------- + none = "none" + + elemental = "Elemental" + data is one per element + + elemental_nodal = "ElementalNodal" + one per node per element + + nodal = "Nodal" + one per node + + time_freq = "TimeFreq_sets" + one per time set + + overall = "overall" + applies everywhere + + time_freq_step = "TimeFreq_steps" + one per time step + + faces = "Faces" + one per face + + zone = "zone" + one per zone + + elemental_and_faces = "ElementalAndFaces" + data available in elements and faces of the model + """ + + pass def _camel_to_snake_case(name): From d6640ca365770ba279f20081a36d5dba8c72baaf Mon Sep 17 00:00:00 2001 From: PProfizi Date: Tue, 17 Jun 2025 11:53:26 +0200 Subject: [PATCH 3/5] Move locations Enum definition from gate to ansys.dpf.core.common --- src/ansys/dpf/core/common.py | 32 +++++++++- src/ansys/dpf/gate/common.py | 65 --------------------- src/ansys/dpf/gate/meshed_region_grpcapi.py | 6 +- 3 files changed, 32 insertions(+), 71 deletions(-) diff --git a/src/ansys/dpf/core/common.py b/src/ansys/dpf/core/common.py index b079e58544a..4cc8a92518a 100644 --- a/src/ansys/dpf/core/common.py +++ b/src/ansys/dpf/core/common.py @@ -30,14 +30,13 @@ from ansys.dpf.core.misc import module_exists from ansys.dpf.gate.common import ( ProgressBarBase, # noqa: F401 - locations as locations_gate, ) from ansys.dpf.gate.dpf_vector import ( # noqa: F401 get_size_of_list as _get_size_of_list, ) -class locations(locations_gate, Enum): +class locations(Enum): """Contains strings for scoping and field locations. Attributes @@ -72,7 +71,34 @@ class locations(locations_gate, Enum): data available in elements and faces of the model """ - pass + none = "none" + + # data is one per element + elemental = "Elemental" + + # one per node per element + elemental_nodal = "ElementalNodal" + + # one per node + nodal = "Nodal" + + # one per time set + time_freq = "TimeFreq_sets" + + # applies everywhere + overall = "overall" + + # one per time step + time_freq_step = "TimeFreq_steps" + + # one per face + faces = "Faces" + + # one per zone + zone = "zone" + + # data available in elements and faces of the model + elemental_and_faces = "ElementalAndFaces" def _camel_to_snake_case(name): diff --git a/src/ansys/dpf/gate/common.py b/src/ansys/dpf/gate/common.py index 178bb8851d5..75849997459 100644 --- a/src/ansys/dpf/gate/common.py +++ b/src/ansys/dpf/gate/common.py @@ -1,71 +1,6 @@ import abc -class locations: - """Contains strings for scoping and field locations. - - Attributes - ----------- - none = "none" - - elemental = "Elemental" - data is one per element - - elemental_nodal = "ElementalNodal" - one per node per element - - nodal = "Nodal" - one per node - - time_freq = "TimeFreq_sets" - one per time set - - overall = "overall" - applies everywhere - - time_freq_step = "TimeFreq_steps" - one per time step - - faces = "Faces" - one per face - - zone = "zone" - one per zone - - elemental_and_faces = "ElementalAndFaces" - data available in elements and faces of the model - """ - - none = "none" - - # data is one per element - elemental = "Elemental" - - # one per node per element - elemental_nodal = "ElementalNodal" - - # one per node - nodal = "Nodal" - - # one per time set - time_freq = "TimeFreq_sets" - - # applies everywhere - overall = "overall" - - # one per time step - time_freq_step = "TimeFreq_steps" - - # one per face - faces = "Faces" - - # one per zone - zone = "zone" - - # data available in elements and faces of the model - elemental_and_faces = "ElementalAndFaces" - - elemental_property_type_dict = { "eltype": "ELEMENT_TYPE", "elshape": "ELEMENT_SHAPE", diff --git a/src/ansys/dpf/gate/meshed_region_grpcapi.py b/src/ansys/dpf/gate/meshed_region_grpcapi.py index 68c3669ab03..53c808635d4 100644 --- a/src/ansys/dpf/gate/meshed_region_grpcapi.py +++ b/src/ansys/dpf/gate/meshed_region_grpcapi.py @@ -51,7 +51,7 @@ def meshed_region_get_num_faces(meshedRegion): @staticmethod def meshed_region_get_shared_nodes_scoping(meshedRegion): from ansys.grpc.dpf import meshed_region_pb2 - from ansys.dpf.gate.common import locations + from ansys.dpf.core.common import locations request = meshed_region_pb2.GetScopingRequest(mesh=meshedRegion._internal_obj) request.loc.location = locations.nodal return _get_stub(meshedRegion._server).GetScoping(request) @@ -59,7 +59,7 @@ def meshed_region_get_shared_nodes_scoping(meshedRegion): @staticmethod def meshed_region_get_shared_elements_scoping(meshedRegion): from ansys.grpc.dpf import meshed_region_pb2 - from ansys.dpf.gate.common import locations + from ansys.dpf.core.common import locations request = meshed_region_pb2.GetScopingRequest(mesh=meshedRegion._internal_obj) request.loc.location = locations.elemental return _get_stub(meshedRegion._server).GetScoping(request) @@ -67,7 +67,7 @@ def meshed_region_get_shared_elements_scoping(meshedRegion): @staticmethod def meshed_region_get_shared_faces_scoping(meshedRegion): from ansys.grpc.dpf import meshed_region_pb2 - from ansys.dpf.gate.common import locations + from ansys.dpf.core.common import locations request = meshed_region_pb2.GetScopingRequest(mesh=meshedRegion._internal_obj) request.loc.location = locations.elemental_nodal return _get_stub(meshedRegion._server).GetScoping(request) From a56027045e38ef6f8b6d7a150e6f127f3745c447 Mon Sep 17 00:00:00 2001 From: PProfizi Date: Tue, 17 Jun 2025 12:12:24 +0200 Subject: [PATCH 4/5] Move locations Enum definition from gate to ansys.dpf.core.common --- src/ansys/dpf/core/common.py | 2 +- src/ansys/dpf/gate/common.py | 1 + src/ansys/dpf/gate/meshed_region_grpcapi.py | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ansys/dpf/core/common.py b/src/ansys/dpf/core/common.py index 4cc8a92518a..9174bfc351e 100644 --- a/src/ansys/dpf/core/common.py +++ b/src/ansys/dpf/core/common.py @@ -36,7 +36,7 @@ ) -class locations(Enum): +class locations: """Contains strings for scoping and field locations. Attributes diff --git a/src/ansys/dpf/gate/common.py b/src/ansys/dpf/gate/common.py index 75849997459..69433b8b26e 100644 --- a/src/ansys/dpf/gate/common.py +++ b/src/ansys/dpf/gate/common.py @@ -1,5 +1,6 @@ import abc +from ansys.dpf.core.common import locations # noqa: F401 elemental_property_type_dict = { "eltype": "ELEMENT_TYPE", diff --git a/src/ansys/dpf/gate/meshed_region_grpcapi.py b/src/ansys/dpf/gate/meshed_region_grpcapi.py index 53c808635d4..68c3669ab03 100644 --- a/src/ansys/dpf/gate/meshed_region_grpcapi.py +++ b/src/ansys/dpf/gate/meshed_region_grpcapi.py @@ -51,7 +51,7 @@ def meshed_region_get_num_faces(meshedRegion): @staticmethod def meshed_region_get_shared_nodes_scoping(meshedRegion): from ansys.grpc.dpf import meshed_region_pb2 - from ansys.dpf.core.common import locations + from ansys.dpf.gate.common import locations request = meshed_region_pb2.GetScopingRequest(mesh=meshedRegion._internal_obj) request.loc.location = locations.nodal return _get_stub(meshedRegion._server).GetScoping(request) @@ -59,7 +59,7 @@ def meshed_region_get_shared_nodes_scoping(meshedRegion): @staticmethod def meshed_region_get_shared_elements_scoping(meshedRegion): from ansys.grpc.dpf import meshed_region_pb2 - from ansys.dpf.core.common import locations + from ansys.dpf.gate.common import locations request = meshed_region_pb2.GetScopingRequest(mesh=meshedRegion._internal_obj) request.loc.location = locations.elemental return _get_stub(meshedRegion._server).GetScoping(request) @@ -67,7 +67,7 @@ def meshed_region_get_shared_elements_scoping(meshedRegion): @staticmethod def meshed_region_get_shared_faces_scoping(meshedRegion): from ansys.grpc.dpf import meshed_region_pb2 - from ansys.dpf.core.common import locations + from ansys.dpf.gate.common import locations request = meshed_region_pb2.GetScopingRequest(mesh=meshedRegion._internal_obj) request.loc.location = locations.elemental_nodal return _get_stub(meshedRegion._server).GetScoping(request) From 8635134a20c9192a7fef4a4e6f56f226e1d81142 Mon Sep 17 00:00:00 2001 From: PProfizi Date: Tue, 17 Jun 2025 13:00:45 +0200 Subject: [PATCH 5/5] Move locations Enum definition from gate to ansys.dpf.core.common --- src/ansys/dpf/gate/common.py | 2 -- src/ansys/dpf/gate/meshed_region_grpcapi.py | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/ansys/dpf/gate/common.py b/src/ansys/dpf/gate/common.py index 69433b8b26e..675e8a8d145 100644 --- a/src/ansys/dpf/gate/common.py +++ b/src/ansys/dpf/gate/common.py @@ -1,7 +1,5 @@ import abc -from ansys.dpf.core.common import locations # noqa: F401 - elemental_property_type_dict = { "eltype": "ELEMENT_TYPE", "elshape": "ELEMENT_SHAPE", diff --git a/src/ansys/dpf/gate/meshed_region_grpcapi.py b/src/ansys/dpf/gate/meshed_region_grpcapi.py index 68c3669ab03..53c808635d4 100644 --- a/src/ansys/dpf/gate/meshed_region_grpcapi.py +++ b/src/ansys/dpf/gate/meshed_region_grpcapi.py @@ -51,7 +51,7 @@ def meshed_region_get_num_faces(meshedRegion): @staticmethod def meshed_region_get_shared_nodes_scoping(meshedRegion): from ansys.grpc.dpf import meshed_region_pb2 - from ansys.dpf.gate.common import locations + from ansys.dpf.core.common import locations request = meshed_region_pb2.GetScopingRequest(mesh=meshedRegion._internal_obj) request.loc.location = locations.nodal return _get_stub(meshedRegion._server).GetScoping(request) @@ -59,7 +59,7 @@ def meshed_region_get_shared_nodes_scoping(meshedRegion): @staticmethod def meshed_region_get_shared_elements_scoping(meshedRegion): from ansys.grpc.dpf import meshed_region_pb2 - from ansys.dpf.gate.common import locations + from ansys.dpf.core.common import locations request = meshed_region_pb2.GetScopingRequest(mesh=meshedRegion._internal_obj) request.loc.location = locations.elemental return _get_stub(meshedRegion._server).GetScoping(request) @@ -67,7 +67,7 @@ def meshed_region_get_shared_elements_scoping(meshedRegion): @staticmethod def meshed_region_get_shared_faces_scoping(meshedRegion): from ansys.grpc.dpf import meshed_region_pb2 - from ansys.dpf.gate.common import locations + from ansys.dpf.core.common import locations request = meshed_region_pb2.GetScopingRequest(mesh=meshedRegion._internal_obj) request.loc.location = locations.elemental_nodal return _get_stub(meshedRegion._server).GetScoping(request)