From 68232f25d27dce4cce0975cb7efb1f8c366173f8 Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Thu, 23 Mar 2023 17:22:49 +0530 Subject: [PATCH 01/35] Meshing Queries Unit Testing --- src/ansys/fluent/core/fluent_connection.py | 9 + .../fluent/core/services/meshing_queries.py | 154 ++++++++++++++++++ 2 files changed, 163 insertions(+) create mode 100644 src/ansys/fluent/core/services/meshing_queries.py diff --git a/src/ansys/fluent/core/fluent_connection.py b/src/ansys/fluent/core/fluent_connection.py index 361783ddf01..8fae9afcaf5 100644 --- a/src/ansys/fluent/core/fluent_connection.py +++ b/src/ansys/fluent/core/fluent_connection.py @@ -20,6 +20,10 @@ from ansys.fluent.core.services.events import EventsService from ansys.fluent.core.services.field_data import FieldData, FieldDataService, FieldInfo from ansys.fluent.core.services.health_check import HealthCheckService +from ansys.fluent.core.services.meshing_queries import ( + MeshingQueries, + MeshingQueriesService, +) from ansys.fluent.core.services.monitor import MonitorsService from ansys.fluent.core.services.scheme_eval import SchemeEval, SchemeEvalService from ansys.fluent.core.services.settings import SettingsService @@ -208,6 +212,11 @@ def __init__( self.events_manager.start() self.datamodel_service_tui = DatamodelService_TUI(self._channel, self._metadata) + self.meshing_queries_service = MeshingQueriesService( + self._channel, self._metadata + ) + self.meshing_queries = MeshingQueries(self.meshing_queries_service) + self.datamodel_service_se = DatamodelService_SE(self._channel, self._metadata) self.datamodel_events = DatamodelEvents(self.datamodel_service_se) self.datamodel_events.start() diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py new file mode 100644 index 00000000000..75696d346f5 --- /dev/null +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -0,0 +1,154 @@ +"""Wrappers over Meshing queries gRPC service of Fluent.""" + +from typing import Any, List, Tuple + +import grpc + +from ansys.api.fluent.v0 import meshing_queries_pb2 as MeshingQueriesProtoModule +from ansys.api.fluent.v0 import meshing_queries_pb2_grpc as MeshingQueriesGrpcModule +from ansys.fluent.core.services.error_handler import catch_grpc_error +from ansys.fluent.core.services.interceptors import BatchInterceptor, TracingInterceptor + +Path = List[Tuple[str, str]] + + +class MeshingQueriesService: + """ + Meshing Queries Service. + """ + + def __init__(self, channel: grpc.Channel, metadata: List[Tuple[str, str]]): + """__init__ method of MeshingQueries class.""" + intercept_channel = grpc.intercept_channel( + channel, TracingInterceptor(), BatchInterceptor() + ) + self._stub = MeshingQueriesGrpcModule.MeshingQueriesStub(intercept_channel) + self._metadata = metadata + + @catch_grpc_error + def GetFaceZoneAtLocation( + self, request: MeshingQueriesProtoModule.GetFaceZoneAtLocationRequest + ) -> MeshingQueriesProtoModule.GetFaceZoneAtLocationResponse: + """GetFaceZoneAtLocation rpc of Reduction service.""" + return self._stub.GetFaceZoneAtLocation(request, metadata=self._metadata) + + @catch_grpc_error + def GetCellZoneAtLocation( + self, request: MeshingQueriesProtoModule.GetCellZoneAtLocationRequest + ) -> MeshingQueriesProtoModule.GetCellZoneAtLocationResponse: + """GetFaceZoneAtLocation rpc of Reduction service.""" + return self._stub.GetCellZoneAtLocation(request, metadata=self._metadata) + + @catch_grpc_error + def GetZonesOfType( + self, request: MeshingQueriesProtoModule.GetZonesOfTypeRequest + ) -> MeshingQueriesProtoModule.GetZonesOfTypeResponse: + """GetFaceZoneAtLocation rpc of Reduction service.""" + return self._stub.GetZonesOfType(request, metadata=self._metadata) + + @catch_grpc_error + def GetZonesOfGroup( + self, request: MeshingQueriesProtoModule.GetZonesOfGroupRequest + ) -> MeshingQueriesProtoModule.GetZonesOfGroupResponse: + """GetFaceZoneAtLocation rpc of Reduction service.""" + return self._stub.GetZonesOfGroup(request, metadata=self._metadata) + + @catch_grpc_error + def GetFaceZonesOfFilter( + self, request: MeshingQueriesProtoModule.GetFaceZonesOfFilterRequest + ) -> MeshingQueriesProtoModule.GetFaceZonesOfFilterResponse: + """GetFaceZoneAtLocation rpc of Reduction service.""" + return self._stub.GetFaceZonesOfFilter(request, metadata=self._metadata) + + @catch_grpc_error + def GetCellZonesOfFilter( + self, request: MeshingQueriesProtoModule.GetCellZonesOfFilterRequest + ) -> MeshingQueriesProtoModule.GetCellZonesOfFilterResponse: + """GetFaceZoneAtLocation rpc of Reduction service.""" + return self._stub.GetCellZonesOfFilter(request, metadata=self._metadata) + + @catch_grpc_error + def GetEdgeZonesOfFilter( + self, request: MeshingQueriesProtoModule.GetEdgeZonesOfFilterRequest + ) -> MeshingQueriesProtoModule.GetEdgeZonesOfFilterResponse: + """GetFaceZoneAtLocation rpc of Reduction service.""" + return self._stub.GetEdgeZonesOfFilter(request, metadata=self._metadata) + + @catch_grpc_error + def GetNodeZonesOfFilter( + self, request: MeshingQueriesProtoModule.GetNodeZonesOfFilterRequest + ) -> MeshingQueriesProtoModule.GetNodeZonesOfFilterResponse: + """GetFaceZoneAtLocation rpc of Reduction service.""" + return self._stub.GetNodeZonesOfFilter(request, metadata=self._metadata) + + +class MeshingQueries: + """ + Reduction. + """ + + def __init__(self, service: MeshingQueriesService): + """__init__ method of Reduction class.""" + self.service = service + + docstring = None + + def GetFaceZoneAtLocation(self, location) -> Any: + """GetFaceZoneAtLocationRequest.""" + request = MeshingQueriesProtoModule.GetFaceZoneAtLocationRequest() + request.location.x = location[0] + request.location.y = location[1] + request.location.z = location[2] + response = self.service.GetFaceZoneAtLocation(request) + return response.face_zone_id + + def GetCellZoneAtLocation(self, location) -> Any: + """GetFaceZoneAtLocationRequest.""" + request = MeshingQueriesProtoModule.GetCellZoneAtLocationRequest() + request.location.x = location[0] + request.location.y = location[1] + request.location.z = location[2] + response = self.service.GetCellZoneAtLocation(request) + return response.cell_zone_id + + def GetZonesOfType(self, zone_type) -> Any: + """GetFaceZoneAtLocationRequest.""" + request = MeshingQueriesProtoModule.GetZonesOfTypeRequest() + request.zone_type = zone_type + response = self.service.GetZonesOfType(request) + return response.zone_ids + + def GetZonesOfGroup(self, group) -> Any: + """GetFaceZoneAtLocationRequest.""" + request = MeshingQueriesProtoModule.GetZonesOfGroupRequest() + request.group = group + response = self.service.GetZonesOfGroup(request) + return response.zone_ids + + def GetFaceZonesOfFilter(self, filter) -> Any: + """GetFaceZoneAtLocationRequest.""" + request = MeshingQueriesProtoModule.GetFaceZonesOfFilterRequest() + request.filter = filter + response = self.service.GetFaceZonesOfFilter(request) + return response.face_zone_ids + + def GetCellZonesOfFilter(self, filter) -> Any: + """GetFaceZoneAtLocationRequest.""" + request = MeshingQueriesProtoModule.GetCellZonesOfFilterRequest() + request.filter = filter + response = self.service.GetCellZonesOfFilter(request) + return response.cell_zone_ids + + def GetEdgeZonesOfFilter(self, filter) -> Any: + """GetFaceZoneAtLocationRequest.""" + request = MeshingQueriesProtoModule.GetEdgeZonesOfFilterRequest() + request.filter = filter + response = self.service.GetEdgeZonesOfFilter(request) + return response.edge_zone_ids + + def GetNodeZonesOfFilter(self, filter) -> Any: + """GetFaceZoneAtLocationRequest.""" + request = MeshingQueriesProtoModule.GetNodeZonesOfFilterRequest() + request.filter = filter + response = self.service.GetNodeZonesOfFilter(request) + return response.node_zone_ids From b72cc22591e0cf641365339317fcd829f472260a Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Thu, 23 Mar 2023 17:37:40 +0530 Subject: [PATCH 02/35] Updated docstrings --- .../fluent/core/services/meshing_queries.py | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index 75696d346f5..3f070b3343b 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -36,49 +36,49 @@ def GetFaceZoneAtLocation( def GetCellZoneAtLocation( self, request: MeshingQueriesProtoModule.GetCellZoneAtLocationRequest ) -> MeshingQueriesProtoModule.GetCellZoneAtLocationResponse: - """GetFaceZoneAtLocation rpc of Reduction service.""" + """GetCellZoneAtLocation rpc of Reduction service.""" return self._stub.GetCellZoneAtLocation(request, metadata=self._metadata) @catch_grpc_error def GetZonesOfType( self, request: MeshingQueriesProtoModule.GetZonesOfTypeRequest ) -> MeshingQueriesProtoModule.GetZonesOfTypeResponse: - """GetFaceZoneAtLocation rpc of Reduction service.""" + """GetZonesOfType rpc of Reduction service.""" return self._stub.GetZonesOfType(request, metadata=self._metadata) @catch_grpc_error def GetZonesOfGroup( self, request: MeshingQueriesProtoModule.GetZonesOfGroupRequest ) -> MeshingQueriesProtoModule.GetZonesOfGroupResponse: - """GetFaceZoneAtLocation rpc of Reduction service.""" + """GetZonesOfGroup rpc of Reduction service.""" return self._stub.GetZonesOfGroup(request, metadata=self._metadata) @catch_grpc_error def GetFaceZonesOfFilter( self, request: MeshingQueriesProtoModule.GetFaceZonesOfFilterRequest ) -> MeshingQueriesProtoModule.GetFaceZonesOfFilterResponse: - """GetFaceZoneAtLocation rpc of Reduction service.""" + """GetFaceZonesOfFilter rpc of Reduction service.""" return self._stub.GetFaceZonesOfFilter(request, metadata=self._metadata) @catch_grpc_error def GetCellZonesOfFilter( self, request: MeshingQueriesProtoModule.GetCellZonesOfFilterRequest ) -> MeshingQueriesProtoModule.GetCellZonesOfFilterResponse: - """GetFaceZoneAtLocation rpc of Reduction service.""" + """GetCellZonesOfFilter rpc of Reduction service.""" return self._stub.GetCellZonesOfFilter(request, metadata=self._metadata) @catch_grpc_error def GetEdgeZonesOfFilter( self, request: MeshingQueriesProtoModule.GetEdgeZonesOfFilterRequest ) -> MeshingQueriesProtoModule.GetEdgeZonesOfFilterResponse: - """GetFaceZoneAtLocation rpc of Reduction service.""" + """GetEdgeZonesOfFilter rpc of Reduction service.""" return self._stub.GetEdgeZonesOfFilter(request, metadata=self._metadata) @catch_grpc_error def GetNodeZonesOfFilter( self, request: MeshingQueriesProtoModule.GetNodeZonesOfFilterRequest ) -> MeshingQueriesProtoModule.GetNodeZonesOfFilterResponse: - """GetFaceZoneAtLocation rpc of Reduction service.""" + """GetNodeZonesOfFilter rpc of Reduction service.""" return self._stub.GetNodeZonesOfFilter(request, metadata=self._metadata) @@ -94,7 +94,7 @@ def __init__(self, service: MeshingQueriesService): docstring = None def GetFaceZoneAtLocation(self, location) -> Any: - """GetFaceZoneAtLocationRequest.""" + """GetFaceZoneAtLocation.""" request = MeshingQueriesProtoModule.GetFaceZoneAtLocationRequest() request.location.x = location[0] request.location.y = location[1] @@ -103,7 +103,7 @@ def GetFaceZoneAtLocation(self, location) -> Any: return response.face_zone_id def GetCellZoneAtLocation(self, location) -> Any: - """GetFaceZoneAtLocationRequest.""" + """GetCellZoneAtLocation.""" request = MeshingQueriesProtoModule.GetCellZoneAtLocationRequest() request.location.x = location[0] request.location.y = location[1] @@ -112,42 +112,42 @@ def GetCellZoneAtLocation(self, location) -> Any: return response.cell_zone_id def GetZonesOfType(self, zone_type) -> Any: - """GetFaceZoneAtLocationRequest.""" + """GetZonesOfType.""" request = MeshingQueriesProtoModule.GetZonesOfTypeRequest() request.zone_type = zone_type response = self.service.GetZonesOfType(request) return response.zone_ids def GetZonesOfGroup(self, group) -> Any: - """GetFaceZoneAtLocationRequest.""" + """GetZonesOfGroup.""" request = MeshingQueriesProtoModule.GetZonesOfGroupRequest() request.group = group response = self.service.GetZonesOfGroup(request) return response.zone_ids def GetFaceZonesOfFilter(self, filter) -> Any: - """GetFaceZoneAtLocationRequest.""" + """GetFaceZonesOfFilter.""" request = MeshingQueriesProtoModule.GetFaceZonesOfFilterRequest() request.filter = filter response = self.service.GetFaceZonesOfFilter(request) return response.face_zone_ids def GetCellZonesOfFilter(self, filter) -> Any: - """GetFaceZoneAtLocationRequest.""" + """GetCellZonesOfFilter.""" request = MeshingQueriesProtoModule.GetCellZonesOfFilterRequest() request.filter = filter response = self.service.GetCellZonesOfFilter(request) return response.cell_zone_ids def GetEdgeZonesOfFilter(self, filter) -> Any: - """GetFaceZoneAtLocationRequest.""" + """GetEdgeZonesOfFilter.""" request = MeshingQueriesProtoModule.GetEdgeZonesOfFilterRequest() request.filter = filter response = self.service.GetEdgeZonesOfFilter(request) return response.edge_zone_ids def GetNodeZonesOfFilter(self, filter) -> Any: - """GetFaceZoneAtLocationRequest.""" + """GetNodeZonesOfFilter.""" request = MeshingQueriesProtoModule.GetNodeZonesOfFilterRequest() request.filter = filter response = self.service.GetNodeZonesOfFilter(request) From b12c3cbaf610ef2c9b72ee3efe5a1603388e023b Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Thu, 23 Mar 2023 17:51:19 +0530 Subject: [PATCH 03/35] Updated docstrings --- .../fluent/core/services/meshing_queries.py | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index 3f070b3343b..87d83d0e28c 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -18,7 +18,7 @@ class MeshingQueriesService: """ def __init__(self, channel: grpc.Channel, metadata: List[Tuple[str, str]]): - """__init__ method of MeshingQueries class.""" + """__init__ method of MeshingQueriesService class.""" intercept_channel = grpc.intercept_channel( channel, TracingInterceptor(), BatchInterceptor() ) @@ -29,66 +29,66 @@ def __init__(self, channel: grpc.Channel, metadata: List[Tuple[str, str]]): def GetFaceZoneAtLocation( self, request: MeshingQueriesProtoModule.GetFaceZoneAtLocationRequest ) -> MeshingQueriesProtoModule.GetFaceZoneAtLocationResponse: - """GetFaceZoneAtLocation rpc of Reduction service.""" + """GetFaceZoneAtLocation rpc of MeshingQueriesService.""" return self._stub.GetFaceZoneAtLocation(request, metadata=self._metadata) @catch_grpc_error def GetCellZoneAtLocation( self, request: MeshingQueriesProtoModule.GetCellZoneAtLocationRequest ) -> MeshingQueriesProtoModule.GetCellZoneAtLocationResponse: - """GetCellZoneAtLocation rpc of Reduction service.""" + """GetCellZoneAtLocation rpc of MeshingQueriesService.""" return self._stub.GetCellZoneAtLocation(request, metadata=self._metadata) @catch_grpc_error def GetZonesOfType( self, request: MeshingQueriesProtoModule.GetZonesOfTypeRequest ) -> MeshingQueriesProtoModule.GetZonesOfTypeResponse: - """GetZonesOfType rpc of Reduction service.""" + """GetZonesOfType rpc of MeshingQueriesService.""" return self._stub.GetZonesOfType(request, metadata=self._metadata) @catch_grpc_error def GetZonesOfGroup( self, request: MeshingQueriesProtoModule.GetZonesOfGroupRequest ) -> MeshingQueriesProtoModule.GetZonesOfGroupResponse: - """GetZonesOfGroup rpc of Reduction service.""" + """GetZonesOfGroup rpc of MeshingQueriesService.""" return self._stub.GetZonesOfGroup(request, metadata=self._metadata) @catch_grpc_error def GetFaceZonesOfFilter( self, request: MeshingQueriesProtoModule.GetFaceZonesOfFilterRequest ) -> MeshingQueriesProtoModule.GetFaceZonesOfFilterResponse: - """GetFaceZonesOfFilter rpc of Reduction service.""" + """GetFaceZonesOfFilter rpc of MeshingQueriesService.""" return self._stub.GetFaceZonesOfFilter(request, metadata=self._metadata) @catch_grpc_error def GetCellZonesOfFilter( self, request: MeshingQueriesProtoModule.GetCellZonesOfFilterRequest ) -> MeshingQueriesProtoModule.GetCellZonesOfFilterResponse: - """GetCellZonesOfFilter rpc of Reduction service.""" + """GetCellZonesOfFilter rpc of MeshingQueriesService.""" return self._stub.GetCellZonesOfFilter(request, metadata=self._metadata) @catch_grpc_error def GetEdgeZonesOfFilter( self, request: MeshingQueriesProtoModule.GetEdgeZonesOfFilterRequest ) -> MeshingQueriesProtoModule.GetEdgeZonesOfFilterResponse: - """GetEdgeZonesOfFilter rpc of Reduction service.""" + """GetEdgeZonesOfFilter rpc of MeshingQueriesService.""" return self._stub.GetEdgeZonesOfFilter(request, metadata=self._metadata) @catch_grpc_error def GetNodeZonesOfFilter( self, request: MeshingQueriesProtoModule.GetNodeZonesOfFilterRequest ) -> MeshingQueriesProtoModule.GetNodeZonesOfFilterResponse: - """GetNodeZonesOfFilter rpc of Reduction service.""" + """GetNodeZonesOfFilter rpc of MeshingQueriesService.""" return self._stub.GetNodeZonesOfFilter(request, metadata=self._metadata) class MeshingQueries: """ - Reduction. + MeshingQueries. """ def __init__(self, service: MeshingQueriesService): - """__init__ method of Reduction class.""" + """__init__ method of MeshingQueries class.""" self.service = service docstring = None From 2b90d6c4fbf081faad15ec44e690822c2d2e832d Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Thu, 30 Mar 2023 17:50:24 +0530 Subject: [PATCH 04/35] Added more rpcs --- .../fluent/core/services/meshing_queries.py | 177 ++++++++++++++++++ 1 file changed, 177 insertions(+) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index 87d83d0e28c..2acfd6ab2a0 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -81,6 +81,101 @@ def GetNodeZonesOfFilter( """GetNodeZonesOfFilter rpc of MeshingQueriesService.""" return self._stub.GetNodeZonesOfFilter(request, metadata=self._metadata) + @catch_grpc_error + def GetObjectsOfType( + self, request: MeshingQueriesProtoModule.GetObjectsOfTypeRequest + ) -> MeshingQueriesProtoModule.GetObjectsOfTypeResponse: + """GetObjectsOfType rpc of MeshingQueriesService.""" + return self._stub.GetObjectsOfType(request, metadata=self._metadata) + + @catch_grpc_error + def GetFaceZoneIdListOfObject( + self, request: MeshingQueriesProtoModule.GetFaceZoneIdListOfObjectRequest + ) -> MeshingQueriesProtoModule.GetFaceZoneIdListOfObjectResponse: + """GetFaceZoneIdListOfObject rpc of MeshingQueriesService.""" + return self._stub.GetFaceZoneIdListOfObject(request, metadata=self._metadata) + + @catch_grpc_error + def GetEdgeZoneIdListOfObject( + self, request: MeshingQueriesProtoModule.GetEdgeZoneIdListOfObjectRequest + ) -> MeshingQueriesProtoModule.GetEdgeZoneIdListOfObjectResponse: + """GetEdgeZoneIdListOfObject rpc of MeshingQueriesService.""" + return self._stub.GetEdgeZoneIdListOfObject(request, metadata=self._metadata) + + @catch_grpc_error + def GetCellZoneIdListOfObject( + self, request: MeshingQueriesProtoModule.GetCellZoneIdListOfObjectRequest + ) -> MeshingQueriesProtoModule.GetCellZoneIdListOfObjectResponse: + """GetCellZoneIdListOfObject rpc of MeshingQueriesService.""" + return self._stub.GetCellZoneIdListOfObject(request, metadata=self._metadata) + + @catch_grpc_error + def GetFaceZonesSharedByRegionsOfType( + self, + request: MeshingQueriesProtoModule.GetFaceZonesSharedByRegionsOfTypeRequest, + ) -> MeshingQueriesProtoModule.GetFaceZonesSharedByRegionsOfTypeResponse: + """GetFaceZonesSharedByRegionsOfType rpc of MeshingQueriesService.""" + return self._stub.GetFaceZonesSharedByRegionsOfType( + request, metadata=self._metadata + ) + + @catch_grpc_error + def GetFaceZonesOfRegions( + self, request: MeshingQueriesProtoModule.GetFaceZonesOfRegionsRequest + ) -> MeshingQueriesProtoModule.GetFaceZonesOfRegionsResponse: + """GetFaceZonesOfRegions rpc of MeshingQueriesService.""" + return self._stub.GetFaceZonesOfRegions(request, metadata=self._metadata) + + @catch_grpc_error + def GetFaceZonesOfLabels( + self, request: MeshingQueriesProtoModule.GetFaceZonesOfLabelsRequest + ) -> MeshingQueriesProtoModule.GetFaceZonesOfLabelsResponse: + """GetFaceZonesOfLabels rpc of MeshingQueriesService.""" + return self._stub.GetFaceZonesOfLabels(request, metadata=self._metadata) + + @catch_grpc_error + def TgapiUtilGetFaceZoneIdListOfLabels( + self, + request: MeshingQueriesProtoModule.TgapiUtilGetFaceZoneIdListOfLabelsRequest, + ) -> MeshingQueriesProtoModule.TgapiUtilGetFaceZoneIdListOfLabelsResponse: + """TgapiUtilGetFaceZoneIdListOfLabels rpc of MeshingQueriesService.""" + return self._stub.TgapiUtilGetFaceZoneIdListOfLabels( + request, metadata=self._metadata + ) + + @catch_grpc_error + def GetFaceZonesOfObjects( + self, request: MeshingQueriesProtoModule.GetFaceZonesOfObjectsRequest + ) -> MeshingQueriesProtoModule.GetFaceZonesOfObjectsResponse: + """GetFaceZonesOfObjects rpc of MeshingQueriesService.""" + return self._stub.GetFaceZonesOfObjects(request, metadata=self._metadata) + + @catch_grpc_error + def GetEdgeZonesOfObjects( + self, request: MeshingQueriesProtoModule.GetEdgeZonesOfObjectsRequest + ) -> MeshingQueriesProtoModule.GetEdgeZonesOfObjectsResponse: + """GetEdgeZonesOfObjects rpc of MeshingQueriesService.""" + return self._stub.GetEdgeZonesOfObjects(request, metadata=self._metadata) + + @catch_grpc_error + def TgapiUtilGetFaceZoneIdListOfRegions( + self, + request: MeshingQueriesProtoModule.TgapiUtilGetFaceZoneIdListOfRegionsRequest, + ) -> MeshingQueriesProtoModule.TgapiUtilGetFaceZoneIdListOfRegionsResponse: + """GetEdgeZonesOfObjects rpc of MeshingQueriesService.""" + return self._stub.TgapiUtilGetFaceZoneIdListOfRegions( + request, metadata=self._metadata + ) + + @catch_grpc_error + def TgapiUtilGetPrismCellZones( + self, request: MeshingQueriesProtoModule.TgapiUtilGetPrismCellZonesRequest + ) -> MeshingQueriesProtoModule.TgapiUtilGetPrismCellZonesResponse: + """TgapiUtilGetPrismCellZones rpc of MeshingQueriesService.""" + return self._stub.TgapiUtilGetPrismCellZonesRegions( + request, metadata=self._metadata + ) + class MeshingQueries: """ @@ -152,3 +247,85 @@ def GetNodeZonesOfFilter(self, filter) -> Any: request.filter = filter response = self.service.GetNodeZonesOfFilter(request) return response.node_zone_ids + + def GetObjectsOfType(self, type_name) -> Any: + """GetObjectsOfType.""" + request = MeshingQueriesProtoModule.GetNodeZonesOfFilterRequest() + request.type = type_name + response = self.service.GetObjectsOfType(request) + return response.objects + + def GetFaceZoneIdListOfObject(self, object_name) -> Any: + """GetFaceZoneIdListOfObject.""" + request = MeshingQueriesProtoModule.GetFaceZoneIdListOfObjectRequest() + request.object = object_name + response = self.service.GetFaceZoneIdListOfObject(request) + return response.zone_ids + + def GetEdgeZoneIdListOfObject(self, object_name) -> Any: + """GetEdgeZoneIdListOfObject.""" + request = MeshingQueriesProtoModule.GetEdgeZoneIdListOfObjectRequest() + request.object = object_name + response = self.service.GetEdgeZoneIdListOfObject(request) + return response.zone_ids + + def GetCellZoneIdListOfObject(self, object_name) -> Any: + """GetCellZoneIdListOfObject.""" + request = MeshingQueriesProtoModule.GetCellZoneIdListOfObjectRequest() + request.object = object_name + response = self.service.GetCellZoneIdListOfObject(request) + return response.zone_ids + + def GetFaceZonesSharedByRegionsOfType(self, object_name, type_name) -> Any: + """GetFaceZonesSharedByRegionsOfType.""" + request = MeshingQueriesProtoModule.GetFaceZonesSharedByRegionsOfTypeRequest() + request.object = object_name + request.type = type_name + response = self.service.GetFaceZonesSharedByRegionsOfType(request) + return response.zone_ids + + def GetFaceZonesOfRegions(self, object_name, type_list) -> Any: + """GetFaceZonesOfRegions.""" + request = MeshingQueriesProtoModule.GetFaceZonesOfRegionsRequest() + request.object = object_name + request.types = type_list + response = self.service.GetFaceZonesOfRegions(request) + return response.zone_ids + + def GetFaceZonesOfLabels(self, object_name, type_list) -> Any: + """GetFaceZonesOfLabels.""" + request = MeshingQueriesProtoModule.GetFaceZonesOfLabelsRequest() + request.object = object_name + request.types = type_list + response = self.service.GetFaceZonesOfLabels(request) + return response.zone_ids + + def TgapiUtilGetFaceZoneIdListOfLabels(self, object_name, type_list) -> Any: + """TgapiUtilGetFaceZoneIdListOfLabels.""" + request = MeshingQueriesProtoModule.TgapiUtilGetFaceZoneIdListOfLabelsRequest() + request.object = object_name + request.types = type_list + response = self.service.TgapiUtilGetFaceZoneIdListOfLabels(request) + return response.zone_ids + + def GetFaceZonesOfObjects(self, type_list) -> Any: + """GetFaceZonesOfObjects.""" + request = MeshingQueriesProtoModule.GetFaceZonesOfObjectsRequest() + request.types = type_list + response = self.service.GetFaceZonesOfObjects(request) + return response.zone_ids + + def GetEdgeZonesOfObjects(self, type_list) -> Any: + """GetEdgeZonesOfObjects.""" + request = MeshingQueriesProtoModule.GetEdgeZonesOfObjectsRequest() + request.types = type_list + response = self.service.GetEdgeZonesOfObjects(request) + return response.zone_ids + + def TgapiUtilGetFaceZoneIdListOfRegions(self, object_name, type_list) -> Any: + """TgapiUtilGetFaceZoneIdListOfRegions.""" + request = MeshingQueriesProtoModule.TgapiUtilGetFaceZoneIdListOfRegionsRequest() + request.object = object_name + request.types = type_list + response = self.service.TgapiUtilGetFaceZoneIdListOfRegions(request) + return response.zone_ids From b8a239127d3d7836aaed7a9279c9f99231cc41ef Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Thu, 30 Mar 2023 18:09:07 +0530 Subject: [PATCH 05/35] Added more rpcs --- src/ansys/fluent/core/services/meshing_queries.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index 2acfd6ab2a0..98388e48d5e 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -167,15 +167,6 @@ def TgapiUtilGetFaceZoneIdListOfRegions( request, metadata=self._metadata ) - @catch_grpc_error - def TgapiUtilGetPrismCellZones( - self, request: MeshingQueriesProtoModule.TgapiUtilGetPrismCellZonesRequest - ) -> MeshingQueriesProtoModule.TgapiUtilGetPrismCellZonesResponse: - """TgapiUtilGetPrismCellZones rpc of MeshingQueriesService.""" - return self._stub.TgapiUtilGetPrismCellZonesRegions( - request, metadata=self._metadata - ) - class MeshingQueries: """ From 7161a625d12614f1d682784fe93fdd654ee39671 Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Thu, 30 Mar 2023 20:36:56 +0530 Subject: [PATCH 06/35] Updated rpcs Added tests --- .../fluent/core/services/meshing_queries.py | 20 ++- tests/test_meshing_queries.py | 123 ++++++++++++++++++ 2 files changed, 136 insertions(+), 7 deletions(-) create mode 100644 tests/test_meshing_queries.py diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index 98388e48d5e..a6a03699086 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -241,7 +241,7 @@ def GetNodeZonesOfFilter(self, filter) -> Any: def GetObjectsOfType(self, type_name) -> Any: """GetObjectsOfType.""" - request = MeshingQueriesProtoModule.GetNodeZonesOfFilterRequest() + request = MeshingQueriesProtoModule.GetObjectsOfTypeRequest() request.type = type_name response = self.service.GetObjectsOfType(request) return response.objects @@ -279,7 +279,8 @@ def GetFaceZonesOfRegions(self, object_name, type_list) -> Any: """GetFaceZonesOfRegions.""" request = MeshingQueriesProtoModule.GetFaceZonesOfRegionsRequest() request.object = object_name - request.types = type_list + for types in type_list: + request.types.append(types) response = self.service.GetFaceZonesOfRegions(request) return response.zone_ids @@ -287,7 +288,8 @@ def GetFaceZonesOfLabels(self, object_name, type_list) -> Any: """GetFaceZonesOfLabels.""" request = MeshingQueriesProtoModule.GetFaceZonesOfLabelsRequest() request.object = object_name - request.types = type_list + for types in type_list: + request.types.append(types) response = self.service.GetFaceZonesOfLabels(request) return response.zone_ids @@ -295,21 +297,24 @@ def TgapiUtilGetFaceZoneIdListOfLabels(self, object_name, type_list) -> Any: """TgapiUtilGetFaceZoneIdListOfLabels.""" request = MeshingQueriesProtoModule.TgapiUtilGetFaceZoneIdListOfLabelsRequest() request.object = object_name - request.types = type_list + for types in type_list: + request.types.append(types) response = self.service.TgapiUtilGetFaceZoneIdListOfLabels(request) return response.zone_ids def GetFaceZonesOfObjects(self, type_list) -> Any: """GetFaceZonesOfObjects.""" request = MeshingQueriesProtoModule.GetFaceZonesOfObjectsRequest() - request.types = type_list + for types in type_list: + request.types.append(types) response = self.service.GetFaceZonesOfObjects(request) return response.zone_ids def GetEdgeZonesOfObjects(self, type_list) -> Any: """GetEdgeZonesOfObjects.""" request = MeshingQueriesProtoModule.GetEdgeZonesOfObjectsRequest() - request.types = type_list + for types in type_list: + request.types.append(types) response = self.service.GetEdgeZonesOfObjects(request) return response.zone_ids @@ -317,6 +322,7 @@ def TgapiUtilGetFaceZoneIdListOfRegions(self, object_name, type_list) -> Any: """TgapiUtilGetFaceZoneIdListOfRegions.""" request = MeshingQueriesProtoModule.TgapiUtilGetFaceZoneIdListOfRegionsRequest() request.object = object_name - request.types = type_list + for types in type_list: + request.types.append(types) response = self.service.TgapiUtilGetFaceZoneIdListOfRegions(request) return response.zone_ids diff --git a/tests/test_meshing_queries.py b/tests/test_meshing_queries.py new file mode 100644 index 00000000000..d26df996833 --- /dev/null +++ b/tests/test_meshing_queries.py @@ -0,0 +1,123 @@ +from ansys.fluent.core import examples + +import_filename = examples.download_file( + "elbow.cas.h5", "pyfluent/examples/DOE-ML-Mixing-Elbow" +) + + +def test_meshing_queries(new_mesh_session): + meshing_session = new_mesh_session + meshing_session.tui.file.read_case(import_filename) + + assert meshing_session.meshing_queries.GetFaceZoneAtLocation( + [1.4, 1.4, 1.4] + ) == meshing_session.scheme_eval.scheme_eval( + "(get-face-zone-at-location '(1.4 1.4 1.4))" + ) + + assert meshing_session.meshing_queries.GetZonesOfType( + "velocity-inlet" + ) == meshing_session.scheme_eval.scheme_eval("(get-zones-of-type 'velocity-inlet)") + + assert meshing_session.meshing_queries.GetZonesOfGroup( + "inlet" + ) == meshing_session.scheme_eval.scheme_eval("(get-zones-of-group 'inlet)") + + assert meshing_session.meshing_queries.GetFaceZonesOfFilter( + "*" + ) == meshing_session.scheme_eval.scheme_eval("(get-face-zones-of-filter '*)") + + assert meshing_session.meshing_queries.GetCellZonesOfFilter("*") == [3460] + assert meshing_session.scheme_eval.scheme_eval("(get-cell-zones-of-filter '*)") == ( + 3460, + ) + + assert meshing_session.meshing_queries.GetEdgeZonesOfFilter("*") == [] + assert ( + meshing_session.scheme_eval.scheme_eval("(get-edge-zones-of-filter '*)") == None + ) + + assert meshing_session.meshing_queries.GetNodeZonesOfFilter( + "*" + ) == meshing_session.scheme_eval.scheme_eval("(get-node-zones-of-filter '*)") + + assert meshing_session.meshing_queries.GetObjectsOfType("mesh") == ["elbow-fluid"] + # assert meshing_session.scheme_eval.scheme_eval("(get-objects-of-type 'mesh)") == (elbow-fluid,) + + assert meshing_session.meshing_queries.GetFaceZoneIdListOfObject( + "elbow-fluid" + ) == meshing_session.scheme_eval.scheme_eval( + "(tgapi-util-get-face-zone-id-list-of-object 'elbow-fluid)" + ) + + assert ( + meshing_session.meshing_queries.GetEdgeZoneIdListOfObject("elbow-fluid") == [] + ) + assert ( + meshing_session.scheme_eval.scheme_eval( + "(tgapi-util-get-edge-zone-id-list-of-object 'elbow-fluid)" + ) + == None + ) + + assert meshing_session.meshing_queries.GetCellZoneIdListOfObject("elbow-fluid") == [ + 3460 + ] + meshing_session.scheme_eval.scheme_eval( + "(tgapi-util-get-cell-zone-id-list-of-object 'elbow-fluid)" + ) == (3460,) + + assert ( + meshing_session.meshing_queries.GetFaceZonesSharedByRegionsOfType( + "elbow-fluid", "fluid-fluid" + ) + == [] + ) + assert ( + meshing_session.scheme_eval.scheme_eval( + "(get-face-zones-shared-by-regions-of-type 'elbow-fluid 'fluid-fluid)" + ) + == None + ) + + assert meshing_session.meshing_queries.GetFaceZonesOfRegions( + "elbow-fluid", ["fluid"] + ) == meshing_session.scheme_eval.scheme_eval( + "(get-face-zones-of-regions 'elbow-fluid '(fluid))" + ) + + assert meshing_session.meshing_queries.GetFaceZonesOfLabels( + "elbow-fluid", ["inlet", "outlet", "wall", "internal"] + ) == [ + 32 + ] # noqa: E501 + assert meshing_session.scheme_eval.scheme_eval( + "(get-face-zones-of-labels 'elbow-fluid '(inlet outlet wall internal))" + ) == (32,) + + assert meshing_session.meshing_queries.TgapiUtilGetFaceZoneIdListOfLabels( + "elbow-fluid", ["outlet"] + ) == [32] + assert meshing_session.scheme_eval.scheme_eval( + "(tgapi-util-get-face-zone-id-list-of-labels 'elbow-fluid '(outlet))" + ) == (32,) + + assert meshing_session.meshing_queries.GetFaceZonesOfObjects( + ["elbow-fluid"] + ) == meshing_session.scheme_eval.scheme_eval( + "(get-face-zones-of-objects '(elbow-fluid))" + ) + + assert meshing_session.meshing_queries.GetEdgeZonesOfObjects(["elbow-fluid"]) == [] + assert ( + meshing_session.scheme_eval.scheme_eval( + "(get-edge-zones-of-objects '(elbow-fluid))" + ) + == None + ) + + assert meshing_session.meshing_queries.TgapiUtilGetFaceZoneIdListOfRegions( + "elbow-fluid", ["fluid"] + ) == meshing_session.scheme_eval.scheme_eval( + "(tgapi-util-get-face-zone-id-list-of-regions 'elbow-fluid '(fluid))" + ) # noqa: E501 From e5f4b31234e3a4832166f5196c329beb698dd791 Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Fri, 31 Mar 2023 07:37:14 +0530 Subject: [PATCH 07/35] Updated tests --- tests/test_meshing_queries.py | 107 +++++++++++++--------------------- 1 file changed, 39 insertions(+), 68 deletions(-) diff --git a/tests/test_meshing_queries.py b/tests/test_meshing_queries.py index d26df996833..da7fede9348 100644 --- a/tests/test_meshing_queries.py +++ b/tests/test_meshing_queries.py @@ -9,63 +9,46 @@ def test_meshing_queries(new_mesh_session): meshing_session = new_mesh_session meshing_session.tui.file.read_case(import_filename) - assert meshing_session.meshing_queries.GetFaceZoneAtLocation( - [1.4, 1.4, 1.4] - ) == meshing_session.scheme_eval.scheme_eval( - "(get-face-zone-at-location '(1.4 1.4 1.4))" - ) + assert meshing_session.meshing_queries.GetFaceZoneAtLocation([1.4, 1.4, 1.4]) == 34 - assert meshing_session.meshing_queries.GetZonesOfType( - "velocity-inlet" - ) == meshing_session.scheme_eval.scheme_eval("(get-zones-of-type 'velocity-inlet)") + assert meshing_session.meshing_queries.GetZonesOfType("velocity-inlet") == [30, 31] - assert meshing_session.meshing_queries.GetZonesOfGroup( - "inlet" - ) == meshing_session.scheme_eval.scheme_eval("(get-zones-of-group 'inlet)") + assert meshing_session.meshing_queries.GetZonesOfGroup("inlet") == [31, 30] - assert meshing_session.meshing_queries.GetFaceZonesOfFilter( - "*" - ) == meshing_session.scheme_eval.scheme_eval("(get-face-zones-of-filter '*)") + assert meshing_session.meshing_queries.GetFaceZonesOfFilter("*") == [ + 3462, + 34, + 33, + 32, + 31, + 30, + 29, + ] assert meshing_session.meshing_queries.GetCellZonesOfFilter("*") == [3460] - assert meshing_session.scheme_eval.scheme_eval("(get-cell-zones-of-filter '*)") == ( - 3460, - ) assert meshing_session.meshing_queries.GetEdgeZonesOfFilter("*") == [] - assert ( - meshing_session.scheme_eval.scheme_eval("(get-edge-zones-of-filter '*)") == None - ) - assert meshing_session.meshing_queries.GetNodeZonesOfFilter( - "*" - ) == meshing_session.scheme_eval.scheme_eval("(get-node-zones-of-filter '*)") + assert meshing_session.meshing_queries.GetNodeZonesOfFilter("*") == [3625, 3624] assert meshing_session.meshing_queries.GetObjectsOfType("mesh") == ["elbow-fluid"] - # assert meshing_session.scheme_eval.scheme_eval("(get-objects-of-type 'mesh)") == (elbow-fluid,) - assert meshing_session.meshing_queries.GetFaceZoneIdListOfObject( - "elbow-fluid" - ) == meshing_session.scheme_eval.scheme_eval( - "(tgapi-util-get-face-zone-id-list-of-object 'elbow-fluid)" - ) + assert meshing_session.meshing_queries.GetFaceZoneIdListOfObject("elbow-fluid") == [ + 29, + 30, + 31, + 32, + 33, + 34, + ] assert ( meshing_session.meshing_queries.GetEdgeZoneIdListOfObject("elbow-fluid") == [] ) - assert ( - meshing_session.scheme_eval.scheme_eval( - "(tgapi-util-get-edge-zone-id-list-of-object 'elbow-fluid)" - ) - == None - ) assert meshing_session.meshing_queries.GetCellZoneIdListOfObject("elbow-fluid") == [ 3460 ] - meshing_session.scheme_eval.scheme_eval( - "(tgapi-util-get-cell-zone-id-list-of-object 'elbow-fluid)" - ) == (3460,) assert ( meshing_session.meshing_queries.GetFaceZonesSharedByRegionsOfType( @@ -73,51 +56,39 @@ def test_meshing_queries(new_mesh_session): ) == [] ) - assert ( - meshing_session.scheme_eval.scheme_eval( - "(get-face-zones-shared-by-regions-of-type 'elbow-fluid 'fluid-fluid)" - ) - == None - ) assert meshing_session.meshing_queries.GetFaceZonesOfRegions( "elbow-fluid", ["fluid"] - ) == meshing_session.scheme_eval.scheme_eval( - "(get-face-zones-of-regions 'elbow-fluid '(fluid))" - ) + ) == [34, 33, 32, 31, 30, 29] assert meshing_session.meshing_queries.GetFaceZonesOfLabels( "elbow-fluid", ["inlet", "outlet", "wall", "internal"] ) == [ 32 ] # noqa: E501 - assert meshing_session.scheme_eval.scheme_eval( - "(get-face-zones-of-labels 'elbow-fluid '(inlet outlet wall internal))" - ) == (32,) assert meshing_session.meshing_queries.TgapiUtilGetFaceZoneIdListOfLabels( "elbow-fluid", ["outlet"] ) == [32] - assert meshing_session.scheme_eval.scheme_eval( - "(tgapi-util-get-face-zone-id-list-of-labels 'elbow-fluid '(outlet))" - ) == (32,) - - assert meshing_session.meshing_queries.GetFaceZonesOfObjects( - ["elbow-fluid"] - ) == meshing_session.scheme_eval.scheme_eval( - "(get-face-zones-of-objects '(elbow-fluid))" - ) + + assert meshing_session.meshing_queries.GetFaceZonesOfObjects(["elbow-fluid"]) == [ + 29, + 30, + 31, + 32, + 33, + 34, + ] assert meshing_session.meshing_queries.GetEdgeZonesOfObjects(["elbow-fluid"]) == [] - assert ( - meshing_session.scheme_eval.scheme_eval( - "(get-edge-zones-of-objects '(elbow-fluid))" - ) - == None - ) assert meshing_session.meshing_queries.TgapiUtilGetFaceZoneIdListOfRegions( "elbow-fluid", ["fluid"] - ) == meshing_session.scheme_eval.scheme_eval( - "(tgapi-util-get-face-zone-id-list-of-regions 'elbow-fluid '(fluid))" - ) # noqa: E501 + ) == [ + 34, + 33, + 32, + 31, + 30, + 29, + ] # noqa: E501 From c6a382df8aaebf15a6f0f174111c85ab7cb806e6 Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Fri, 31 Mar 2023 08:26:41 +0530 Subject: [PATCH 08/35] Removed TgapiUtil --- .../fluent/core/services/meshing_queries.py | 38 +++++++++---------- tests/test_meshing_queries.py | 4 +- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index a6a03699086..fa0cfb8ee6c 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -134,14 +134,12 @@ def GetFaceZonesOfLabels( return self._stub.GetFaceZonesOfLabels(request, metadata=self._metadata) @catch_grpc_error - def TgapiUtilGetFaceZoneIdListOfLabels( + def GetFaceZoneIdListOfLabels( self, - request: MeshingQueriesProtoModule.TgapiUtilGetFaceZoneIdListOfLabelsRequest, - ) -> MeshingQueriesProtoModule.TgapiUtilGetFaceZoneIdListOfLabelsResponse: - """TgapiUtilGetFaceZoneIdListOfLabels rpc of MeshingQueriesService.""" - return self._stub.TgapiUtilGetFaceZoneIdListOfLabels( - request, metadata=self._metadata - ) + request: MeshingQueriesProtoModule.GetFaceZoneIdListOfLabelsRequest, + ) -> MeshingQueriesProtoModule.GetFaceZoneIdListOfLabelsResponse: + """GetFaceZoneIdListOfLabels rpc of MeshingQueriesService.""" + return self._stub.GetFaceZoneIdListOfLabels(request, metadata=self._metadata) @catch_grpc_error def GetFaceZonesOfObjects( @@ -158,14 +156,12 @@ def GetEdgeZonesOfObjects( return self._stub.GetEdgeZonesOfObjects(request, metadata=self._metadata) @catch_grpc_error - def TgapiUtilGetFaceZoneIdListOfRegions( + def GetFaceZoneIdListOfRegions( self, - request: MeshingQueriesProtoModule.TgapiUtilGetFaceZoneIdListOfRegionsRequest, - ) -> MeshingQueriesProtoModule.TgapiUtilGetFaceZoneIdListOfRegionsResponse: + request: MeshingQueriesProtoModule.GetFaceZoneIdListOfRegionsRequest, + ) -> MeshingQueriesProtoModule.GetFaceZoneIdListOfRegionsResponse: """GetEdgeZonesOfObjects rpc of MeshingQueriesService.""" - return self._stub.TgapiUtilGetFaceZoneIdListOfRegions( - request, metadata=self._metadata - ) + return self._stub.GetFaceZoneIdListOfRegions(request, metadata=self._metadata) class MeshingQueries: @@ -293,13 +289,13 @@ def GetFaceZonesOfLabels(self, object_name, type_list) -> Any: response = self.service.GetFaceZonesOfLabels(request) return response.zone_ids - def TgapiUtilGetFaceZoneIdListOfLabels(self, object_name, type_list) -> Any: - """TgapiUtilGetFaceZoneIdListOfLabels.""" - request = MeshingQueriesProtoModule.TgapiUtilGetFaceZoneIdListOfLabelsRequest() + def GetFaceZoneIdListOfLabels(self, object_name, type_list) -> Any: + """GetFaceZoneIdListOfLabels.""" + request = MeshingQueriesProtoModule.GetFaceZoneIdListOfLabelsRequest() request.object = object_name for types in type_list: request.types.append(types) - response = self.service.TgapiUtilGetFaceZoneIdListOfLabels(request) + response = self.service.GetFaceZoneIdListOfLabels(request) return response.zone_ids def GetFaceZonesOfObjects(self, type_list) -> Any: @@ -318,11 +314,11 @@ def GetEdgeZonesOfObjects(self, type_list) -> Any: response = self.service.GetEdgeZonesOfObjects(request) return response.zone_ids - def TgapiUtilGetFaceZoneIdListOfRegions(self, object_name, type_list) -> Any: - """TgapiUtilGetFaceZoneIdListOfRegions.""" - request = MeshingQueriesProtoModule.TgapiUtilGetFaceZoneIdListOfRegionsRequest() + def GetFaceZoneIdListOfRegions(self, object_name, type_list) -> Any: + """GetFaceZoneIdListOfRegions.""" + request = MeshingQueriesProtoModule.GetFaceZoneIdListOfRegionsRequest() request.object = object_name for types in type_list: request.types.append(types) - response = self.service.TgapiUtilGetFaceZoneIdListOfRegions(request) + response = self.service.GetFaceZoneIdListOfRegions(request) return response.zone_ids diff --git a/tests/test_meshing_queries.py b/tests/test_meshing_queries.py index da7fede9348..f149eb99878 100644 --- a/tests/test_meshing_queries.py +++ b/tests/test_meshing_queries.py @@ -67,7 +67,7 @@ def test_meshing_queries(new_mesh_session): 32 ] # noqa: E501 - assert meshing_session.meshing_queries.TgapiUtilGetFaceZoneIdListOfLabels( + assert meshing_session.meshing_queries.GetFaceZoneIdListOfLabels( "elbow-fluid", ["outlet"] ) == [32] @@ -82,7 +82,7 @@ def test_meshing_queries(new_mesh_session): assert meshing_session.meshing_queries.GetEdgeZonesOfObjects(["elbow-fluid"]) == [] - assert meshing_session.meshing_queries.TgapiUtilGetFaceZoneIdListOfRegions( + assert meshing_session.meshing_queries.GetFaceZoneIdListOfRegions( "elbow-fluid", ["fluid"] ) == [ 34, From 9831c0d8413e5b78ba523ea24b0c0272374e35ad Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Fri, 31 Mar 2023 13:30:25 +0530 Subject: [PATCH 09/35] Added rpc and Updated test --- .../fluent/core/services/meshing_queries.py | 55 +++++++++++++------ tests/test_meshing_queries.py | 4 ++ 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index fa0cfb8ee6c..117503260ff 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -163,6 +163,14 @@ def GetFaceZoneIdListOfRegions( """GetEdgeZonesOfObjects rpc of MeshingQueriesService.""" return self._stub.GetFaceZoneIdListOfRegions(request, metadata=self._metadata) + @catch_grpc_error + def GetPrismCellZones( + self, + request: MeshingQueriesProtoModule.GetPrismCellZonesRequest, + ) -> MeshingQueriesProtoModule.GetPrismCellZonesResponse: + """GetPrismCellZones rpc of MeshingQueriesService.""" + return self._stub.GetPrismCellZones(request, metadata=self._metadata) + class MeshingQueries: """ @@ -193,47 +201,47 @@ def GetCellZoneAtLocation(self, location) -> Any: response = self.service.GetCellZoneAtLocation(request) return response.cell_zone_id - def GetZonesOfType(self, zone_type) -> Any: + def GetZonesOfType(self, object_name) -> Any: """GetZonesOfType.""" request = MeshingQueriesProtoModule.GetZonesOfTypeRequest() - request.zone_type = zone_type + request.object = object_name response = self.service.GetZonesOfType(request) return response.zone_ids - def GetZonesOfGroup(self, group) -> Any: + def GetZonesOfGroup(self, object_name) -> Any: """GetZonesOfGroup.""" request = MeshingQueriesProtoModule.GetZonesOfGroupRequest() - request.group = group + request.object = object_name response = self.service.GetZonesOfGroup(request) return response.zone_ids - def GetFaceZonesOfFilter(self, filter) -> Any: + def GetFaceZonesOfFilter(self, object_name) -> Any: """GetFaceZonesOfFilter.""" request = MeshingQueriesProtoModule.GetFaceZonesOfFilterRequest() - request.filter = filter + request.object = object_name response = self.service.GetFaceZonesOfFilter(request) - return response.face_zone_ids + return response.zone_ids - def GetCellZonesOfFilter(self, filter) -> Any: + def GetCellZonesOfFilter(self, object_name) -> Any: """GetCellZonesOfFilter.""" request = MeshingQueriesProtoModule.GetCellZonesOfFilterRequest() - request.filter = filter + request.object = object_name response = self.service.GetCellZonesOfFilter(request) - return response.cell_zone_ids + return response.zone_ids - def GetEdgeZonesOfFilter(self, filter) -> Any: + def GetEdgeZonesOfFilter(self, object_name) -> Any: """GetEdgeZonesOfFilter.""" request = MeshingQueriesProtoModule.GetEdgeZonesOfFilterRequest() - request.filter = filter + request.object = object_name response = self.service.GetEdgeZonesOfFilter(request) - return response.edge_zone_ids + return response.zone_ids - def GetNodeZonesOfFilter(self, filter) -> Any: + def GetNodeZonesOfFilter(self, object_name) -> Any: """GetNodeZonesOfFilter.""" request = MeshingQueriesProtoModule.GetNodeZonesOfFilterRequest() - request.filter = filter + request.object = object_name response = self.service.GetNodeZonesOfFilter(request) - return response.node_zone_ids + return response.zone_ids def GetObjectsOfType(self, type_name) -> Any: """GetObjectsOfType.""" @@ -322,3 +330,18 @@ def GetFaceZoneIdListOfRegions(self, object_name, type_list) -> Any: request.types.append(types) response = self.service.GetFaceZoneIdListOfRegions(request) return response.zone_ids + + def GetPrismCellZones(self, object_name) -> Any: + """GetPrismCellZones.""" + request = MeshingQueriesProtoModule.GetPrismCellZonesRequest() + request.object = object_name + response = self.service.GetPrismCellZones(request) + return response.zone_ids + + def GetPrismCellZones(self, type_list) -> Any: + """GetPrismCellZones.""" + request = MeshingQueriesProtoModule.GetPrismCellZonesRequest() + for types in type_list: + request.types.append(types) + response = self.service.GetPrismCellZones(request) + return response.zone_ids diff --git a/tests/test_meshing_queries.py b/tests/test_meshing_queries.py index f149eb99878..d77a8217901 100644 --- a/tests/test_meshing_queries.py +++ b/tests/test_meshing_queries.py @@ -92,3 +92,7 @@ def test_meshing_queries(new_mesh_session): 30, 29, ] # noqa: E501 + + assert meshing_session.meshing_queries.GetPrismCellZones(["inlet", "outlet"]) == [] + + assert meshing_session.meshing_queries.GetPrismCellZones("*") == [] From 663ed155c82a7d0f688b03a322a3243a80f36601 Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Tue, 4 Apr 2023 09:17:23 +0530 Subject: [PATCH 10/35] Refactoring --- .../fluent/core/services/meshing_queries.py | 86 +++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index 117503260ff..6686a42b893 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -204,144 +204,144 @@ def GetCellZoneAtLocation(self, location) -> Any: def GetZonesOfType(self, object_name) -> Any: """GetZonesOfType.""" request = MeshingQueriesProtoModule.GetZonesOfTypeRequest() - request.object = object_name + request.input = object_name response = self.service.GetZonesOfType(request) - return response.zone_ids + return response.outputs def GetZonesOfGroup(self, object_name) -> Any: """GetZonesOfGroup.""" request = MeshingQueriesProtoModule.GetZonesOfGroupRequest() - request.object = object_name + request.input = object_name response = self.service.GetZonesOfGroup(request) - return response.zone_ids + return response.outputs def GetFaceZonesOfFilter(self, object_name) -> Any: """GetFaceZonesOfFilter.""" request = MeshingQueriesProtoModule.GetFaceZonesOfFilterRequest() - request.object = object_name + request.input = object_name response = self.service.GetFaceZonesOfFilter(request) - return response.zone_ids + return response.outputs def GetCellZonesOfFilter(self, object_name) -> Any: """GetCellZonesOfFilter.""" request = MeshingQueriesProtoModule.GetCellZonesOfFilterRequest() - request.object = object_name + request.input = object_name response = self.service.GetCellZonesOfFilter(request) - return response.zone_ids + return response.outputs def GetEdgeZonesOfFilter(self, object_name) -> Any: """GetEdgeZonesOfFilter.""" request = MeshingQueriesProtoModule.GetEdgeZonesOfFilterRequest() - request.object = object_name + request.input = object_name response = self.service.GetEdgeZonesOfFilter(request) - return response.zone_ids + return response.outputs def GetNodeZonesOfFilter(self, object_name) -> Any: """GetNodeZonesOfFilter.""" request = MeshingQueriesProtoModule.GetNodeZonesOfFilterRequest() - request.object = object_name + request.input = object_name response = self.service.GetNodeZonesOfFilter(request) - return response.zone_ids + return response.outputs def GetObjectsOfType(self, type_name) -> Any: """GetObjectsOfType.""" request = MeshingQueriesProtoModule.GetObjectsOfTypeRequest() - request.type = type_name + request.input = type_name response = self.service.GetObjectsOfType(request) - return response.objects + return response.outputs def GetFaceZoneIdListOfObject(self, object_name) -> Any: """GetFaceZoneIdListOfObject.""" request = MeshingQueriesProtoModule.GetFaceZoneIdListOfObjectRequest() - request.object = object_name + request.input = object_name response = self.service.GetFaceZoneIdListOfObject(request) - return response.zone_ids + return response.outputs def GetEdgeZoneIdListOfObject(self, object_name) -> Any: """GetEdgeZoneIdListOfObject.""" request = MeshingQueriesProtoModule.GetEdgeZoneIdListOfObjectRequest() - request.object = object_name + request.input = object_name response = self.service.GetEdgeZoneIdListOfObject(request) - return response.zone_ids + return response.outputs def GetCellZoneIdListOfObject(self, object_name) -> Any: """GetCellZoneIdListOfObject.""" request = MeshingQueriesProtoModule.GetCellZoneIdListOfObjectRequest() - request.object = object_name + request.input = object_name response = self.service.GetCellZoneIdListOfObject(request) - return response.zone_ids + return response.outputs def GetFaceZonesSharedByRegionsOfType(self, object_name, type_name) -> Any: """GetFaceZonesSharedByRegionsOfType.""" request = MeshingQueriesProtoModule.GetFaceZonesSharedByRegionsOfTypeRequest() - request.object = object_name - request.type = type_name + request.input_1 = object_name + request.input_2 = type_name response = self.service.GetFaceZonesSharedByRegionsOfType(request) - return response.zone_ids + return response.outputs def GetFaceZonesOfRegions(self, object_name, type_list) -> Any: """GetFaceZonesOfRegions.""" request = MeshingQueriesProtoModule.GetFaceZonesOfRegionsRequest() - request.object = object_name + request.input = object_name for types in type_list: - request.types.append(types) + request.inputs.append(types) response = self.service.GetFaceZonesOfRegions(request) - return response.zone_ids + return response.outputs def GetFaceZonesOfLabels(self, object_name, type_list) -> Any: """GetFaceZonesOfLabels.""" request = MeshingQueriesProtoModule.GetFaceZonesOfLabelsRequest() - request.object = object_name + request.input = object_name for types in type_list: - request.types.append(types) + request.inputs.append(types) response = self.service.GetFaceZonesOfLabels(request) - return response.zone_ids + return response.outputs def GetFaceZoneIdListOfLabels(self, object_name, type_list) -> Any: """GetFaceZoneIdListOfLabels.""" request = MeshingQueriesProtoModule.GetFaceZoneIdListOfLabelsRequest() - request.object = object_name + request.input = object_name for types in type_list: - request.types.append(types) + request.inputs.append(types) response = self.service.GetFaceZoneIdListOfLabels(request) - return response.zone_ids + return response.outputs def GetFaceZonesOfObjects(self, type_list) -> Any: """GetFaceZonesOfObjects.""" request = MeshingQueriesProtoModule.GetFaceZonesOfObjectsRequest() for types in type_list: - request.types.append(types) + request.inputs.append(types) response = self.service.GetFaceZonesOfObjects(request) - return response.zone_ids + return response.outputs def GetEdgeZonesOfObjects(self, type_list) -> Any: """GetEdgeZonesOfObjects.""" request = MeshingQueriesProtoModule.GetEdgeZonesOfObjectsRequest() for types in type_list: - request.types.append(types) + request.inputs.append(types) response = self.service.GetEdgeZonesOfObjects(request) - return response.zone_ids + return response.outputs def GetFaceZoneIdListOfRegions(self, object_name, type_list) -> Any: """GetFaceZoneIdListOfRegions.""" request = MeshingQueriesProtoModule.GetFaceZoneIdListOfRegionsRequest() - request.object = object_name + request.input = object_name for types in type_list: - request.types.append(types) + request.inputs.append(types) response = self.service.GetFaceZoneIdListOfRegions(request) - return response.zone_ids + return response.outputs def GetPrismCellZones(self, object_name) -> Any: """GetPrismCellZones.""" request = MeshingQueriesProtoModule.GetPrismCellZonesRequest() - request.object = object_name + request.input = object_name response = self.service.GetPrismCellZones(request) - return response.zone_ids + return response.outputs def GetPrismCellZones(self, type_list) -> Any: """GetPrismCellZones.""" request = MeshingQueriesProtoModule.GetPrismCellZonesRequest() for types in type_list: - request.types.append(types) + request.inputs.append(types) response = self.service.GetPrismCellZones(request) - return response.zone_ids + return response.outputs From 9d8b63a760b3b531b45e9adba764b94852f2ec7d Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Tue, 4 Apr 2023 16:57:20 +0530 Subject: [PATCH 11/35] Added rpcs and tests --- .../fluent/core/services/meshing_queries.py | 248 ++++++++++++++---- tests/test_meshing_queries.py | 57 ++++ 2 files changed, 255 insertions(+), 50 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index 6686a42b893..2e5a5f67cb0 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -171,6 +171,60 @@ def GetPrismCellZones( """GetPrismCellZones rpc of MeshingQueriesService.""" return self._stub.GetPrismCellZones(request, metadata=self._metadata) + @catch_grpc_error + def GetTetCellZones( + self, + request: MeshingQueriesProtoModule.GetTetCellZonesRequest, + ) -> MeshingQueriesProtoModule.GetTetCellZonesResponse: + """GetTetCellZones rpc of MeshingQueriesService.""" + return self._stub.GetTetCellZones(request, metadata=self._metadata) + + @catch_grpc_error + def GetAdjacentCellZones( + self, + request: MeshingQueriesProtoModule.GetAdjacentCellZonesRequest, + ) -> MeshingQueriesProtoModule.GetAdjacentCellZonesResponse: + """GetAdjacentCellZones rpc of MeshingQueriesService.""" + return self._stub.GetAdjacentCellZones(request, metadata=self._metadata) + + @catch_grpc_error + def GetAdjacentFaceZones( + self, + request: MeshingQueriesProtoModule.GetAdjacentFaceZonesRequest, + ) -> MeshingQueriesProtoModule.GetAdjacentFaceZonesResponse: + """GetAdjacentFaceZones rpc of MeshingQueriesService.""" + return self._stub.GetAdjacentFaceZones(request, metadata=self._metadata) + + @catch_grpc_error + def GetAdjacentInteriorAndBoundaryFaceZones( + self, + request: MeshingQueriesProtoModule.GetAdjacentInteriorAndBoundaryFaceZonesRequest, + ) -> MeshingQueriesProtoModule.GetAdjacentInteriorAndBoundaryFaceZonesResponse: + """GetAdjacentInteriorAndBoundaryFaceZones rpc of MeshingQueriesService.""" + return self._stub.GetAdjacentInteriorAndBoundaryFaceZones( + request, metadata=self._metadata + ) + + @catch_grpc_error + def GetAdjacentZonesByEdgeConnectivity( + self, + request: MeshingQueriesProtoModule.GetAdjacentZonesByEdgeConnectivityRequest, + ) -> MeshingQueriesProtoModule.GetAdjacentZonesByEdgeConnectivityResponse: + """GetAdjacentZonesByEdgeConnectivity rpc of MeshingQueriesService.""" + return self._stub.GetAdjacentZonesByEdgeConnectivity( + request, metadata=self._metadata + ) + + @catch_grpc_error + def GetAdjacentZonesByNodeConnectivity( + self, + request: MeshingQueriesProtoModule.GetAdjacentZonesByNodeConnectivityRequest, + ) -> MeshingQueriesProtoModule.GetAdjacentZonesByNodeConnectivityResponse: + """GetAdjacentZonesByNodeConnectivity rpc of MeshingQueriesService.""" + return self._stub.GetAdjacentZonesByNodeConnectivity( + request, metadata=self._metadata + ) + class MeshingQueries: """ @@ -201,147 +255,241 @@ def GetCellZoneAtLocation(self, location) -> Any: response = self.service.GetCellZoneAtLocation(request) return response.cell_zone_id - def GetZonesOfType(self, object_name) -> Any: + def GetZonesOfType(self, type) -> Any: """GetZonesOfType.""" request = MeshingQueriesProtoModule.GetZonesOfTypeRequest() - request.input = object_name + request.input = type response = self.service.GetZonesOfType(request) return response.outputs - def GetZonesOfGroup(self, object_name) -> Any: + def GetZonesOfGroup(self, group) -> Any: """GetZonesOfGroup.""" request = MeshingQueriesProtoModule.GetZonesOfGroupRequest() - request.input = object_name + request.input = group response = self.service.GetZonesOfGroup(request) return response.outputs - def GetFaceZonesOfFilter(self, object_name) -> Any: + def GetFaceZonesOfFilter(self, filter) -> Any: """GetFaceZonesOfFilter.""" request = MeshingQueriesProtoModule.GetFaceZonesOfFilterRequest() - request.input = object_name + request.input = filter response = self.service.GetFaceZonesOfFilter(request) return response.outputs - def GetCellZonesOfFilter(self, object_name) -> Any: + def GetCellZonesOfFilter(self, filter) -> Any: """GetCellZonesOfFilter.""" request = MeshingQueriesProtoModule.GetCellZonesOfFilterRequest() - request.input = object_name + request.input = filter response = self.service.GetCellZonesOfFilter(request) return response.outputs - def GetEdgeZonesOfFilter(self, object_name) -> Any: + def GetEdgeZonesOfFilter(self, filter) -> Any: """GetEdgeZonesOfFilter.""" request = MeshingQueriesProtoModule.GetEdgeZonesOfFilterRequest() - request.input = object_name + request.input = filter response = self.service.GetEdgeZonesOfFilter(request) return response.outputs - def GetNodeZonesOfFilter(self, object_name) -> Any: + def GetNodeZonesOfFilter(self, filter) -> Any: """GetNodeZonesOfFilter.""" request = MeshingQueriesProtoModule.GetNodeZonesOfFilterRequest() - request.input = object_name + request.input = filter response = self.service.GetNodeZonesOfFilter(request) return response.outputs - def GetObjectsOfType(self, type_name) -> Any: + def GetObjectsOfType(self, type) -> Any: """GetObjectsOfType.""" request = MeshingQueriesProtoModule.GetObjectsOfTypeRequest() - request.input = type_name + request.input = type response = self.service.GetObjectsOfType(request) return response.outputs - def GetFaceZoneIdListOfObject(self, object_name) -> Any: + def GetFaceZoneIdListOfObject(self, object) -> Any: """GetFaceZoneIdListOfObject.""" request = MeshingQueriesProtoModule.GetFaceZoneIdListOfObjectRequest() - request.input = object_name + request.input = object response = self.service.GetFaceZoneIdListOfObject(request) return response.outputs - def GetEdgeZoneIdListOfObject(self, object_name) -> Any: + def GetEdgeZoneIdListOfObject(self, object) -> Any: """GetEdgeZoneIdListOfObject.""" request = MeshingQueriesProtoModule.GetEdgeZoneIdListOfObjectRequest() - request.input = object_name + request.input = object response = self.service.GetEdgeZoneIdListOfObject(request) return response.outputs - def GetCellZoneIdListOfObject(self, object_name) -> Any: + def GetCellZoneIdListOfObject(self, object) -> Any: """GetCellZoneIdListOfObject.""" request = MeshingQueriesProtoModule.GetCellZoneIdListOfObjectRequest() - request.input = object_name + request.input = object response = self.service.GetCellZoneIdListOfObject(request) return response.outputs - def GetFaceZonesSharedByRegionsOfType(self, object_name, type_name) -> Any: + def GetFaceZonesSharedByRegionsOfType(self, mesh_object, region_type) -> Any: """GetFaceZonesSharedByRegionsOfType.""" request = MeshingQueriesProtoModule.GetFaceZonesSharedByRegionsOfTypeRequest() - request.input_1 = object_name - request.input_2 = type_name + request.input_1 = mesh_object + request.input_2 = region_type response = self.service.GetFaceZonesSharedByRegionsOfType(request) return response.outputs - def GetFaceZonesOfRegions(self, object_name, type_list) -> Any: + def GetFaceZonesOfRegions(self, object, region_name_list) -> Any: """GetFaceZonesOfRegions.""" request = MeshingQueriesProtoModule.GetFaceZonesOfRegionsRequest() - request.input = object_name - for types in type_list: - request.inputs.append(types) + request.input = object + for region in region_name_list: + request.inputs.append(region) response = self.service.GetFaceZonesOfRegions(request) return response.outputs - def GetFaceZonesOfLabels(self, object_name, type_list) -> Any: + def GetFaceZonesOfLabels(self, object, label_name_list) -> Any: """GetFaceZonesOfLabels.""" request = MeshingQueriesProtoModule.GetFaceZonesOfLabelsRequest() - request.input = object_name - for types in type_list: - request.inputs.append(types) + request.input = object + for label in label_name_list: + request.inputs.append(label) response = self.service.GetFaceZonesOfLabels(request) return response.outputs - def GetFaceZoneIdListOfLabels(self, object_name, type_list) -> Any: + def GetFaceZoneIdListOfLabels(self, object, zone_label_list) -> Any: """GetFaceZoneIdListOfLabels.""" request = MeshingQueriesProtoModule.GetFaceZoneIdListOfLabelsRequest() - request.input = object_name - for types in type_list: - request.inputs.append(types) + request.input = object + for zone_label in zone_label_list: + request.inputs.append(zone_label) response = self.service.GetFaceZoneIdListOfLabels(request) return response.outputs - def GetFaceZonesOfObjects(self, type_list) -> Any: + def GetFaceZonesOfObjects(self, object_list) -> Any: """GetFaceZonesOfObjects.""" request = MeshingQueriesProtoModule.GetFaceZonesOfObjectsRequest() - for types in type_list: - request.inputs.append(types) + for object in object_list: + request.inputs.append(object) response = self.service.GetFaceZonesOfObjects(request) return response.outputs - def GetEdgeZonesOfObjects(self, type_list) -> Any: + def GetEdgeZonesOfObjects(self, object_list) -> Any: """GetEdgeZonesOfObjects.""" request = MeshingQueriesProtoModule.GetEdgeZonesOfObjectsRequest() - for types in type_list: - request.inputs.append(types) + for object in object_list: + request.inputs.append(object) response = self.service.GetEdgeZonesOfObjects(request) return response.outputs - def GetFaceZoneIdListOfRegions(self, object_name, type_list) -> Any: + def GetFaceZoneIdListOfRegions(self, object, region_list) -> Any: """GetFaceZoneIdListOfRegions.""" request = MeshingQueriesProtoModule.GetFaceZoneIdListOfRegionsRequest() - request.input = object_name - for types in type_list: - request.inputs.append(types) + request.input = object + for region in region_list: + request.inputs.append(region) response = self.service.GetFaceZoneIdListOfRegions(request) return response.outputs - def GetPrismCellZones(self, object_name) -> Any: + def GetPrismCellZones(self, pattern) -> Any: """GetPrismCellZones.""" request = MeshingQueriesProtoModule.GetPrismCellZonesRequest() - request.input = object_name + request.input = pattern response = self.service.GetPrismCellZones(request) return response.outputs - def GetPrismCellZones(self, type_list) -> Any: + def GetPrismCellZones(self, zone_list) -> Any: """GetPrismCellZones.""" request = MeshingQueriesProtoModule.GetPrismCellZonesRequest() - for types in type_list: - request.inputs.append(types) + for zone in zone_list: + request.inputs.append(zone) response = self.service.GetPrismCellZones(request) return response.outputs + + def GetTetCellZones(self, pattern) -> Any: + """GetTetCellZones.""" + request = MeshingQueriesProtoModule.GetTetCellZonesRequest() + request.input = pattern + response = self.service.GetTetCellZones(request) + return response.outputs + + def GetTetCellZones(self, zone_list) -> Any: + """GetTetCellZones.""" + request = MeshingQueriesProtoModule.GetTetCellZonesRequest() + for zone in zone_list: + request.inputs.append(zone) + response = self.service.GetTetCellZones(request) + return response.outputs + + def GetAdjacentCellZones(self, pattern) -> Any: + """GetAdjacentCellZones.""" + request = MeshingQueriesProtoModule.GetAdjacentCellZonesRequest() + request.input = pattern + response = self.service.GetAdjacentCellZones(request) + return response.outputs + + def GetAdjacentCellZones(self, zone_list) -> Any: + """GetAdjacentCellZones.""" + request = MeshingQueriesProtoModule.GetAdjacentCellZonesRequest() + for zone in zone_list: + request.inputs.append(zone) + response = self.service.GetAdjacentCellZones(request) + return response.outputs + + def GetAdjacentFaceZones(self, pattern) -> Any: + """GetAdjacentFaceZones.""" + request = MeshingQueriesProtoModule.GetAdjacentCellZonesRequest() + request.input = pattern + response = self.service.GetAdjacentCellZones(request) + return response.outputs + + def GetAdjacentFaceZones(self, zone_list) -> Any: + """GetAdjacentFaceZones.""" + request = MeshingQueriesProtoModule.GetAdjacentFaceZonesRequest() + for zone in zone_list: + request.inputs.append(zone) + response = self.service.GetAdjacentFaceZones(request) + return response.outputs + + def GetAdjacentInteriorAndBoundaryFaceZones(self, pattern) -> Any: + """GetAdjacentInteriorAndBoundaryFaceZones.""" + request = ( + MeshingQueriesProtoModule.GetAdjacentInteriorAndBoundaryFaceZonesGetAdjacentCellZonesRequest() + ) + request.input = pattern + response = self.service.GetAdjacentInteriorAndBoundaryFaceZones(request) + return response.outputs + + def GetAdjacentInteriorAndBoundaryFaceZones(self, zone_list) -> Any: + """GetAdjacentInteriorAndBoundaryFaceZones.""" + request = ( + MeshingQueriesProtoModule.GetAdjacentInteriorAndBoundaryFaceZonesRequest() + ) + for zone in zone_list: + request.inputs.append(zone) + response = self.service.GetAdjacentInteriorAndBoundaryFaceZones(request) + return response.outputs + + def GetAdjacentZonesByEdgeConnectivity(self, pattern) -> Any: + """GetAdjacentZonesByEdgeConnectivity.""" + request = MeshingQueriesProtoModule.GetAdjacentZonesByEdgeConnectivityRequest() + request.input = pattern + response = self.service.GetAdjacentZonesByEdgeConnectivity(request) + return response.outputs + + def GetAdjacentZonesByEdgeConnectivity(self, zone_list) -> Any: + """GetAdjacentZonesByEdgeConnectivity.""" + request = MeshingQueriesProtoModule.GetAdjacentZonesByEdgeConnectivityRequest() + for zone in zone_list: + request.inputs.append(zone) + response = self.service.GetAdjacentZonesByEdgeConnectivity(request) + return response.outputs + + def GetAdjacentZonesByNodeConnectivity(self, pattern) -> Any: + """GetAdjacentZonesByNodeConnectivity.""" + request = MeshingQueriesProtoModule.GetAdjacentZonesByNodeConnectivityRequest() + request.input = pattern + response = self.service.GetAdjacentZonesByNodeConnectivity(request) + return response.outputs + + def GetAdjacentZonesByEdgeConnectivity(self, zone_list) -> Any: + """GetAdjacentZonesByNodeConnectivity.""" + request = MeshingQueriesProtoModule.GetAdjacentZonesByNodeConnectivityRequest() + for zone in zone_list: + request.inputs.append(zone) + response = self.service.GetAdjacentZonesByNodeConnectivity(request) + return response.outputs diff --git a/tests/test_meshing_queries.py b/tests/test_meshing_queries.py index d77a8217901..7228f6dcb58 100644 --- a/tests/test_meshing_queries.py +++ b/tests/test_meshing_queries.py @@ -96,3 +96,60 @@ def test_meshing_queries(new_mesh_session): assert meshing_session.meshing_queries.GetPrismCellZones(["inlet", "outlet"]) == [] assert meshing_session.meshing_queries.GetPrismCellZones("*") == [] + + assert meshing_session.meshing_queries.GetTetCellZones(["inlet", "outlet"]) == [] + + assert meshing_session.meshing_queries.GetTetCellZones("*") == [] + + assert meshing_session.meshing_queries.GetAdjacentCellZones([30]) == [3460] + + assert meshing_session.meshing_queries.GetAdjacentCellZones("*") == [3460] + + assert meshing_session.meshing_queries.GetAdjacentFaceZones([3460]) == [ + 29, + 30, + 31, + 32, + 33, + 34, + ] + + assert meshing_session.meshing_queries.GetAdjacentFaceZones("*") == [ + 29, + 30, + 31, + 32, + 33, + 34, + ] + + assert ( + meshing_session.meshing_queries.GetAdjacentInteriorAndBoundaryFaceZones([30]) + == [] + ) + + assert meshing_session.meshing_queries.GetAdjacentInteriorAndBoundaryFaceZones( + "*" + ) == [ + 29, + 30, + 31, + 32, + 33, + 34, + 3462, + ] # noqa: E501 + + assert meshing_session.meshing_queries.GetAdjacentZonesByEdgeConnectivity([30]) == [ + 33, + 29, + ] + + assert meshing_session.meshing_queries.GetAdjacentZonesByEdgeConnectivity("*") == [] + + assert meshing_session.meshing_queries.GetAdjacentZonesByNodeConnectivity([30]) == [ + 29, + 33, + ] + + assert meshing_session.meshing_queries.GetAdjacentZonesByNodeConnectivity("*") == [] From 4b888e6a43a8978473fd7d5a9489ae6d127dd225 Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Tue, 4 Apr 2023 18:57:23 +0530 Subject: [PATCH 12/35] Updated tests --- .../fluent/core/services/meshing_queries.py | 114 +++++++----------- tests/test_meshing_queries.py | 38 +++--- 2 files changed, 61 insertions(+), 91 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index 2e5a5f67cb0..dce9ccea1f4 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -385,111 +385,81 @@ def GetFaceZoneIdListOfRegions(self, object, region_list) -> Any: response = self.service.GetFaceZoneIdListOfRegions(request) return response.outputs - def GetPrismCellZones(self, pattern) -> Any: + def GetPrismCellZones(self, list_or_pattern) -> Any: """GetPrismCellZones.""" request = MeshingQueriesProtoModule.GetPrismCellZonesRequest() - request.input = pattern + if isinstance(list_or_pattern, str): + request.input = list_or_pattern + elif isinstance(list_or_pattern, list): + for items in list_or_pattern: + request.inputs.append(items) response = self.service.GetPrismCellZones(request) return response.outputs - def GetPrismCellZones(self, zone_list) -> Any: - """GetPrismCellZones.""" - request = MeshingQueriesProtoModule.GetPrismCellZonesRequest() - for zone in zone_list: - request.inputs.append(zone) - response = self.service.GetPrismCellZones(request) - return response.outputs - - def GetTetCellZones(self, pattern) -> Any: + def GetTetCellZones(self, list_or_pattern) -> Any: """GetTetCellZones.""" request = MeshingQueriesProtoModule.GetTetCellZonesRequest() - request.input = pattern + if isinstance(list_or_pattern, str): + request.input = list_or_pattern + elif isinstance(list_or_pattern, list): + for items in list_or_pattern: + request.inputs.append(items) response = self.service.GetTetCellZones(request) return response.outputs - def GetTetCellZones(self, zone_list) -> Any: - """GetTetCellZones.""" - request = MeshingQueriesProtoModule.GetTetCellZonesRequest() - for zone in zone_list: - request.inputs.append(zone) - response = self.service.GetTetCellZones(request) - return response.outputs - - def GetAdjacentCellZones(self, pattern) -> Any: - """GetAdjacentCellZones.""" - request = MeshingQueriesProtoModule.GetAdjacentCellZonesRequest() - request.input = pattern - response = self.service.GetAdjacentCellZones(request) - return response.outputs - - def GetAdjacentCellZones(self, zone_list) -> Any: + def GetAdjacentCellZones(self, list_or_pattern) -> Any: """GetAdjacentCellZones.""" request = MeshingQueriesProtoModule.GetAdjacentCellZonesRequest() - for zone in zone_list: - request.inputs.append(zone) + if isinstance(list_or_pattern, str): + request.input = list_or_pattern + elif isinstance(list_or_pattern, list): + for items in list_or_pattern: + request.inputs.append(items) response = self.service.GetAdjacentCellZones(request) return response.outputs - def GetAdjacentFaceZones(self, pattern) -> Any: + def GetAdjacentFaceZones(self, list_or_pattern) -> Any: """GetAdjacentFaceZones.""" request = MeshingQueriesProtoModule.GetAdjacentCellZonesRequest() - request.input = pattern + if isinstance(list_or_pattern, str): + request.input = list_or_pattern + elif isinstance(list_or_pattern, list): + for items in list_or_pattern: + request.inputs.append(items) response = self.service.GetAdjacentCellZones(request) return response.outputs - def GetAdjacentFaceZones(self, zone_list) -> Any: - """GetAdjacentFaceZones.""" - request = MeshingQueriesProtoModule.GetAdjacentFaceZonesRequest() - for zone in zone_list: - request.inputs.append(zone) - response = self.service.GetAdjacentFaceZones(request) - return response.outputs - - def GetAdjacentInteriorAndBoundaryFaceZones(self, pattern) -> Any: - """GetAdjacentInteriorAndBoundaryFaceZones.""" - request = ( - MeshingQueriesProtoModule.GetAdjacentInteriorAndBoundaryFaceZonesGetAdjacentCellZonesRequest() - ) - request.input = pattern - response = self.service.GetAdjacentInteriorAndBoundaryFaceZones(request) - return response.outputs - - def GetAdjacentInteriorAndBoundaryFaceZones(self, zone_list) -> Any: + def GetAdjacentInteriorAndBoundaryFaceZones(self, list_or_pattern) -> Any: """GetAdjacentInteriorAndBoundaryFaceZones.""" request = ( MeshingQueriesProtoModule.GetAdjacentInteriorAndBoundaryFaceZonesRequest() ) - for zone in zone_list: - request.inputs.append(zone) + if isinstance(list_or_pattern, str): + request.input = list_or_pattern + elif isinstance(list_or_pattern, list): + for items in list_or_pattern: + request.inputs.append(items) response = self.service.GetAdjacentInteriorAndBoundaryFaceZones(request) return response.outputs - def GetAdjacentZonesByEdgeConnectivity(self, pattern) -> Any: + def GetAdjacentZonesByEdgeConnectivity(self, list_or_pattern) -> Any: """GetAdjacentZonesByEdgeConnectivity.""" request = MeshingQueriesProtoModule.GetAdjacentZonesByEdgeConnectivityRequest() - request.input = pattern + if isinstance(list_or_pattern, str): + request.input = list_or_pattern + elif isinstance(list_or_pattern, list): + for items in list_or_pattern: + request.inputs.append(items) response = self.service.GetAdjacentZonesByEdgeConnectivity(request) return response.outputs - def GetAdjacentZonesByEdgeConnectivity(self, zone_list) -> Any: - """GetAdjacentZonesByEdgeConnectivity.""" - request = MeshingQueriesProtoModule.GetAdjacentZonesByEdgeConnectivityRequest() - for zone in zone_list: - request.inputs.append(zone) - response = self.service.GetAdjacentZonesByEdgeConnectivity(request) - return response.outputs - - def GetAdjacentZonesByNodeConnectivity(self, pattern) -> Any: - """GetAdjacentZonesByNodeConnectivity.""" - request = MeshingQueriesProtoModule.GetAdjacentZonesByNodeConnectivityRequest() - request.input = pattern - response = self.service.GetAdjacentZonesByNodeConnectivity(request) - return response.outputs - - def GetAdjacentZonesByEdgeConnectivity(self, zone_list) -> Any: + def GetAdjacentZonesByNodeConnectivity(self, list_or_pattern) -> Any: """GetAdjacentZonesByNodeConnectivity.""" request = MeshingQueriesProtoModule.GetAdjacentZonesByNodeConnectivityRequest() - for zone in zone_list: - request.inputs.append(zone) + if isinstance(list_or_pattern, str): + request.input = list_or_pattern + elif isinstance(list_or_pattern, list): + for items in list_or_pattern: + request.inputs.append(items) response = self.service.GetAdjacentZonesByNodeConnectivity(request) return response.outputs diff --git a/tests/test_meshing_queries.py b/tests/test_meshing_queries.py index 7228f6dcb58..a18c8e4caee 100644 --- a/tests/test_meshing_queries.py +++ b/tests/test_meshing_queries.py @@ -91,7 +91,7 @@ def test_meshing_queries(new_mesh_session): 31, 30, 29, - ] # noqa: E501 + ] assert meshing_session.meshing_queries.GetPrismCellZones(["inlet", "outlet"]) == [] @@ -105,23 +105,23 @@ def test_meshing_queries(new_mesh_session): assert meshing_session.meshing_queries.GetAdjacentCellZones("*") == [3460] - assert meshing_session.meshing_queries.GetAdjacentFaceZones([3460]) == [ - 29, - 30, - 31, - 32, - 33, - 34, - ] - - assert meshing_session.meshing_queries.GetAdjacentFaceZones("*") == [ - 29, - 30, - 31, - 32, - 33, - 34, - ] + # assert meshing_session.meshing_queries.GetAdjacentFaceZones([3460]) == [ + # 29, + # 30, + # 31, + # 32, + # 33, + # 34, + # ] + + # assert meshing_session.meshing_queries.GetAdjacentFaceZones("*") == [ + # 29, + # 30, + # 31, + # 32, + # 33, + # 34, + # ] assert ( meshing_session.meshing_queries.GetAdjacentInteriorAndBoundaryFaceZones([30]) @@ -138,7 +138,7 @@ def test_meshing_queries(new_mesh_session): 33, 34, 3462, - ] # noqa: E501 + ] assert meshing_session.meshing_queries.GetAdjacentZonesByEdgeConnectivity([30]) == [ 33, From 92942c90a8b8e5141ee801f4b3d2d74b743af4a6 Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Tue, 4 Apr 2023 19:02:50 +0530 Subject: [PATCH 13/35] Updated tests --- .../fluent/core/services/meshing_queries.py | 4 +- tests/test_meshing_queries.py | 38 +++++++++---------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index dce9ccea1f4..de091089f35 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -420,13 +420,13 @@ def GetAdjacentCellZones(self, list_or_pattern) -> Any: def GetAdjacentFaceZones(self, list_or_pattern) -> Any: """GetAdjacentFaceZones.""" - request = MeshingQueriesProtoModule.GetAdjacentCellZonesRequest() + request = MeshingQueriesProtoModule.GetAdjacentFaceZonesRequest() if isinstance(list_or_pattern, str): request.input = list_or_pattern elif isinstance(list_or_pattern, list): for items in list_or_pattern: request.inputs.append(items) - response = self.service.GetAdjacentCellZones(request) + response = self.service.GetAdjacentFaceZones(request) return response.outputs def GetAdjacentInteriorAndBoundaryFaceZones(self, list_or_pattern) -> Any: diff --git a/tests/test_meshing_queries.py b/tests/test_meshing_queries.py index a18c8e4caee..d01cb6e69d5 100644 --- a/tests/test_meshing_queries.py +++ b/tests/test_meshing_queries.py @@ -63,9 +63,7 @@ def test_meshing_queries(new_mesh_session): assert meshing_session.meshing_queries.GetFaceZonesOfLabels( "elbow-fluid", ["inlet", "outlet", "wall", "internal"] - ) == [ - 32 - ] # noqa: E501 + ) == [32] assert meshing_session.meshing_queries.GetFaceZoneIdListOfLabels( "elbow-fluid", ["outlet"] @@ -105,23 +103,23 @@ def test_meshing_queries(new_mesh_session): assert meshing_session.meshing_queries.GetAdjacentCellZones("*") == [3460] - # assert meshing_session.meshing_queries.GetAdjacentFaceZones([3460]) == [ - # 29, - # 30, - # 31, - # 32, - # 33, - # 34, - # ] - - # assert meshing_session.meshing_queries.GetAdjacentFaceZones("*") == [ - # 29, - # 30, - # 31, - # 32, - # 33, - # 34, - # ] + assert meshing_session.meshing_queries.GetAdjacentFaceZones([3460]) == [ + 29, + 30, + 31, + 32, + 33, + 34, + ] + + assert meshing_session.meshing_queries.GetAdjacentFaceZones("*") == [ + 29, + 30, + 31, + 32, + 33, + 34, + ] assert ( meshing_session.meshing_queries.GetAdjacentInteriorAndBoundaryFaceZones([30]) From da7bccf27d00c788edebca3da0c80a23ab287754 Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Thu, 6 Apr 2023 12:31:21 +0530 Subject: [PATCH 14/35] Added rpcs and tests --- .../fluent/core/services/meshing_queries.py | 271 ++++++++++++++++++ tests/test_meshing_queries.py | 46 +++ 2 files changed, 317 insertions(+) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index de091089f35..955f37b87d0 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -225,6 +225,154 @@ def GetAdjacentZonesByNodeConnectivity( request, metadata=self._metadata ) + # @catch_grpc_error + # def GetSharedBoundaryZones( + # self, + # request: MeshingQueriesProtoModule.GetSharedBoundaryZonesRequest, + # ) -> MeshingQueriesProtoModule.GetSharedBoundaryZonesResponse: + # """GetSharedBoundaryZones rpc of MeshingQueriesService.""" + # return self._stub.GetSharedBoundaryZones( + # request, metadata=self._metadata + # ) + + @catch_grpc_error + def GetInteriorZonesConnectedToCellZones( + self, + request: MeshingQueriesProtoModule.GetInteriorZonesConnectedToCellZonesRequest, + ) -> MeshingQueriesProtoModule.GetInteriorZonesConnectedToCellZonesResponse: + """GetInteriorZonesConnectedToCellZones rpc of MeshingQueriesService.""" + return self._stub.GetInteriorZonesConnectedToCellZones( + request, metadata=self._metadata + ) + + @catch_grpc_error + def GetFaceZonesWithZoneSpecificPrismsApplied( + self, + request: MeshingQueriesProtoModule.Empty, + ) -> MeshingQueriesProtoModule.GetFaceZonesWithZoneSpecificPrismsAppliedResponse: + """GetFaceZonesWithZoneSpecificPrismsApplied rpc of MeshingQueriesService.""" + return self._stub.GetFaceZonesWithZoneSpecificPrismsApplied( + request, metadata=self._metadata + ) + + # @catch_grpc_error + # def GetFaceZonesOfPrismControls( + # self, + # request: MeshingQueriesProtoModule.GetFaceZonesOfPrismControlsRequest, + # ) -> MeshingQueriesProtoModule.GetFaceZonesOfPrismControlsResponse: + # """GetFaceZonesOfPrismControls rpc of MeshingQueriesService.""" + # return self._stub.GetFaceZonesOfPrismControls( + # request, metadata=self._metadata + # ) + + @catch_grpc_error + def GetBaffles( + self, + request: MeshingQueriesProtoModule.GetBafflesRequest, + ) -> MeshingQueriesProtoModule.GetBafflesResponse: + """GetBaffles rpc of MeshingQueriesService.""" + return self._stub.GetBaffles(request, metadata=self._metadata) + + @catch_grpc_error + def GetEmbeddedBaffles( + self, + request: MeshingQueriesProtoModule.Empty, + ) -> MeshingQueriesProtoModule.GetEmbeddedBafflesResponse: + """GetEmbeddedBaffles rpc of MeshingQueriesService.""" + return self._stub.GetEmbeddedBaffles(request, metadata=self._metadata) + + @catch_grpc_error + def GetWrappedZones( + self, + request: MeshingQueriesProtoModule.Empty, + ) -> MeshingQueriesProtoModule.GetWrappedZonesResponse: + """GetWrappedZones rpc of MeshingQueriesService.""" + return self._stub.GetWrappedZones(request, metadata=self._metadata) + + @catch_grpc_error + def GetUnreferencedEdgeZones( + self, + request: MeshingQueriesProtoModule.Empty, + ) -> MeshingQueriesProtoModule.GetUnreferencedEdgeZonesResponse: + """GetUnreferencedEdgeZones rpc of MeshingQueriesService.""" + return self._stub.GetUnreferencedEdgeZones(request, metadata=self._metadata) + + @catch_grpc_error + def GetUnreferencedFaceZones( + self, + request: MeshingQueriesProtoModule.Empty, + ) -> MeshingQueriesProtoModule.GetUnreferencedFaceZonesResponse: + """GetUnreferencedFaceZones rpc of MeshingQueriesService.""" + return self._stub.GetUnreferencedFaceZones(request, metadata=self._metadata) + + @catch_grpc_error + def GetUnreferencedCellZones( + self, + request: MeshingQueriesProtoModule.Empty, + ) -> MeshingQueriesProtoModule.GetUnreferencedCellZonesResponse: + """GetUnreferencedCellZones rpc of MeshingQueriesService.""" + return self._stub.GetUnreferencedCellZones(request, metadata=self._metadata) + + @catch_grpc_error + def GetUnreferencedEdgeZonesOfFilter( + self, + request: MeshingQueriesProtoModule.GetUnreferencedEdgeZonesOfFilterRequest, + ) -> MeshingQueriesProtoModule.GetUnreferencedEdgeZonesOfFilterResponse: + """GetUnreferencedEdgeZonesOfFilter rpc of MeshingQueriesService.""" + return self._stub.GetUnreferencedEdgeZonesOfFilter( + request, metadata=self._metadata + ) + + @catch_grpc_error + def GetUnreferencedFaceZonesOfFilter( + self, + request: MeshingQueriesProtoModule.GetUnreferencedFaceZonesOfFilterRequest, + ) -> MeshingQueriesProtoModule.GetUnreferencedFaceZonesOfFilterResponse: + """GetUnreferencedFaceZonesOfFilter rpc of MeshingQueriesService.""" + return self._stub.GetUnreferencedFaceZonesOfFilter( + request, metadata=self._metadata + ) + + @catch_grpc_error + def GetUnreferencedCellZonesOfFilter( + self, + request: MeshingQueriesProtoModule.GetUnreferencedCellZonesOfFilterRequest, + ) -> MeshingQueriesProtoModule.GetUnreferencedCellZonesOfFilterResponse: + """GetUnreferencedCellZonesOfFilter rpc of MeshingQueriesService.""" + return self._stub.GetUnreferencedCellZonesOfFilter( + request, metadata=self._metadata + ) + + @catch_grpc_error + def GetUnreferencedEdgeZoneIdListOfPattern( + self, + request: MeshingQueriesProtoModule.GetUnreferencedEdgeZoneIdListOfPatternRequest, + ) -> MeshingQueriesProtoModule.GetUnreferencedEdgeZoneIdListOfPatternResponse: + """GetUnreferencedEdgeZoneIdListOfPattern rpc of MeshingQueriesService.""" + return self._stub.GetUnreferencedEdgeZoneIdListOfPattern( + request, metadata=self._metadata + ) + + @catch_grpc_error + def GetUnreferencedFaceZoneIdListOfPattern( + self, + request: MeshingQueriesProtoModule.GetUnreferencedFaceZoneIdListOfPatternRequest, + ) -> MeshingQueriesProtoModule.GetUnreferencedFaceZoneIdListOfPatternResponse: + """GetUnreferencedFaceZoneIdListOfPattern rpc of MeshingQueriesService.""" + return self._stub.GetUnreferencedFaceZoneIdListOfPattern( + request, metadata=self._metadata + ) + + @catch_grpc_error + def GetUnreferencedCellZoneIdListOfPattern( + self, + request: MeshingQueriesProtoModule.GetUnreferencedCellZoneIdListOfPatternRequest, + ) -> MeshingQueriesProtoModule.GetUnreferencedCellZoneIdListOfPatternResponse: + """GetUnreferencedCellZoneIdListOfPattern rpc of MeshingQueriesService.""" + return self._stub.GetUnreferencedCellZoneIdListOfPattern( + request, metadata=self._metadata + ) + class MeshingQueries: """ @@ -463,3 +611,126 @@ def GetAdjacentZonesByNodeConnectivity(self, list_or_pattern) -> Any: request.inputs.append(items) response = self.service.GetAdjacentZonesByNodeConnectivity(request) return response.outputs + + # def GetSharedBoundaryZones(self, list_or_pattern) -> Any: + # """GetSharedBoundaryZones.""" + # request = MeshingQueriesProtoModule.GetSharedBoundaryZonesRequest() + # if isinstance(list_or_pattern, str): + # request.input = list_or_pattern + # elif isinstance(list_or_pattern, list): + # for items in list_or_pattern: + # request.inputs.append(items) + # response = self.service.GetSharedBoundaryZones(request) + # return response.outputs + + def GetInteriorZonesConnectedToCellZones(self, list_or_pattern) -> Any: + """GetInteriorZonesConnectedToCellZones.""" + request = ( + MeshingQueriesProtoModule.GetInteriorZonesConnectedToCellZonesRequest() + ) + if isinstance(list_or_pattern, str): + request.input = list_or_pattern + elif isinstance(list_or_pattern, list): + for items in list_or_pattern: + request.inputs.append(items) + response = self.service.GetInteriorZonesConnectedToCellZones(request) + return response.outputs + + def GetFaceZonesWithZoneSpecificPrismsApplied(self) -> Any: + """GetFaceZonesWithZoneSpecificPrismsApplied.""" + request = MeshingQueriesProtoModule.Empty() + response = self.service.GetFaceZonesWithZoneSpecificPrismsApplied(request) + return response.outputs + + # def GetFaceZonesOfPrismControls(self, control_name) -> Any: + # """GetInteriorZonesConnectedToCellZones.""" + # request = MeshingQueriesProtoModule.GetFaceZonesOfPrismControlsRequest() + # request.input = control_name + # response = self.service.GetFaceZonesOfPrismControls(request) + # return response.outputs + + def GetBaffles(self, face_zone_list) -> Any: + """GetBaffles.""" + request = MeshingQueriesProtoModule.GetBafflesRequest() + for items in face_zone_list: + request.inputs.append(items) + response = self.service.GetBaffles(request) + return response.outputs + + def GetEmbeddedBaffles(self) -> Any: + """GetEmbeddedBaffles.""" + request = MeshingQueriesProtoModule.Empty() + response = self.service.GetEmbeddedBaffles(request) + return response.outputs + + def GetWrappedZones(self) -> Any: + """GetWrappedZones.""" + request = MeshingQueriesProtoModule.Empty() + response = self.service.GetWrappedZones(request) + return response.outputs + + def GetUnreferencedEdgeZones(self) -> Any: + """GetUnreferencedEdgeZones.""" + request = MeshingQueriesProtoModule.Empty() + response = self.service.GetUnreferencedEdgeZones(request) + return response.outputs + + def GetUnreferencedFaceZones(self) -> Any: + """GetUnreferencedFaceZones.""" + request = MeshingQueriesProtoModule.Empty() + response = self.service.GetUnreferencedFaceZones(request) + return response.outputs + + def GetUnreferencedCellZones(self) -> Any: + """GetUnreferencedCellZones.""" + request = MeshingQueriesProtoModule.Empty() + response = self.service.GetUnreferencedCellZones(request) + return response.outputs + + def GetUnreferencedEdgeZonesOfFilter(self, filter) -> Any: + """GetUnreferencedEdgeZonesOfFilter.""" + request = MeshingQueriesProtoModule.GetUnreferencedEdgeZonesOfFilterRequest() + request.input = filter + response = self.service.GetUnreferencedEdgeZonesOfFilter(request) + return response.outputs + + def GetUnreferencedFaceZonesOfFilter(self, filter) -> Any: + """GetUnreferencedFaceZonesOfFilter.""" + request = MeshingQueriesProtoModule.GetUnreferencedFaceZonesOfFilterRequest() + request.input = filter + response = self.service.GetUnreferencedFaceZonesOfFilter(request) + return response.outputs + + def GetUnreferencedCellZonesOfFilter(self, filter) -> Any: + """GetUnreferencedEdgeZonesOfFilter.""" + request = MeshingQueriesProtoModule.GetUnreferencedCellZonesOfFilterRequest() + request.input = filter + response = self.service.GetUnreferencedCellZonesOfFilter(request) + return response.outputs + + def GetUnreferencedEdgeZoneIdListOfPattern(self, pattern) -> Any: + """GetUnreferencedEdgeZoneIdListOfPattern.""" + request = ( + MeshingQueriesProtoModule.GetUnreferencedEdgeZoneIdListOfPatternRequest() + ) + request.input = pattern + response = self.service.GetUnreferencedEdgeZoneIdListOfPattern(request) + return response.outputs + + def GetUnreferencedFaceZoneIdListOfPattern(self, pattern) -> Any: + """GetUnreferencedFaceZoneIdListOfPattern.""" + request = ( + MeshingQueriesProtoModule.GetUnreferencedFaceZoneIdListOfPatternRequest() + ) + request.input = pattern + response = self.service.GetUnreferencedFaceZoneIdListOfPattern(request) + return response.outputs + + def GetUnreferencedCellZoneIdListOfPattern(self, pattern) -> Any: + """GetUnreferencedCellZoneIdListOfPattern.""" + request = ( + MeshingQueriesProtoModule.GetUnreferencedCellZoneIdListOfPatternRequest() + ) + request.input = pattern + response = self.service.GetUnreferencedCellZoneIdListOfPattern(request) + return response.outputs diff --git a/tests/test_meshing_queries.py b/tests/test_meshing_queries.py index d01cb6e69d5..5ec5352ef35 100644 --- a/tests/test_meshing_queries.py +++ b/tests/test_meshing_queries.py @@ -151,3 +151,49 @@ def test_meshing_queries(new_mesh_session): ] assert meshing_session.meshing_queries.GetAdjacentZonesByNodeConnectivity("*") == [] + + assert meshing_session.meshing_queries.GetInteriorZonesConnectedToCellZones( + [3460] + ) == [3462] + + assert meshing_session.meshing_queries.GetInteriorZonesConnectedToCellZones( + "*" + ) == [3462] + + assert ( + meshing_session.meshing_queries.GetFaceZonesWithZoneSpecificPrismsApplied() + == [] + ) + + assert meshing_session.meshing_queries.GetBaffles([29, 30]) == [30, 29] + + assert meshing_session.meshing_queries.GetEmbeddedBaffles() == [] + + assert meshing_session.meshing_queries.GetWrappedZones() == [] + + assert meshing_session.meshing_queries.GetUnreferencedEdgeZones() == [] + + assert meshing_session.meshing_queries.GetUnreferencedEdgeZones() == [] + + assert meshing_session.meshing_queries.GetUnreferencedEdgeZones() == [] + + assert meshing_session.meshing_queries.GetUnreferencedEdgeZonesOfFilter("*") == [] + + assert meshing_session.meshing_queries.GetUnreferencedFaceZonesOfFilter("*") == [] + + assert meshing_session.meshing_queries.GetUnreferencedCellZonesOfFilter("*") == [] + + assert ( + meshing_session.meshing_queries.GetUnreferencedEdgeZoneIdListOfPattern("*") + == [] + ) + + assert ( + meshing_session.meshing_queries.GetUnreferencedFaceZoneIdListOfPattern("*") + == [] + ) + + assert ( + meshing_session.meshing_queries.GetUnreferencedCellZoneIdListOfPattern("*") + == [] + ) From 82c219b4b5d372f83d65307ff6a9774294286ccf Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Fri, 7 Apr 2023 15:51:06 +0530 Subject: [PATCH 15/35] Added rpcs and tests --- .../fluent/core/services/meshing_queries.py | 460 ++++++++++++++++++ tests/test_meshing_queries.py | 100 ++++ 2 files changed, 560 insertions(+) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index 955f37b87d0..58e37678df5 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -373,6 +373,232 @@ def GetUnreferencedCellZoneIdListOfPattern( request, metadata=self._metadata ) + @catch_grpc_error + def GetMaxsizeCellZoneByVolume( + self, + request: MeshingQueriesProtoModule.GetMaxsizeCellZoneByVolumeRequest, + ) -> MeshingQueriesProtoModule.GetMaxsizeCellZoneByVolumeResponse: + """GetMaxsizeCellZoneByVolume rpc of MeshingQueriesService.""" + return self._stub.GetMaxsizeCellZoneByVolume(request, metadata=self._metadata) + + @catch_grpc_error + def GetMaxsizeCellZoneByCount( + self, + request: MeshingQueriesProtoModule.GetMaxsizeCellZoneByCountRequest, + ) -> MeshingQueriesProtoModule.GetMaxsizeCellZoneByCountResponse: + """GetMaxsizeCellZoneByCount rpc of MeshingQueriesService.""" + return self._stub.GetMaxsizeCellZoneByCount(request, metadata=self._metadata) + + @catch_grpc_error + def GetMinsizeFaceZoneByArea( + self, + request: MeshingQueriesProtoModule.GetMinsizeFaceZoneByAreaRequest, + ) -> MeshingQueriesProtoModule.GetMinsizeFaceZoneByAreaResponse: + """GetMinsizeFaceZoneByArea rpc of MeshingQueriesService.""" + return self._stub.GetMinsizeFaceZoneByArea(request, metadata=self._metadata) + + @catch_grpc_error + def GetMinsizeFaceZoneByCount( + self, + request: MeshingQueriesProtoModule.GetMinsizeFaceZoneByCountRequest, + ) -> MeshingQueriesProtoModule.GetMinsizeFaceZoneByCountResponse: + """GetMinsizeFaceZoneByCount rpc of MeshingQueriesService.""" + return self._stub.GetMinsizeFaceZoneByCount(request, metadata=self._metadata) + + @catch_grpc_error + def GetFaceZoneListByMaximumEntityCount( + self, + request: MeshingQueriesProtoModule.GetFaceZoneListByMaximumEntityCountRequest, + ) -> MeshingQueriesProtoModule.GetFaceZoneListByMaximumEntityCountResponse: + """GetFaceZoneListByMaximumEntityCount rpc of MeshingQueriesService.""" + return self._stub.GetFaceZoneListByMaximumEntityCount( + request, metadata=self._metadata + ) + + @catch_grpc_error + def GetEdgeZoneListByMaximumEntityCount( + self, + request: MeshingQueriesProtoModule.GetEdgeZoneListByMaximumEntityCountRequest, + ) -> MeshingQueriesProtoModule.GetEdgeZoneListByMaximumEntityCountResponse: + """GetEdgeZoneListByMaximumEntityCount rpc of MeshingQueriesService.""" + return self._stub.GetEdgeZoneListByMaximumEntityCount( + request, metadata=self._metadata + ) + + @catch_grpc_error + def GetCellZoneListByMaximumEntityCount( + self, + request: MeshingQueriesProtoModule.GetCellZoneListByMaximumEntityCountRequest, + ) -> MeshingQueriesProtoModule.GetCellZoneListByMaximumEntityCountResponse: + """GetCellZoneListByMaximumEntityCount rpc of MeshingQueriesService.""" + return self._stub.GetCellZoneListByMaximumEntityCount( + request, metadata=self._metadata + ) + + @catch_grpc_error + def GetFaceZoneListByMaximumZoneArea( + self, + request: MeshingQueriesProtoModule.GetFaceZoneListByMaximumZoneAreaRequest, + ) -> MeshingQueriesProtoModule.GetFaceZoneListByMaximumZoneAreaResponse: + """GetFaceZoneListByMaximumZoneArea rpc of MeshingQueriesService.""" + return self._stub.GetFaceZoneListByMaximumZoneArea( + request, metadata=self._metadata + ) + + @catch_grpc_error + def GetFaceZoneListByMinimumZoneArea( + self, + request: MeshingQueriesProtoModule.GetFaceZoneListByMinimumZoneAreaRequest, + ) -> MeshingQueriesProtoModule.GetFaceZoneListByMinimumZoneAreaResponse: + """GetFaceZoneListByMinimumZoneArea rpc of MeshingQueriesService.""" + return self._stub.GetFaceZoneListByMinimumZoneArea( + request, metadata=self._metadata + ) + + @catch_grpc_error + def GetZonesWithFreeFaces( + self, + request: MeshingQueriesProtoModule.GetZonesWithFreeFacesRequest, + ) -> MeshingQueriesProtoModule.GetZonesWithFreeFacesResponse: + """GetZonesWithFreeFaces rpc of MeshingQueriesService.""" + return self._stub.GetZonesWithFreeFaces(request, metadata=self._metadata) + + @catch_grpc_error + def GetZonesWithFreeFaces( + self, + request: MeshingQueriesProtoModule.GetZonesWithFreeFacesRequest, + ) -> MeshingQueriesProtoModule.GetZonesWithFreeFacesResponse: + """GetZonesWithFreeFaces rpc of MeshingQueriesService.""" + return self._stub.GetZonesWithFreeFaces(request, metadata=self._metadata) + + @catch_grpc_error + def GetZonesWithMultiFaces( + self, + request: MeshingQueriesProtoModule.GetZonesWithMultiFacesRequest, + ) -> MeshingQueriesProtoModule.GetZonesWithMultiFacesResponse: + """GetZonesWithMultiFaces rpc of MeshingQueriesService.""" + return self._stub.GetZonesWithMultiFaces(request, metadata=self._metadata) + + @catch_grpc_error + def GetOverlappingFaceZones( + self, + request: MeshingQueriesProtoModule.GetOverlappingFaceZonesRequest, + ) -> MeshingQueriesProtoModule.GetOverlappingFaceZonesResponse: + """GetOverlappingFaceZones rpc of MeshingQueriesService.""" + return self._stub.GetOverlappingFaceZones(request, metadata=self._metadata) + + @catch_grpc_error + def GetZonesWithMultiFaces( + self, + request: MeshingQueriesProtoModule.GetZonesWithMultiFacesRequest, + ) -> MeshingQueriesProtoModule.GetZonesWithMultiFacesResponse: + """GetZonesWithMultiFaces rpc of MeshingQueriesService.""" + return self._stub.GetZonesWithMultiFaces(request, metadata=self._metadata) + + @catch_grpc_error + def GetZonesWithMarkedFaces( + self, + request: MeshingQueriesProtoModule.GetZonesWithMarkedFacesRequest, + ) -> MeshingQueriesProtoModule.GetZonesWithMarkedFacesResponse: + """GetZonesWithMarkedFaces rpc of MeshingQueriesService.""" + return self._stub.GetZonesWithMarkedFaces(request, metadata=self._metadata) + + @catch_grpc_error + def GetZonesWithMarkedFaces( + self, + request: MeshingQueriesProtoModule.GetZonesWithMarkedFacesRequest, + ) -> MeshingQueriesProtoModule.GetZonesWithMarkedFacesResponse: + """GetZonesWithMarkedFaces rpc of MeshingQueriesService.""" + return self._stub.GetZonesWithMarkedFaces(request, metadata=self._metadata) + + @catch_grpc_error + def GetAllObjectNameList( + self, + request: MeshingQueriesProtoModule.Empty, + ) -> MeshingQueriesProtoModule.GetAllObjectNameListResponse: + """GetAllObjectNameList rpc of MeshingQueriesService.""" + return self._stub.GetAllObjectNameList(request, metadata=self._metadata) + + @catch_grpc_error + def GetObjectNameListOfType( + self, + request: MeshingQueriesProtoModule.GetObjectNameListOfTypeRequest, + ) -> MeshingQueriesProtoModule.GetObjectNameListOfTypeResponse: + """GetObjectNameListOfType rpc of MeshingQueriesService.""" + return self._stub.GetObjectNameListOfType(request, metadata=self._metadata) + + @catch_grpc_error + def GetObjectsOfFilter( + self, + request: MeshingQueriesProtoModule.GetObjectsOfFilterRequest, + ) -> MeshingQueriesProtoModule.GetObjectsOfFilterResponse: + """GetObjectsOfFilter rpc of MeshingQueriesService.""" + return self._stub.GetObjectsOfFilter(request, metadata=self._metadata) + + @catch_grpc_error + def GetObjectsOfFilter( + self, + request: MeshingQueriesProtoModule.GetObjectsOfFilterRequest, + ) -> MeshingQueriesProtoModule.GetObjectsOfFilterResponse: + """GetObjectsOfFilter rpc of MeshingQueriesService.""" + return self._stub.GetObjectsOfFilter(request, metadata=self._metadata) + + @catch_grpc_error + def GetRegionsOfObject( + self, + request: MeshingQueriesProtoModule.GetRegionsOfObjectRequest, + ) -> MeshingQueriesProtoModule.GetRegionsOfObjectResponse: + """GetRegionsOfObject rpc of MeshingQueriesService.""" + return self._stub.GetRegionsOfObject(request, metadata=self._metadata) + + @catch_grpc_error + def GetRegionNameListOfObject( + self, + request: MeshingQueriesProtoModule.GetRegionNameListOfObjectRequest, + ) -> MeshingQueriesProtoModule.GetRegionNameListOfObjectResponse: + """GetRegionNameListOfObject rpc of MeshingQueriesService.""" + return self._stub.GetRegionNameListOfObject(request, metadata=self._metadata) + + @catch_grpc_error + def GetRegionVolume( + self, + request: MeshingQueriesProtoModule.GetRegionVolumeRequest, + ) -> MeshingQueriesProtoModule.GetRegionVolumeResponse: + """GetRegionVolume rpc of MeshingQueriesService.""" + return self._stub.GetRegionVolume(request, metadata=self._metadata) + + @catch_grpc_error + def GetRegionsOfFilter( + self, + request: MeshingQueriesProtoModule.GetRegionsOfFilterRequest, + ) -> MeshingQueriesProtoModule.GetRegionsOfFilterResponse: + """GetRegionsOfFilter rpc of MeshingQueriesService.""" + return self._stub.GetRegionsOfFilter(request, metadata=self._metadata) + + @catch_grpc_error + def GetRegionNameListOfPattern( + self, + request: MeshingQueriesProtoModule.GetRegionNameListOfPatternRequest, + ) -> MeshingQueriesProtoModule.GetRegionNameListOfPatternResponse: + """GetRegionNameListOfPattern rpc of MeshingQueriesService.""" + return self._stub.GetRegionNameListOfPattern(request, metadata=self._metadata) + + @catch_grpc_error + def GetRegionsOfFaceZones( + self, + request: MeshingQueriesProtoModule.GetRegionsOfFaceZonesRequest, + ) -> MeshingQueriesProtoModule.GetRegionsOfFaceZonesResponse: + """GetRegionsOfFaceZones rpc of MeshingQueriesService.""" + return self._stub.GetRegionsOfFaceZones(request, metadata=self._metadata) + + @catch_grpc_error + def GetRegionNameListOfFaceZones( + self, + request: MeshingQueriesProtoModule.GetRegionNameListOfFaceZonesRequest, + ) -> MeshingQueriesProtoModule.GetRegionNameListOfFaceZonesResponse: + """GetRegionNameListOfFaceZones rpc of MeshingQueriesService.""" + return self._stub.GetRegionNameListOfFaceZones(request, metadata=self._metadata) + class MeshingQueries: """ @@ -734,3 +960,237 @@ def GetUnreferencedCellZoneIdListOfPattern(self, pattern) -> Any: request.input = pattern response = self.service.GetUnreferencedCellZoneIdListOfPattern(request) return response.outputs + + def GetMaxsizeCellZoneByVolume(self, list_or_pattern) -> Any: + """GetMaxsizeCellZoneByVolume.""" + request = MeshingQueriesProtoModule.GetMaxsizeCellZoneByVolumeRequest() + if isinstance(list_or_pattern, str): + request.string_input = list_or_pattern + elif isinstance(list_or_pattern, list): + if isinstance(list_or_pattern[0], int): + for items in list_or_pattern: + request.int_inputs.append(items) + elif isinstance(list_or_pattern[0], str): + for items in list_or_pattern: + request.string_inputs.append(items) + response = self.service.GetMaxsizeCellZoneByVolume(request) + return response.outputs + + def GetMaxsizeCellZoneByCount(self, list_or_pattern) -> Any: + """GetMaxsizeCellZoneByCount.""" + request = MeshingQueriesProtoModule.GetMaxsizeCellZoneByCountRequest() + if isinstance(list_or_pattern, str): + request.string_input = list_or_pattern + elif isinstance(list_or_pattern, list): + if isinstance(list_or_pattern[0], int): + for items in list_or_pattern: + request.int_inputs.append(items) + elif isinstance(list_or_pattern[0], str): + for items in list_or_pattern: + request.string_inputs.append(items) + response = self.service.GetMaxsizeCellZoneByCount(request) + return response.outputs + + def GetMinsizeFaceZoneByArea(self, list_or_pattern) -> Any: + """GetMinsizeFaceZoneByArea.""" + request = MeshingQueriesProtoModule.GetMinsizeFaceZoneByAreaRequest() + if isinstance(list_or_pattern, str): + request.string_input = list_or_pattern + elif isinstance(list_or_pattern, list): + if isinstance(list_or_pattern[0], int): + for items in list_or_pattern: + request.int_inputs.append(items) + elif isinstance(list_or_pattern[0], str): + for items in list_or_pattern: + request.string_inputs.append(items) + response = self.service.GetMinsizeFaceZoneByArea(request) + return response.outputs + + def GetMinsizeFaceZoneByCount(self, list_or_pattern) -> Any: + """GetMinsizeFaceZoneByCount.""" + request = MeshingQueriesProtoModule.GetMinsizeFaceZoneByCountRequest() + if isinstance(list_or_pattern, str): + request.string_input = list_or_pattern + elif isinstance(list_or_pattern, list): + if isinstance(list_or_pattern[0], int): + for items in list_or_pattern: + request.int_inputs.append(items) + elif isinstance(list_or_pattern[0], str): + for items in list_or_pattern: + request.string_inputs.append(items) + response = self.service.GetMinsizeFaceZoneByCount(request) + return response.outputs + + def GetFaceZoneListByMaximumEntityCount( + self, max_entity_count, only_boundary + ) -> Any: + """GetFaceZoneListByMaximumEntityCount.""" + request = MeshingQueriesProtoModule.GetFaceZoneListByMaximumEntityCountRequest() + request.int_input = max_entity_count + request.bool_input = only_boundary + response = self.service.GetFaceZoneListByMaximumEntityCount(request) + return response.outputs + + def GetEdgeZoneListByMaximumEntityCount( + self, max_entity_count, only_boundary + ) -> Any: + """GetEdgeZoneListByMaximumEntityCount.""" + request = MeshingQueriesProtoModule.GetEdgeZoneListByMaximumEntityCountRequest() + request.int_input = max_entity_count + request.bool_input = only_boundary + response = self.service.GetEdgeZoneListByMaximumEntityCount(request) + return response.outputs + + def GetCellZoneListByMaximumEntityCount(self, max_entity_count) -> Any: + """GetCellZoneListByMaximumEntityCount.""" + request = MeshingQueriesProtoModule.GetCellZoneListByMaximumEntityCountRequest() + request.int_input = max_entity_count + response = self.service.GetCellZoneListByMaximumEntityCount(request) + return response.outputs + + def GetFaceZoneListByMaximumZoneArea(self, max_entity_count) -> Any: + """GetFaceZoneListByMaximumZoneArea.""" + request = MeshingQueriesProtoModule.GetFaceZoneListByMaximumZoneAreaRequest() + request.int_input = max_entity_count + response = self.service.GetFaceZoneListByMaximumZoneArea(request) + return response.outputs + + def GetFaceZoneListByMinimumZoneArea(self, max_entity_count) -> Any: + """GetFaceZoneListByMinimumZoneArea.""" + request = MeshingQueriesProtoModule.GetFaceZoneListByMinimumZoneAreaRequest() + request.int_input = max_entity_count + response = self.service.GetFaceZoneListByMinimumZoneArea(request) + return response.outputs + + def GetZonesWithFreeFaces(self, list_or_pattern) -> Any: + """GetZonesWithFreeFaces.""" + request = MeshingQueriesProtoModule.GetZonesWithFreeFacesRequest() + if isinstance(list_or_pattern, str): + request.string_input = list_or_pattern + elif isinstance(list_or_pattern, list): + if isinstance(list_or_pattern[0], int): + for items in list_or_pattern: + request.int_inputs.append(items) + elif isinstance(list_or_pattern[0], str): + for items in list_or_pattern: + request.string_inputs.append(items) + response = self.service.GetZonesWithFreeFaces(request) + return response.outputs + + def GetZonesWithMultiFaces(self, list_or_pattern) -> Any: + """GetZonesWithMultiFaces.""" + request = MeshingQueriesProtoModule.GetZonesWithMultiFacesRequest() + if isinstance(list_or_pattern, str): + request.string_input = list_or_pattern + elif isinstance(list_or_pattern, list): + if isinstance(list_or_pattern[0], int): + for items in list_or_pattern: + request.int_inputs.append(items) + elif isinstance(list_or_pattern[0], str): + for items in list_or_pattern: + request.string_inputs.append(items) + response = self.service.GetZonesWithMultiFaces(request) + return response.outputs + + def GetOverlappingFaceZones( + self, zone_name_pattern, areal_tolerance, distance_tolerance + ) -> Any: + """GetOverlappingFaceZones.""" + request = MeshingQueriesProtoModule.GetOverlappingFaceZonesRequest() + request.string_input = zone_name_pattern + request.double_input_1 = areal_tolerance + request.double_input_2 = distance_tolerance + response = self.service.GetOverlappingFaceZones(request) + return response.outputs + + def GetZonesWithMarkedFaces(self, list_or_pattern) -> Any: + """GetZonesWithMarkedFaces.""" + request = MeshingQueriesProtoModule.GetZonesWithMarkedFacesRequest() + if isinstance(list_or_pattern, str): + request.string_input = list_or_pattern + elif isinstance(list_or_pattern, list): + if isinstance(list_or_pattern[0], int): + for items in list_or_pattern: + request.int_inputs.append(items) + elif isinstance(list_or_pattern[0], str): + for items in list_or_pattern: + request.string_inputs.append(items) + response = self.service.GetZonesWithMarkedFaces(request) + return response.outputs + + def GetAllObjectNameList(self) -> Any: + """GetAllObjectNameList.""" + request = MeshingQueriesProtoModule.Empty() + response = self.service.GetAllObjectNameList(request) + return response.outputs + + def GetObjectNameListOfType(self, type) -> Any: + """GetObjectNameListOfType.""" + request = MeshingQueriesProtoModule.GetObjectNameListOfTypeRequest() + request.input = type + response = self.service.GetObjectNameListOfType(request) + return response.outputs + + def GetObjectsOfFilter(self, filter) -> Any: + """GetObjectsOfFilter.""" + request = MeshingQueriesProtoModule.GetObjectsOfFilterRequest() + request.input = filter + response = self.service.GetObjectsOfFilter(request) + return response.outputs + + def GetRegionsOfObject(self, object) -> Any: + """GetRegionsOfObject.""" + request = MeshingQueriesProtoModule.GetRegionsOfObjectRequest() + request.input = object + response = self.service.GetRegionsOfObject(request) + return response.outputs + + def GetRegionNameListOfObject(self, object) -> Any: + """GetRegionNameListOfObject.""" + request = MeshingQueriesProtoModule.GetRegionNameListOfObjectRequest() + request.input = object + response = self.service.GetRegionNameListOfObject(request) + return response.outputs + + def GetRegionVolume(self, object_name, region_name) -> Any: + """GetRegionVolume.""" + request = MeshingQueriesProtoModule.GetRegionVolumeRequest() + request.string_input_1 = object_name + request.string_input_2 = region_name + response = self.service.GetRegionVolume(request) + return response.outputs + + def GetRegionsOfFilter(self, object, filter) -> Any: + """GetRegionsOfFilter.""" + request = MeshingQueriesProtoModule.GetRegionsOfFilterRequest() + request.string_input_1 = object + request.string_input_2 = filter + response = self.service.GetRegionsOfFilter(request) + return response.outputs + + def GetRegionNameListOfPattern(self, object, region_name_pattern) -> Any: + """GetRegionNameListOfPattern.""" + request = MeshingQueriesProtoModule.GetRegionNameListOfPatternRequest() + request.string_input_1 = object + request.string_input_2 = region_name_pattern + response = self.service.GetRegionNameListOfPattern(request) + return response.outputs + + def GetRegionsOfFaceZones(self, face_zone_id_list) -> Any: + """GetRegionsOfFaceZones.""" + request = MeshingQueriesProtoModule.GetRegionsOfFaceZonesRequest() + for id in face_zone_id_list: + request.inputs.append(id) + response = self.service.GetRegionsOfFaceZones(request) + return response.outputs + + def GetRegionNameListOfFaceZones(self, list_or_pattern) -> Any: + """GetRegionNameListOfFaceZones.""" + request = MeshingQueriesProtoModule.GetRegionNameListOfFaceZonesRequest() + if isinstance(list_or_pattern, str): + request.input = list_or_pattern + elif isinstance(list_or_pattern, list): + for items in list_or_pattern: + request.inputs.append(items) + response = self.service.GetRegionNameListOfFaceZones(request) + return response.outputs diff --git a/tests/test_meshing_queries.py b/tests/test_meshing_queries.py index 5ec5352ef35..742059ae4b3 100644 --- a/tests/test_meshing_queries.py +++ b/tests/test_meshing_queries.py @@ -197,3 +197,103 @@ def test_meshing_queries(new_mesh_session): meshing_session.meshing_queries.GetUnreferencedCellZoneIdListOfPattern("*") == [] ) + + # assert meshing_session.meshing_queries.GetMaxsizeCellZoneByVolume("*") == [3460] + # + # assert meshing_session.meshing_queries.GetMaxsizeCellZoneByVolume([3460]) == [3460] + # + # assert meshing_session.meshing_queries.GetMaxsizeCellZoneByCount("*") == [3460] + # + # assert meshing_session.meshing_queries.GetMaxsizeCellZoneByCount([3460]) == [3460] + # + # assert meshing_session.meshing_queries.GetMinsizeFaceZoneByArea("*") == [30] + # + # assert meshing_session.meshing_queries.GetMinsizeFaceZoneByArea([29, 30, 31, 32, 33, 34]) == [30] + # + # assert meshing_session.meshing_queries.GetMinsizeFaceZoneByCount("*") == [30] + # + # assert meshing_session.meshing_queries.GetMinsizeFaceZoneByCount([29, 30, 31, 32, 33, 34]) == [30] + + assert ( + meshing_session.meshing_queries.GetFaceZoneListByMaximumEntityCount(20, True) + == [] + ) + + assert ( + meshing_session.meshing_queries.GetEdgeZoneListByMaximumEntityCount(20, False) + == [] + ) + + assert meshing_session.meshing_queries.GetCellZoneListByMaximumEntityCount(1) == [] + + assert meshing_session.meshing_queries.GetFaceZoneListByMaximumZoneArea(100) == [ + 33, + 32, + 31, + 30, + ] + + assert meshing_session.meshing_queries.GetFaceZoneListByMinimumZoneArea(10) == [ + 34, + 29, + ] + + assert meshing_session.meshing_queries.GetZonesWithFreeFaces("*") == [] + assert meshing_session.meshing_queries.GetZonesWithFreeFaces([29, 30, 31, 32]) == [] + assert ( + meshing_session.meshing_queries.GetZonesWithFreeFaces(["inlet", "outlet"]) == [] + ) + + assert meshing_session.meshing_queries.GetZonesWithMultiFaces("*") == [] + assert ( + meshing_session.meshing_queries.GetZonesWithMultiFaces([29, 30, 31, 32]) == [] + ) + assert ( + meshing_session.meshing_queries.GetZonesWithMultiFaces(["inlet", "outlet"]) + == [] + ) + + assert meshing_session.meshing_queries.GetOverlappingFaceZones("*", 0.1, 0.1) == [] + + assert meshing_session.meshing_queries.GetZonesWithMarkedFaces("*") == [] + assert ( + meshing_session.meshing_queries.GetZonesWithMarkedFaces([29, 30, 31, 32]) == [] + ) + assert ( + meshing_session.meshing_queries.GetZonesWithMarkedFaces(["inlet", "outlet"]) + == [] + ) + + assert meshing_session.meshing_queries.GetAllObjectNameList() == ["elbow-fluid"] + + assert meshing_session.meshing_queries.GetObjectNameListOfType("mesh") == [ + "elbow-fluid" + ] + + assert meshing_session.meshing_queries.GetObjectsOfFilter("*") == ["elbow-fluid"] + + assert meshing_session.meshing_queries.GetRegionsOfObject("elbow-fluid") == [ + "fluid" + ] + + assert meshing_session.meshing_queries.GetRegionNameListOfObject("elbow-fluid") == [ + "fluid" + ] + + # assert meshing_session.meshing_queries.GetRegionVolume("elbow-fluid", "fluid") == [152.59942] + + assert meshing_session.meshing_queries.GetRegionsOfFilter("elbow-fluid", "*") == [ + "fluid" + ] + + assert meshing_session.meshing_queries.GetRegionNameListOfPattern( + "elbow-fluid", "*" + ) == ["fluid"] + + assert meshing_session.meshing_queries.GetRegionsOfFaceZones( + [29, 30, 31, 32, 33, 34] + ) == ["fluid"] + + assert meshing_session.meshing_queries.GetRegionNameListOfFaceZones( + [29, 30, 31, 32, 33, 34] + ) == ["fluid"] From fcf615ae1b05e58d1a2c84d08d828b81a8df5582 Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Mon, 10 Apr 2023 19:41:36 +0530 Subject: [PATCH 16/35] Added rpcs and tests --- .../fluent/core/services/meshing_queries.py | 166 ++++++++++++++++++ tests/test_meshing_queries.py | 48 +++++ 2 files changed, 214 insertions(+) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index 58e37678df5..dc56df5335c 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -599,6 +599,86 @@ def GetRegionNameListOfFaceZones( """GetRegionNameListOfFaceZones rpc of MeshingQueriesService.""" return self._stub.GetRegionNameListOfFaceZones(request, metadata=self._metadata) + @catch_grpc_error + def ConvertZoneNameSymbolsToIds( + self, + request: MeshingQueriesProtoModule.ConvertZoneNameSymbolsToIdsRequest, + ) -> MeshingQueriesProtoModule.ConvertZoneNameSymbolsToIdsResponse: + """ConvertZoneNameSymbolsToIds rpc of MeshingQueriesService.""" + return self._stub.ConvertZoneNameSymbolsToIds(request, metadata=self._metadata) + + @catch_grpc_error + def ConvertZoneNameStringsToIds( + self, + request: MeshingQueriesProtoModule.ConvertZoneNameStringsToIdsRequest, + ) -> MeshingQueriesProtoModule.ConvertZoneNameStringsToIdsResponse: + """ConvertZoneNameStringsToIds rpc of MeshingQueriesService.""" + return self._stub.ConvertZoneNameStringsToIds(request, metadata=self._metadata) + + @catch_grpc_error + def ConvertZoneIdsToNameStrings( + self, + request: MeshingQueriesProtoModule.ConvertZoneIdsToNameStringsRequest, + ) -> MeshingQueriesProtoModule.ConvertZoneIdsToNameStringsResponse: + """ConvertZoneIdsToNameStrings rpc of MeshingQueriesService.""" + return self._stub.ConvertZoneIdsToNameStrings(request, metadata=self._metadata) + + @catch_grpc_error + def ConvertZoneIdsToNameSymbols( + self, + request: MeshingQueriesProtoModule.ConvertZoneIdsToNameSymbolsRequest, + ) -> MeshingQueriesProtoModule.ConvertZoneIdsToNameSymbolsResponse: + """ConvertZoneIdsToNameSymbols rpc of MeshingQueriesService.""" + return self._stub.ConvertZoneIdsToNameSymbols(request, metadata=self._metadata) + + @catch_grpc_error + def ConvertSymbolListToString( + self, + request: MeshingQueriesProtoModule.ConvertSymbolListToStringRequest, + ) -> MeshingQueriesProtoModule.ConvertSymbolListToStringResponse: + """ConvertSymbolListToString rpc of MeshingQueriesService.""" + return self._stub.ConvertSymbolListToString(request, metadata=self._metadata) + + @catch_grpc_error + def CreateStringFromSymbolList( + self, + request: MeshingQueriesProtoModule.CreateStringFromSymbolListRequest, + ) -> MeshingQueriesProtoModule.CreateStringFromSymbolListResponse: + """CreateStringFromSymbolList rpc of MeshingQueriesService.""" + return self._stub.CreateStringFromSymbolList(request, metadata=self._metadata) + + @catch_grpc_error + def IntegerListSubstract( + self, + request: MeshingQueriesProtoModule.IntegerListSubstractRequest, + ) -> MeshingQueriesProtoModule.IntegerListSubstractResponse: + """IntegerListSubstract rpc of MeshingQueriesService.""" + return self._stub.IntegerListSubstract(request, metadata=self._metadata) + + @catch_grpc_error + def ListReplace( + self, + request: MeshingQueriesProtoModule.ListReplaceRequest, + ) -> MeshingQueriesProtoModule.ListReplaceResponse: + """ListReplace rpc of MeshingQueriesService.""" + return self._stub.ListReplace(request, metadata=self._metadata) + + @catch_grpc_error + def RemoveElementFromList( + self, + request: MeshingQueriesProtoModule.RemoveElementFromListRequest, + ) -> MeshingQueriesProtoModule.RemoveElementFromListResponse: + """RemoveElementFromList rpc of MeshingQueriesService.""" + return self._stub.RemoveElementFromList(request, metadata=self._metadata) + + @catch_grpc_error + def ListContains( + self, + request: MeshingQueriesProtoModule.ListContainsRequest, + ) -> MeshingQueriesProtoModule.ListContainsResponse: + """ListContains rpc of MeshingQueriesService.""" + return self._stub.ListContains(request, metadata=self._metadata) + class MeshingQueries: """ @@ -1194,3 +1274,89 @@ def GetRegionNameListOfFaceZones(self, list_or_pattern) -> Any: request.inputs.append(items) response = self.service.GetRegionNameListOfFaceZones(request) return response.outputs + + def ConvertZoneNameSymbolsToIds(self, zone_name_list) -> Any: + """ConvertZoneNameSymbolsToIds.""" + request = MeshingQueriesProtoModule.ConvertZoneNameSymbolsToIdsRequest() + for zone_name in zone_name_list: + request.inputs.append(zone_name) + response = self.service.ConvertZoneNameSymbolsToIds(request) + return response.outputs + + def ConvertZoneNameStringsToIds(self, zone_name_list) -> Any: + """ConvertZoneNameStringsToIds.""" + request = MeshingQueriesProtoModule.ConvertZoneNameStringsToIdsRequest() + for zone_name in zone_name_list: + request.inputs.append(zone_name) + response = self.service.ConvertZoneNameStringsToIds(request) + return response.outputs + + def ConvertZoneIdsToNameStrings(self, zone_id_list) -> Any: + """ConvertZoneIdsToNameStrings.""" + request = MeshingQueriesProtoModule.ConvertZoneIdsToNameStringsRequest() + for id in zone_id_list: + request.inputs.append(id) + response = self.service.ConvertZoneIdsToNameStrings(request) + return response.outputs + + def ConvertZoneIdsToNameSymbols(self, zone_id_list) -> Any: + """ConvertZoneIdsToNameSymbols.""" + request = MeshingQueriesProtoModule.ConvertZoneIdsToNameSymbolsRequest() + for id in zone_id_list: + request.inputs.append(id) + response = self.service.ConvertZoneIdsToNameSymbols(request) + return response.outputs + + def ConvertSymbolListToString(self, symbol_list) -> Any: + """ConvertSymbolListToString.""" + request = MeshingQueriesProtoModule.ConvertSymbolListToStringRequest() + for symbol in symbol_list: + request.inputs.append(symbol) + response = self.service.ConvertSymbolListToString(request) + return response.output + + def CreateStringFromSymbolList(self, symbol_list) -> Any: + """CreateStringFromSymbolList.""" + request = MeshingQueriesProtoModule.CreateStringFromSymbolListRequest() + for symbol in symbol_list: + request.inputs.append(symbol) + response = self.service.CreateStringFromSymbolList(request) + return response.output + + def IntegerListSubstract(self, list_1, list_2) -> Any: + """IntegerListSubstract.""" + request = MeshingQueriesProtoModule.IntegerListSubstractRequest() + for item in list_1: + request.inputs_1.append(item) + for item in list_2: + request.inputs_2.append(item) + response = self.service.IntegerListSubstract(request) + return response.outputs + + def ListReplace(self, new_element, old_element, input_list) -> Any: + """ListReplace.""" + request = MeshingQueriesProtoModule.ListReplaceRequest() + request.input_1 = new_element + request.input_2 = old_element + for item in input_list: + request.inputs.append(item) + response = self.service.ListReplace(request) + return response.outputs + + def RemoveElementFromList(self, new_element, input_list) -> Any: + """RemoveElementFromList.""" + request = MeshingQueriesProtoModule.RemoveElementFromListRequest() + request.input = new_element + for item in input_list: + request.inputs.append(item) + response = self.service.RemoveElementFromList(request) + return response.outputs + + def ListContains(self, element, input_list) -> Any: + """ListContains.""" + request = MeshingQueriesProtoModule.ListContainsRequest() + request.input = element + for item in input_list: + request.inputs.append(item) + response = self.service.ListContains(request) + return response.output diff --git a/tests/test_meshing_queries.py b/tests/test_meshing_queries.py index 742059ae4b3..b2ecb324e3d 100644 --- a/tests/test_meshing_queries.py +++ b/tests/test_meshing_queries.py @@ -297,3 +297,51 @@ def test_meshing_queries(new_mesh_session): assert meshing_session.meshing_queries.GetRegionNameListOfFaceZones( [29, 30, 31, 32, 33, 34] ) == ["fluid"] + + assert meshing_session.meshing_queries.ConvertZoneNameSymbolsToIds(["outlet"]) == [ + 32 + ] + + assert meshing_session.meshing_queries.ConvertZoneNameStringsToIds(["outlet"]) == [ + 32 + ] + + assert meshing_session.meshing_queries.ConvertZoneIdsToNameStrings([29]) == [ + "symmetry-xyplane" + ] + + assert meshing_session.meshing_queries.ConvertZoneIdsToNameSymbols([31]) == [ + "cold-inlet" + ] + + assert ( + meshing_session.meshing_queries.ConvertSymbolListToString(["inlet", "outlet"]) + == "inlet outlet " + ) + + assert ( + meshing_session.meshing_queries.CreateStringFromSymbolList(["inlet", "outlet"]) + == "inlet outlet" + ) + + assert meshing_session.meshing_queries.IntegerListSubstract( + [1, 2, 3, 4], [2, 3] + ) == [1, 4] + + assert meshing_session.meshing_queries.ListReplace(4, 2, [1, 2, 3]) == [1, 4, 3] + + assert meshing_session.meshing_queries.ListReplace(4.4, 2.2, [1.1, 2.2, 3.3]) == [ + 1.1, + 4.4, + 3.3, + ] + + assert meshing_session.meshing_queries.RemoveElementFromList(2, [1, 2, 3]) == [1, 3] + + assert meshing_session.meshing_queries.RemoveElementFromList( + 2.2, [1.1, 2.2, 3.3] + ) == [1.1, 3.3] + + assert meshing_session.meshing_queries.ListContains(4, [1, 2, 3]) is False + + assert meshing_session.meshing_queries.ListContains(2.2, [1.1, 2.2, 3.3]) is True From 8bbb9aadd318c9d1b60441971685c074fe28eab4 Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Tue, 11 Apr 2023 11:01:57 +0530 Subject: [PATCH 17/35] Updated rpcs and tests --- src/ansys/fluent/core/services/meshing_queries.py | 2 +- tests/test_meshing_queries.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index dc56df5335c..46bfe960202 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -1238,7 +1238,7 @@ def GetRegionVolume(self, object_name, region_name) -> Any: request.string_input_1 = object_name request.string_input_2 = region_name response = self.service.GetRegionVolume(request) - return response.outputs + return response.output def GetRegionsOfFilter(self, object, filter) -> Any: """GetRegionsOfFilter.""" diff --git a/tests/test_meshing_queries.py b/tests/test_meshing_queries.py index b2ecb324e3d..cb3a823a735 100644 --- a/tests/test_meshing_queries.py +++ b/tests/test_meshing_queries.py @@ -280,7 +280,10 @@ def test_meshing_queries(new_mesh_session): "fluid" ] - # assert meshing_session.meshing_queries.GetRegionVolume("elbow-fluid", "fluid") == [152.59942] + assert ( + meshing_session.meshing_queries.GetRegionVolume("elbow-fluid", "fluid") + == 152.599422561798 + ) assert meshing_session.meshing_queries.GetRegionsOfFilter("elbow-fluid", "*") == [ "fluid" From 995371d2a50e9891f5fef484c834d3b2a150f2e3 Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Wed, 12 Apr 2023 12:25:45 +0530 Subject: [PATCH 18/35] Updated rpcs and tests --- .../fluent/core/services/meshing_queries.py | 36 ++++++++-------- tests/test_meshing_queries.py | 42 ++++++++++++------- 2 files changed, 44 insertions(+), 34 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index 46bfe960202..70d971841e7 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -255,15 +255,13 @@ def GetFaceZonesWithZoneSpecificPrismsApplied( request, metadata=self._metadata ) - # @catch_grpc_error - # def GetFaceZonesOfPrismControls( - # self, - # request: MeshingQueriesProtoModule.GetFaceZonesOfPrismControlsRequest, - # ) -> MeshingQueriesProtoModule.GetFaceZonesOfPrismControlsResponse: - # """GetFaceZonesOfPrismControls rpc of MeshingQueriesService.""" - # return self._stub.GetFaceZonesOfPrismControls( - # request, metadata=self._metadata - # ) + @catch_grpc_error + def GetFaceZonesOfPrismControls( + self, + request: MeshingQueriesProtoModule.GetFaceZonesOfPrismControlsRequest, + ) -> MeshingQueriesProtoModule.GetFaceZonesOfPrismControlsResponse: + """GetFaceZonesOfPrismControls rpc of MeshingQueriesService.""" + return self._stub.GetFaceZonesOfPrismControls(request, metadata=self._metadata) @catch_grpc_error def GetBaffles( @@ -948,12 +946,12 @@ def GetFaceZonesWithZoneSpecificPrismsApplied(self) -> Any: response = self.service.GetFaceZonesWithZoneSpecificPrismsApplied(request) return response.outputs - # def GetFaceZonesOfPrismControls(self, control_name) -> Any: - # """GetInteriorZonesConnectedToCellZones.""" - # request = MeshingQueriesProtoModule.GetFaceZonesOfPrismControlsRequest() - # request.input = control_name - # response = self.service.GetFaceZonesOfPrismControls(request) - # return response.outputs + def GetFaceZonesOfPrismControls(self, control_name) -> Any: + """GetInteriorZonesConnectedToCellZones.""" + request = MeshingQueriesProtoModule.GetFaceZonesOfPrismControlsRequest() + request.input = control_name + response = self.service.GetFaceZonesOfPrismControls(request) + return response.outputs def GetBaffles(self, face_zone_list) -> Any: """GetBaffles.""" @@ -1054,7 +1052,7 @@ def GetMaxsizeCellZoneByVolume(self, list_or_pattern) -> Any: for items in list_or_pattern: request.string_inputs.append(items) response = self.service.GetMaxsizeCellZoneByVolume(request) - return response.outputs + return response.output def GetMaxsizeCellZoneByCount(self, list_or_pattern) -> Any: """GetMaxsizeCellZoneByCount.""" @@ -1069,7 +1067,7 @@ def GetMaxsizeCellZoneByCount(self, list_or_pattern) -> Any: for items in list_or_pattern: request.string_inputs.append(items) response = self.service.GetMaxsizeCellZoneByCount(request) - return response.outputs + return response.output def GetMinsizeFaceZoneByArea(self, list_or_pattern) -> Any: """GetMinsizeFaceZoneByArea.""" @@ -1084,7 +1082,7 @@ def GetMinsizeFaceZoneByArea(self, list_or_pattern) -> Any: for items in list_or_pattern: request.string_inputs.append(items) response = self.service.GetMinsizeFaceZoneByArea(request) - return response.outputs + return response.output def GetMinsizeFaceZoneByCount(self, list_or_pattern) -> Any: """GetMinsizeFaceZoneByCount.""" @@ -1099,7 +1097,7 @@ def GetMinsizeFaceZoneByCount(self, list_or_pattern) -> Any: for items in list_or_pattern: request.string_inputs.append(items) response = self.service.GetMinsizeFaceZoneByCount(request) - return response.outputs + return response.output def GetFaceZoneListByMaximumEntityCount( self, max_entity_count, only_boundary diff --git a/tests/test_meshing_queries.py b/tests/test_meshing_queries.py index cb3a823a735..b5d57475122 100644 --- a/tests/test_meshing_queries.py +++ b/tests/test_meshing_queries.py @@ -165,6 +165,8 @@ def test_meshing_queries(new_mesh_session): == [] ) + assert meshing_session.meshing_queries.GetFaceZonesOfPrismControls("*") == [33, 34] + assert meshing_session.meshing_queries.GetBaffles([29, 30]) == [30, 29] assert meshing_session.meshing_queries.GetEmbeddedBaffles() == [] @@ -198,21 +200,31 @@ def test_meshing_queries(new_mesh_session): == [] ) - # assert meshing_session.meshing_queries.GetMaxsizeCellZoneByVolume("*") == [3460] - # - # assert meshing_session.meshing_queries.GetMaxsizeCellZoneByVolume([3460]) == [3460] - # - # assert meshing_session.meshing_queries.GetMaxsizeCellZoneByCount("*") == [3460] - # - # assert meshing_session.meshing_queries.GetMaxsizeCellZoneByCount([3460]) == [3460] - # - # assert meshing_session.meshing_queries.GetMinsizeFaceZoneByArea("*") == [30] - # - # assert meshing_session.meshing_queries.GetMinsizeFaceZoneByArea([29, 30, 31, 32, 33, 34]) == [30] - # - # assert meshing_session.meshing_queries.GetMinsizeFaceZoneByCount("*") == [30] - # - # assert meshing_session.meshing_queries.GetMinsizeFaceZoneByCount([29, 30, 31, 32, 33, 34]) == [30] + assert meshing_session.meshing_queries.GetMaxsizeCellZoneByVolume("*") == 3460 + + assert meshing_session.meshing_queries.GetMaxsizeCellZoneByVolume([3460]) == 3460 + + assert meshing_session.meshing_queries.GetMaxsizeCellZoneByCount("*") == 3460 + + assert meshing_session.meshing_queries.GetMaxsizeCellZoneByCount([3460]) == 3460 + + assert meshing_session.meshing_queries.GetMinsizeFaceZoneByArea("*") == 30 + + assert ( + meshing_session.meshing_queries.GetMinsizeFaceZoneByArea( + [29, 30, 31, 32, 33, 34] + ) + == 30 + ) + + assert meshing_session.meshing_queries.GetMinsizeFaceZoneByCount("*") == 30 + + assert ( + meshing_session.meshing_queries.GetMinsizeFaceZoneByCount( + [29, 30, 31, 32, 33, 34] + ) + == 30 + ) assert ( meshing_session.meshing_queries.GetFaceZoneListByMaximumEntityCount(20, True) From ab5921604147b7ae5fc818058affbb83ac91c04b Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Wed, 12 Apr 2023 16:32:22 +0530 Subject: [PATCH 19/35] Added rpc and test --- .../fluent/core/services/meshing_queries.py | 16 ++++++++++++++++ tests/test_meshing_queries.py | 9 +++++++++ 2 files changed, 25 insertions(+) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index 70d971841e7..cf9ab77a38a 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -557,6 +557,14 @@ def GetRegionNameListOfObject( """GetRegionNameListOfObject rpc of MeshingQueriesService.""" return self._stub.GetRegionNameListOfObject(request, metadata=self._metadata) + @catch_grpc_error + def SortRegionsByVolume( + self, + request: MeshingQueriesProtoModule.SortRegionsByVolumeRequest, + ) -> MeshingQueriesProtoModule.SortRegionsByVolumeResponse: + """SortRegionsByVolume rpc of MeshingQueriesService.""" + return self._stub.SortRegionsByVolume(request, metadata=self._metadata) + @catch_grpc_error def GetRegionVolume( self, @@ -1230,6 +1238,14 @@ def GetRegionNameListOfObject(self, object) -> Any: response = self.service.GetRegionNameListOfObject(request) return response.outputs + def SortRegionsByVolume(self, object_name, order) -> Any: + """SortRegionsByVolume.""" + request = MeshingQueriesProtoModule.SortRegionsByVolumeRequest() + request.string_input_1 = object_name + request.string_input_2 = order + response = self.service.SortRegionsByVolume(request) + return response.outputs + def GetRegionVolume(self, object_name, region_name) -> Any: """GetRegionVolume.""" request = MeshingQueriesProtoModule.GetRegionVolumeRequest() diff --git a/tests/test_meshing_queries.py b/tests/test_meshing_queries.py index b5d57475122..abc1ce93292 100644 --- a/tests/test_meshing_queries.py +++ b/tests/test_meshing_queries.py @@ -292,6 +292,15 @@ def test_meshing_queries(new_mesh_session): "fluid" ] + assert ( + str( + meshing_session.meshing_queries.SortRegionsByVolume( + "elbow-fluid", "ascending" + ) + ) + == '[double_output: 152.599422561798\nstring_output: "fluid"\n]' + ) + assert ( meshing_session.meshing_queries.GetRegionVolume("elbow-fluid", "fluid") == 152.599422561798 From 294c15c2a253fbbd0b008818426881a42c85744a Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Wed, 12 Apr 2023 20:19:15 +0530 Subject: [PATCH 20/35] Updated rpc and test --- .../fluent/core/services/meshing_queries.py | 36 +++++++++---------- tests/test_meshing_queries.py | 4 +++ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index cf9ab77a38a..768c2abf8b1 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -225,15 +225,13 @@ def GetAdjacentZonesByNodeConnectivity( request, metadata=self._metadata ) - # @catch_grpc_error - # def GetSharedBoundaryZones( - # self, - # request: MeshingQueriesProtoModule.GetSharedBoundaryZonesRequest, - # ) -> MeshingQueriesProtoModule.GetSharedBoundaryZonesResponse: - # """GetSharedBoundaryZones rpc of MeshingQueriesService.""" - # return self._stub.GetSharedBoundaryZones( - # request, metadata=self._metadata - # ) + @catch_grpc_error + def GetSharedBoundaryZones( + self, + request: MeshingQueriesProtoModule.GetSharedBoundaryZonesRequest, + ) -> MeshingQueriesProtoModule.GetSharedBoundaryZonesResponse: + """GetSharedBoundaryZones rpc of MeshingQueriesService.""" + return self._stub.GetSharedBoundaryZones(request, metadata=self._metadata) @catch_grpc_error def GetInteriorZonesConnectedToCellZones( @@ -924,16 +922,16 @@ def GetAdjacentZonesByNodeConnectivity(self, list_or_pattern) -> Any: response = self.service.GetAdjacentZonesByNodeConnectivity(request) return response.outputs - # def GetSharedBoundaryZones(self, list_or_pattern) -> Any: - # """GetSharedBoundaryZones.""" - # request = MeshingQueriesProtoModule.GetSharedBoundaryZonesRequest() - # if isinstance(list_or_pattern, str): - # request.input = list_or_pattern - # elif isinstance(list_or_pattern, list): - # for items in list_or_pattern: - # request.inputs.append(items) - # response = self.service.GetSharedBoundaryZones(request) - # return response.outputs + def GetSharedBoundaryZones(self, list_or_pattern) -> Any: + """GetSharedBoundaryZones.""" + request = MeshingQueriesProtoModule.GetSharedBoundaryZonesRequest() + if isinstance(list_or_pattern, str): + request.input = list_or_pattern + elif isinstance(list_or_pattern, list): + for items in list_or_pattern: + request.inputs.append(items) + response = self.service.GetSharedBoundaryZones(request) + return response.outputs def GetInteriorZonesConnectedToCellZones(self, list_or_pattern) -> Any: """GetInteriorZonesConnectedToCellZones.""" diff --git a/tests/test_meshing_queries.py b/tests/test_meshing_queries.py index abc1ce93292..a97363fee25 100644 --- a/tests/test_meshing_queries.py +++ b/tests/test_meshing_queries.py @@ -121,6 +121,10 @@ def test_meshing_queries(new_mesh_session): 34, ] + assert meshing_session.meshing_queries.GetSharedBoundaryZones("*") == [] + + assert meshing_session.meshing_queries.GetSharedBoundaryZones([3460]) == [] + assert ( meshing_session.meshing_queries.GetAdjacentInteriorAndBoundaryFaceZones([30]) == [] From 68e3754b7523d7ff6ab26f444d02c618bdcbe0ca Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Thu, 13 Apr 2023 16:10:45 +0530 Subject: [PATCH 21/35] Added rpc and test --- .../fluent/core/services/meshing_queries.py | 28 +++++++++++++++++++ tests/test_meshing_queries.py | 14 ++++++++++ 2 files changed, 42 insertions(+) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index 768c2abf8b1..df0ffed96d3 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -595,6 +595,14 @@ def GetRegionsOfFaceZones( """GetRegionsOfFaceZones rpc of MeshingQueriesService.""" return self._stub.GetRegionsOfFaceZones(request, metadata=self._metadata) + @catch_grpc_error + def FindJoinPairs( + self, + request: MeshingQueriesProtoModule.FindJoinPairsRequest, + ) -> MeshingQueriesProtoModule.FindJoinPairsResponse: + """FindJoinPairs rpc of MeshingQueriesService.""" + return self._stub.FindJoinPairs(request, metadata=self._metadata) + @catch_grpc_error def GetRegionNameListOfFaceZones( self, @@ -1276,6 +1284,26 @@ def GetRegionsOfFaceZones(self, face_zone_id_list) -> Any: response = self.service.GetRegionsOfFaceZones(request) return response.outputs + def FindJoinPairs( + self, list_or_pattern, join_tolerance, absolute_tolerance, join_angle + ) -> Any: + """FindJoinPairs.""" + request = MeshingQueriesProtoModule.FindJoinPairsRequest() + if isinstance(list_or_pattern, str): + request.input_1 = list_or_pattern + elif isinstance(list_or_pattern, list): + if isinstance(list_or_pattern[0], int): + for items in list_or_pattern: + request.int_inputs.append(items) + elif isinstance(list_or_pattern[0], str): + for items in list_or_pattern: + request.string_inputs.append(items) + request.input_2 = join_tolerance + request.input_3 = absolute_tolerance + request.input_4 = join_angle + response = self.service.FindJoinPairs(request) + return response.outputs + def GetRegionNameListOfFaceZones(self, list_or_pattern) -> Any: """GetRegionNameListOfFaceZones.""" request = MeshingQueriesProtoModule.GetRegionNameListOfFaceZonesRequest() diff --git a/tests/test_meshing_queries.py b/tests/test_meshing_queries.py index a97363fee25..a086c544880 100644 --- a/tests/test_meshing_queries.py +++ b/tests/test_meshing_queries.py @@ -322,6 +322,20 @@ def test_meshing_queries(new_mesh_session): [29, 30, 31, 32, 33, 34] ) == ["fluid"] + assert ( + str(meshing_session.meshing_queries.FindJoinPairs("outlet", 0.1, True, 40)) + == "[]" + ) + + assert ( + str(meshing_session.meshing_queries.FindJoinPairs([32], 0.1, True, 40)) == "[]" + ) + + assert ( + str(meshing_session.meshing_queries.FindJoinPairs(["outlet"], 0.1, True, 40)) + == "[]" + ) + assert meshing_session.meshing_queries.GetRegionNameListOfFaceZones( [29, 30, 31, 32, 33, 34] ) == ["fluid"] From 00efe5e67b78c698af4f01a22d31346308bae61f Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Thu, 13 Apr 2023 17:01:22 +0530 Subject: [PATCH 22/35] Specific name update --- .../fluent/core/services/meshing_queries.py | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index df0ffed96d3..a9d8ab211ef 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -802,29 +802,29 @@ def GetFaceZonesSharedByRegionsOfType(self, mesh_object, region_type) -> Any: def GetFaceZonesOfRegions(self, object, region_name_list) -> Any: """GetFaceZonesOfRegions.""" request = MeshingQueriesProtoModule.GetFaceZonesOfRegionsRequest() - request.input = object + request.object = object for region in region_name_list: - request.inputs.append(region) + request.regions.append(region) response = self.service.GetFaceZonesOfRegions(request) - return response.outputs + return response.zone_ids def GetFaceZonesOfLabels(self, object, label_name_list) -> Any: """GetFaceZonesOfLabels.""" request = MeshingQueriesProtoModule.GetFaceZonesOfLabelsRequest() - request.input = object + request.object = object for label in label_name_list: - request.inputs.append(label) + request.labels.append(label) response = self.service.GetFaceZonesOfLabels(request) - return response.outputs + return response.zone_ids def GetFaceZoneIdListOfLabels(self, object, zone_label_list) -> Any: """GetFaceZoneIdListOfLabels.""" request = MeshingQueriesProtoModule.GetFaceZoneIdListOfLabelsRequest() - request.input = object + request.object = object for zone_label in zone_label_list: - request.inputs.append(zone_label) + request.labels.append(zone_label) response = self.service.GetFaceZoneIdListOfLabels(request) - return response.outputs + return response.zone_ids def GetFaceZonesOfObjects(self, object_list) -> Any: """GetFaceZonesOfObjects.""" @@ -845,11 +845,11 @@ def GetEdgeZonesOfObjects(self, object_list) -> Any: def GetFaceZoneIdListOfRegions(self, object, region_list) -> Any: """GetFaceZoneIdListOfRegions.""" request = MeshingQueriesProtoModule.GetFaceZoneIdListOfRegionsRequest() - request.input = object + request.object = object for region in region_list: - request.inputs.append(region) + request.labels.append(region) response = self.service.GetFaceZoneIdListOfRegions(request) - return response.outputs + return response.zone_ids def GetPrismCellZones(self, list_or_pattern) -> Any: """GetPrismCellZones.""" From cc254efa15f36fc39ba032cee32b2cf9564b63ab Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Mon, 17 Apr 2023 13:14:54 +0530 Subject: [PATCH 23/35] Removed string/list functions --- .../fluent/core/services/meshing_queries.py | 166 ------------------ tests/test_meshing_queries.py | 48 ----- 2 files changed, 214 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index a9d8ab211ef..b38cccacbec 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -611,86 +611,6 @@ def GetRegionNameListOfFaceZones( """GetRegionNameListOfFaceZones rpc of MeshingQueriesService.""" return self._stub.GetRegionNameListOfFaceZones(request, metadata=self._metadata) - @catch_grpc_error - def ConvertZoneNameSymbolsToIds( - self, - request: MeshingQueriesProtoModule.ConvertZoneNameSymbolsToIdsRequest, - ) -> MeshingQueriesProtoModule.ConvertZoneNameSymbolsToIdsResponse: - """ConvertZoneNameSymbolsToIds rpc of MeshingQueriesService.""" - return self._stub.ConvertZoneNameSymbolsToIds(request, metadata=self._metadata) - - @catch_grpc_error - def ConvertZoneNameStringsToIds( - self, - request: MeshingQueriesProtoModule.ConvertZoneNameStringsToIdsRequest, - ) -> MeshingQueriesProtoModule.ConvertZoneNameStringsToIdsResponse: - """ConvertZoneNameStringsToIds rpc of MeshingQueriesService.""" - return self._stub.ConvertZoneNameStringsToIds(request, metadata=self._metadata) - - @catch_grpc_error - def ConvertZoneIdsToNameStrings( - self, - request: MeshingQueriesProtoModule.ConvertZoneIdsToNameStringsRequest, - ) -> MeshingQueriesProtoModule.ConvertZoneIdsToNameStringsResponse: - """ConvertZoneIdsToNameStrings rpc of MeshingQueriesService.""" - return self._stub.ConvertZoneIdsToNameStrings(request, metadata=self._metadata) - - @catch_grpc_error - def ConvertZoneIdsToNameSymbols( - self, - request: MeshingQueriesProtoModule.ConvertZoneIdsToNameSymbolsRequest, - ) -> MeshingQueriesProtoModule.ConvertZoneIdsToNameSymbolsResponse: - """ConvertZoneIdsToNameSymbols rpc of MeshingQueriesService.""" - return self._stub.ConvertZoneIdsToNameSymbols(request, metadata=self._metadata) - - @catch_grpc_error - def ConvertSymbolListToString( - self, - request: MeshingQueriesProtoModule.ConvertSymbolListToStringRequest, - ) -> MeshingQueriesProtoModule.ConvertSymbolListToStringResponse: - """ConvertSymbolListToString rpc of MeshingQueriesService.""" - return self._stub.ConvertSymbolListToString(request, metadata=self._metadata) - - @catch_grpc_error - def CreateStringFromSymbolList( - self, - request: MeshingQueriesProtoModule.CreateStringFromSymbolListRequest, - ) -> MeshingQueriesProtoModule.CreateStringFromSymbolListResponse: - """CreateStringFromSymbolList rpc of MeshingQueriesService.""" - return self._stub.CreateStringFromSymbolList(request, metadata=self._metadata) - - @catch_grpc_error - def IntegerListSubstract( - self, - request: MeshingQueriesProtoModule.IntegerListSubstractRequest, - ) -> MeshingQueriesProtoModule.IntegerListSubstractResponse: - """IntegerListSubstract rpc of MeshingQueriesService.""" - return self._stub.IntegerListSubstract(request, metadata=self._metadata) - - @catch_grpc_error - def ListReplace( - self, - request: MeshingQueriesProtoModule.ListReplaceRequest, - ) -> MeshingQueriesProtoModule.ListReplaceResponse: - """ListReplace rpc of MeshingQueriesService.""" - return self._stub.ListReplace(request, metadata=self._metadata) - - @catch_grpc_error - def RemoveElementFromList( - self, - request: MeshingQueriesProtoModule.RemoveElementFromListRequest, - ) -> MeshingQueriesProtoModule.RemoveElementFromListResponse: - """RemoveElementFromList rpc of MeshingQueriesService.""" - return self._stub.RemoveElementFromList(request, metadata=self._metadata) - - @catch_grpc_error - def ListContains( - self, - request: MeshingQueriesProtoModule.ListContainsRequest, - ) -> MeshingQueriesProtoModule.ListContainsResponse: - """ListContains rpc of MeshingQueriesService.""" - return self._stub.ListContains(request, metadata=self._metadata) - class MeshingQueries: """ @@ -1314,89 +1234,3 @@ def GetRegionNameListOfFaceZones(self, list_or_pattern) -> Any: request.inputs.append(items) response = self.service.GetRegionNameListOfFaceZones(request) return response.outputs - - def ConvertZoneNameSymbolsToIds(self, zone_name_list) -> Any: - """ConvertZoneNameSymbolsToIds.""" - request = MeshingQueriesProtoModule.ConvertZoneNameSymbolsToIdsRequest() - for zone_name in zone_name_list: - request.inputs.append(zone_name) - response = self.service.ConvertZoneNameSymbolsToIds(request) - return response.outputs - - def ConvertZoneNameStringsToIds(self, zone_name_list) -> Any: - """ConvertZoneNameStringsToIds.""" - request = MeshingQueriesProtoModule.ConvertZoneNameStringsToIdsRequest() - for zone_name in zone_name_list: - request.inputs.append(zone_name) - response = self.service.ConvertZoneNameStringsToIds(request) - return response.outputs - - def ConvertZoneIdsToNameStrings(self, zone_id_list) -> Any: - """ConvertZoneIdsToNameStrings.""" - request = MeshingQueriesProtoModule.ConvertZoneIdsToNameStringsRequest() - for id in zone_id_list: - request.inputs.append(id) - response = self.service.ConvertZoneIdsToNameStrings(request) - return response.outputs - - def ConvertZoneIdsToNameSymbols(self, zone_id_list) -> Any: - """ConvertZoneIdsToNameSymbols.""" - request = MeshingQueriesProtoModule.ConvertZoneIdsToNameSymbolsRequest() - for id in zone_id_list: - request.inputs.append(id) - response = self.service.ConvertZoneIdsToNameSymbols(request) - return response.outputs - - def ConvertSymbolListToString(self, symbol_list) -> Any: - """ConvertSymbolListToString.""" - request = MeshingQueriesProtoModule.ConvertSymbolListToStringRequest() - for symbol in symbol_list: - request.inputs.append(symbol) - response = self.service.ConvertSymbolListToString(request) - return response.output - - def CreateStringFromSymbolList(self, symbol_list) -> Any: - """CreateStringFromSymbolList.""" - request = MeshingQueriesProtoModule.CreateStringFromSymbolListRequest() - for symbol in symbol_list: - request.inputs.append(symbol) - response = self.service.CreateStringFromSymbolList(request) - return response.output - - def IntegerListSubstract(self, list_1, list_2) -> Any: - """IntegerListSubstract.""" - request = MeshingQueriesProtoModule.IntegerListSubstractRequest() - for item in list_1: - request.inputs_1.append(item) - for item in list_2: - request.inputs_2.append(item) - response = self.service.IntegerListSubstract(request) - return response.outputs - - def ListReplace(self, new_element, old_element, input_list) -> Any: - """ListReplace.""" - request = MeshingQueriesProtoModule.ListReplaceRequest() - request.input_1 = new_element - request.input_2 = old_element - for item in input_list: - request.inputs.append(item) - response = self.service.ListReplace(request) - return response.outputs - - def RemoveElementFromList(self, new_element, input_list) -> Any: - """RemoveElementFromList.""" - request = MeshingQueriesProtoModule.RemoveElementFromListRequest() - request.input = new_element - for item in input_list: - request.inputs.append(item) - response = self.service.RemoveElementFromList(request) - return response.outputs - - def ListContains(self, element, input_list) -> Any: - """ListContains.""" - request = MeshingQueriesProtoModule.ListContainsRequest() - request.input = element - for item in input_list: - request.inputs.append(item) - response = self.service.ListContains(request) - return response.output diff --git a/tests/test_meshing_queries.py b/tests/test_meshing_queries.py index a086c544880..2fbcafeff20 100644 --- a/tests/test_meshing_queries.py +++ b/tests/test_meshing_queries.py @@ -339,51 +339,3 @@ def test_meshing_queries(new_mesh_session): assert meshing_session.meshing_queries.GetRegionNameListOfFaceZones( [29, 30, 31, 32, 33, 34] ) == ["fluid"] - - assert meshing_session.meshing_queries.ConvertZoneNameSymbolsToIds(["outlet"]) == [ - 32 - ] - - assert meshing_session.meshing_queries.ConvertZoneNameStringsToIds(["outlet"]) == [ - 32 - ] - - assert meshing_session.meshing_queries.ConvertZoneIdsToNameStrings([29]) == [ - "symmetry-xyplane" - ] - - assert meshing_session.meshing_queries.ConvertZoneIdsToNameSymbols([31]) == [ - "cold-inlet" - ] - - assert ( - meshing_session.meshing_queries.ConvertSymbolListToString(["inlet", "outlet"]) - == "inlet outlet " - ) - - assert ( - meshing_session.meshing_queries.CreateStringFromSymbolList(["inlet", "outlet"]) - == "inlet outlet" - ) - - assert meshing_session.meshing_queries.IntegerListSubstract( - [1, 2, 3, 4], [2, 3] - ) == [1, 4] - - assert meshing_session.meshing_queries.ListReplace(4, 2, [1, 2, 3]) == [1, 4, 3] - - assert meshing_session.meshing_queries.ListReplace(4.4, 2.2, [1.1, 2.2, 3.3]) == [ - 1.1, - 4.4, - 3.3, - ] - - assert meshing_session.meshing_queries.RemoveElementFromList(2, [1, 2, 3]) == [1, 3] - - assert meshing_session.meshing_queries.RemoveElementFromList( - 2.2, [1.1, 2.2, 3.3] - ) == [1.1, 3.3] - - assert meshing_session.meshing_queries.ListContains(4, [1, 2, 3]) is False - - assert meshing_session.meshing_queries.ListContains(2.2, [1.1, 2.2, 3.3]) is True From e2cfb5335bb6f247b50a450e5629ab712acddcac Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Mon, 17 Apr 2023 18:02:00 +0530 Subject: [PATCH 24/35] Specific name update --- .../fluent/core/services/meshing_queries.py | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index b38cccacbec..2817a79f30e 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -644,44 +644,44 @@ def GetCellZoneAtLocation(self, location) -> Any: def GetZonesOfType(self, type) -> Any: """GetZonesOfType.""" request = MeshingQueriesProtoModule.GetZonesOfTypeRequest() - request.input = type + request.type = type response = self.service.GetZonesOfType(request) - return response.outputs + return response.zone_ids def GetZonesOfGroup(self, group) -> Any: """GetZonesOfGroup.""" request = MeshingQueriesProtoModule.GetZonesOfGroupRequest() - request.input = group + request.group = group response = self.service.GetZonesOfGroup(request) - return response.outputs + return response.zone_ids def GetFaceZonesOfFilter(self, filter) -> Any: """GetFaceZonesOfFilter.""" request = MeshingQueriesProtoModule.GetFaceZonesOfFilterRequest() - request.input = filter + request.filter = filter response = self.service.GetFaceZonesOfFilter(request) - return response.outputs + return response.face_zone_ids def GetCellZonesOfFilter(self, filter) -> Any: """GetCellZonesOfFilter.""" request = MeshingQueriesProtoModule.GetCellZonesOfFilterRequest() - request.input = filter + request.filter = filter response = self.service.GetCellZonesOfFilter(request) - return response.outputs + return response.cell_zone_ids def GetEdgeZonesOfFilter(self, filter) -> Any: """GetEdgeZonesOfFilter.""" request = MeshingQueriesProtoModule.GetEdgeZonesOfFilterRequest() - request.input = filter + request.filter = filter response = self.service.GetEdgeZonesOfFilter(request) - return response.outputs + return response.edge_zone_ids def GetNodeZonesOfFilter(self, filter) -> Any: """GetNodeZonesOfFilter.""" request = MeshingQueriesProtoModule.GetNodeZonesOfFilterRequest() - request.input = filter + request.filter = filter response = self.service.GetNodeZonesOfFilter(request) - return response.outputs + return response.node_zone_ids def GetObjectsOfType(self, type) -> Any: """GetObjectsOfType.""" @@ -693,23 +693,23 @@ def GetObjectsOfType(self, type) -> Any: def GetFaceZoneIdListOfObject(self, object) -> Any: """GetFaceZoneIdListOfObject.""" request = MeshingQueriesProtoModule.GetFaceZoneIdListOfObjectRequest() - request.input = object + request.object = object response = self.service.GetFaceZoneIdListOfObject(request) - return response.outputs + return response.face_zone_ids def GetEdgeZoneIdListOfObject(self, object) -> Any: """GetEdgeZoneIdListOfObject.""" request = MeshingQueriesProtoModule.GetEdgeZoneIdListOfObjectRequest() - request.input = object + request.object = object response = self.service.GetEdgeZoneIdListOfObject(request) - return response.outputs + return response.edge_zone_ids def GetCellZoneIdListOfObject(self, object) -> Any: """GetCellZoneIdListOfObject.""" request = MeshingQueriesProtoModule.GetCellZoneIdListOfObjectRequest() - request.input = object + request.object = object response = self.service.GetCellZoneIdListOfObject(request) - return response.outputs + return response.cell_zone_ids def GetFaceZonesSharedByRegionsOfType(self, mesh_object, region_type) -> Any: """GetFaceZonesSharedByRegionsOfType.""" @@ -928,50 +928,50 @@ def GetUnreferencedCellZones(self) -> Any: def GetUnreferencedEdgeZonesOfFilter(self, filter) -> Any: """GetUnreferencedEdgeZonesOfFilter.""" request = MeshingQueriesProtoModule.GetUnreferencedEdgeZonesOfFilterRequest() - request.input = filter + request.filter = filter response = self.service.GetUnreferencedEdgeZonesOfFilter(request) - return response.outputs + return response.unreferenced_edge_zone_ids def GetUnreferencedFaceZonesOfFilter(self, filter) -> Any: """GetUnreferencedFaceZonesOfFilter.""" request = MeshingQueriesProtoModule.GetUnreferencedFaceZonesOfFilterRequest() - request.input = filter + request.filter = filter response = self.service.GetUnreferencedFaceZonesOfFilter(request) - return response.outputs + return response.unreferenced_face_zone_ids def GetUnreferencedCellZonesOfFilter(self, filter) -> Any: """GetUnreferencedEdgeZonesOfFilter.""" request = MeshingQueriesProtoModule.GetUnreferencedCellZonesOfFilterRequest() - request.input = filter + request.filter = filter response = self.service.GetUnreferencedCellZonesOfFilter(request) - return response.outputs + return response.unreferenced_cell_zone_ids def GetUnreferencedEdgeZoneIdListOfPattern(self, pattern) -> Any: """GetUnreferencedEdgeZoneIdListOfPattern.""" request = ( MeshingQueriesProtoModule.GetUnreferencedEdgeZoneIdListOfPatternRequest() ) - request.input = pattern + request.pattern = pattern response = self.service.GetUnreferencedEdgeZoneIdListOfPattern(request) - return response.outputs + return response.unreferenced_edge_zone_ids def GetUnreferencedFaceZoneIdListOfPattern(self, pattern) -> Any: """GetUnreferencedFaceZoneIdListOfPattern.""" request = ( MeshingQueriesProtoModule.GetUnreferencedFaceZoneIdListOfPatternRequest() ) - request.input = pattern + request.pattern = pattern response = self.service.GetUnreferencedFaceZoneIdListOfPattern(request) - return response.outputs + return response.unreferenced_face_zone_ids def GetUnreferencedCellZoneIdListOfPattern(self, pattern) -> Any: """GetUnreferencedCellZoneIdListOfPattern.""" request = ( MeshingQueriesProtoModule.GetUnreferencedCellZoneIdListOfPatternRequest() ) - request.input = pattern + request.pattern = pattern response = self.service.GetUnreferencedCellZoneIdListOfPattern(request) - return response.outputs + return response.unreferenced_cell_zone_ids def GetMaxsizeCellZoneByVolume(self, list_or_pattern) -> Any: """GetMaxsizeCellZoneByVolume.""" From 11b64199f89d07004a4d6373c6d92bfceab29d26 Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Tue, 18 Apr 2023 14:10:27 +0530 Subject: [PATCH 25/35] Specific name update --- src/ansys/fluent/core/services/meshing_queries.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index 2817a79f30e..b0be26e5316 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -750,17 +750,17 @@ def GetFaceZonesOfObjects(self, object_list) -> Any: """GetFaceZonesOfObjects.""" request = MeshingQueriesProtoModule.GetFaceZonesOfObjectsRequest() for object in object_list: - request.inputs.append(object) + request.object_list.append(object) response = self.service.GetFaceZonesOfObjects(request) - return response.outputs + return response.face_zone_ids def GetEdgeZonesOfObjects(self, object_list) -> Any: """GetEdgeZonesOfObjects.""" request = MeshingQueriesProtoModule.GetEdgeZonesOfObjectsRequest() for object in object_list: - request.inputs.append(object) + request.object_list.append(object) response = self.service.GetEdgeZonesOfObjects(request) - return response.outputs + return response.edge_zone_ids def GetFaceZoneIdListOfRegions(self, object, region_list) -> Any: """GetFaceZoneIdListOfRegions.""" From fb64ffcd7418c779a0bdf55a572f45fb355584d3 Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Tue, 18 Apr 2023 14:48:21 +0530 Subject: [PATCH 26/35] Specific name update --- .../fluent/core/services/meshing_queries.py | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index b0be26e5316..733ef6430f2 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -686,9 +686,9 @@ def GetNodeZonesOfFilter(self, filter) -> Any: def GetObjectsOfType(self, type) -> Any: """GetObjectsOfType.""" request = MeshingQueriesProtoModule.GetObjectsOfTypeRequest() - request.input = type + request.type = type response = self.service.GetObjectsOfType(request) - return response.outputs + return response.objects def GetFaceZoneIdListOfObject(self, object) -> Any: """GetFaceZoneIdListOfObject.""" @@ -714,10 +714,10 @@ def GetCellZoneIdListOfObject(self, object) -> Any: def GetFaceZonesSharedByRegionsOfType(self, mesh_object, region_type) -> Any: """GetFaceZonesSharedByRegionsOfType.""" request = MeshingQueriesProtoModule.GetFaceZonesSharedByRegionsOfTypeRequest() - request.input_1 = mesh_object - request.input_2 = region_type + request.mesh_object = mesh_object + request.region_type = region_type response = self.service.GetFaceZonesSharedByRegionsOfType(request) - return response.outputs + return response.shared_face_zone_ids def GetFaceZonesOfRegions(self, object, region_name_list) -> Any: """GetFaceZonesOfRegions.""" @@ -1139,30 +1139,30 @@ def GetAllObjectNameList(self) -> Any: def GetObjectNameListOfType(self, type) -> Any: """GetObjectNameListOfType.""" request = MeshingQueriesProtoModule.GetObjectNameListOfTypeRequest() - request.input = type + request.type = type response = self.service.GetObjectNameListOfType(request) - return response.outputs + return response.objects def GetObjectsOfFilter(self, filter) -> Any: """GetObjectsOfFilter.""" request = MeshingQueriesProtoModule.GetObjectsOfFilterRequest() - request.input = filter + request.filter = filter response = self.service.GetObjectsOfFilter(request) - return response.outputs + return response.objects def GetRegionsOfObject(self, object) -> Any: """GetRegionsOfObject.""" request = MeshingQueriesProtoModule.GetRegionsOfObjectRequest() - request.input = object + request.object = object response = self.service.GetRegionsOfObject(request) - return response.outputs + return response.regions def GetRegionNameListOfObject(self, object) -> Any: """GetRegionNameListOfObject.""" request = MeshingQueriesProtoModule.GetRegionNameListOfObjectRequest() - request.input = object + request.object = object response = self.service.GetRegionNameListOfObject(request) - return response.outputs + return response.regions def SortRegionsByVolume(self, object_name, order) -> Any: """SortRegionsByVolume.""" From eff34de01b65011efa105fda7a10e28c28756761 Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Tue, 18 Apr 2023 15:30:38 +0530 Subject: [PATCH 27/35] Specific name update --- .../fluent/core/services/meshing_queries.py | 98 +++++++++---------- tests/test_meshing_queries.py | 4 + 2 files changed, 53 insertions(+), 49 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index 733ef6430f2..b822b76dd83 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -793,86 +793,86 @@ def GetTetCellZones(self, list_or_pattern) -> Any: response = self.service.GetTetCellZones(request) return response.outputs - def GetAdjacentCellZones(self, list_or_pattern) -> Any: + def GetAdjacentCellZones(self, list_or_name_or_pattern) -> Any: """GetAdjacentCellZones.""" request = MeshingQueriesProtoModule.GetAdjacentCellZonesRequest() - if isinstance(list_or_pattern, str): - request.input = list_or_pattern - elif isinstance(list_or_pattern, list): - for items in list_or_pattern: - request.inputs.append(items) + if isinstance(list_or_name_or_pattern, str): + request.zone_name_or_pattern = list_or_name_or_pattern + elif isinstance(list_or_name_or_pattern, list): + for items in list_or_name_or_pattern: + request.face_zone_ids.append(items) response = self.service.GetAdjacentCellZones(request) - return response.outputs + return response.adjacent_cell_zones - def GetAdjacentFaceZones(self, list_or_pattern) -> Any: + def GetAdjacentFaceZones(self, list_or_name_or_pattern) -> Any: """GetAdjacentFaceZones.""" request = MeshingQueriesProtoModule.GetAdjacentFaceZonesRequest() - if isinstance(list_or_pattern, str): - request.input = list_or_pattern - elif isinstance(list_or_pattern, list): - for items in list_or_pattern: - request.inputs.append(items) + if isinstance(list_or_name_or_pattern, str): + request.zone_name_or_pattern = list_or_name_or_pattern + elif isinstance(list_or_name_or_pattern, list): + for items in list_or_name_or_pattern: + request.cell_zone_ids.append(items) response = self.service.GetAdjacentFaceZones(request) - return response.outputs + return response.adjacent_boundary_face_zones - def GetAdjacentInteriorAndBoundaryFaceZones(self, list_or_pattern) -> Any: + def GetAdjacentInteriorAndBoundaryFaceZones(self, list_or_name_or_pattern) -> Any: """GetAdjacentInteriorAndBoundaryFaceZones.""" request = ( MeshingQueriesProtoModule.GetAdjacentInteriorAndBoundaryFaceZonesRequest() ) - if isinstance(list_or_pattern, str): - request.input = list_or_pattern - elif isinstance(list_or_pattern, list): - for items in list_or_pattern: - request.inputs.append(items) + if isinstance(list_or_name_or_pattern, str): + request.zone_name_or_pattern = list_or_name_or_pattern + elif isinstance(list_or_name_or_pattern, list): + for items in list_or_name_or_pattern: + request.cell_zone_ids.append(items) response = self.service.GetAdjacentInteriorAndBoundaryFaceZones(request) - return response.outputs + return response.adjacent_interior_and_boundary_face_zones - def GetAdjacentZonesByEdgeConnectivity(self, list_or_pattern) -> Any: + def GetAdjacentZonesByEdgeConnectivity(self, list_or_name_or_pattern) -> Any: """GetAdjacentZonesByEdgeConnectivity.""" request = MeshingQueriesProtoModule.GetAdjacentZonesByEdgeConnectivityRequest() - if isinstance(list_or_pattern, str): - request.input = list_or_pattern - elif isinstance(list_or_pattern, list): - for items in list_or_pattern: - request.inputs.append(items) + if isinstance(list_or_name_or_pattern, str): + request.zone_name_or_pattern = list_or_name_or_pattern + elif isinstance(list_or_name_or_pattern, list): + for items in list_or_name_or_pattern: + request.zone_ids.append(items) response = self.service.GetAdjacentZonesByEdgeConnectivity(request) - return response.outputs + return response.adjacent_zone_ids - def GetAdjacentZonesByNodeConnectivity(self, list_or_pattern) -> Any: + def GetAdjacentZonesByNodeConnectivity(self, list_or_name_or_pattern) -> Any: """GetAdjacentZonesByNodeConnectivity.""" request = MeshingQueriesProtoModule.GetAdjacentZonesByNodeConnectivityRequest() - if isinstance(list_or_pattern, str): - request.input = list_or_pattern - elif isinstance(list_or_pattern, list): - for items in list_or_pattern: - request.inputs.append(items) + if isinstance(list_or_name_or_pattern, str): + request.zone_name_or_pattern = list_or_name_or_pattern + elif isinstance(list_or_name_or_pattern, list): + for items in list_or_name_or_pattern: + request.zone_ids.append(items) response = self.service.GetAdjacentZonesByNodeConnectivity(request) - return response.outputs + return response.adjacent_zone_ids - def GetSharedBoundaryZones(self, list_or_pattern) -> Any: + def GetSharedBoundaryZones(self, list_or_name_or_pattern) -> Any: """GetSharedBoundaryZones.""" request = MeshingQueriesProtoModule.GetSharedBoundaryZonesRequest() - if isinstance(list_or_pattern, str): - request.input = list_or_pattern - elif isinstance(list_or_pattern, list): - for items in list_or_pattern: - request.inputs.append(items) + if isinstance(list_or_name_or_pattern, str): + request.cell_zone_name_or_pattern = list_or_name_or_pattern + elif isinstance(list_or_name_or_pattern, list): + for items in list_or_name_or_pattern: + request.cell_zone_ids.append(items) response = self.service.GetSharedBoundaryZones(request) - return response.outputs + return response.shared_boundary_zone_ids - def GetInteriorZonesConnectedToCellZones(self, list_or_pattern) -> Any: + def GetInteriorZonesConnectedToCellZones(self, list_or_name_or_pattern) -> Any: """GetInteriorZonesConnectedToCellZones.""" request = ( MeshingQueriesProtoModule.GetInteriorZonesConnectedToCellZonesRequest() ) - if isinstance(list_or_pattern, str): - request.input = list_or_pattern - elif isinstance(list_or_pattern, list): - for items in list_or_pattern: - request.inputs.append(items) + if isinstance(list_or_name_or_pattern, str): + request.cell_zone_name_or_pattern = list_or_name_or_pattern + elif isinstance(list_or_name_or_pattern, list): + for items in list_or_name_or_pattern: + request.face_zone_ids.append(items) response = self.service.GetInteriorZonesConnectedToCellZones(request) - return response.outputs + return response.interior_zone_ids def GetFaceZonesWithZoneSpecificPrismsApplied(self) -> Any: """GetFaceZonesWithZoneSpecificPrismsApplied.""" diff --git a/tests/test_meshing_queries.py b/tests/test_meshing_queries.py index 2fbcafeff20..4b678ae57f5 100644 --- a/tests/test_meshing_queries.py +++ b/tests/test_meshing_queries.py @@ -130,6 +130,10 @@ def test_meshing_queries(new_mesh_session): == [] ) + assert meshing_session.meshing_queries.GetAdjacentInteriorAndBoundaryFaceZones( + "fluid" + ) == [29, 30, 31, 32, 33, 34, 3462] + assert meshing_session.meshing_queries.GetAdjacentInteriorAndBoundaryFaceZones( "*" ) == [ From 92a125516132825735792420ff6d551f3a63b9ce Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Tue, 18 Apr 2023 15:58:11 +0530 Subject: [PATCH 28/35] Specific name update --- .../fluent/core/services/meshing_queries.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index b822b76dd83..13ba3e2307e 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -878,7 +878,7 @@ def GetFaceZonesWithZoneSpecificPrismsApplied(self) -> Any: """GetFaceZonesWithZoneSpecificPrismsApplied.""" request = MeshingQueriesProtoModule.Empty() response = self.service.GetFaceZonesWithZoneSpecificPrismsApplied(request) - return response.outputs + return response.face_zone_ids def GetFaceZonesOfPrismControls(self, control_name) -> Any: """GetInteriorZonesConnectedToCellZones.""" @@ -891,39 +891,39 @@ def GetBaffles(self, face_zone_list) -> Any: """GetBaffles.""" request = MeshingQueriesProtoModule.GetBafflesRequest() for items in face_zone_list: - request.inputs.append(items) + request.face_zone_ids.append(items) response = self.service.GetBaffles(request) - return response.outputs + return response.baffle_zone_ids def GetEmbeddedBaffles(self) -> Any: """GetEmbeddedBaffles.""" request = MeshingQueriesProtoModule.Empty() response = self.service.GetEmbeddedBaffles(request) - return response.outputs + return response.embedded_baffles_zone_ids def GetWrappedZones(self) -> Any: """GetWrappedZones.""" request = MeshingQueriesProtoModule.Empty() response = self.service.GetWrappedZones(request) - return response.outputs + return response.wrapped_face_zone_ids def GetUnreferencedEdgeZones(self) -> Any: """GetUnreferencedEdgeZones.""" request = MeshingQueriesProtoModule.Empty() response = self.service.GetUnreferencedEdgeZones(request) - return response.outputs + return response.unreferenced_edge_zone_ids def GetUnreferencedFaceZones(self) -> Any: """GetUnreferencedFaceZones.""" request = MeshingQueriesProtoModule.Empty() response = self.service.GetUnreferencedFaceZones(request) - return response.outputs + return response.unreferenced_face_zone_ids def GetUnreferencedCellZones(self) -> Any: """GetUnreferencedCellZones.""" request = MeshingQueriesProtoModule.Empty() response = self.service.GetUnreferencedCellZones(request) - return response.outputs + return response.unreferenced_cell_zone_ids def GetUnreferencedEdgeZonesOfFilter(self, filter) -> Any: """GetUnreferencedEdgeZonesOfFilter.""" From 4469a3fc24729faa3bee63e1c063536b6534684f Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Tue, 18 Apr 2023 19:33:02 +0530 Subject: [PATCH 29/35] Specific name update --- .../fluent/core/services/meshing_queries.py | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index 13ba3e2307e..180584ad074 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -977,61 +977,61 @@ def GetMaxsizeCellZoneByVolume(self, list_or_pattern) -> Any: """GetMaxsizeCellZoneByVolume.""" request = MeshingQueriesProtoModule.GetMaxsizeCellZoneByVolumeRequest() if isinstance(list_or_pattern, str): - request.string_input = list_or_pattern + request.cell_zone_pattern = list_or_pattern elif isinstance(list_or_pattern, list): if isinstance(list_or_pattern[0], int): for items in list_or_pattern: - request.int_inputs.append(items) + request.cell_zone_ids.append(items) elif isinstance(list_or_pattern[0], str): for items in list_or_pattern: - request.string_inputs.append(items) + request.cell_zone_names.append(items) response = self.service.GetMaxsizeCellZoneByVolume(request) - return response.output + return response.cell_zone_id def GetMaxsizeCellZoneByCount(self, list_or_pattern) -> Any: """GetMaxsizeCellZoneByCount.""" request = MeshingQueriesProtoModule.GetMaxsizeCellZoneByCountRequest() if isinstance(list_or_pattern, str): - request.string_input = list_or_pattern + request.cell_zone_pattern = list_or_pattern elif isinstance(list_or_pattern, list): if isinstance(list_or_pattern[0], int): for items in list_or_pattern: - request.int_inputs.append(items) + request.cell_zone_ids.append(items) elif isinstance(list_or_pattern[0], str): for items in list_or_pattern: - request.string_inputs.append(items) + request.cell_zone_names.append(items) response = self.service.GetMaxsizeCellZoneByCount(request) - return response.output + return response.cell_zone_id def GetMinsizeFaceZoneByArea(self, list_or_pattern) -> Any: """GetMinsizeFaceZoneByArea.""" request = MeshingQueriesProtoModule.GetMinsizeFaceZoneByAreaRequest() if isinstance(list_or_pattern, str): - request.string_input = list_or_pattern + request.face_zone_pattern = list_or_pattern elif isinstance(list_or_pattern, list): if isinstance(list_or_pattern[0], int): for items in list_or_pattern: - request.int_inputs.append(items) + request.face_zone_ids.append(items) elif isinstance(list_or_pattern[0], str): for items in list_or_pattern: - request.string_inputs.append(items) + request.face_zone_names.append(items) response = self.service.GetMinsizeFaceZoneByArea(request) - return response.output + return response.face_zone_id def GetMinsizeFaceZoneByCount(self, list_or_pattern) -> Any: """GetMinsizeFaceZoneByCount.""" request = MeshingQueriesProtoModule.GetMinsizeFaceZoneByCountRequest() if isinstance(list_or_pattern, str): - request.string_input = list_or_pattern + request.face_zone_pattern = list_or_pattern elif isinstance(list_or_pattern, list): if isinstance(list_or_pattern[0], int): for items in list_or_pattern: - request.int_inputs.append(items) + request.face_zone_ids.append(items) elif isinstance(list_or_pattern[0], str): for items in list_or_pattern: - request.string_inputs.append(items) + request.face_zone_names.append(items) response = self.service.GetMinsizeFaceZoneByCount(request) - return response.output + return response.face_zone_id def GetFaceZoneListByMaximumEntityCount( self, max_entity_count, only_boundary From 92264d81a56470088f700475827f301f7cf31b26 Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Wed, 19 Apr 2023 10:21:26 +0530 Subject: [PATCH 30/35] Specific name update --- .../fluent/core/services/meshing_queries.py | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index 180584ad074..59b06884deb 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -1038,71 +1038,71 @@ def GetFaceZoneListByMaximumEntityCount( ) -> Any: """GetFaceZoneListByMaximumEntityCount.""" request = MeshingQueriesProtoModule.GetFaceZoneListByMaximumEntityCountRequest() - request.int_input = max_entity_count - request.bool_input = only_boundary + request.maximum_entity_count = max_entity_count + request.only_boundary = only_boundary response = self.service.GetFaceZoneListByMaximumEntityCount(request) - return response.outputs + return response.face_zone_ids def GetEdgeZoneListByMaximumEntityCount( self, max_entity_count, only_boundary ) -> Any: """GetEdgeZoneListByMaximumEntityCount.""" request = MeshingQueriesProtoModule.GetEdgeZoneListByMaximumEntityCountRequest() - request.int_input = max_entity_count - request.bool_input = only_boundary + request.maximum_entity_count = max_entity_count + request.only_boundary = only_boundary response = self.service.GetEdgeZoneListByMaximumEntityCount(request) - return response.outputs + return response.edge_zone_ids - def GetCellZoneListByMaximumEntityCount(self, max_entity_count) -> Any: + def GetCellZoneListByMaximumEntityCount(self, maximum_entity_count) -> Any: """GetCellZoneListByMaximumEntityCount.""" request = MeshingQueriesProtoModule.GetCellZoneListByMaximumEntityCountRequest() - request.int_input = max_entity_count + request.maximum_entity_count = maximum_entity_count response = self.service.GetCellZoneListByMaximumEntityCount(request) - return response.outputs + return response.cell_zone_ids - def GetFaceZoneListByMaximumZoneArea(self, max_entity_count) -> Any: + def GetFaceZoneListByMaximumZoneArea(self, maximum_zone_area) -> Any: """GetFaceZoneListByMaximumZoneArea.""" request = MeshingQueriesProtoModule.GetFaceZoneListByMaximumZoneAreaRequest() - request.int_input = max_entity_count + request.maximum_zone_area = maximum_zone_area response = self.service.GetFaceZoneListByMaximumZoneArea(request) - return response.outputs + return response.face_zone_ids - def GetFaceZoneListByMinimumZoneArea(self, max_entity_count) -> Any: + def GetFaceZoneListByMinimumZoneArea(self, minimum_zone_area) -> Any: """GetFaceZoneListByMinimumZoneArea.""" request = MeshingQueriesProtoModule.GetFaceZoneListByMinimumZoneAreaRequest() - request.int_input = max_entity_count + request.minimum_zone_area = minimum_zone_area response = self.service.GetFaceZoneListByMinimumZoneArea(request) - return response.outputs + return response.face_zone_ids def GetZonesWithFreeFaces(self, list_or_pattern) -> Any: """GetZonesWithFreeFaces.""" request = MeshingQueriesProtoModule.GetZonesWithFreeFacesRequest() if isinstance(list_or_pattern, str): - request.string_input = list_or_pattern + request.face_zone_pattern = list_or_pattern elif isinstance(list_or_pattern, list): if isinstance(list_or_pattern[0], int): for items in list_or_pattern: - request.int_inputs.append(items) + request.face_zone_ids.append(items) elif isinstance(list_or_pattern[0], str): for items in list_or_pattern: - request.string_inputs.append(items) + request.face_zone_names.append(items) response = self.service.GetZonesWithFreeFaces(request) - return response.outputs + return response.zones_with_free_faces def GetZonesWithMultiFaces(self, list_or_pattern) -> Any: """GetZonesWithMultiFaces.""" request = MeshingQueriesProtoModule.GetZonesWithMultiFacesRequest() if isinstance(list_or_pattern, str): - request.string_input = list_or_pattern + request.face_zone_pattern = list_or_pattern elif isinstance(list_or_pattern, list): if isinstance(list_or_pattern[0], int): for items in list_or_pattern: - request.int_inputs.append(items) + request.face_zone_ids.append(items) elif isinstance(list_or_pattern[0], str): for items in list_or_pattern: - request.string_inputs.append(items) + request.face_zone_names.append(items) response = self.service.GetZonesWithMultiFaces(request) - return response.outputs + return response.zones_with_multi_connected_faces def GetOverlappingFaceZones( self, zone_name_pattern, areal_tolerance, distance_tolerance @@ -1119,16 +1119,16 @@ def GetZonesWithMarkedFaces(self, list_or_pattern) -> Any: """GetZonesWithMarkedFaces.""" request = MeshingQueriesProtoModule.GetZonesWithMarkedFacesRequest() if isinstance(list_or_pattern, str): - request.string_input = list_or_pattern + request.face_zone_pattern = list_or_pattern elif isinstance(list_or_pattern, list): if isinstance(list_or_pattern[0], int): for items in list_or_pattern: - request.int_inputs.append(items) + request.face_zone_ids.append(items) elif isinstance(list_or_pattern[0], str): for items in list_or_pattern: - request.string_inputs.append(items) + request.face_zone_names.append(items) response = self.service.GetZonesWithMarkedFaces(request) - return response.outputs + return response.zones_with_marked_faces def GetAllObjectNameList(self) -> Any: """GetAllObjectNameList.""" From 25df8c0996532de4ae8b1e9ee6366cf75cff13c1 Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Wed, 19 Apr 2023 11:44:47 +0530 Subject: [PATCH 31/35] Specific name update --- .../fluent/core/services/meshing_queries.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index 59b06884deb..dcf1047f2ac 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -1105,15 +1105,15 @@ def GetZonesWithMultiFaces(self, list_or_pattern) -> Any: return response.zones_with_multi_connected_faces def GetOverlappingFaceZones( - self, zone_name_pattern, areal_tolerance, distance_tolerance + self, zone_name_pattern, area_tolerance, distance_tolerance ) -> Any: """GetOverlappingFaceZones.""" request = MeshingQueriesProtoModule.GetOverlappingFaceZonesRequest() - request.string_input = zone_name_pattern - request.double_input_1 = areal_tolerance - request.double_input_2 = distance_tolerance + request.face_zone_name_or_pattern = zone_name_pattern + request.area_tolerance = area_tolerance + request.distance_tolerance = distance_tolerance response = self.service.GetOverlappingFaceZones(request) - return response.outputs + return response.overlapping_face_zone_ids def GetZonesWithMarkedFaces(self, list_or_pattern) -> Any: """GetZonesWithMarkedFaces.""" @@ -1134,7 +1134,7 @@ def GetAllObjectNameList(self) -> Any: """GetAllObjectNameList.""" request = MeshingQueriesProtoModule.Empty() response = self.service.GetAllObjectNameList(request) - return response.outputs + return response.objects def GetObjectNameListOfType(self, type) -> Any: """GetObjectNameListOfType.""" @@ -1175,10 +1175,10 @@ def SortRegionsByVolume(self, object_name, order) -> Any: def GetRegionVolume(self, object_name, region_name) -> Any: """GetRegionVolume.""" request = MeshingQueriesProtoModule.GetRegionVolumeRequest() - request.string_input_1 = object_name - request.string_input_2 = region_name + request.object_name = object_name + request.region_name = region_name response = self.service.GetRegionVolume(request) - return response.output + return response.region_volume def GetRegionsOfFilter(self, object, filter) -> Any: """GetRegionsOfFilter.""" From 1f5a07fafd33dfabd4cbde335a6ee26f5649cfa5 Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Wed, 19 Apr 2023 13:25:54 +0530 Subject: [PATCH 32/35] Specific name update --- .../fluent/core/services/meshing_queries.py | 66 +++++++++---------- tests/test_meshing_queries.py | 2 +- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index dcf1047f2ac..7b5f7cee052 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -883,9 +883,9 @@ def GetFaceZonesWithZoneSpecificPrismsApplied(self) -> Any: def GetFaceZonesOfPrismControls(self, control_name) -> Any: """GetInteriorZonesConnectedToCellZones.""" request = MeshingQueriesProtoModule.GetFaceZonesOfPrismControlsRequest() - request.input = control_name + request.control_name = control_name response = self.service.GetFaceZonesOfPrismControls(request) - return response.outputs + return response.face_zone_ids def GetBaffles(self, face_zone_list) -> Any: """GetBaffles.""" @@ -1167,10 +1167,10 @@ def GetRegionNameListOfObject(self, object) -> Any: def SortRegionsByVolume(self, object_name, order) -> Any: """SortRegionsByVolume.""" request = MeshingQueriesProtoModule.SortRegionsByVolumeRequest() - request.string_input_1 = object_name - request.string_input_2 = order + request.object_name = object_name + request.order = order response = self.service.SortRegionsByVolume(request) - return response.outputs + return response.regions def GetRegionVolume(self, object_name, region_name) -> Any: """GetRegionVolume.""" @@ -1183,54 +1183,54 @@ def GetRegionVolume(self, object_name, region_name) -> Any: def GetRegionsOfFilter(self, object, filter) -> Any: """GetRegionsOfFilter.""" request = MeshingQueriesProtoModule.GetRegionsOfFilterRequest() - request.string_input_1 = object - request.string_input_2 = filter + request.object = object + request.filter = filter response = self.service.GetRegionsOfFilter(request) - return response.outputs + return response.regions - def GetRegionNameListOfPattern(self, object, region_name_pattern) -> Any: + def GetRegionNameListOfPattern(self, object, region_name_or_pattern) -> Any: """GetRegionNameListOfPattern.""" request = MeshingQueriesProtoModule.GetRegionNameListOfPatternRequest() - request.string_input_1 = object - request.string_input_2 = region_name_pattern + request.object = object + request.region_name_or_pattern = region_name_or_pattern response = self.service.GetRegionNameListOfPattern(request) - return response.outputs + return response.regions - def GetRegionsOfFaceZones(self, face_zone_id_list) -> Any: + def GetRegionsOfFaceZones(self, list_of_face_zone_ids) -> Any: """GetRegionsOfFaceZones.""" request = MeshingQueriesProtoModule.GetRegionsOfFaceZonesRequest() - for id in face_zone_id_list: - request.inputs.append(id) + for id in list_of_face_zone_ids: + request.face_zone_ids.append(id) response = self.service.GetRegionsOfFaceZones(request) - return response.outputs + return response.regions def FindJoinPairs( - self, list_or_pattern, join_tolerance, absolute_tolerance, join_angle + self, face_zone_list_or_pattern, join_tolerance, absolute_tolerance, join_angle ) -> Any: """FindJoinPairs.""" request = MeshingQueriesProtoModule.FindJoinPairsRequest() - if isinstance(list_or_pattern, str): - request.input_1 = list_or_pattern - elif isinstance(list_or_pattern, list): - if isinstance(list_or_pattern[0], int): - for items in list_or_pattern: - request.int_inputs.append(items) - elif isinstance(list_or_pattern[0], str): - for items in list_or_pattern: - request.string_inputs.append(items) - request.input_2 = join_tolerance - request.input_3 = absolute_tolerance - request.input_4 = join_angle + if isinstance(face_zone_list_or_pattern, str): + request.face_zone_name_or_pattern = face_zone_list_or_pattern + elif isinstance(face_zone_list_or_pattern, list): + if isinstance(face_zone_list_or_pattern[0], int): + for items in face_zone_list_or_pattern: + request.face_zone_ids.append(items) + elif isinstance(face_zone_list_or_pattern[0], str): + for items in face_zone_list_or_pattern: + request.face_zone_names.append(items) + request.join_tolerance = join_tolerance + request.absolute_tolerance = absolute_tolerance + request.join_angle = join_angle response = self.service.FindJoinPairs(request) - return response.outputs + return response.pairs def GetRegionNameListOfFaceZones(self, list_or_pattern) -> Any: """GetRegionNameListOfFaceZones.""" request = MeshingQueriesProtoModule.GetRegionNameListOfFaceZonesRequest() if isinstance(list_or_pattern, str): - request.input = list_or_pattern + request.face_zone_name_or_pattern = list_or_pattern elif isinstance(list_or_pattern, list): for items in list_or_pattern: - request.inputs.append(items) + request.face_zone_ids.append(items) response = self.service.GetRegionNameListOfFaceZones(request) - return response.outputs + return response.regions diff --git a/tests/test_meshing_queries.py b/tests/test_meshing_queries.py index 4b678ae57f5..6965c4a6c30 100644 --- a/tests/test_meshing_queries.py +++ b/tests/test_meshing_queries.py @@ -306,7 +306,7 @@ def test_meshing_queries(new_mesh_session): "elbow-fluid", "ascending" ) ) - == '[double_output: 152.599422561798\nstring_output: "fluid"\n]' + == '[volume: 152.599422561798\nregion: "fluid"\n]' ) assert ( From 9ada8b779f46b3b067ab6bc2ba2b19b4032ae2f5 Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Wed, 19 Apr 2023 13:58:56 +0530 Subject: [PATCH 33/35] Specific name update --- src/ansys/fluent/core/services/meshing_queries.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ansys/fluent/core/services/meshing_queries.py b/src/ansys/fluent/core/services/meshing_queries.py index 7b5f7cee052..a38a2df5921 100644 --- a/src/ansys/fluent/core/services/meshing_queries.py +++ b/src/ansys/fluent/core/services/meshing_queries.py @@ -775,23 +775,23 @@ def GetPrismCellZones(self, list_or_pattern) -> Any: """GetPrismCellZones.""" request = MeshingQueriesProtoModule.GetPrismCellZonesRequest() if isinstance(list_or_pattern, str): - request.input = list_or_pattern + request.zone_name_or_pattern = list_or_pattern elif isinstance(list_or_pattern, list): for items in list_or_pattern: - request.inputs.append(items) + request.zones.append(items) response = self.service.GetPrismCellZones(request) - return response.outputs + return response.prism_cell_zones def GetTetCellZones(self, list_or_pattern) -> Any: """GetTetCellZones.""" request = MeshingQueriesProtoModule.GetTetCellZonesRequest() if isinstance(list_or_pattern, str): - request.input = list_or_pattern + request.zone_name_or_pattern = list_or_pattern elif isinstance(list_or_pattern, list): for items in list_or_pattern: - request.inputs.append(items) + request.zones.append(items) response = self.service.GetTetCellZones(request) - return response.outputs + return response.tet_cell_zones def GetAdjacentCellZones(self, list_or_name_or_pattern) -> Any: """GetAdjacentCellZones.""" From cd92ce6d090c51fbf7760c239f6f58a773d473d4 Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Wed, 26 Apr 2023 12:58:36 +0530 Subject: [PATCH 34/35] Updated ansys-api version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ba41cfeb253..99d0cff8fb3 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ shutil.copy2(_README_FILE, _DOCS_FILE) install_requires = [ - "ansys-api-fluent==0.3.11", + "ansys-api-fluent==0.3.12", "ansys-platform-instancemanagement~=1.0", "grpcio>=1.30.0", "numpy>=1.21.5", From f546c3b0f67d7b924b3e8afae25bafa186fb4ec6 Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Wed, 26 Apr 2023 14:52:04 +0530 Subject: [PATCH 35/35] Added 23.2 test marker --- tests/test_meshing_queries.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/test_meshing_queries.py b/tests/test_meshing_queries.py index 6965c4a6c30..6dea5237f2c 100644 --- a/tests/test_meshing_queries.py +++ b/tests/test_meshing_queries.py @@ -1,3 +1,5 @@ +import pytest + from ansys.fluent.core import examples import_filename = examples.download_file( @@ -5,6 +7,7 @@ ) +@pytest.mark.fluent_232 def test_meshing_queries(new_mesh_session): meshing_session = new_mesh_session meshing_session.tui.file.read_case(import_filename)