Changeset 11910

Timestamp:

04/04/12 14:07:11 (13 years ago)

Author:

habbalf

Message:

Added support for petsc-dev

Location:

issm/trunk-jpl/src/c/toolkits/petsc/patches

Files:

• MatPartition.cpp (modified) (1 diff)
• NewMat.cpp (modified) (2 diffs)
• PetscOptionsInsertMultipleString.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/toolkits/petsc/patches/MatPartition.cpp ¶

@@ -48 +48 @@
                         d_nz=0;
                         o_nz=0;
+                        #ifdef _HAVE_PETSCDEV_
+                        MatCreateAIJ(MPI_COMM_WORLD,PETSC_DETERMINE,PETSC_DETERMINE, 0,0,d_nz,PETSC_NULL,o_nz,PETSC_NULL,&outmatrix);
+                        #else
                         MatCreateMPIAIJ(MPI_COMM_WORLD,PETSC_DETERMINE,PETSC_DETERMINE, 0,0,d_nz,PETSC_NULL,o_nz,PETSC_NULL,&outmatrix);
+                        #endif
                 }
                 else if (strcmp(type,"mpidense")==0){
+                        #ifdef _HAVE_PETSCDEV_
+                        MatCreateDense(MPI_COMM_WORLD,PETSC_DETERMINE,PETSC_DETERMINE, 0,0,PETSC_NULL,&outmatrix);
+                        #else
                         MatCreateMPIDense(MPI_COMM_WORLD,PETSC_DETERMINE,PETSC_DETERMINE, 0,0,PETSC_NULL,&outmatrix);
+                        #endif
                 }
                 /*Assemble*/

issm/trunk-jpl/src/c/toolkits/petsc/patches/NewMat.cpp ¶

@@ -39 +39 @@
         o_nz=(int)((double)nnz/(double)M/2.0); //number of non zeros per row/2
 
+        #ifdef _HAVE_PETSCDEV_
+        MatCreateAIJ(MPI_COMM_WORLD,m,n,M,N,d_nz,NULL,o_nz,NULL,&outmatrix); 
+        #else
         MatCreateMPIAIJ(MPI_COMM_WORLD,m,n,M,N,d_nz,NULL,o_nz,NULL,&outmatrix); 
+        #endif
 
         return outmatrix;
@@ -63 +67 @@
         o_nz=(int)((double)nnz/(double)M/2.0); //number of non zeros per row/2
 
+        #ifdef _HAVE_PETSCDEV_
+        MatCreateAIJ(MPI_COMM_WORLD,m,n,M,N,d_nz,NULL,o_nz,NULL,&outmatrix); 
+        #else
         MatCreateMPIAIJ(MPI_COMM_WORLD,m,n,M,N,d_nz,NULL,o_nz,NULL,&outmatrix); 
+        #endif
 
         return outmatrix;

issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp ¶

@@ -90 +90 @@
         }
 
+#ifdef _HAVE_PETSCDEV_
+        PetscTokenDestroy(&token);
+#else
         PetscTokenDestroy(token);
+#endif
 }