Skip to content

Feat/field data refactoring #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 8, 2022
Merged

Feat/field data refactoring #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
263 changes: 135 additions & 128 deletions ansys/api/fluent/v0/field_data_pb2.py
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 26 additions & 6 deletions ansys/fluent/core/services/field_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,15 @@ class FieldData:

Methods
-------
get_surfaces(surface_ids: List[int], overset_mesh: bool) -> Dict[int, Dict]
Get surfaces data i.e. coordinates and connectivity.
def get_surfaces(
surface_ids: List[int],
overset_mesh: bool = False,
provide_vertices=True,
provide_faces=True,
provide_faces_centroid=False,
provide_faces_normal=False,
) -> Dict[int, Dict]
Get surfaces data i.e. vertices, faces connectivity, centroids and normals.

get_scalar_field(
surface_ids: List[int],
Expand Down Expand Up @@ -207,7 +214,13 @@ def _extract_field(field_datatype, field_size, chunk_iterator):
return fields_data

def get_surfaces(
self, surface_ids: List[int], overset_mesh: bool = False
self,
surface_ids: List[int],
overset_mesh: bool = False,
provide_vertices=True,
provide_faces=True,
provide_faces_centroid=False,
provide_faces_normal=False,
) -> Dict[int, Dict]:
request = FieldDataProtoModule.GetFieldsRequest(
provideBytesStream=self._bytes_stream, chunkSize=self._chunk_size
Expand All @@ -217,7 +230,10 @@ def get_surfaces(
FieldDataProtoModule.SurfaceRequest(
surfaceId=surface_id,
oversetMesh=overset_mesh,
provideFaces=True,
provideFaces=provide_faces,
provideVertices=provide_vertices,
provideFacesCentroid=provide_faces_centroid,
provideFacesNormal=provide_faces_normal,
)
for surface_id in surface_ids
]
Expand All @@ -240,6 +256,9 @@ def get_scalar_field(
surfaceId=surface_id,
oversetMesh=False,
provideFaces=True,
provideVertices=True,
provideFacesCentroid=False,
provideFacesNormal=False,
)
for surface_id in surface_ids
]
Expand Down Expand Up @@ -275,6 +294,9 @@ def get_vector_field(
surfaceId=surface_id,
oversetMesh=False,
provideFaces=True,
provideVertices=True,
provideFacesCentroid=False,
provideFacesNormal=False,
)
for surface_id in surface_ids
]
Expand All @@ -298,8 +320,6 @@ def get_vector_field(
FieldDataProtoModule.VectorFieldRequest(
surfaceId=surface_id,
vectorFieldName=vector_field,
provideFacesCentroid=False,
provideFacesAreaNormal=False,
)
for surface_id in surface_ids
]
Expand Down
4 changes: 3 additions & 1 deletion ansys/fluent/post/matplotlib/matplot_objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
from typing import Optional

from ansys.fluent.core.meta import PyLocalContainer
from ansys.fluent.post.matplotlib import matplot_windows_manager
from ansys.fluent.post.matplotlib.matplot_windows_manager import (
matplot_windows_manager,
)
from ansys.fluent.post.post_object_defns import XYPlotDefn


Expand Down
14 changes: 7 additions & 7 deletions protos/ansys/api/fluent/v0/field_data.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,15 @@ message GetFieldsResponse {

/**
* Request for surface data.
* Surface data consists of information about vertices and their connectivity.
* Connectivity information is provided only if provideFaces is True.
* Surface data consists of information about vertices and faces.
*/
message SurfaceRequest {
uint64 surfaceId = 1; // Surface id.
bool oversetMesh = 2; // Provide overset mesh.
bool provideFaces = 3; // Provide faces information i.e. vertices connectivity.
uint64 surfaceId = 1; // Surface id.
bool oversetMesh = 2; // Provide overset mesh.
bool provideVertices = 3; // Provide vectices.
bool provideFaces = 4; // Provide face to vertex connectivity.
bool provideFacesCentroid = 5; // Provide face centroids.
bool provideFacesNormal = 6; // Provide face normals.
}

enum DataLocation {
Expand All @@ -128,8 +130,6 @@ message ScalarFieldRequest {
message VectorFieldRequest {
uint64 surfaceId = 1; // Surface id for vector field.
string vectorFieldName = 2; // Vector field name.
bool provideFacesCentroid = 3; // Provide faces centroid.
bool provideFacesAreaNormal = 4; // Provide faces area normal.
}

/**
Expand Down