Skip to content

Commit 6bc355d

Browse files
authored
build: Bump version to v0.21.1 (#571)
Bump version to v0.21.1
1 parent a80eec3 commit 6bc355d

File tree

9 files changed

+92
-183
lines changed

9 files changed

+92
-183
lines changed

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
55
[tool.poetry]
66
# Check https://python-poetry.org/docs/pyproject/ for all available sections
77
name = "ansys-fluent-visualization"
8-
version = "0.21.0"
8+
version = "0.21.1"
99
description = "A python wrapper for ansys Fluent visualization"
1010
license = "MIT"
1111
authors = ["ANSYS, Inc. <[email protected]>"]
@@ -25,7 +25,7 @@ packages = [
2525
[tool.poetry.dependencies]
2626
python = ">=3.10,<4.0"
2727
importlib-metadata = {version = "^4.0", python = "<3.9"}
28-
ansys-fluent-core = "~=0.34.0"
28+
ansys-fluent-core = "~=0.34.1"
2929
pyvista = ">=0.44.0"
3030
matplotlib = ">=3.6.0"
3131
pyvistaqt = { version = "~=0.11.1", optional = true }

src/ansys/fluent/interface/post_objects/meta.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,8 @@ def __new__(cls, name, bases, attrs):
254254
attrs["root"] = property(lambda self: self.get_root())
255255
attrs["path"] = property(lambda self: self.get_path())
256256
attrs["session"] = property(lambda self: self.get_session())
257+
attrs["field_data"] = property(lambda self: self.get_session().field_data)
258+
attrs["monitors"] = property(lambda self: self.get_session().monitors)
257259
attrs["session_handle"] = property(lambda self: self.get_session_handle())
258260
return super(PyLocalBaseMeta, cls).__new__(cls, name, bases, attrs)
259261

src/ansys/fluent/interface/post_objects/post_helper.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ def _get_api_handle(self):
6363
return self.obj.get_root().session.results.surfaces
6464

6565
def _delete_if_exists_on_server(self):
66-
field_info = self.obj._api_helper.field_info()
67-
surfaces_list = list(field_info.get_surfaces_info().keys())
66+
field_data = self.obj._api_helper.field_data()
67+
surfaces_list = list(field_data.surfaces())
6868
if self._surface_name_on_server in surfaces_list:
6969
self.delete_surface_on_server()
7070

@@ -130,8 +130,8 @@ def create_surface_on_server(self):
130130
"method": method,
131131
position: value,
132132
}
133-
field_info = self.obj._api_helper.field_info()
134-
surfaces_list = list(field_info.get_surfaces_info().keys())
133+
field_data = self.obj._api_helper.field_data()
134+
surfaces_list = list(field_data.surfaces())
135135
if self._surface_name_on_server not in surfaces_list:
136136
raise SurfaceCreationError()
137137

@@ -145,7 +145,6 @@ def delete_surface_on_server(self):
145145
def __init__(self, obj):
146146
"""__init__ method of PostAPIHelper class."""
147147
self.obj = obj
148-
self.field_info = lambda: obj.get_root().session.fields.field_info
149148
self.field_data = lambda: obj.get_root().session.fields.field_data
150149
if obj.__class__.__name__ == "Surface":
151150
self.surface_api = PostAPIHelper._SurfaceAPI(obj)
@@ -163,14 +162,14 @@ def remote_surface_name(self, local_surface_name):
163162
def get_field_unit(self, field):
164163
"""Return the unit of the field."""
165164
session = self.obj.get_root().session
166-
if FluentVersion(session.scheme_eval.version) < FluentVersion.v252:
165+
if FluentVersion(session.scheme.version) < FluentVersion.v252:
167166
quantity = self._field_unit_quantity(field)
168167
if quantity == "*null*":
169168
return ""
170169
scheme_eval_str = f"(units/get-pretty-wb-units-from-dimension (units/inquire-dimension '{quantity}))" # noqa: E501
171170
return " ".join(self._scheme_str_to_py_list(scheme_eval_str))
172171
else:
173-
fields_info = self.field_info().get_scalar_fields_info()
172+
fields_info = self.field_data().scalar_fields()
174173
return get_si_unit_for_fluent_quantity(fields_info[field]["quantity_name"])
175174

176175
def _field_unit_quantity(self, field):
@@ -180,7 +179,7 @@ def _field_unit_quantity(self, field):
180179
def _scheme_str_to_py_list(self, scheme_eval_str):
181180
session = self.obj.get_root().session
182181
if hasattr(session, "scheme_eval"):
183-
str_val = session.scheme_eval.string_eval(scheme_eval_str)
182+
str_val = session.scheme.string_eval(scheme_eval_str)
184183
return list(filter(None, re.split(r'[\s()"\']', str_val)))
185184
else:
186185
return ["*null*"]

src/ansys/fluent/interface/post_objects/post_object_definitions.py

Lines changed: 27 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class monitor_set_name(metaclass=PyLocalPropertyMeta):
107107
@Attribute
108108
def allowed_values(self):
109109
"""Monitor set allowed values."""
110-
return self.session.monitors.get_monitor_set_names()
110+
return self.monitors.get_monitor_set_names()
111111

112112

113113
class XYPlotDefn(PlotDefn):
@@ -138,7 +138,7 @@ class y_axis_function(metaclass=PyLocalPropertyMeta):
138138
@Attribute
139139
def allowed_values(self):
140140
"""Y axis function allowed values."""
141-
return list(self.session.field_info.get_scalar_fields_info())
141+
return list(self.field_data.scalar_fields())
142142

143143
class x_axis_function(metaclass=PyLocalPropertyMeta):
144144
"""X Axis Function."""
@@ -158,7 +158,7 @@ class surfaces(metaclass=PyLocalPropertyMeta):
158158
@Attribute
159159
def allowed_values(self):
160160
"""Surface list allowed values."""
161-
return list(self.session.field_info.get_surfaces_info()) + list(
161+
return list(self.field_data.surfaces()) + list(
162162
self.get_root()._local_surfaces_provider()
163163
)
164164

@@ -176,7 +176,7 @@ class surfaces(metaclass=PyLocalPropertyMeta):
176176
@Attribute
177177
def allowed_values(self):
178178
"""Surface list allowed values."""
179-
return list(self.session.field_info.get_surfaces_info()) + list(
179+
return list(self.field_data.surfaces()) + list(
180180
self.get_root()._local_surfaces_provider()
181181
)
182182

@@ -209,7 +209,7 @@ class field(metaclass=PyLocalPropertyMeta):
209209
@Attribute
210210
def allowed_values(self):
211211
"""Field allowed values."""
212-
return list(self.session.field_info.get_scalar_fields_info())
212+
return list(self.field_data.scalar_fields())
213213

214214
class surfaces(metaclass=PyLocalPropertyMeta):
215215
"""List of surfaces for pathlines."""
@@ -219,7 +219,7 @@ class surfaces(metaclass=PyLocalPropertyMeta):
219219
@Attribute
220220
def allowed_values(self):
221221
"""Surface list allowed values."""
222-
return list(self.session.field_info.get_surfaces_info()) + list(
222+
return list(self.field_data.surfaces()) + list(
223223
self.get_root()._local_surfaces_provider()
224224
)
225225

@@ -286,9 +286,7 @@ class x(metaclass=PyLocalPropertyMeta):
286286
@Attribute
287287
def range(self):
288288
"""X value range."""
289-
return self.session.field_info.get_scalar_field_range(
290-
"x-coordinate", True
291-
)
289+
return self.field_data.scalar_fields.range("x-coordinate", True)
292290

293291
class y(metaclass=PyLocalPropertyMeta):
294292
"""Y value."""
@@ -298,9 +296,7 @@ class y(metaclass=PyLocalPropertyMeta):
298296
@Attribute
299297
def range(self):
300298
"""Y value range."""
301-
return self.session.field_info.get_scalar_field_range(
302-
"y-coordinate", True
303-
)
299+
return self.field_data.scalar_fields.range("y-coordinate", True)
304300

305301
class z(metaclass=PyLocalPropertyMeta):
306302
"""Z value."""
@@ -310,9 +306,7 @@ class z(metaclass=PyLocalPropertyMeta):
310306
@Attribute
311307
def range(self):
312308
"""Z value range."""
313-
return self.session.field_info.get_scalar_field_range(
314-
"z-coordinate", True
315-
)
309+
return self.field_data.scalar_fields.range("z-coordinate", True)
316310

317311
class normal(metaclass=PyLocalObjectMeta):
318312
"""Normal entry for point-and-normal surface."""
@@ -368,9 +362,7 @@ class z(metaclass=PyLocalPropertyMeta):
368362
@Attribute
369363
def range(self):
370364
"""Z value range."""
371-
return self.session.field_info.get_scalar_field_range(
372-
"z-coordinate", True
373-
)
365+
return self.field_data.scalar_fields.range("z-coordinate", True)
374366

375367
class yz_plane(metaclass=PyLocalObjectMeta):
376368
"""YZ Plane definition."""
@@ -388,9 +380,7 @@ class x(metaclass=PyLocalPropertyMeta):
388380
@Attribute
389381
def range(self):
390382
"""X value range."""
391-
return self.session.field_info.get_scalar_field_range(
392-
"x-coordinate", True
393-
)
383+
return self.field_data.scalar_fields.range("x-coordinate", True)
394384

395385
class zx_plane(metaclass=PyLocalObjectMeta):
396386
"""ZX Plane definition."""
@@ -408,9 +398,7 @@ class y(metaclass=PyLocalPropertyMeta):
408398
@Attribute
409399
def range(self):
410400
"""Y value range."""
411-
return self.session.field_info.get_scalar_field_range(
412-
"y-coordinate", True
413-
)
401+
return self.field_data.scalar_fields.range("y-coordinate", True)
414402

415403
class iso_surface(metaclass=PyLocalObjectMeta):
416404
"""Iso surface definition."""
@@ -428,7 +416,7 @@ class field(metaclass=PyLocalPropertyMeta):
428416
@Attribute
429417
def allowed_values(self):
430418
"""Field allowed values."""
431-
return list(self.session.field_info.get_scalar_fields_info())
419+
return list(self.field_data.scalar_fields())
432420

433421
class rendering(metaclass=PyLocalPropertyMeta):
434422
"""Iso surface rendering."""
@@ -465,9 +453,7 @@ def range(self):
465453
"""Iso value range."""
466454
field = self._parent.field()
467455
if field:
468-
return self.session.field_info.get_scalar_field_range(
469-
field, True
470-
)
456+
return self.field_data.scalar_fields.range(field, True)
471457

472458

473459
class ContourDefn(GraphicsDefn):
@@ -483,7 +469,7 @@ class field(metaclass=PyLocalPropertyMeta):
483469
@Attribute
484470
def allowed_values(self):
485471
"""Field allowed values."""
486-
return list(self.session.field_info.get_scalar_fields_info())
472+
return list(self.field_data.scalar_fields())
487473

488474
class surfaces(metaclass=PyLocalPropertyMeta):
489475
"""Contour surfaces."""
@@ -493,7 +479,7 @@ class surfaces(metaclass=PyLocalPropertyMeta):
493479
@Attribute
494480
def allowed_values(self):
495481
"""Surfaces list allowed values."""
496-
return list(self.session.field_info.get_surfaces_info()) + list(
482+
return list(self.field_data.surfaces()) + list(
497483
self.get_root()._local_surfaces_provider()
498484
)
499485

@@ -607,8 +593,8 @@ def value(self):
607593
if getattr(self, "_value", None) is None:
608594
field = self.get_ancestors_by_type(ContourDefn).field()
609595
if field:
610-
field_info = self.session.field_info
611-
field_range = field_info.get_scalar_field_range(
596+
field_data = self.field_data
597+
field_range = field_data.scalar_fields.range(
612598
field,
613599
self.get_ancestors_by_type(ContourDefn).node_values(),
614600
)
@@ -636,8 +622,8 @@ def value(self):
636622
if getattr(self, "_value", None) is None:
637623
field = self.get_ancestors_by_type(ContourDefn).field()
638624
if field:
639-
field_info = self.session.field_info
640-
field_range = field_info.get_scalar_field_range(
625+
field_data = self.field_data
626+
field_range = field_data.scalar_fields.range(
641627
field,
642628
self.get_ancestors_by_type(ContourDefn).node_values(),
643629
)
@@ -663,7 +649,7 @@ class vectors_of(metaclass=PyLocalPropertyMeta):
663649
@Attribute
664650
def allowed_values(self):
665651
"""Vectors of allowed values."""
666-
return list(self.session.field_info.get_vector_fields_info())
652+
return list(self.field_data.vectors())
667653

668654
class field(metaclass=PyLocalPropertyMeta):
669655
"""Vector color field."""
@@ -673,7 +659,7 @@ class field(metaclass=PyLocalPropertyMeta):
673659
@Attribute
674660
def allowed_values(self):
675661
"""Field allowed values."""
676-
return list(self.session.field_info.get_scalar_fields_info())
662+
return list(self.field_data.scalar_fields())
677663

678664
class surfaces(metaclass=PyLocalPropertyMeta):
679665
"""List of surfaces for vector graphics."""
@@ -683,7 +669,7 @@ class surfaces(metaclass=PyLocalPropertyMeta):
683669
@Attribute
684670
def allowed_values(self):
685671
"""Surface list allowed values."""
686-
return list(self.session.field_info.get_surfaces_info()) + list(
672+
return list(self.field_data.surfaces()) + list(
687673
self.get_root()._local_surfaces_provider()
688674
)
689675

@@ -750,8 +736,8 @@ class minimum(metaclass=PyLocalPropertyMeta):
750736
def value(self):
751737
"""Range minimum property setter."""
752738
if getattr(self, "_value", None) is None:
753-
field_info = self.session.field_info
754-
field_range = field_info.get_scalar_field_range(
739+
field_data = self.field_data
740+
field_range = field_data.scalar_fields.range(
755741
"velocity-magnitude",
756742
False,
757743
)
@@ -771,8 +757,8 @@ class maximum(metaclass=PyLocalPropertyMeta):
771757
def value(self):
772758
"""Range maximum property setter."""
773759
if getattr(self, "_value", None) is None:
774-
field_info = self.session.field_info
775-
field_range = field_info.get_scalar_field_range(
760+
field_data = self.field_data
761+
field_range = field_data.scalar_fields.range(
776762
"velocity-magnitude",
777763
False,
778764
)

src/ansys/fluent/visualization/graphics/graphics_windows_manager.py

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -276,28 +276,22 @@ def _fetch_monitor_data(self, obj):
276276
"yscale": "log" if monitor_set_name == "residual" else "linear",
277277
}
278278

279-
@staticmethod
280-
def _pack_faces_connectivity_data(faces_data):
281-
flat = []
282-
for face in faces_data:
283-
flat.append(len(face))
284-
flat.extend(face)
285-
return np.array(flat)
286-
287279
def _resolve_mesh_data(self, mesh_data):
288-
if mesh_data.connectivity[0].shape[0] == 2: # Line
280+
if mesh_data.connectivity.size == 0:
281+
return pv.PolyData()
282+
if mesh_data.connectivity[0] == 2: # Line
289283
return pv.PolyData(
290284
mesh_data.vertices,
291-
lines=self._pack_faces_connectivity_data(mesh_data.connectivity),
285+
lines=mesh_data.connectivity,
292286
)
293287
else: # Face
294288
return pv.PolyData(
295289
mesh_data.vertices,
296-
faces=self._pack_faces_connectivity_data(mesh_data.connectivity),
290+
faces=mesh_data.connectivity,
297291
)
298292

299293
def _display_vector(self, obj, obj_dict):
300-
field_info = obj.session.field_info
294+
field_data = obj.session.field_data
301295
vectors_of = obj.vectors_of()
302296
# scalar bar properties
303297
try:
@@ -339,7 +333,7 @@ def _display_vector(self, obj, obj_dict):
339333
else:
340334
auto_range_on = obj.range.auto_range_on
341335
if auto_range_on.global_range():
342-
range_ = field_info.get_scalar_field_range(obj.field(), False)
336+
range_ = field_data.scalar_fields.range(obj.field(), False)
343337
else:
344338
range_ = [np.min(scalar_field), np.max(scalar_field)]
345339

@@ -404,7 +398,7 @@ def _display_pathlines(self, obj, obj_dict):
404398

405399
mesh = pv.PolyData(
406400
surface_data.vertices,
407-
lines=self._pack_faces_connectivity_data(surface_data.lines),
401+
lines=surface_data.lines,
408402
)
409403

410404
mesh.point_data[field] = surface_data.scalar_field
@@ -527,12 +521,10 @@ def _display_contour(self, obj, obj_dict):
527521
auto_range_on = obj.range.auto_range_on
528522
if auto_range_on.global_range():
529523
if filled:
530-
field_info = obj.session.field_info
524+
field_data = obj.session.field_data
531525
_mesh_dict = {
532526
"data": mesh,
533-
"clim": field_info.get_scalar_field_range(
534-
obj.field(), False
535-
),
527+
"clim": field_data.scalar_fields.range(obj.field(), False),
536528
"scalars": field,
537529
"show_edges": obj.show_edges(),
538530
"scalar_bar_args": scalar_bar_args,

src/ansys/fluent/visualization/graphics/pyvista/renderer.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,9 @@ def render(self, meshes: list[list[dict]]):
133133
)
134134
del mesh_dict["position"]
135135
if isinstance(mesh, pv.DataSet):
136-
mesh_dict.update(mesh_dict.pop("kwargs"))
137-
self.plotter.add_mesh(mesh, **mesh_dict)
136+
if mesh.n_points > 0:
137+
mesh_dict.update(mesh_dict.pop("kwargs"))
138+
self.plotter.add_mesh(mesh, **mesh_dict)
138139
else:
139140
y_range = None
140141
chart = pv.Chart2D()

0 commit comments

Comments
 (0)