From d133f3cb7998dfe32539b0c1800b7658a91570f5 Mon Sep 17 00:00:00 2001 From: Prithwish Mukherjee Date: Mon, 3 Jul 2023 14:11:06 +0530 Subject: [PATCH 1/3] get_scalar_fields_range -> get_scalar_field_range --- .../pyvista/pyvista_windows_manager.py | 4 ++-- tests/test_post.py | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ansys/fluent/visualization/pyvista/pyvista_windows_manager.py b/src/ansys/fluent/visualization/pyvista/pyvista_windows_manager.py index 9e6677c9..7ba16c14 100644 --- a/src/ansys/fluent/visualization/pyvista/pyvista_windows_manager.py +++ b/src/ansys/fluent/visualization/pyvista/pyvista_windows_manager.py @@ -213,7 +213,7 @@ def _display_vector(self, obj, plotter: Union[BackgroundPlotter, pv.Plotter]): else: auto_range_on = obj.range.auto_range_on if auto_range_on.global_range(): - range = field_info.get_scalar_fields_range(obj.field(), False) + range = field_info.get_scalar_field_range(obj.field(), False) else: range = [np.min(scalar_field), np.max(scalar_field)] @@ -360,7 +360,7 @@ def _display_contour(self, obj, plotter: Union[BackgroundPlotter, pv.Plotter]): field_info = obj._api_helper.field_info() plotter.add_mesh( mesh, - clim=field_info.get_scalar_fields_range(obj.field(), False), + clim=field_info.get_scalar_field_range(obj.field(), False), scalars=field, show_edges=obj.show_edges(), scalar_bar_args=scalar_bar_args, diff --git a/tests/test_post.py b/tests/test_post.py index 813607c8..bb098063 100644 --- a/tests/test_post.py +++ b/tests/test_post.py @@ -135,7 +135,7 @@ class MockFieldInfo: def __init__(self, solver_data): self._session_data = solver_data - def get_scalar_fields_range( + def get_scalar_field_range( self, field: str, node_value: bool = False, surface_ids: List[int] = [] ) -> List[float]: if not surface_ids: @@ -328,7 +328,7 @@ def test_contour_object(): if k in contour1.surfaces_list() ] - range = field_info.get_scalar_fields_range( + range = field_info.get_scalar_field_range( contour1.field(), contour1.node_values(), surfaces_id ) assert range[0] == pytest.approx(contour1.range.auto_range_off.minimum()) @@ -336,7 +336,7 @@ def test_contour_object(): # Range should adjust to min/max of cell field values. contour1.node_values = False - range = field_info.get_scalar_fields_range( + range = field_info.get_scalar_field_range( contour1.field(), contour1.node_values(), surfaces_id ) assert range[0] == pytest.approx(contour1.range.auto_range_off.minimum()) @@ -344,7 +344,7 @@ def test_contour_object(): # Range should adjust to min/max of node field values contour1.field = "pressure" - range = field_info.get_scalar_fields_range( + range = field_info.get_scalar_field_range( contour1.field(), contour1.node_values(), surfaces_id ) assert range[0] == pytest.approx(contour1.range.auto_range_off.minimum()) @@ -381,7 +381,7 @@ def test_vector_object(): if k in vector1.surfaces_list() ] - range = field_info.get_scalar_fields_range("velocity-magnitude", False) + range = field_info.get_scalar_field_range("velocity-magnitude", False) assert range == pytest.approx( [ vector1.range.auto_range_off.minimum(), @@ -419,7 +419,7 @@ def test_surface_object(): # Iso surface value should automatically update upon change in field. iso_surf.field = "temperature" - range = field_info.get_scalar_fields_range(iso_surf.field(), True) + range = field_info.get_scalar_field_range(iso_surf.field(), True) assert (range[0] + range[1]) / 2.0 == pytest.approx(iso_surf.iso_value()) # Setting out of range should throw exception @@ -431,7 +431,7 @@ def test_surface_object(): # Iso surface value should automatically update upon change in field. iso_surf.field = "pressure" - range = field_info.get_scalar_fields_range(iso_surf.field(), True) + range = field_info.get_scalar_field_range(iso_surf.field(), True) assert (range[0] + range[1]) / 2.0 == pytest.approx(iso_surf.iso_value()) # New surface should be in allowed values for graphics. From bd8392f8c381a316651ba16ec005cb38fad1fb2f Mon Sep 17 00:00:00 2001 From: Prithwish Mukherjee Date: Mon, 3 Jul 2023 17:16:22 +0530 Subject: [PATCH 2/3] Remove import of pyfluent. --- doc/source/conf.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 6059b1e9..0dc43b34 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -5,7 +5,6 @@ import subprocess import sys -import ansys.fluent.core as pyfluent from ansys_sphinx_theme import ansys_favicon, get_version_match, pyansys_logo_black import numpy as np import pyvista @@ -29,7 +28,6 @@ # necessary when building the sphinx gallery pyvista.BUILDING_GALLERY = True -pyfluent.BUILDING_GALLERY = True # -- Project information ----------------------------------------------------- From 66da32da7281dfbe33ecae69a2f7fdd4ca11011a Mon Sep 17 00:00:00 2001 From: Prithwish Mukherjee Date: Mon, 3 Jul 2023 17:24:41 +0530 Subject: [PATCH 3/3] Revert --- doc/source/conf.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/source/conf.py b/doc/source/conf.py index 0dc43b34..6059b1e9 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -5,6 +5,7 @@ import subprocess import sys +import ansys.fluent.core as pyfluent from ansys_sphinx_theme import ansys_favicon, get_version_match, pyansys_logo_black import numpy as np import pyvista @@ -28,6 +29,7 @@ # necessary when building the sphinx gallery pyvista.BUILDING_GALLERY = True +pyfluent.BUILDING_GALLERY = True # -- Project information -----------------------------------------------------