Lisandro Dalcin avatar Lisandro Dalcin committed edbf2af

Update after {Vec|Mat}Type change in petsc-dev

Comments (0)

Files changed (4)

 #define __FUNCT__ "IGASetVecType"
 PetscErrorCode IGASetVecType(IGA iga,const VecType vectype)
 {
-  VecType        vtype;
+  char           *vtype;
   PetscErrorCode ierr;
   PetscFunctionBegin;
   PetscValidHeaderSpecific(iga,IGA_CLASSID,1);
 #define __FUNCT__ "IGASetMatType"
 PetscErrorCode IGASetMatType(IGA iga,const MatType mattype)
 {
-  MatType        mtype;
+  char           *mtype;
   PetscErrorCode ierr;
   PetscFunctionBegin;
   PetscValidHeaderSpecific(iga,IGA_CLASSID,1);
   PetscInt       maxnnz;
   PetscInt       n,N,bs;
   LGMap          ltog,ltogb;
-  const MatType  mtype;
+  MatType        mtype;
   Mat            A;
   PetscErrorCode ierr;
   PetscFunctionBegin;
 #endif
 #include "petigapc.h"
 
+#if PETSC_VERSION_(3,3,0) || PETSC_VERSION_(3,2,0)
+#undef MatType
+typedef const char* MatType;
+#endif         
+
 typedef struct {
   PetscInt dim,dof;
   PetscInt overlap[3];
   MPI_Comm       comm = ((PetscObject)A)->comm;
   PetscBool      aij,baij,sbaij;
   PetscInt       m,n,M,N,bs;
-  const MatType  mtype;
+  MatType        mtype;
   Mat            mat;
   PetscErrorCode ierr;
   PetscFunctionBegin;
 #endif
 #include "petigapc.h"
 
+#if PETSC_VERSION_(3,3,0) || PETSC_VERSION_(3,2,0)
+#undef MatType
+typedef const char* MatType;
+#endif         
+
 typedef struct {
   Mat mat;
 } PC_EBE;
         if (done) {
           PetscInt m,n,M,N,bs;
           PetscInt j,cstart,*newja;
-          const MatType mtype;
+          MatType mtype;
           ierr = MatGetType(A,&mtype);CHKERRQ(ierr);
           ierr = MatGetSize(A,&M,&N);CHKERRQ(ierr);
           ierr = MatGetLocalSize(A,&m,&n);CHKERRQ(ierr);
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.