petsc error messages and debugging, petscSolver with more consistent interface...

petsc error messages and debugging, petscSolver with more consistent interface compared to sequentiell solvers

AMDiS/src/Global.cc

@@ -20,7 +20,9 @@
 #include "Line.h"
 #include "Triangle.h"
 #include "Tetrahedron.h"
-
+#ifdef HAVE_PARALLEL_DOMAIN_AMDIS
+#include "petsc.h"
+#endif
 namespace AMDiS {
 
   const char *funcName = NULL;
@@ -176,8 +178,11 @@ namespace AMDiS {
     vsprintf(buff, format, arg);
     PRINT_LINE((*error), buff);
     va_end(arg);
-
+#ifdef HAVE_PARALLEL_DOMAIN_AMDIS
+    PetscError(MPI_COMM_WORLD, __LINE__, "Msg::print_error_exit", "Global.cc", "src/", 1, PETSC_ERROR_INITIAL, buff);
+#else
     throw std::runtime_error(buff);
+#endif
     exit(1);
   }
 

AMDiS/src/OEMSolver.h

@@ -102,7 +102,7 @@ namespace AMDiS {
       return -1;
     }
 
-    inline int solveSystem(const SolverMatrix<Matrix<DOFMatrix*> >& A,
+    virtual int solveSystem(const SolverMatrix<Matrix<DOFMatrix*> >& A,
 			   SystemVector& x,
 			   SystemVector& b,
 			   bool createMatrixData,

AMDiS/src/parallel/PetscProblemStat.cc

@@ -28,7 +28,8 @@ namespace AMDiS {
   PetscProblemStat::PetscProblemStat(string nameStr,
 				     ProblemIterationInterface *problemIteration)
     : ParallelProblemStatBase(nameStr, problemIteration),
-      deleteSolver(true)
+      deleteSolver(true),
+      petscSolver(NULL)
   {
     FUNCNAME("PetscProblemStat::PetscProblemStat()");
 
@@ -48,7 +49,7 @@ namespace AMDiS {
 				    Flag adoptFlag)
   {
     ParallelProblemStatBase::initialize(initFlag, adoptProblem, adoptFlag);
-    
+    TEST_EXIT(petscSolver != NULL)("petsc parallelization does not work without petsc solver\n");
     string tmp("");
     Parameters::get(getName() + "->solver->petsc prefix", tmp);
     petscSolver->setKspPrefix(tmp);    

AMDiS/src/parallel/PetscSolver.cc

@@ -89,6 +89,32 @@ namespace AMDiS {
     }
   }
 
+ int PetscSolver::solveSystem(const SolverMatrix<Matrix<DOFMatrix*> >& A,
+			   SystemVector& x,
+			   SystemVector& b,
+			   bool createMatrixData,
+			   bool storeMatrixData)
+ {
+	 MPI::COMM_WORLD.Barrier();
+	 double wtime = MPI::Wtime();
+
+	 if (createMatrixData)
+		 fillPetscMatrix(const_cast< Matrix< DOFMatrix* >* >(A.getOriginalMat()));
+
+	 fillPetscRhs(&b);
+
+	 INFO(info, 8)("creation of parallel data structures needed %.5f seconds\n", 
+			 MPI::Wtime() - wtime);
+	 wtime = MPI::Wtime();
+
+	 solvePetscMatrix(x, NULL);
+
+	 INFO(info, 8)("solution of discrete system needed %.5f seconds\n", 
+			 MPI::Wtime() - wtime);
+
+	 destroyVectorData();
+	 return 0;
+ }
 
   void PetscSolver::fillPetscMatrix(DOFMatrix* mat)
   {

AMDiS/src/parallel/PetscSolver.h

@@ -58,6 +58,13 @@ namespace AMDiS {
 	      vector<const FiniteElemSpace*> &feSpaces,
 	      bool createGlobalMapping = true);
 
+    ///consistent interface to sequentiel solvers
+    int solveSystem(const SolverMatrix<Matrix<DOFMatrix*> >& A,
+			   SystemVector& x,
+			   SystemVector& b,
+			   bool createMatrixData,
+			   bool storeMatrixData);
+
     /** \brief
      * Create a PETSc matrix. The given DOF matrices are used to create the nnz 
      * structure of the PETSc matrix and the values are transfered to it.