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

Timestamp:

03/12/12 09:35:33 (13 years ago)

Author:

Eric.Larour

Message:

Large commit, to strip out Petsc from the code. Created new Matrix and Vector
wrapper objects to the Petsc Mat and Vec objects. These wrappers make it possible
to hook up a different package to handle matrix and vector operations.

File:

• issm/trunk-jpl/src/c/objects/Numerics/Matrix.cpp (modified) (1 diff)

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

@@ -140 +140 @@
         _error_("not implemented yet!");
         #endif
+        return dataref;
 
 }
 /*}}}*/
 #endif
+/*FUNCTION Matrix::Assemble{{{1*/
+void Matrix::Assemble(void){
+        #ifdef _HAVE_PETSC_
+                MatAssemblyBegin(this->matrix,MAT_FINAL_ASSEMBLY);
+                MatAssemblyEnd(this->matrix,MAT_FINAL_ASSEMBLY);
+                #if _PETSC_MAJOR_ == 2 
+                        MatCompress(this->matrix);
+                #endif
+        #else
+                /*do nothing:*/
+        #endif
+
+}
+/*}}}*/
+/*FUNCTION Matrix::Norm{{{1*/
+double Matrix::Norm(int norm_type){
+        
+        double norm=0;
+        #ifdef _HAVE_PETSC_
+            MatNorm(this->matrix,(NormType)norm_type,&norm);
+        #else
+                _error_("not implemented yet!");
+        #endif
+        return norm;
+}
+/*}}}*/
+/*FUNCTION Matrix::GetSize{{{1*/
+void Matrix::GetSize(int* pM,int* pN){
+        
+        #ifdef _HAVE_PETSC_
+            MatGetSize(this->matrix,pM,pN);
+        #else
+                _error_("not implemented yet!");
+        #endif
+}
+/*}}}*/
+/*FUNCTION Matrix::GetLocalSize{{{1*/
+void Matrix::GetLocalSize(int* pM,int* pN){
+        
+        #ifdef _HAVE_PETSC_
+            MatGetLocalSize(this->matrix,pM,pN);
+        #else
+                _error_("not implemented yet!");
+        #endif
+}
+/*}}}*/
+/*FUNCTION Matrix::MatMult{{{1*/
+void Matrix::MatMult(Vector* X,Vector* AX){
+
+        #ifdef _HAVE_PETSC_
+            MatMultPatch(this->matrix,X->vector,AX->vector);
+        #else
+                _error_("not implemented yet!");
+        #endif
+}
+/*}}}*/