Changeset 12021

Timestamp:

04/17/12 07:07:23 (13 years ago)

Author:

Mathieu Morlighem

Message:

minor, removed folds for easier debugging

File:

• issm/trunk-jpl/src/c/modules/Solverx/SolverxPetsc.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/modules/Solverx/SolverxPetsc.cpp ¶

@@ -43 +43 @@
         #endif
 
-
         /*Display message*/
         _printf_(VerboseModule(),"   Solving\n");
@@ -52 +51 @@
         #endif
 
-        /*First, check that f-set is not NULL, i.e. model is fully constrained: {{{*/
+        /*First, check that f-set is not NULL, i.e. model is fully constrained:*/ 
         _assert_(Kff);
         MatGetSize(Kff,&global_m,&global_n); _assert_(global_m==global_m);
@@ -58 +57 @@
                 *puf=NULL; return;
         }
-        /*}}}*/
-        /*Initial guess logic here: {{{1*/
+
+        /*Initial guess */
         /*Now, check that we are not giving an initial guess to the solver, if we are running a direct solver: */
         #if _PETSC_MAJOR_ >= 3 
@@ -74 +73 @@
                 MatGetLocalSize(Kff,&local_m,&local_n);uf=NewVec(local_n,fromlocalsize);
         }
-        /*}}}*/
-        /*Process petsc options to see if we are using special types of external solvers: {{{1*/
+
+        /*Process petsc options to see if we are using special types of external solvers*/
         PetscOptionsDetermineSolverType(&solver_type);
 
-        /*}}}*/
-        /*Check the solver is available: {{{1*/
+        /*Check the solver is available*/
         if(solver_type==MUMPSPACKAGE_LU || solver_type==MUMPSPACKAGE_CHOL){
-        #if _PETSC_MAJOR_ >=3
-                #ifndef _HAVE_MUMPS_
-                _error_("requested MUMPS solver, which was not compiled into ISSM!\n");
+                #if _PETSC_MAJOR_ >=3
+                        #ifndef _HAVE_MUMPS_
+                        _error_("requested MUMPS solver, which was not compiled into ISSM!\n");
+                        #endif
                 #endif
+        }
 
-        #endif
-        }
-        /*}}}*/
-        /*Prepare solver:{{{1*/
+        /*Prepare solver*/
         KSPCreate(MPI_COMM_WORLD,&ksp);
         KSPSetOperators(ksp,Kff,Kff,DIFFERENT_NONZERO_PATTERN);
@@ -124 +121 @@
         #endif
 
-        /*}}}*/
-        /*If there is an initial guess for the solution, use it, except if we are using the MUMPS direct solver, where any initial guess will crash Petsc: {{{1*/
+        /*If there is an initial guess for the solution, use it
+         * except if we are using the MUMPS direct solver
+         * where any initial guess will crash Petsc*/
         if (uf0){
-                if( (solver_type!=MUMPSPACKAGE_LU) && (solver_type!=MUMPSPACKAGE_CHOL) && (solver_type!=SPOOLESPACKAGE_LU) && (solver_type!=SPOOLESPACKAGE_CHOL) && (solver_type!=SUPERLUDISTPACKAGE)){
+                if((solver_type!=MUMPSPACKAGE_LU) && (solver_type!=MUMPSPACKAGE_CHOL) && (solver_type!=SPOOLESPACKAGE_LU) && (solver_type!=SPOOLESPACKAGE_CHOL) && (solver_type!=SUPERLUDISTPACKAGE)){
                         KSPSetInitialGuessNonzero(ksp,PETSC_TRUE);
                 }
         }
-        /*}}}*/
-        
-        if(VerboseSolver())KSPView(ksp,PETSC_VIEWER_STDOUT_WORLD);
 
         /*Solve: */
+        if(VerboseSolver())KSPView(ksp,PETSC_VIEWER_STDOUT_WORLD);
         KSPSolve(ksp,pf,uf);