Changeset 13599

Timestamp:

10/10/12 22:39:12 (12 years ago)

Author:

Eric.Larour

Message:

CHG: more changes to switch from my_rank and num_procs to IssmComm::GetSize and IssmComm::GetRank

Location:

issm/trunk-jpl/src/c

Files:

• modules/OutputRiftsx/OutputRiftsx.cpp (modified) (1 diff)
• modules/SmearFunctionx/SmearFunctionx.cpp (modified) (1 diff)
• modules/Solverx/SolverxPetsc.cpp (modified) (2 diffs)
• toolkits/petsc/objects/PetscVec.cpp (modified) (3 diffs)
• toolkits/petsc/patches/NewVec.cpp (modified) (2 diffs)
• toolkits/petsc/patches/SerialToVec.cpp (modified) (1 diff)
• toolkits/petsc/patches/VecPartition.cpp (modified) (1 diff)
• toolkits/petsc/patches/VecTranspose.cpp (modified) (1 diff)
• toolkits/petsc/patches/petscpatches.h (modified) (1 diff)

issm/trunk-jpl/src/c/modules/OutputRiftsx/OutputRiftsx.cpp

@@ -17 +17 @@
 
         /*Allocate grad_g: */
-        riftproperties=NewVec(numrifts);
+        riftproperties=NewVec(numrifts,IssmComm::GetComm());
 
         /*Compute rift properties : */

issm/trunk-jpl/src/c/modules/SmearFunctionx/SmearFunctionx.cpp

@@ -28 +28 @@
         /*allocate: */
         gsize=nodes->NumberOfDofs(configuration_type,GsetEnum);
-        smearedvector=NewVec(gsize);
+        smearedvector=NewVec(gsize,IssmComm::GetComm());
         
-        x=NewVec(gsize);
-        y=NewVec(gsize);
-        z=NewVec(gsize);
+        x=NewVec(gsize,IssmComm::GetComm());
+        y=NewVec(gsize,IssmComm::GetComm());
+        z=NewVec(gsize,IssmComm::GetComm());
 
         for(i=0;i<nodes->Size();i++){

issm/trunk-jpl/src/c/modules/Solverx/SolverxPetsc.cpp

@@ -70 +70 @@
         MatGetSize(Kff,&global_m,&global_n); _assert_(global_m==global_m);
         if(!global_n){
-                *puf=NewVec(0); return;
+                *puf=NewVec(0,IssmComm::GetComm()); return;
         }
 
@@ -86 +86 @@
         }
         else{
-                MatGetLocalSize(Kff,&local_m,&local_n);uf=NewVec(local_n,fromlocalsize);
+                MatGetLocalSize(Kff,&local_m,&local_n);uf=NewVec(local_n,IssmComm::GetComm(),fromlocalsize);
         }
 

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

@@ -30 +30 @@
 PetscVec::PetscVec(int M,bool fromlocalsize){
         
-        this->vector=NewVec(M,fromlocalsize);
+        this->vector=NewVec(M,IssmComm::GetComm(),fromlocalsize);
 
 }
@@ -38 +38 @@
 
         if(petsc_vec==NULL){
-                this->vector=NewVec(0);
+                this->vector=NewVec(0,IssmComm::GetComm());
         }
         else{
@@ -55 +55 @@
         for(int i=0;i<M;i++) idxm[i]=i;
 
-        this->vector=NewVec(M);
+        this->vector=NewVec(M,IssmComm::GetComm());
         VecSetValues(this->vector,M,idxm,serial_vec,INSERT_VALUES);
         VecAssemblyBegin(this->vector);

issm/trunk-jpl/src/c/toolkits/petsc/patches/NewVec.cpp

@@ -17 +17 @@
 #include "../../mpi/patches/mpipatches.h"
 
-Vec NewVec(int size,bool fromlocalsize){
+Vec NewVec(int size,COMM comm,bool fromlocalsize){
 
         int ierr;
@@ -33 +33 @@
         }
         
-        VecCreate(PETSC_COMM_WORLD,&vector); 
+        VecCreate(comm,&vector); 
         
         VecSetSizes(vector,local_size,PETSC_DECIDE); 

issm/trunk-jpl/src/c/toolkits/petsc/patches/SerialToVec.cpp

@@ -30 +30 @@
                 
         /*Create parallel vector: */
-        outvector=NewVec(vector_size);
+        outvector=NewVec(vector_size,MPI_COMM_WORLD);
 
         /*plug values from local vector into new parallel vector: */

issm/trunk-jpl/src/c/toolkits/petsc/patches/VecPartition.cpp

@@ -100 +100 @@
                 if(kffpartition){
                         VecFree(&outvector);
-                        outvector=NewVec(row_partition_vector_size);
+                        outvector=NewVec(row_partition_vector_size,MPI_COMM_WORLD);
                 }
 

issm/trunk-jpl/src/c/toolkits/petsc/patches/VecTranspose.cpp

@@ -25 +25 @@
         
         /*Create new vector of same size: */
-        tvector=NewVec(size);
+        tvector=NewVec(size,MPI_COMM_WORLD);
 
         /*Extract values locally from input vector: */

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

@@ -17 +17 @@
 class Parameters;
 
-Vec NewVec(int size,bool fromlocalsize=false);
+Vec NewVec(int size,COMM comm,bool fromlocalsize=false);
 Mat NewMat(int M,int N,COMM comm);
 Mat NewMat(int M,int N,double sparsity,COMM comm);