Changeset 2060

Timestamp:

09/01/09 14:11:25 (15 years ago)

Author:

Eric.Larour

Message:

Reverting to petsc 2

Location:

issm/trunk/src/c/Solverx

Files:

• Solverx.cpp (modified) (3 diffs)
• Solverx.cpp.petsc2 (added)
• Solverx.cpp.petsc3 (added)

issm/trunk/src/c/Solverx/Solverx.cpp

@@ -20 +20 @@
         /*Solver*/
         KSP ksp=NULL;
-        PC  pc=NULL;
         int iteration_number;
         PetscTruth flag;
@@ -40 +39 @@
         PetscOptionsDetermineSolverType(&solver_type,solver_string);
 
-        /*obsolete? : */
-//      if (solver_type==MUMPSPACKAGE_LU){
-//              /*Convert Kff to MATTAIJMUMPS: */
-//              MatConvert(Kff,MATAIJMUMPS,MAT_REUSE_MATRIX,&Kff);
-//      }
-//      if (solver_type==MUMPSPACKAGE_CHOL){
-//              /*Convert Kff to MATTSBAIJMUMPS: */
-//              MatConvert(Kff,MATSBAIJMUMPS,MAT_REUSE_MATRIX,&Kff);
-//      }
-//      if (solver_type==SPOOLESPACKAGE_LU){
-//              /*Convert Kff to MATTSBAIJMUMPS: */
-//              MatConvert(Kff,MATAIJSPOOLES,MAT_REUSE_MATRIX,&Kff);
-//      }
-//      if (solver_type==SPOOLESPACKAGE_CHOL){
-//              /*Convert Kff to MATTSBAIJMUMPS: */
-//              MatConvert(Kff,MATSBAIJSPOOLES,MAT_REUSE_MATRIX,&Kff);
-//      }
-//      if (solver_type==SUPERLUDISTPACKAGE){
-//              /*Convert Kff to MATTSBAIJMUMPS: */
-//              MatConvert(Kff,MATSUPERLU_DIST,MAT_REUSE_MATRIX,&Kff);
-//      }
-//
+        if (solver_type==MUMPSPACKAGE_LU){
+                /*Convert Kff to MATTAIJMUMPS: */
+                MatConvert(Kff,MATAIJMUMPS,MAT_REUSE_MATRIX,&Kff);
+        }
+        if (solver_type==MUMPSPACKAGE_CHOL){
+                /*Convert Kff to MATTSBAIJMUMPS: */
+                MatConvert(Kff,MATSBAIJMUMPS,MAT_REUSE_MATRIX,&Kff);
+        }
+        if (solver_type==SPOOLESPACKAGE_LU){
+                /*Convert Kff to MATTSBAIJMUMPS: */
+                MatConvert(Kff,MATAIJSPOOLES,MAT_REUSE_MATRIX,&Kff);
+        }
+        if (solver_type==SPOOLESPACKAGE_CHOL){
+                /*Convert Kff to MATTSBAIJMUMPS: */
+                MatConvert(Kff,MATSBAIJSPOOLES,MAT_REUSE_MATRIX,&Kff);
+        }
+        if (solver_type==SUPERLUDISTPACKAGE){
+                /*Convert Kff to MATTSBAIJMUMPS: */
+                MatConvert(Kff,MATSUPERLU_DIST,MAT_REUSE_MATRIX,&Kff);
+        }
+
 
         /*Prepare solver*/
@@ -67 +65 @@
         KSPSetOperators(ksp,Kff,Kff,DIFFERENT_NONZERO_PATTERN);
         KSPSetFromOptions(ksp);
-
-        /*specific solver?: */
-        KSPGetPC(ksp,&pc);
-        if (solver_type==MUMPSPACKAGE_LU){
-                PCFactorSetMatSolverPackage(pc,MAT_SOLVER_MUMPS);
-        }
 
         /*If initial guess for solution, use it, except if we are using the MUMPS direct solver, where any initial