Changeset 13599


Ignore:
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:
9 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/modules/OutputRiftsx/OutputRiftsx.cpp

    r4214 r13599  
    1717
    1818        /*Allocate grad_g: */
    19         riftproperties=NewVec(numrifts);
     19        riftproperties=NewVec(numrifts,IssmComm::GetComm());
    2020
    2121        /*Compute rift properties : */
  • issm/trunk-jpl/src/c/modules/SmearFunctionx/SmearFunctionx.cpp

    r11259 r13599  
    2828        /*allocate: */
    2929        gsize=nodes->NumberOfDofs(configuration_type,GsetEnum);
    30         smearedvector=NewVec(gsize);
     30        smearedvector=NewVec(gsize,IssmComm::GetComm());
    3131       
    32         x=NewVec(gsize);
    33         y=NewVec(gsize);
    34         z=NewVec(gsize);
     32        x=NewVec(gsize,IssmComm::GetComm());
     33        y=NewVec(gsize,IssmComm::GetComm());
     34        z=NewVec(gsize,IssmComm::GetComm());
    3535
    3636        for(i=0;i<nodes->Size();i++){
  • issm/trunk-jpl/src/c/modules/Solverx/SolverxPetsc.cpp

    r13590 r13599  
    7070        MatGetSize(Kff,&global_m,&global_n); _assert_(global_m==global_m);
    7171        if(!global_n){
    72                 *puf=NewVec(0); return;
     72                *puf=NewVec(0,IssmComm::GetComm()); return;
    7373        }
    7474
     
    8686        }
    8787        else{
    88                 MatGetLocalSize(Kff,&local_m,&local_n);uf=NewVec(local_n,fromlocalsize);
     88                MatGetLocalSize(Kff,&local_m,&local_n);uf=NewVec(local_n,IssmComm::GetComm(),fromlocalsize);
    8989        }
    9090
  • issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.cpp

    r13595 r13599  
    3030PetscVec::PetscVec(int M,bool fromlocalsize){
    3131       
    32         this->vector=NewVec(M,fromlocalsize);
     32        this->vector=NewVec(M,IssmComm::GetComm(),fromlocalsize);
    3333
    3434}
     
    3838
    3939        if(petsc_vec==NULL){
    40                 this->vector=NewVec(0);
     40                this->vector=NewVec(0,IssmComm::GetComm());
    4141        }
    4242        else{
     
    5555        for(int i=0;i<M;i++) idxm[i]=i;
    5656
    57         this->vector=NewVec(M);
     57        this->vector=NewVec(M,IssmComm::GetComm());
    5858        VecSetValues(this->vector,M,idxm,serial_vec,INSERT_VALUES);
    5959        VecAssemblyBegin(this->vector);
  • issm/trunk-jpl/src/c/toolkits/petsc/patches/NewVec.cpp

    r11695 r13599  
    1717#include "../../mpi/patches/mpipatches.h"
    1818
    19 Vec NewVec(int size,bool fromlocalsize){
     19Vec NewVec(int size,COMM comm,bool fromlocalsize){
    2020
    2121        int ierr;
     
    3333        }
    3434       
    35         VecCreate(PETSC_COMM_WORLD,&vector);
     35        VecCreate(comm,&vector);
    3636       
    3737        VecSetSizes(vector,local_size,PETSC_DECIDE);
  • issm/trunk-jpl/src/c/toolkits/petsc/patches/SerialToVec.cpp

    r12431 r13599  
    3030               
    3131        /*Create parallel vector: */
    32         outvector=NewVec(vector_size);
     32        outvector=NewVec(vector_size,MPI_COMM_WORLD);
    3333
    3434        /*plug values from local vector into new parallel vector: */
  • issm/trunk-jpl/src/c/toolkits/petsc/patches/VecPartition.cpp

    r12431 r13599  
    100100                if(kffpartition){
    101101                        VecFree(&outvector);
    102                         outvector=NewVec(row_partition_vector_size);
     102                        outvector=NewVec(row_partition_vector_size,MPI_COMM_WORLD);
    103103                }
    104104
  • issm/trunk-jpl/src/c/toolkits/petsc/patches/VecTranspose.cpp

    r12431 r13599  
    2525       
    2626        /*Create new vector of same size: */
    27         tvector=NewVec(size);
     27        tvector=NewVec(size,MPI_COMM_WORLD);
    2828
    2929        /*Extract values locally from input vector: */
  • issm/trunk-jpl/src/c/toolkits/petsc/patches/petscpatches.h

    r13597 r13599  
    1717class Parameters;
    1818
    19 Vec NewVec(int size,bool fromlocalsize=false);
     19Vec NewVec(int size,COMM comm,bool fromlocalsize=false);
    2020Mat NewMat(int M,int N,COMM comm);
    2121Mat NewMat(int M,int N,double sparsity,COMM comm);
Note: See TracChangeset for help on using the changeset viewer.