Changeset 12899

Timestamp:

08/03/12 17:18:15 (13 years ago)

Author:

Eric.Larour

Message:

BUG: forward declaration of Parameters.

Location:

issm/trunk-jpl/src/c/classes/matrix

Files:

• ElementMatrix.h (modified) (1 diff)
• ElementVector.h (modified) (1 diff)
• Matrix.cpp (modified) (5 diffs)
• Vector.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/matrix/ElementMatrix.h ¶

@@ -16 +16 @@
 class Node;
 class Matrix;
+class Parameters;
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/matrix/ElementVector.h ¶

@@ -16 +16 @@
 class Node;
 class Vector;
+class Parameters;
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/matrix/Matrix.cpp ¶

@@ -26 +26 @@
 Matrix::Matrix(){
 
-        pmatrix=NULL;
+        #ifdef _HAVE_PETSC_
+        pmatrix=NULL;
+        #endif
         smatrix=NULL;
 
@@ -39 +41 @@
 Matrix::Matrix(int M,int N,int in_type){
 
-        pmatrix=NULL;
+        #ifdef _HAVE_PETSC_
+        pmatrix=NULL;
+        #endif
         smatrix=NULL;
         type=in_type;
@@ -60 +64 @@
 Matrix::Matrix(int M,int N,IssmDouble sparsity,int in_type){
 
-        pmatrix=NULL;
+        #ifdef _HAVE_PETSC_
+        pmatrix=NULL;
+        #endif
         smatrix=NULL;
         type=in_type;
@@ -80 +86 @@
 Matrix::Matrix(IssmDouble* serial_mat, int M,int N,IssmDouble sparsity,int in_type){
 
-        pmatrix=NULL;
+        #ifdef _HAVE_PETSC_
+        pmatrix=NULL;
+        #endif
         smatrix=NULL;
         type=in_type;
@@ -101 +109 @@
 Matrix::Matrix(int M,int N,int connectivity,int numberofdofspernode,int in_type){
 
-        pmatrix=NULL;
+        #ifdef _HAVE_PETSC_
+        pmatrix=NULL;
+        #endif
         smatrix=NULL;
         type=in_type;

issm/trunk-jpl/src/c/classes/matrix/Vector.cpp ¶

@@ -25 +25 @@
 Vector::Vector(){
 
+        #ifdef _HAVE_PETSC_
         this->pvector=NULL;
+        #endif
         this->svector=NULL;
         
@@ -38 +40 @@
 Vector::Vector(int M,bool fromlocalsize,int in_type){
         
+        #ifdef _HAVE_PETSC_
         pvector=NULL;
+        #endif
         svector=NULL;
         type=in_type;
@@ -60 +64 @@
 Vector::Vector(IssmDouble* serial_vec,int M,int in_type){
 
+        #ifdef _HAVE_PETSC_
         pvector=NULL;
+        #endif
+
         svector=NULL;
         type=in_type;