Changeset 13975 for issm/trunk/src/c/classes/matrix/Matrix.h

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/classes/matrix/Matrix.h (modified) (6 diffs)

issm/trunk/src/c/classes/matrix/Matrix.h

@@ -76 +76 @@
                 }
                 /*}}}*/
+                /*FUNCTION Matrix(int m,int n,int M,int N,int* d_nnz,int* o_nnz,int type){{{*/
+                #ifdef _HAVE_PETSC_
+                Matrix(int m,int n,int M,int N,int* d_nnz,int* o_nnz,int in_type=PetscMatType){
+                #else
+                Matrix(int m,int n,int M,int N,int* d_nnz,int* o_nnz,int in_type=SeqMatType){
+                #endif
+
+                        #ifdef _HAVE_PETSC_
+                        pmatrix=NULL;
+                        #endif
+                        smatrix=NULL;
+                        type=in_type;
+
+                        if(type==PetscMatType){
+                                #ifdef _HAVE_PETSC_
+                                this->pmatrix=new PetscMat(m,n,M,N,d_nnz,o_nnz);
+                                #else
+                                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
+                                #endif
+                        }
+                        else if(type==SeqMatType){
+                                this->smatrix=new SeqMat<doubletype>(m,n,M,N,d_nnz,o_nnz);
+                        }
+                        else _error_("Matrix type: " << type << " not supported yet!");
+
+                }
+                /*}}}*/
                 /*FUNCTION Matrix(int M,int N,IssmDouble sparsity,int in_type){{{*/
                 #ifdef _HAVE_PETSC_
@@ -163 +190 @@
                                 #ifdef _HAVE_PETSC_
                                 delete this->pmatrix;
-                                #else
-                                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
                                 #endif
                         }
@@ -170 +195 @@
                                 delete this->smatrix;
                         }
-                        else _error_("Matrix type: " << type << " not supported yet!");
 
                 }
@@ -192 +216 @@
                 }
                 /*}}}*/
+                /*FUNCTION AllocationInfo{{{*/
+                void AllocationInfo(void){
+                        _assert_(this);
+                        if(type==PetscMatType){
+                                #ifdef _HAVE_PETSC_
+                                this->pmatrix->AllocationInfo();
+                                #endif
+                        }
+                        else if(type==SeqMatType){
+                                //this->smatrix->AllocationInfo();
+                        }
+                        else _error_("Matrix type: " << type << " not supported yet!");
+                }/*}}}*/
                 /*FUNCTION Assemble{{{*/
                 void Assemble(void){
@@ -274 +311 @@
                 Matrix* Duplicate(void){
 
-                        Matrix* output=NULL;
-
-                        output=new Matrix();
+                        Matrix* output=new Matrix();
 
                         if(type==PetscMatType){
@@ -306 +341 @@
                         else _error_("Matrix type: " << type << " not supported yet!");
 
-
                         return output;
                 }