/[escript]/trunk/finley/src/NodeFile.cpp
ViewVC logotype

Diff of /trunk/finley/src/NodeFile.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 4504 by caltinay, Mon Jul 15 06:53:44 2013 UTC revision 4505 by jfenwick, Tue Jul 23 02:09:45 2013 UTC
# Line 406  void NodeFile::gather_global(const std:: Line 406  void NodeFile::gather_global(const std::
406                      MPI_DOUBLE, dest, in->MPIInfo->msg_tag_counter+3, source,                      MPI_DOUBLE, dest, in->MPIInfo->msg_tag_counter+3, source,
407                      in->MPIInfo->msg_tag_counter+3, in->MPIInfo->comm, &status);                      in->MPIInfo->msg_tag_counter+3, in->MPIInfo->comm, &status);
408  #endif  #endif
409              in->MPIInfo->msg_tag_counter+=4;          ESYS_MPI_INC_COUNTER(*(in->MPIInfo), 4)
410          }          }
411          buffer_rank=Esys_MPIInfo_mod(in->MPIInfo->size, buffer_rank-1);          buffer_rank=Esys_MPIInfo_mod(in->MPIInfo->size, buffer_rank-1);
412          scatterEntries(in->numNodes, in->Id, distribution[buffer_rank],          scatterEntries(in->numNodes, in->Id, distribution[buffer_rank],
# Line 442  void NodeFile::gather_global(const std:: Line 442  void NodeFile::gather_global(const std::
442                      MPI_DOUBLE, dest, in->MPIInfo->msg_tag_counter+3, source,                      MPI_DOUBLE, dest, in->MPIInfo->msg_tag_counter+3, source,
443                      in->MPIInfo->msg_tag_counter+3, in->MPIInfo->comm, &status);                      in->MPIInfo->msg_tag_counter+3, in->MPIInfo->comm, &status);
444  #endif  #endif
445               in->MPIInfo->msg_tag_counter+=4;              ESYS_MPI_INC_COUNTER(*(in->MPIInfo), 4)
446          }          }
447          buffer_rank=Esys_MPIInfo_mod(in->MPIInfo->size, buffer_rank-1);          buffer_rank=Esys_MPIInfo_mod(in->MPIInfo->size, buffer_rank-1);
448      }      }
# Line 604  int NodeFile::createDenseDOFLabeling() Line 604  int NodeFile::createDenseDOFLabeling()
604                      dest, MPIInfo->msg_tag_counter, source,                      dest, MPIInfo->msg_tag_counter, source,
605                      MPIInfo->msg_tag_counter, MPIInfo->comm, &status);                      MPIInfo->msg_tag_counter, MPIInfo->comm, &status);
606  #endif  #endif
607              MPIInfo->msg_tag_counter+=1;          ESYS_MPI_INC_COUNTER(*MPIInfo, 1)
608          }          }
609          buffer_rank=Esys_MPIInfo_mod(MPIInfo->size, buffer_rank-1);          buffer_rank=Esys_MPIInfo_mod(MPIInfo->size, buffer_rank-1);
610      }      }
# Line 719  int NodeFile::createDenseNodeLabeling(st Line 719  int NodeFile::createDenseNodeLabeling(st
719                      dest, MPIInfo->msg_tag_counter, source,                      dest, MPIInfo->msg_tag_counter, source,
720                      MPIInfo->msg_tag_counter, MPIInfo->comm, &status);                      MPIInfo->msg_tag_counter, MPIInfo->comm, &status);
721  #endif  #endif
722              MPIInfo->msg_tag_counter+=1;          ESYS_MPI_INC_COUNTER(*MPIInfo, 1)
723          }          }
724          buffer_rank=Esys_MPIInfo_mod(MPIInfo->size, buffer_rank-1);          buffer_rank=Esys_MPIInfo_mod(MPIInfo->size, buffer_rank-1);
725      }      }
# Line 789  int NodeFile::createDenseReducedLabeling Line 789  int NodeFile::createDenseReducedLabeling
789                      MPIInfo->msg_tag_counter, source,                      MPIInfo->msg_tag_counter, source,
790                      MPIInfo->msg_tag_counter, MPIInfo->comm, &status);                      MPIInfo->msg_tag_counter, MPIInfo->comm, &status);
791  #endif  #endif
792              MPIInfo->msg_tag_counter+=1;          ESYS_MPI_INC_COUNTER(*MPIInfo, 1)
793          }          }
794          buffer_rank=Esys_MPIInfo_mod(MPIInfo->size, buffer_rank-1);          buffer_rank=Esys_MPIInfo_mod(MPIInfo->size, buffer_rank-1);
795      }      }
# Line 987  void NodeFile::createDOFMappingAndCoupli Line 987  void NodeFile::createDOFMappingAndCoupli
987              n+=snd_len[p];              n+=snd_len[p];
988          }          }
989      }      }
990      MPIInfo->msg_tag_counter+=MPIInfo->size;      ESYS_MPI_INC_COUNTER(*MPIInfo, MPIInfo->size)
991      offsetInShared[numNeighbors]=n;      offsetInShared[numNeighbors]=n;
992  #ifdef ESYS_MPI  #ifdef ESYS_MPI
993      MPI_Waitall(count, &mpi_requests[0], &mpi_stati[0]);      MPI_Waitall(count, &mpi_requests[0], &mpi_stati[0]);

Legend:
Removed from v.4504  
changed lines
  Added in v.4505

  ViewVC Help
Powered by ViewVC 1.1.26