Changeset 5895

Timestamp:

09/20/10 07:39:10 (15 years ago)

Author:

Eric.Larour

Message:

Applied NewMat prototype

Location:

issm/trunk/src/c

Files:

• modules/Reduceloadfromgtofx/Reduceloadfromgtofx.cpp (modified) (2 diffs)
• modules/Reduceloadx/Reduceloadx.cpp (modified) (2 diffs)
• modules/SystemMatricesx/SystemMatricesx.cpp (modified) (1 diff)
• objects/Params/PetscMatParam.cpp (modified) (1 diff)
• toolkits/petsc/patches/MatInvert.cpp (modified) (1 diff)
• toolkits/petsc/patches/NewMat.cpp (modified) (2 diffs)
• toolkits/petsc/patches/petscpatches.h (modified) (1 diff)

issm/trunk/src/c/modules/Reduceloadfromgtofx/Reduceloadfromgtofx.cpp

@@ -25 +25 @@
         int verbose; 
         bool kffpartition=false;
+        bool fromlocalsize=true;
 
         parameters->FindParam(&verbose,VerboseEnum);
@@ -47 +48 @@
                                 /*pf = pf - Kfs * y_s;*/
                                 MatGetLocalSize(Kfs,&Kfsm,&Kfsn);
-                                Kfsy_s=NewVecFromLocalSize(Kfsm);
+                                Kfsy_s=NewVec(Kfsm,fromlocalsize);
                                 if (flag_ys0){
 

issm/trunk/src/c/modules/Reduceloadx/Reduceloadx.cpp

@@ -18 +18 @@
         int Kfsm,Kfsn;
         PetscScalar a;
+        bool fromlocalsize=true;
         
         if(pf){
@@ -23 +24 @@
                 /*pf = pf - Kfs * y_s;*/
                 MatGetLocalSize(Kfs,&Kfsm,&Kfsn);
-                Kfsy_s=NewVecFromLocalSize(Kfsm);
+                Kfsy_s=NewVec(Kfsm,fromlocalsize);
                 if (flag_ys0){
 

issm/trunk/src/c/modules/SystemMatricesx/SystemMatricesx.cpp

@@ -53 +53 @@
         if(kflag){
 
-                if(!buildkff)Kgg=NewMat(gsize,gsize,NULL,&connectivity,&numberofdofspernode);
+                if(!buildkff)Kgg=NewMat(gsize,gsize,connectivity,numberofdofspernode);
                 else{
-                        Kff=NewMat(fsize,fsize,NULL,&connectivity,&numberofdofspernode);
-                        Kfs=NewMat(fsize,ssize,NULL,&connectivity,&numberofdofspernode);
+                        Kff=NewMat(fsize,fsize,connectivity,numberofdofspernode);
+                        Kfs=NewMat(fsize,ssize,connectivity,numberofdofspernode);
                 }
 

issm/trunk/src/c/objects/Params/PetscMatParam.cpp

@@ -149 +149 @@
                 serial_mat=(double*)xmalloc(M*N*sizeof(double));
                 memcpy(serial_mat,marshalled_dataset,M*N*sizeof(double));marshalled_dataset+=(M*N*sizeof(double));
-                value=NewMat(M,N,&sparsity,NULL,NULL);
+                value=NewMat(M,N,sparsity);
                 idxm=(int*)xmalloc(M*sizeof(int));
                 idxn=(int*)xmalloc(N*sizeof(int));

issm/trunk/src/c/toolkits/petsc/patches/MatInvert.cpp

@@ -32 +32 @@
 
         /*Create identitiy matrix: */
-        identity=NewMat(M,N,&sparsity,NULL,NULL);
+        identity=NewMat(M,N,sparsity);
         diagonal=NewVec(M);
         VecSet(diagonal,1.0);

issm/trunk/src/c/toolkits/petsc/patches/NewMat.cpp

@@ -77 +77 @@
         int    d_nz,o_nz;
         int    nnz;
+        MatType type;
+
 
         /*Determine local sizes: */
@@ -86 +88 @@
         o_nz=(int)connectivity*numberofdofspernode/2;
 
-        MatCreateMPIAIJ(MPI_COMM_WORLD,m,n,M,N,d_nz,NULL,o_nz,NULL,&outmatrix); 
+        MatCreate(MPI_COMM_WORLD,&outmatrix);
+        MatSetSizes(outmatrix,m,n,M,N);
+        MatSetFromOptions(outmatrix);
+
+        /*preallocation  according to type: */
+        MatGetType(outmatrix,&type);
+        if(strcmp(type,"mpiaij")==0){
+                MatMPIAIJSetPreallocation(outmatrix,d_nz,NULL,o_nz,NULL);
+        }
 
         return outmatrix;

issm/trunk/src/c/toolkits/petsc/patches/petscpatches.h

@@ -22 +22 @@
 
 int PetscDetermineLocalSize(int global_size);
-Vec NewVec(int size,bool fromlocalsize);
+Vec NewVec(int size,bool fromlocalsize=false);
 Mat NewMat(int M,int N);
 Mat NewMat(int M,int N,double sparsity);