Changeset 13880

Timestamp:

11/05/12 15:35:08 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added new constructors for matrix and vector, with local and global sizes that are provided

Location:

issm/trunk-jpl/src/c

Files:

• classes/matrix/Matrix.h (modified) (1 diff)
• classes/matrix/Vector.h (modified) (1 diff)
• toolkits/issm/SeqMat.h (modified) (1 diff)
• toolkits/issm/SeqVec.h (modified) (1 diff)
• toolkits/petsc/objects/PetscMat.cpp (modified) (1 diff)
• toolkits/petsc/objects/PetscMat.h (modified) (2 diffs)
• toolkits/petsc/objects/PetscVec.cpp (modified) (1 diff)
• toolkits/petsc/objects/PetscVec.h (modified) (2 diffs)

issm/trunk-jpl/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_

issm/trunk-jpl/src/c/classes/matrix/Vector.h

@@ -75 +75 @@
                 }
                 /*}}}*/
+                /*FUNCTION Vector(int m,int M,int in_type){{{*/
+                #ifdef _HAVE_PETSC_
+                Vector(int m,int M,int in_type=PetscVecType){
+                #else
+                Vector(int m,int M,int in_type=SeqVecType){
+                #endif
+
+                        #ifdef _HAVE_PETSC_
+                        pvector=NULL;
+                        #endif
+                        svector=NULL;
+                        type=in_type;
+
+                        if(type==PetscVecType){
+                        #ifdef _HAVE_PETSC_
+                                this->pvector=new PetscVec(m,M);
+                         #else
+                                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
+                         #endif
+                        }
+                        else if(type==SeqVecType){
+                                this->svector=new SeqVec<doubletype>(m,M);
+                        }
+                        else _error_("Vector type: " << type << " not supported yet!");
+
+                }
+                /*}}}*/
                 /*FUNCTION Vector(doubletype* serial_vec,int M,int in_type){{{*/
                 #ifdef _HAVE_PETSC_

issm/trunk-jpl/src/c/toolkits/issm/SeqMat.h

@@ -59 +59 @@
                         this->matrix=NULL;
                         if(M*N) this->matrix=xNewZeroInit<doubletype>(pM*pN);
+                }
+                /*}}}*/
+                /*FUNCTION SeqMat(int m,int n,int M,int N,int* d_nnz,int* o_nnz){{{*/
+                SeqMat(int m,int n,int pM,int pN,int* d_nnz,int* o_nnz){
+
+                        this->M=pM;
+                        this->N=pN;
+                        this->matrix=NULL;
+                        if(pM*pN) this->matrix=xNewZeroInit<doubletype>(pM*pN);
                 }
                 /*}}}*/

issm/trunk-jpl/src/c/toolkits/issm/SeqVec.h

@@ -49 +49 @@
                 }
                 /*}}}*/
+                /*FUNCTION SeqVec(int m,int M){{{*/
+                SeqVec(int pm,int pM){
+
+                        this->M=pM;
+                        this->vector=NULL;
+                        if(this->M) this->vector=xNewZeroInit<doubletype>(pM);
+                }
+                /*}}}*/
                 /*FUNCTION SeqVec(int M,bool fromlocalsize){{{*/
                 SeqVec(int pM,bool fromlocalsize){

issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.cpp

@@ -38 +38 @@
 
         this->matrix=NewMat(M,N,sparsity,IssmComm::GetComm());
+}
+/*}}}*/
+/*FUNCTION PetscMat::PetscMat(int M,int N, IssmDouble sparsity){{{*/
+PetscMat::PetscMat(int m,int n,int M,int N,int* d_nnz,int* o_nnz){
+
+        MatCreate(IssmComm::GetComm(),&this->matrix);
+        MatSetSizes(this->matrix,m,n,M,N);
+        MatSetFromOptions(this->matrix);
+        MatMPIAIJSetPreallocation(this->matrix,0,d_nnz,0,o_nnz);
+
 }
 /*}}}*/

issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.h

@@ -31 +31 @@
                 #endif
 
-                /*PetscMat constructors, destructors {{{*/
+                /*PetscMat constructors, destructors*/
                 PetscMat();
                 PetscMat(int M,int N);
                 PetscMat(int M,int N,IssmDouble sparsity);
+                PetscMat(int m,int n,int M,int N,int* d_nnz,int* o_nnz);
                 PetscMat(IssmDouble* serial_mat,int M,int N,IssmDouble sparsity);
                 PetscMat(int M,int N,int connectivity,int numberofdofspernode);
                 ~PetscMat();
-                /*}}}*/
-                /*PetscMat specific routines {{{*/
+
+                /*PetscMat specific routines*/
                 void AllocationInfo(void);
                 void Echo(void);
@@ -51 +52 @@
                 void SetValues(int m,int* idxm,int n,int* idxn,IssmDouble* values,InsMode mode);
                 void Convert(MatrixType type);
-                /*}}}*/
-
 };
 

issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.cpp

@@ -31 +31 @@
 
         this->vector=NewVec(M,IssmComm::GetComm(),fromlocalsize);
+
+}
+/*}}}*/
+/*FUNCTION PetscVec::PetscVec(int m,int M){{{*/
+PetscVec::PetscVec(int m,int M){
+
+        VecCreate(IssmComm::GetComm(),&this->vector);
+        VecSetSizes(this->vector,m,M);
+        VecSetFromOptions(this->vector);
+        VecSet(this->vector,0.0);
 
 }

issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.h

@@ -30 +30 @@
                 #endif
 
-                /*PetscVec constructors, destructors {{{*/
+                /*PetscVec constructors, destructors*/
                 PetscVec();
                 PetscVec(int M,bool fromlocalsize=false);
+                PetscVec(int m,int M);
                 PetscVec(IssmDouble* buffer, int M);
                 PetscVec(Vec petsc_vec);
                 ~PetscVec();
-                /*}}}*/
-                /*PetscVec specific routines {{{*/
+
+                /*PetscVec specific routines*/
                 void Echo(void);
                 void Assemble(void);
@@ -55 +56 @@
                 void PointwiseDivide(PetscVec* x,PetscVec* y);
                 IssmDouble Dot(PetscVec* vector);
-                /*}}}*/
 };