source: issm/oecreview/Archive/12678-13393/ISSM-12898-12899.diff@ 13980

Last change on this file since 13980 was 13394, checked in by Mathieu Morlighem, 13 years ago

Added 12678-13393
File size: 3.6 KB
RevLine 
[13394]1Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/ElementVector.h
2===================================================================
3--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/ElementVector.h (revision 12898)
4+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/ElementVector.h (revision 12899)
5@@ -15,6 +15,7 @@
6 #include "../../EnumDefinitions/EnumDefinitions.h"
7 class Node;
8 class Vector;
9+class Parameters;
10 /*}}}*/
11
12 class ElementVector{
13Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/Vector.cpp
14===================================================================
15--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/Vector.cpp (revision 12898)
16+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/Vector.cpp (revision 12899)
17@@ -24,7 +24,9 @@
18 /*FUNCTION Vector::Vector(){{{*/
19 Vector::Vector(){
20
21+ #ifdef _HAVE_PETSC_
22 this->pvector=NULL;
23+ #endif
24 this->svector=NULL;
25
26 type=PetscVecType; //default
27@@ -37,7 +39,9 @@
28 /*FUNCTION Vector::Vector(int M,bool fromlocalsize,int type){{{*/
29 Vector::Vector(int M,bool fromlocalsize,int in_type){
30
31+ #ifdef _HAVE_PETSC_
32 pvector=NULL;
33+ #endif
34 svector=NULL;
35 type=in_type;
36
37@@ -59,7 +63,10 @@
38 /*FUNCTION Vector::Vector(IssmDouble* serial_vec,int M,int type){{{*/
39 Vector::Vector(IssmDouble* serial_vec,int M,int in_type){
40
41+ #ifdef _HAVE_PETSC_
42 pvector=NULL;
43+ #endif
44+
45 svector=NULL;
46 type=in_type;
47
48Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/ElementMatrix.h
49===================================================================
50--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/ElementMatrix.h (revision 12898)
51+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/ElementMatrix.h (revision 12899)
52@@ -15,6 +15,7 @@
53 #include "../../EnumDefinitions/EnumDefinitions.h"
54 class Node;
55 class Matrix;
56+class Parameters;
57 /*}}}*/
58
59 class ElementMatrix{
60Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/Matrix.cpp
61===================================================================
62--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/Matrix.cpp (revision 12898)
63+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/matrix/Matrix.cpp (revision 12899)
64@@ -25,7 +25,9 @@
65 /*FUNCTION Matrix::Matrix(){{{*/
66 Matrix::Matrix(){
67
68+ #ifdef _HAVE_PETSC_
69 pmatrix=NULL;
70+ #endif
71 smatrix=NULL;
72
73 type=PetscMatType; //default
74@@ -38,7 +40,9 @@
75 /*FUNCTION Matrix::Matrix(int M,int N,int type){{{*/
76 Matrix::Matrix(int M,int N,int in_type){
77
78+ #ifdef _HAVE_PETSC_
79 pmatrix=NULL;
80+ #endif
81 smatrix=NULL;
82 type=in_type;
83
84@@ -59,7 +63,9 @@
85 /*FUNCTION Matrix::Matrix(int M,int N,IssmDouble sparsity,int type){{{*/
86 Matrix::Matrix(int M,int N,IssmDouble sparsity,int in_type){
87
88+ #ifdef _HAVE_PETSC_
89 pmatrix=NULL;
90+ #endif
91 smatrix=NULL;
92 type=in_type;
93
94@@ -79,7 +85,9 @@
95 /*FUNCTION Matrix::Matrix(IssmDouble* serial_mat, int M,int N,IssmDouble sparsity,int type){{{*/
96 Matrix::Matrix(IssmDouble* serial_mat, int M,int N,IssmDouble sparsity,int in_type){
97
98+ #ifdef _HAVE_PETSC_
99 pmatrix=NULL;
100+ #endif
101 smatrix=NULL;
102 type=in_type;
103
104@@ -100,7 +108,9 @@
105 /*FUNCTION Matrix::Matrix(int M,int N,int connectivity,int numberofdofspernode,int type){{{*/
106 Matrix::Matrix(int M,int N,int connectivity,int numberofdofspernode,int in_type){
107
108+ #ifdef _HAVE_PETSC_
109 pmatrix=NULL;
110+ #endif
111 smatrix=NULL;
112 type=in_type;
113
Note: See TracBrowser for help on using the repository browser.