Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/ElementVector.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/ElementVector.h (revision 12898) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/ElementVector.h (revision 12899) @@ -15,6 +15,7 @@ #include "../../EnumDefinitions/EnumDefinitions.h" class Node; class Vector; +class Parameters; /*}}}*/ class ElementVector{ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/Vector.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/Vector.cpp (revision 12898) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/Vector.cpp (revision 12899) @@ -24,7 +24,9 @@ /*FUNCTION Vector::Vector(){{{*/ Vector::Vector(){ + #ifdef _HAVE_PETSC_ this->pvector=NULL; + #endif this->svector=NULL; type=PetscVecType; //default @@ -37,7 +39,9 @@ /*FUNCTION Vector::Vector(int M,bool fromlocalsize,int type){{{*/ Vector::Vector(int M,bool fromlocalsize,int in_type){ + #ifdef _HAVE_PETSC_ pvector=NULL; + #endif svector=NULL; type=in_type; @@ -59,7 +63,10 @@ /*FUNCTION Vector::Vector(IssmDouble* serial_vec,int M,int type){{{*/ Vector::Vector(IssmDouble* serial_vec,int M,int in_type){ + #ifdef _HAVE_PETSC_ pvector=NULL; + #endif + svector=NULL; type=in_type; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/ElementMatrix.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/ElementMatrix.h (revision 12898) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/ElementMatrix.h (revision 12899) @@ -15,6 +15,7 @@ #include "../../EnumDefinitions/EnumDefinitions.h" class Node; class Matrix; +class Parameters; /*}}}*/ class ElementMatrix{ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/Matrix.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/Matrix.cpp (revision 12898) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/Matrix.cpp (revision 12899) @@ -25,7 +25,9 @@ /*FUNCTION Matrix::Matrix(){{{*/ Matrix::Matrix(){ + #ifdef _HAVE_PETSC_ pmatrix=NULL; + #endif smatrix=NULL; type=PetscMatType; //default @@ -38,7 +40,9 @@ /*FUNCTION Matrix::Matrix(int M,int N,int type){{{*/ Matrix::Matrix(int M,int N,int in_type){ + #ifdef _HAVE_PETSC_ pmatrix=NULL; + #endif smatrix=NULL; type=in_type; @@ -59,7 +63,9 @@ /*FUNCTION Matrix::Matrix(int M,int N,IssmDouble sparsity,int type){{{*/ Matrix::Matrix(int M,int N,IssmDouble sparsity,int in_type){ + #ifdef _HAVE_PETSC_ pmatrix=NULL; + #endif smatrix=NULL; type=in_type; @@ -79,7 +85,9 @@ /*FUNCTION Matrix::Matrix(IssmDouble* serial_mat, int M,int N,IssmDouble sparsity,int type){{{*/ Matrix::Matrix(IssmDouble* serial_mat, int M,int N,IssmDouble sparsity,int in_type){ + #ifdef _HAVE_PETSC_ pmatrix=NULL; + #endif smatrix=NULL; type=in_type; @@ -100,7 +108,9 @@ /*FUNCTION Matrix::Matrix(int M,int N,int connectivity,int numberofdofspernode,int type){{{*/ Matrix::Matrix(int M,int N,int connectivity,int numberofdofspernode,int in_type){ + #ifdef _HAVE_PETSC_ pmatrix=NULL; + #endif smatrix=NULL; type=in_type;