Changeset 11713

Timestamp:

03/14/12 15:37:29 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added lots of asserts to avoid nasty segmentation faults

Location:

issm/trunk-jpl/src/c/objects/Numerics

Files:

• Matrix.cpp (modified) (6 diffs)
• Vector.cpp (modified) (12 diffs)

issm/trunk-jpl/src/c/objects/Numerics/Matrix.cpp

@@ -183 +183 @@
 void Matrix::Assemble(void){
         #ifdef _HAVE_PETSC_
+                _assert_(this->matrix);
                 MatAssemblyBegin(this->matrix,MAT_FINAL_ASSEMBLY);
                 MatAssemblyEnd(this->matrix,MAT_FINAL_ASSEMBLY);
@@ -199 +200 @@
         double norm=0;
         #ifdef _HAVE_PETSC_
-            MatNorm(this->matrix,ISSMToPetscNormMode(norm_type),&norm);
+                _assert_(this->matrix);
+                MatNorm(this->matrix,ISSMToPetscNormMode(norm_type),&norm);
         #else
                 _error_("not implemented yet!");
@@ -210 +212 @@
         
         #ifdef _HAVE_PETSC_
-            MatGetSize(this->matrix,pM,pN);
+                _assert_(this->matrix);
+                MatGetSize(this->matrix,pM,pN);
         #else
                 _error_("not implemented yet!");
@@ -220 +223 @@
         
         #ifdef _HAVE_PETSC_
-            MatGetLocalSize(this->matrix,pM,pN);
+                _assert_(this->matrix);
+                MatGetLocalSize(this->matrix,pM,pN);
         #else
                 _error_("not implemented yet!");
@@ -230 +234 @@
 
         #ifdef _HAVE_PETSC_
-            MatMultPatch(this->matrix,X->vector,AX->vector);
+                _assert_(this->matrix);
+                _assert_(X->vector);
+                MatMultPatch(this->matrix,X->vector,AX->vector);
         #else
                 _error_("not implemented yet!");
@@ -244 +250 @@
 
         #ifdef _HAVE_PETSC
+                _assert_(this->matrix);
                 MatDuplicate(this->matrix,MAT_COPY_VALUES,&output->matrix);
         #else

issm/trunk-jpl/src/c/objects/Numerics/Vector.cpp

@@ -150 +150 @@
                 
         #ifdef _HAVE_PETSC_
+                _assert_(this->vector);
                 VecAssemblyBegin(this->vector); 
                 VecAssemblyEnd(this->vector);
@@ -163 +164 @@
                 
         #ifdef _HAVE_PETSC_
+                _assert_(this->vector);
                 VecSetValues(this->vector,ssize,list,values,ISSMToPetscInsertMode(mode));
         #else
@@ -173 +175 @@
 void Vector::SetValue(int dof, double value, InsMode mode){
                 
-                
-        #ifdef _HAVE_PETSC_
+        #ifdef _HAVE_PETSC_
+                _assert_(this->vector);
                 VecSetValues(this->vector,1,&dof,&value,ISSMToPetscInsertMode(mode));
         #else
@@ -185 +187 @@
 void Vector::GetValue(double* pvalue,int dof){
                 
-                
-        #ifdef _HAVE_PETSC_
-        VecGetValues(this->vector,1,&dof,pvalue);
-        #else
-                _error_("not implemented yet!");
-        #endif
-
-}
-/*}}}*/
-                
+        #ifdef _HAVE_PETSC_
+                _assert_(this->vector);
+                VecGetValues(this->vector,1,&dof,pvalue);
+        #else
+                _error_("not implemented yet!");
+        #endif
+}
+/*}}}*/
 /*FUNCTION Vector::GetSize{{{1*/
 void Vector::GetSize(int* pM){
                 
         #ifdef _HAVE_PETSC_
+                _assert_(this->vector);
                 VecGetSize(this->vector,pM);
         #else
@@ -210 +211 @@
                 
         #ifdef _HAVE_PETSC_
+                _assert_(this->vector);
                 VecGetLocalSize(this->vector,pM);
         #else
@@ -224 +226 @@
         #ifdef _HAVE_PETSC_
                 Vec vec_output=NULL;
+                _assert_(this->vector);
                 VecDuplicate(this->vector,&vec_output);
                 output->vector=vec_output;
@@ -238 +241 @@
         
         #ifdef _HAVE_PETSC_
+                _assert_(this->vector);
                 VecSet(this->vector,value);
         #else
@@ -249 +253 @@
         
         #ifdef _HAVE_PETSC_
+                _assert_(this->vector);
                 VecAXPY(this->vector,a,X->vector);
         #else
@@ -259 +264 @@
         
         #ifdef _HAVE_PETSC_
+                _assert_(this->vector);
                 VecAYPX(this->vector,a,X->vector);
         #else
@@ -297 +303 @@
         double norm=0;
         #ifdef _HAVE_PETSC_
-            VecNorm(this->vector,ISSMToPetscNormMode(norm_type),&norm);
+                _assert_(this->vector);
+                VecNorm(this->vector,ISSMToPetscNormMode(norm_type),&norm);
         #else
                 _error_("not implemented yet!");
@@ -308 +315 @@
         
         #ifdef _HAVE_PETSC_
-            VecScale(this->vector,scale_factor); 
-        #else
-                _error_("not implemented yet!");
-        #endif
-}
-/*}}}*/
-/*FUNCTION Vector::Scale{{{1*/
+                _assert_(this->vector);
+                VecScale(this->vector,scale_factor); 
+        #else
+                _error_("not implemented yet!");
+        #endif
+}
+/*}}}*/
+/*FUNCTION Vector::Dot{{{1*/
 double Vector::Dot(Vector* vector){
 
         double dot;
         #ifdef _HAVE_PETSC_
-            VecDot(this->vector,vector->vector,&dot);
+                _assert_(this->vector);
+                VecDot(this->vector,vector->vector,&dot);
         #else
                 _error_("not implemented yet!");
@@ -330 +339 @@
 
         #ifdef _HAVE_PETSC_
+                _assert_(this->vector);
                 VecPointwiseDivide(this->vector,x->vector,y->vector);
         #else