Changeset 16137 for issm/trunk/src/c/toolkits/petsc/objects/PetscSolver.cpp

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/toolkits (modified) (1 prop)
• src/c/toolkits/petsc/objects (modified) (1 prop)
• src/c/toolkits/petsc/objects/PetscSolver.cpp (modified) (4 diffs)

issm/trunk

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

issm/trunk/src/c

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp

issm/trunk/src/c/toolkits/petsc/objects/PetscSolver.cpp

@@ -13 +13 @@
 #include "../../../shared/MemOps/MemOps.h"
 #include "../../../shared/Exceptions/exceptions.h"
-#include "../../../shared/io/Comm/Comm.h"
+#include "../../../shared/io/Comm/IssmComm.h"
 #include "../../../shared/Enum/Enum.h"
 
@@ -52 +52 @@
         #endif
 
-        /*Stokes: */
+        /*FS: */
         IS         isv=NULL;
         IS         isp=NULL;
@@ -118 +118 @@
         }
 
-        /*Stokes: */
-        if (solver_type==StokesSolverEnum){
+        /*FS: */
+        if (solver_type==FSSolverEnum){
                 /*Make indices out of doftypes: */
-                if(!df)_error_("need doftypes for Stokes solver!\n");
-                DofTypesToIndexSet(&isv,&isp,df,StokesSolverEnum);
+                if(!df)_error_("need doftypes for FS solver!\n");
+                DofTypesToIndexSet(&isv,&isp,df,FSSolverEnum);
 
                 /*Set field splits: */
@@ -179 +179 @@
         int      velocity_count=0;
 
-        if(typeenum==StokesSolverEnum){
+        if(typeenum==FSSolverEnum){
 
                 /*Ok, recover doftypes vector values and indices: */

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp