[cig-commits] r20259 - short/3D/PyLith/branches/v1.7-trunk/pylith/problems

[brad at geodynamics.org]

Author: brad
Date: 2012-05-31 18:04:56 -0700 (Thu, 31 May 2012)
New Revision: 20259

Modified:
   short/3D/PyLith/branches/v1.7-trunk/pylith/problems/Formulation.py
   short/3D/PyLith/branches/v1.7-trunk/pylith/problems/Solver.py
Log:
Use aijcusp and cusp matrix and vector types.

Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/problems/Formulation.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/problems/Formulation.py	2012-06-01 01:04:30 UTC (rev 20258)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/problems/Formulation.py	2012-06-01 01:04:56 UTC (rev 20259)
@@ -90,9 +90,11 @@
 
     import pyre.inventory
 
+    # WARNING: This setting is not yet functional!!!!!!!!!
     useCUDA = pyre.inventory.bool("use_cuda", default=False,
                                   validator=validateUseCUDA)
     useCUDA.meta['tip'] = "Enable use of CUDA for finite-element integrations."
+    
 
     matrixType = pyre.inventory.str("matrix_type", default="unknown")
     matrixType.meta['tip'] = "Type of PETSc sparse matrix."
@@ -366,7 +368,7 @@
         self.matrixType = matrixMap[self.matrixType]
     self.blockMatrixOkay = True
     if self.matrixType == "unknown" and self.solver.useCUDA:
-      self.matrixType = "mpiaijcusp"
+      self.matrixType = "aijcusp"
     for constraint in self.constraints:
       numDimConstrained = constraint.numDimConstrained()
       if numDimConstrained > 0 and self.mesh.dimension() != numDimConstrained:

Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/problems/Solver.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/problems/Solver.py	2012-06-01 01:04:30 UTC (rev 20258)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/problems/Solver.py	2012-06-01 01:04:56 UTC (rev 20259)
@@ -80,7 +80,7 @@
       # Set vec_type for CUDA, if it has not already been set.
       from pylith.utils.petsc import optionsSetValue, optionsHasName
       if not optionsHasName("-vec_type"):
-        optionsSetValue("-vec_type", "mpicusp")
+        optionsSetValue("-vec_type", "cusp")
     return