Merge branch 'main' into release/0.52

Author: akaszynski

ansys/mapdl/reader/cyclic_reader.py

@@ -515,8 +515,15 @@ def _get_full_result(
 
         # full result may or may not contain the duplicate sector
         if self._has_duplicate_sector:
-            result = full_result[self._mas_ind]
-            nnum = nnum[self._mas_ind]
+            if nnum.size < self._mas_ind.size:
+                # node numbers of the master sector
+                nnum_mas = self._neqv[self._mas_ind]
+                mask = np.in1d(nnum, nnum_mas)
+                nnum = nnum[mask]
+                result = full_result[mask]
+            else:
+                result = full_result[self._mas_ind]
+                nnum = nnum[self._mas_ind]
         else:
             result = full_result
 
@@ -1181,7 +1188,6 @@ def plot_nodal_solution(
         >>> result.plot_nodal_solution(0)
 
         """
-
         # Load result from file
         if not full_rotor:
             return super().plot_nodal_solution(
@@ -1203,17 +1209,17 @@ def plot_nodal_solution(
         label = "Cyclic Rotor\nDisplacement"
         if comp == "x":
             scalars = result[:, :, 0]
-            title = "X {:s}\n".format(label)
+            title = f"X {label}\n"
         elif comp == "y":
             scalars = result[:, :, 1]
-            title = "Y {:s}\n".format(label)
+            title = f"Y {label}\n"
         elif comp == "z":
             scalars = result[:, :, 2]
-            title = "Z {:s}\n".format(label)
+            title = f"Z {label}\n"
         else:
             # Normalize displacement
-            scalars = (result * result).sum(2) ** 0.5
-            title = "Normalized\n%s\n" % label
+            scalars = np.linalg.norm(result, axis=-1)
+            title = f"Normalized\n{label}\n"
 
         kwargs.setdefault("scalar_bar_args", {"title": title})
         kwargs["node_components"] = node_components

ansys/mapdl/reader/rst.py

@@ -60,8 +60,8 @@ def access_bit(data, num):
 
 
 EMAIL_ME = """Please raise an issue at:
+
 https://github.com/pyansys/pymapdl-reader/issues
-Or email the PyAnsys support team at pyansys.support@ansys.com
 """
 np.seterr(divide="ignore", invalid="ignore")
 
@@ -151,7 +151,6 @@ def __init__(self, filename, read_mesh=True, parse_vtk=True, **kwargs):
         self._sidx_elem = np.argsort(self._resultheader["eeqv"])
 
         # Store node numbering in ANSYS
-        self._neqv = self._resultheader["neqv"]
         self._eeqv = self._resultheader["eeqv"]  # unsorted
 
         # cache geometry header
@@ -1460,8 +1459,7 @@ def nodal_acceleration(self, rnum, in_nodal_coord_sys=False):
     def _nodal_solution_result(
         self, rnum, solution_type, in_nodal_coord_sys=False, nodes=None
     ):
-        """Returns the DOF solution for each node in the global
-        cartesian coordinate system or nodal coordinate system.
+        """Return the DOF solution for each node in the global coordinate system.
 
         Parameters
         ----------
@@ -1509,8 +1507,7 @@ def _nodal_solution_result(
         # check if nodal solution exists
         if not self.available_results[solution_type]:
             raise AttributeError(
-                'Result file is missing "%s"'
-                % self.available_results.description[solution_type]
+                f'Result file is missing "{self.available_results.description[solution_type]}"'
             )
 
         # result pointer
@@ -1560,14 +1557,20 @@ def _nodal_solution_result(
             new_sidx = np.argsort(unsort_nnum)
             nnum = unsort_nnum[new_sidx]
             result = result[new_sidx]
+
+            # Convert result to the global coordinate system
+            if not in_nodal_coord_sys:
+                euler_angles = self._mesh.node_angles[new_sidx].T
+                rotate_to_global(result, euler_angles)
+
         else:
             nnum = self._neqv[self._sidx]
             result = result.take(self._sidx, 0)
 
-        # Convert result to the global coordinate system
-        if not in_nodal_coord_sys:
-            euler_angles = self._mesh.node_angles[self._insolution].T
-            rotate_to_global(result, euler_angles)
+            # Convert result to the global coordinate system
+            if not in_nodal_coord_sys:
+                euler_angles = self._mesh.node_angles[self._insolution].T
+                rotate_to_global(result, euler_angles)
 
         # check for invalid values (mapdl writes invalid values as 2*100)
         result[result == 2**100] = 0
@@ -3757,7 +3760,8 @@ def _nodal_result(self, rnum, result_type, nnum_of_interest=None):
             # replace values in nodstr
             is_solid = elements.SOLID_ELEMENTS[self.mesh.ekey[:, 1]]
             is_solid += self.mesh.ekey[:, 1] == 41  # must include SHELL41
-            nodstr[1:][is_solid] = self._nodfor[1:][is_solid]
+            ind = self.mesh.ekey[:, 0]
+            nodstr[ind][is_solid] = self._nodfor[ind][is_solid]
 
         # call cython to extract and assemble the data
         cells, offset = vtk_cell_info(grid)
@@ -3924,6 +3928,11 @@ def nodal_reaction_forces(self, rnum):
         nnum = self._resultheader["neqv"][idx]
         return rforces, nnum, dof
 
+    @property
+    def _neqv(self):
+        """Return the nodal equivalence array."""
+        return self._resultheader["neqv"]
+
     def plot_element_result(
         self, rnum, result_type, item_index, in_element_coord_sys=False, **kwargs
     ):

requirements/requirements_docs.txt

@@ -1,9 +1,9 @@
 Sphinx<6
-ansys-sphinx-theme==0.8.2
+ansys-sphinx-theme==0.9.5
 notfound==1.0.2
 pypandoc==1.10
-pyvista==0.38.1
+pyvista==0.38.3
 sphinx-copybutton==0.5.1
 sphinx-gallery==0.11.1
 sphinx-notfound-page==0.8.3
-vtk==9.2.5
+vtk==9.2.6

setup.py

@@ -27,6 +27,10 @@
     description="Pythonic interface to files generated by MAPDL",
     long_description=open("README.rst").read(),
     long_description_content_type="text/x-rst",
+    author="Ansys, Inc.",
+    author_email="pyansys.maintainers@ansys.com",
+    maintainer="PyAnsys developers",
+    maintainer_email="pyansys.maintainers@ansys.com",
     license="MIT",
     classifiers=[
         "Development Status :: 4 - Beta",
@@ -36,11 +40,11 @@
         "Operating System :: Microsoft :: Windows",
         "Operating System :: POSIX",
         "Operating System :: MacOS",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
     ],
     url="https://github.com/pyansys/pymapdl-reader",
     # Build cython modules