Merge branch 'main' into release/0.52

Author: akaszynski

.github/workflows/testing-and-deployment.yml

@@ -275,7 +275,6 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           files: |
-            ./**/*.tar.gz
             ./**/*.whl
             ./**/*.zip
             ./**/*.pdf

.gitignore

@@ -8,6 +8,10 @@
 *.o
 *.cache
 
+# virtual environment
+venv/
+.venv/
+
 # OS generated files #
 ######################
 .fuse_hidden*
@@ -65,4 +69,7 @@ examples/.local
 .ipynb_checkpoints/
 
 # docker
-docker/mapdl/v211
+docker/mapdl/v211
+
+# Visual studio code local settings
+.vscode/

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos:
 - repo: https://github.com/psf/black
-  rev: 22.12.0
+  rev: 23.1.0
   hooks:
   - id: black
 
 - repo: https://github.com/pycqa/isort
-  rev: 5.11.4
+  rev: 5.12.0
   hooks:
   - id: isort
     args: [
@@ -40,6 +40,6 @@ repos:
 
 # this validates our github workflow files
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.20.0
+  rev: 0.21.0
   hooks:
     - id: check-github-workflows

ansys/mapdl/reader/archive.py

@@ -642,7 +642,6 @@ def save_as_archive(
 
     if include_components:
         with open(filename, "a") as fid:
-
             # write node components
             for node_key in grid.point_data:
                 arr = grid.point_data[node_key]

ansys/mapdl/reader/common.py

@@ -309,10 +309,8 @@ def two_ints_to_long(intl, inth):
 def read_standard_header(filename):
     """Reads standard header"""
     with open(filename, "rb") as f:
-
         endian = "<"
         if np.fromfile(f, dtype="<i", count=1) != 100:
-
             # Check if big enos
             f.seek(0)
             if np.fromfile(f, dtype=">i", count=1) == 100:

ansys/mapdl/reader/full.py

@@ -428,7 +428,6 @@ def load_km(self, as_sparse=True, sort=False):
 
         # output as a sparse matrix
         if as_sparse:
-
             if kdata is not None:
                 k = coo_matrix((self.neqn,) * 2)
                 k.data = kdata  # data has to be set first

ansys/mapdl/reader/mesh.py

@@ -187,7 +187,6 @@ def _parse_vtk(
 
         if allowable_types is None or 200 in allowable_types:
             for etype_ind, etype in self._ekey:
-
                 # MESH200
                 if etype == 200 and etype_ind in self.key_option:
                     # keyoption 1 contains various cell types

ansys/mapdl/reader/rst.py

@@ -15,6 +15,7 @@
 import numpy as np
 import pyvista as pv
 from pyvista import _vtk as vtk
+from pyvista.themes import DefaultTheme
 from tqdm import tqdm
 
 from ansys.mapdl.reader import _binary_reader, _reader, elements
@@ -60,7 +61,7 @@ def access_bit(data, num):
 
 EMAIL_ME = """Please raise an issue at:
 https://github.com/pyansys/pymapdl-reader/issues
-Or email the developer at alexander.kaszynski@ansys.com
+Or email the PyAnsys support team at pyansys.support@ansys.com
 """
 np.seterr(divide="ignore", invalid="ignore")
 
@@ -3020,7 +3021,8 @@ def _plot_point_scalars(
             plotter.add_axes()
 
         # set background
-        plotter.background_color = kwargs.pop("background", None)
+        theme = DefaultTheme()
+        theme.background = kwargs.pop("background", None)
 
         # remove extra keyword args
         kwargs.pop("node_components", None)
@@ -3034,14 +3036,13 @@ def _plot_point_scalars(
 
         # set scalar bar text colors
         if text_color:
-            text_color = pv.parse_color(text_color)
-            plotter.scalar_bar.GetLabelTextProperty().SetColor(text_color)
-            plotter.scalar_bar.GetAnnotationTextProperty().SetColor(text_color)
-            plotter.scalar_bar.GetTitleTextProperty().SetColor(text_color)
+            theme = DefaultTheme()
+            theme.color = text_color
+            pv.global_theme.load_theme(theme)
 
         # NAN/missing data are white
         # plotter.renderers[0].SetUseDepthPeeling(1)  # <-- for transparency issues
-        plotter.mapper.GetLookupTable().SetNanColor(1, 1, 1, 1)
+        theme.nan_color = [1, 1, 1, 1]
 
         if cpos:
             plotter.camera_position = cpos
@@ -3103,7 +3104,6 @@ def exit_callback(plotter, RenderWindowInteractor, event):
             first_loop = True
             cached_normals = [None for _ in range(n_frames)]
             while self._animating:
-
                 for j, angle in enumerate(np.linspace(0, np.pi * 2, n_frames + 1)[:-1]):
                     mag_adj = np.sin(angle)
                     if scalars is not None:
@@ -3121,12 +3121,8 @@ def exit_callback(plotter, RenderWindowInteractor, event):
                             copied_mesh.point_data["Normals"][:] = cached_normals[j]
 
                     if add_text:
-                        # 2 maps to vtk.vtkCornerAnnotation.UpperLeft
-                        plotter.textActor.SetText(
-                            2,
-                            "%s\nPhase %.1f Degrees"
-                            % (result_text, (angle * 180 / np.pi)),
-                        )
+                        phase = angle * 180 / np.pi
+                        plotter.add_text(f"{result_text} \nPhase {phase} Degrees")
 
                     # at max supported framerate
                     plotter.update(1, force_redraw=True)
@@ -3264,7 +3260,8 @@ def _animate_point_scalars(
             plotter.add_axes()
 
         # set background
-        plotter.background_color = kwargs.pop("background", None)
+        theme = DefaultTheme()
+        theme.background = kwargs.pop("background", None)
 
         # remove extra keyword args
         kwargs.pop("node_components", None)
@@ -3279,14 +3276,12 @@ def _animate_point_scalars(
 
         # set scalar bar text colors
         if text_color:
-            text_color = pv.parse_color(text_color)
-            plotter.scalar_bar.GetLabelTextProperty().SetColor(text_color)
-            plotter.scalar_bar.GetAnnotationTextProperty().SetColor(text_color)
-            plotter.scalar_bar.GetTitleTextProperty().SetColor(text_color)
+            theme.color = text_color
+            pv.global_theme.load_theme(theme)
 
         # NAN/missing data are white
         # plotter.renderers[0].SetUseDepthPeeling(1)  # <-- for transparency issues
-        plotter.mapper.GetLookupTable().SetNanColor(1, 1, 1, 1)
+        theme.nan_color = [1, 1, 1, 1]
 
         if cpos:
             plotter.camera_position = cpos
@@ -3335,8 +3330,7 @@ def q_callback():
                 copied_mesh.active_scalars[:] = data
 
                 if text is not None:
-                    # 2 maps to vtk.vtkCornerAnnotation.UpperLeft
-                    plotter.textActor.SetText(2, text[i])
+                    plotter.add_text(text[i])
 
                 # at max supported framerate
                 plotter.update(1, force_redraw=True)

requirements/requirements_docs.txt

@@ -1,8 +1,8 @@
-Sphinx==6.1.3
-ansys-sphinx-theme==0.8.1
+Sphinx<6
+ansys-sphinx-theme==0.8.2
 notfound==1.0.2
 pypandoc==1.10
-pyvista==0.37.0
+pyvista==0.38.1
 sphinx-copybutton==0.5.1
 sphinx-gallery==0.11.1
 sphinx-notfound-page==0.8.3

requirements/requirements_test.txt

@@ -1,5 +1,5 @@
 ansys-mapdl-core>=0.60.4
-matplotlib
-pytest
-pytest-cov
-scipy
+matplotlib>=3.5.3
+pytest==7.2.1
+pytest-cov==4.0.0
+scipy>=1.7.3