Merge 9dbecec into dfd4de3

simpeg · Aug 25, 2016 · 844cf29 · 844cf29
2 parents dfd4de3 + 9dbecec
commit 844cf29
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/pymatsolver/Base.py b/pymatsolver/Base.py
@@ -96,18 +96,8 @@ def is_symmetric(self):
 
     @is_symmetric.setter
     def is_symmetric(self, value):
-        if value is True:
-            self.is_structurally_symmetric = True
         self._is_symmetric = value
 
-    @property
-    def is_structurally_symmetric(self):
-        return getattr(self, '_is_structurally_symmetric', False)
-
-    @is_structurally_symmetric.setter
-    def is_structurally_symmetric(self, value):
-        self._is_structurally_symmetric = value
-
     @property
     def is_hermitian(self):
         if self.is_real and self.is_symmetric:

diff --git a/pymatsolver/Pardiso/__init__.py b/pymatsolver/Pardiso/__init__.py
@@ -27,11 +27,12 @@ class PardisoSolver(BaseSolver):
 
     def __init__(self, A, **kwargs):
         if not A.has_sorted_indices:
+            A = A.tocsr()
             A.sort_indices()
         self.A = A
         self.setKwargs(**kwargs)
         self.solver = _pardisoSolver(
-            A.tocsc(),
+            A,
             mtype=self._martixType()
         )
 
@@ -62,8 +63,6 @@ def _martixType(self):
                     return 2
                 else:
                     return -2
-            elif self.is_structurally_symmetric:
-                return 1
             else:
                 return 11
         else:
@@ -74,8 +73,6 @@ def _martixType(self):
                     return 4
                 else:
                     return -4
-            elif self.is_structurally_symmetric:
-                return 3
             else:
                 return 13
 

diff --git a/pymatsolver/Tests/test_Pardiso.py b/pymatsolver/Tests/test_Pardiso.py
@@ -89,6 +89,7 @@ def test(self):
         rhs = self.rhs
         Ainv = PardisoSolver(self.A, check_accuracy=True)
         sol = Ainv * rhs
+        sol = Ainv * rhs.real
 
 
 class TestPardisoComplex(unittest.TestCase):