Index: /issm/trunk-jpl/src/c/classes/Node.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Node.cpp (revision 23599) +++ /issm/trunk-jpl/src/c/classes/Node.cpp (revision 23600) @@ -500,5 +500,5 @@ } /*}}}*/ -void Node::SetApproximation(int in_approximation){/*{{{*/ +void Node::SetApproximation(int in_approximation){/*{{{*/ this->approximation = in_approximation; @@ -749,21 +749,18 @@ } /*}}}*/ -void Node::ShowTrueDofs(int* truedofs, int ncols,int setenum){/*{{{*/ - - int j; - - /*Are we a clone? : */ - if(indexing.clone) return; +void Node::ShowTrueDofs(int* truedofs,int setenum){/*{{{*/ + + _assert_(!this->indexing.clone); /*Ok, we are not a clone, just plug our dofs into truedofs: */ switch(setenum){ case GsetEnum: - for(j=0;jindexing.gsize;j++) truedofs[ncols*sid+j]=indexing.gdoflist[j]; + for(int j=0;jindexing.gsize;j++) truedofs[j]=indexing.gdoflist[j]; break; case FsetEnum: - for(j=0;jindexing.fsize;j++) truedofs[ncols*sid+j]=indexing.fdoflist[j]; + for(int j=0;jindexing.fsize;j++) truedofs[j]=indexing.fdoflist[j]; break; case SsetEnum: - for(j=0;jindexing.ssize;j++) truedofs[ncols*sid+j]=indexing.sdoflist[j]; + for(int j=0;jindexing.ssize;j++) truedofs[j]=indexing.sdoflist[j]; break; default: @@ -773,10 +770,7 @@ } /*}}}*/ -void Node::UpdateCloneDofs(int* alltruedofs,int ncols,int setenum){/*{{{*/ - - int j; - - /*If we are not a clone, don't update, we already have dofs!: */ - if(!indexing.clone)return; +void Node::UpdateCloneDofs(int* alltruedofs,int setenum){/*{{{*/ + + _assert_(this->indexing.clone); /*Ok, we are a clone node, but we did not create the dofs for this node. @@ -784,11 +778,11 @@ switch(setenum){ case GsetEnum: - for(j=0;jindexing.gsize;j++) indexing.gdoflist[j]=alltruedofs[ncols*sid+j]; + for(int j=0;jindexing.gsize;j++) indexing.gdoflist[j]=alltruedofs[j]; break; case FsetEnum: - for(j=0;jindexing.fsize;j++) indexing.fdoflist[j]=alltruedofs[ncols*sid+j]; + for(int j=0;jindexing.fsize;j++) indexing.fdoflist[j]=alltruedofs[j]; break; case SsetEnum: - for(j=0;jindexing.ssize;j++) indexing.sdoflist[j]=alltruedofs[ncols*sid+j]; + for(int j=0;jindexing.ssize;j++) indexing.sdoflist[j]=alltruedofs[j]; break; default: Index: /issm/trunk-jpl/src/c/classes/Node.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Node.h (revision 23599) +++ /issm/trunk-jpl/src/c/classes/Node.h (revision 23600) @@ -78,7 +78,7 @@ bool RequiresDofReindexing(void); void SetCurrentConfiguration(DataSet* nodes,Vertices* vertices); - void ShowTrueDofs(int* truerows,int ncols,int setenum); + void ShowTrueDofs(int* truerows,int setenum); int Sid(void); - void UpdateCloneDofs(int* alltruerows,int ncols,int setenum); + void UpdateCloneDofs(int* alltruerows,int setenum); void VecMerge(Vector* ug, IssmDouble* vector_serial,int setenum); void VecReduce(Vector* vector, IssmDouble* ug_serial,int setnum); Index: /issm/trunk-jpl/src/c/classes/Nodes.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Nodes.cpp (revision 23599) +++ /issm/trunk-jpl/src/c/classes/Nodes.cpp (revision 23600) @@ -133,21 +133,12 @@ void Nodes::DistributeDofs(int setenum){/*{{{*/ - /*some check: */ - _assert_(setenum==GsetEnum || setenum==FsetEnum || setenum==SsetEnum); - - int i; - int dofcount=0; - int maxdofspernode=0; - int* alldofcount=NULL; - int* truedofs=NULL; - int* alltruedofs=NULL; - int numnodes=0; - /*recover my_rank:*/ + ISSM_MPI_Status status; int my_rank = IssmComm::GetRank(); int num_procs = IssmComm::GetSize(); /*Go through objects, and distribute dofs locally, from 0 to numberofdofsperobject*/ - for(i=0;iSize();i++){ + int dofcount=0; + for(int i=0;iSize();i++){ Node* node=xDynamicCast(this->GetObjectByOffset(i)); node->DistributeDofs(&dofcount,setenum); @@ -158,17 +149,17 @@ * cpus by the total last dofs of the previus cpu, starting from 0. * First: get number of dofs for each cpu*/ - alldofcount=xNew(num_procs); + int* alldofcount=xNew(num_procs); ISSM_MPI_Gather(&dofcount,1,ISSM_MPI_INT,alldofcount,1,ISSM_MPI_INT,0,IssmComm::GetComm()); ISSM_MPI_Bcast(alldofcount,num_procs,ISSM_MPI_INT,0,IssmComm::GetComm()); /* Every cpu should start its own dof count at the end of the dofcount from cpu-1*/ - dofcount=0; - for(i=0;iSize();i++){ + int offset=0; + for(int i=0;i(alldofcount); + + for(int i=0;iSize();i++){ /*Check that this node corresponds to our analysis currently being carried out: */ Node* node=xDynamicCast(this->GetObjectByOffset(i)); - node->OffsetDofs(dofcount,setenum); + node->OffsetDofs(offset,setenum); } @@ -176,34 +167,33 @@ * object that is not a clone, tell them to show their dofs, so that later on, they can get picked * up by their clones: */ - maxdofspernode=this->MaxNumDofs(setenum); - numnodes=this->NumberOfNodes(); - if(numnodes*maxdofspernode){ - truedofs= xNewZeroInit(numnodes*maxdofspernode); //initialize to 0, so that we can pick up the max - alltruedofs=xNewZeroInit(numnodes*maxdofspernode); - } - - for(i=0;iSize();i++){ - Node* node=xDynamicCast(this->GetObjectByOffset(i)); - node->ShowTrueDofs(truedofs,maxdofspernode,setenum);//give maxdofspernode, column size, so that nodes can index into truedofs - } - - ISSM_MPI_Allreduce((void*)truedofs,(void*)alltruedofs,numnodes*maxdofspernode,ISSM_MPI_INT,ISSM_MPI_MAX,IssmComm::GetComm()); - - /* Now every cpu knows the true dofs of everyone else that is not a clone*/ - for(i=0;iSize();i++){ - Node* node=xDynamicCast(this->GetObjectByOffset(i)); - node->UpdateCloneDofs(alltruedofs,maxdofspernode,setenum); - } + int maxdofspernode = this->MaxNumDofs(setenum); + int* truedofs = xNew(this->Size()*maxdofspernode); //only one alloc + for(int rank=0;rankcommon_send[rank]){ + int numids = this->common_send[rank]; + for(int i=0;i(this->GetObjectByOffset(this->common_send_ids[rank][i])); + node->ShowTrueDofs(&truedofs[i*maxdofspernode+0],setenum); + } + ISSM_MPI_Send(truedofs,numids*maxdofspernode,ISSM_MPI_INT,rank,0,IssmComm::GetComm()); + } + } + for(int rank=0;rankcommon_recv[rank]){ + int numids = this->common_recv[rank]; + ISSM_MPI_Recv(truedofs,numids*maxdofspernode,ISSM_MPI_INT,rank,0,IssmComm::GetComm(),&status); + for(int i=0;i(this->GetObjectByOffset(this->common_recv_ids[rank][i])); + node->UpdateCloneDofs(&truedofs[i*maxdofspernode+0],setenum); + } + } + } + xDelete(truedofs); /*Update indexingupdateflag*/ - for(i=0;iSize();i++){ + for(int i=0;iSize();i++){ Node* node=xDynamicCast(this->GetObjectByOffset(i)); node->ReindexingDone(); } - - /* Free ressources: */ - xDelete(alldofcount); - xDelete(truedofs); - xDelete(alltruedofs); } /*}}}*/ Index: /issm/trunk-jpl/src/c/modules/NodesDofx/NodesDofx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/NodesDofx/NodesDofx.cpp (revision 23599) +++ /issm/trunk-jpl/src/c/modules/NodesDofx/NodesDofx.cpp (revision 23600) @@ -24,4 +24,3 @@ nodes->DistributeDofs(FsetEnum); nodes->DistributeDofs(SsetEnum); - }