Changeset 12729

Timestamp:

07/24/12 16:38:58 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added support for PETSC 3.3

Location:

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

Files:

• MatPartition.cpp (modified) (2 diffs)
• 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_
+                        #if _PETSC_MAJOR_ == 3 && _PETSC_MINOR_ > 2
                         MatCreateAIJ(MPI_COMM_WORLD,PETSC_DETERMINE,PETSC_DETERMINE, 0,0,d_nz,PETSC_NULL,o_nz,PETSC_NULL,&outmatrix);
                         #else
@@ -55 +55 @@
                 }
                 else if (strcmp(type,"mpidense")==0){
-                        #ifdef _HAVE_PETSCDEV_
+                        #if _PETSC_MAJOR_ == 3 && _PETSC_MINOR_ > 2
                         MatCreateDense(MPI_COMM_WORLD,PETSC_DETERMINE,PETSC_DETERMINE, 0,0,PETSC_NULL,&outmatrix);
                         #else

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_
+        #if _PETSC_MAJOR_ == 3 && _PETSC_MINOR_ > 2
         MatCreateAIJ(MPI_COMM_WORLD,m,n,M,N,d_nz,NULL,o_nz,NULL,&outmatrix); 
         #else
@@ -67 +67 @@
         o_nz=(int)((double)nnz/(double)M/2.0); //number of non zeros per row/2
 
-        #ifdef _HAVE_PETSCDEV_
+        #if _PETSC_MAJOR_ == 3 && _PETSC_MINOR_ > 2
         if(sparsity==1){
                 MatCreateDense(MPI_COMM_WORLD,m,n,M,N,NULL,&outmatrix); 

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

@@ -90 +90 @@
         }
 
-#ifdef _HAVE_PETSCDEV_
+#if _PETSC_MAJOR_ == 3 && _PETSC_MINOR_ > 2
         PetscTokenDestroy(&token);
 #else