additional fixes for *SMAT

Author: akaszynski

docs/loading_km.rst

@@ -1,15 +1,29 @@
 Working with a ANSYS Full File (full)
 =====================================
-The ANSYS full file is a FORTRAN formatted binary file containing the mass and stiffness from an ANSYS analysis.  Using pyansys it can be loaded into memory as either a sparse or full matrix.
+The ANSYS full file is a FORTRAN formatted binary file containing the
+mass and stiffness from an ANSYS analysis.  Using pyansys it can be
+loaded into memory as either a sparse or full matrix.
 
 
 Reading a Full File
 -------------------
-This example reads in the mass and stiffness matrices associated with the above example.  ``load_km`` sorts degrees of freedom such that the nodes are ordered from minimum to maximum, and each degree of freedom (i.e. X, Y, Z), are sorted within each node.  The matrices ``k`` and ``m`` are sparse by default, but if ``scipy`` is not installed, or if the optional parameter ``as_sparse=False`` then they will be full numpy arrays.
-
-By default ``load_km`` outputs the upper triangle of both matrices.  The constrained nodes of the analysis can be identified by accessing ``fobj.const`` where the constrained degrees of freedom are True and all others are False.  This corresponds to the degrees of reference in ``dof_ref``.
-
-By default dof_ref is unsorted.  To sort these values, set ``sort==True``.  It is enabled for this example to allow for plotting of the values later on.
+This example reads in the mass and stiffness matrices associated with
+the above example.  ``load_km`` sorts degrees of freedom such that the
+nodes are ordered from minimum to maximum, and each degree of freedom
+(i.e. X, Y, Z), are sorted within each node.  The matrices ``k`` and
+``m`` are sparse by default, but if ``scipy`` is not installed, or if
+the optional parameter ``as_sparse=False`` then they will be full
+numpy arrays.
+
+By default ``load_km`` outputs the upper triangle of both matrices.
+The constrained nodes of the analysis can be identified by accessing
+``fobj.const`` where the constrained degrees of freedom are True and
+all others are False.  This corresponds to the degrees of reference in
+``dof_ref``.
+
+By default dof_ref is unsorted.  To sort these values, set
+``sort==True``.  It is enabled for this example to allow for plotting
+of the values later on.
 
 .. code:: python
 
@@ -22,14 +36,16 @@ By default dof_ref is unsorted.  To sort these values, set ``sort==True``.  It i
     dof_ref, k, m = full.load_km(sort=True)
 
 
-ANSYS only stores the upper triangular matrix in the full file.  To make the full matrix:
+ANSYS only stores the upper triangular matrix in the full file.  To
+make the full matrix:
 
 .. code:: python
 
     k += sparse.triu(k, 1).T
     m += sparse.triu(m, 1).T
 
-If you have ``scipy`` installed, you can solve solve for the natural frequencies and mode shapes of a system.  
+If you have ``scipy`` installed, you can solve solve for the natural
+frequencies and mode shapes of a system.
 
 .. code:: python
 

docs/mapdl/conversion.rst

@@ -47,3 +47,8 @@ some commands require and will break the CORBA server connection.
 Also note that APDL macros that use ``*CREATE`` have been replaced
 with a python function.  This will make the code easier to debug
 should it be necessary to insert a break point in the code.
+
+
+Convert Script Description
+--------------------------
+.. autofunction:: pyansys.convert.convert_script

pyansys/errors.py

