Changeset 11160

Timestamp:

01/19/12 14:55:37 (13 years ago)

Author:

habbalf

Message:

Updated English

File:

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

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

@@ -16 +16 @@
 void    Solverx(Vec* puf, Mat Kff, Vec pf, Vec uf0,Vec df, Parameters* parameters){
 
-        /*output: */
+        /*Output: */
         Vec        uf               = NULL;
 
-        /*intermediary: */
+        /*Intermediary: */
         int        local_m,local_n,global_m,global_n;
         int        analysis_type;
@@ -35 +35 @@
         #endif
 
-        /*stokes: */
+        /*Stokes: */
         IS         isv=NULL;
         IS         isp=NULL;
@@ -52 +52 @@
         #endif
 
-        /*First, check that f-set is not NULL, ie 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);
@@ -60 +60 @@
         /*}}}*/
         /*Initial guess logic here: {{{1*/
-        /*Now, check that we are not getting an initial guess to the solver, if we are running a direct solver: */
+        /*Now, check that we are not giving an initial guess to the solver, if we are running a direct solver: */
         #if _PETSC_MAJOR_ >= 3 
         PetscOptionsGetString(PETSC_NULL,"-ksp_type",ksp_type,49,&flg);
@@ -66 +66 @@
         #endif
 
-        /*If initial guess for solution exists, use it to create uf, otherwise, 
-         * duplicate right hand side so that solution vector has same structure*/
+        /*If initial guess for the solution exists, use it to create uf, otherwise, 
+         * duplicate the right hand side so that the solution vector has the same structure*/
         if(uf0){
                 VecDuplicate(uf0,&uf); VecCopy(uf0,uf);
@@ -75 +75 @@
         }
         /*}}}*/
-        /*Process petsc options to see if we are not using special types of external solvers: {{{1*/
+        /*Process petsc options to see if we are using special types of external solvers: {{{1*/
         PetscOptionsDetermineSolverType(&solver_type);
 
-        /*In serial mode, matrices have been loaded at MPIAIJ or AIJ matrices. 
+        /*In serial mode, the matrices have been loaded as MPIAIJ or AIJ matrices. 
          We need to convert them if we are going to run the solvers successfully: */
         #ifdef _SERIAL_
@@ -114 +114 @@
 
         #if defined(_SERIAL_) && _PETSC_VERSION_==3
-        /*specific solver?: */
+        /*Specific solver?: */
         KSPGetPC(ksp,&pc);
         if (solver_type==MUMPSPACKAGE_LU){
@@ -137 +137 @@
 
         /*}}}*/
-        /*If initial guess for 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: {{{1*/
         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);
                 }
@@ -154 +154 @@
         if (iteration_number<0) _error_("%s%i"," Solver diverged at iteration number: ",-iteration_number);
 
-        /*Free ressources:*/
+        /*Free resources:*/
         KSPFree(&ksp);