@@ -7,6 +7,12 @@
 
 """
 
+class VersionError(ValueError):
+    """Raised when MAPDL is the wrong version"""
+
+    def __init__(self, msg='Invalid MAPDL version'):
+        ValueError.__init__(self, msg)
+
 class MapdlRuntimeError(RuntimeError):
     """Raised when MAPDL passes an error"""
     pass

pyansys/launcher.py

@@ -12,7 +12,7 @@
 import pexpect
 
 from pyansys.misc import is_float, random_string
-from pyansys.errors import LockFileException
+from pyansys.errors import LockFileException, VersionError
 
 # settings directory
 SETTINGS_DIR = appdirs.user_data_dir('pyansys')
@@ -663,7 +663,7 @@ def check_mode(mode, version):
 
         if mode == 'corba':
             if version < 170:
-                raise ValueError('CORBA AAS mode requires MAPDL v17.0 or newer.')
+                raise VersionError('CORBA AAS mode requires MAPDL v17.0 or newer.')
             # elif version > 20.1 and os.name == 'nt':
             #     raise ValueError('CORBA AAS mode on Windows requires MAPDL 2020R1'
             #                      ' or earlier.')
@@ -679,7 +679,7 @@ def check_mode(mode, version):
             mode = 'corba'
         else:
             if os.name == 'nt':
-                raise RuntimeError('Running MAPDL as a service requires '
+                raise VersionError('Running MAPDL as a service requires '
                                    'v17.0 or greater on Windows.')
             mode = 'console'
 

pyansys/mapdl.py

@@ -335,11 +335,6 @@ def mesh(self):
         """
         return self._mesh
 
-    # @property
-    # def _mesh(self):  # pragma: no cover
-    #     """Implemented by child class"""
-    #     raise NotImplementedError('Implemented by child class')
-
     @property
     @supress_logging
     def _mesh(self):

pyansys/mapdl_functions.py

@@ -45355,9 +45355,6 @@ def hbmat(self, fname="", ext="", form="", matrx="", rhs="", mapping="",
         ext
             Filename extension (eight-character maximum).
 
-        --
-            Unused field.
-
         form
             Specifies format of output matrix file:
 
@@ -45459,7 +45456,7 @@ def hbmat(self, fname="", ext="", form="", matrx="", rhs="", mapping="",
         cannot be mapped directly to a node number or particular degree of
         freedom.
         """
-        command = "HBMAT,%s,%s,%s,%s,%s,%s" % (str(fname), str(ext), str(form), str(matrx), str(rhs), str(mapping))
+        command = "HBMAT,%s,%s,,%s,%s,%s,%s" % (str(fname), str(ext), str(form), str(matrx), str(rhs), str(mapping))
         return self.run(command, **kwargs)
 
     def sfdele(self, nlist="", lab="", **kwargs):
@@ -59806,7 +59803,7 @@ def edhgls(self, hgco="", **kwargs):
         command = "EDHGLS,%s" % (str(hgco))
         return self.run(command, **kwargs)
 
-    def smat(self, matrix="", type="", method="", val1="", val2="", val3="",
+    def smat(self, matrix="", type="", method="", val1="", val2="", val3="", val4="",
              **kwargs):
         """APDL Command: *SMAT
 
@@ -59827,9 +59824,10 @@ def smat(self, matrix="", type="", method="", val1="", val2="", val3="",
 
             Copy an existing matrix. - Import the matrix from a file.
 
-        val1, val2, val3
-            Additional input. The meaning of Val1 through Val3 will vary
-            depending on the specified Method. See details below.
+        val1, val2, val3, val4
+            Additional input. The meaning of Val1 through Val3 will
+            vary depending on the specified Method. See in your ansys
+            documentation.
 
         Notes
         -----
@@ -59845,7 +59843,7 @@ def smat(self, matrix="", type="", method="", val1="", val2="", val3="",
         For more information about .FULL file contents, see the HBMAT in the
         Command Reference.
         """
-        command = "*SMAT,%s,%s,%s,%s,%s,%s" % (str(matrix), str(type), str(method), str(val1), str(val2), str(val3))
+        command = "*SMAT,%s,%s,%s,%s,%s,%s,%s" % (str(matrix), str(type), str(method), str(val1), str(val2), str(val3), str(val4))
         return self.run(command, **kwargs)
 
     def hpgl(self, kywrd="", opt1="", opt2="", **kwargs):