refactor!: remove adm_local/ directory

[tools/medcoupling.git] / src / ParaMEDMEM / OverlapMapping.cxx

diff --git a/src/ParaMEDMEM/OverlapMapping.cxx b/src/ParaMEDMEM/OverlapMapping.cxx
index 203dd3ff3b2a5dbf71f7cff1ed0a72dbf82cb2c0..051ad304319e099be64f82953c17b18633d0ffd9 100644 (file)
--- a/src/ParaMEDMEM/OverlapMapping.cxx
+++ b/src/ParaMEDMEM/OverlapMapping.cxx
@@ -311,7 +311,7 @@ void OverlapMapping::serializeMatrixStep0ST(const mcIdType *nbOfElemsSrc, mcIdTy
   int myProcId=_group.myRank();
   for(std::size_t i=0;i<_matrixes_st.size();i++)
     {
-      if(_source_proc_id_st[i]==myProcId)// && _target_proc_id_st[i]!=myProcId
+      if(_source_proc_id_st[i]==myProcId && _matrixes_st[i].size())// && _target_proc_id_st[i]!=myProcId
         {
           count[_target_proc_id_st[i]]=(int)_matrixes_st[i].size()+1;
           szz+=_matrixes_st[i].size()+1;
@@ -323,7 +323,7 @@ void OverlapMapping::serializeMatrixStep0ST(const mcIdType *nbOfElemsSrc, mcIdTy
     offsets[i]=offsets[i-1]+count[i-1];
   for(std::size_t i=0;i<_matrixes_st.size();i++)
     {
-      if(_source_proc_id_st[i]==myProcId)
+      if(_source_proc_id_st[i]==myProcId && _matrixes_st[i].size())
         {
           mcIdType start=offsets[_target_proc_id_st[i]];
           mcIdType *work=bigArr+start;
@@ -374,7 +374,7 @@ mcIdType OverlapMapping::serializeMatrixStep1ST(const mcIdType *nbOfElemsSrc, co
   std::size_t fullLgth=0;
   for(std::size_t i=0;i<_matrixes_st.size();i++)
     {
-      if(_source_proc_id_st[i]==myProcId)
+      if(_source_proc_id_st[i]==myProcId && _matrixes_st[i].size())
         {
           const std::vector< SparseDoubleVec >& mat=_matrixes_st[i];
           mcIdType lgthToSend=0;
@@ -393,7 +393,7 @@ mcIdType OverlapMapping::serializeMatrixStep1ST(const mcIdType *nbOfElemsSrc, co
   fullLgth=0;
   for(std::size_t i=0;i<_matrixes_st.size();i++)
     {
-      if(_source_proc_id_st[i]==myProcId)
+      if(_source_proc_id_st[i]==myProcId && _matrixes_st[i].size())
         {
           const std::vector< SparseDoubleVec >& mat=_matrixes_st[i];
           for(std::vector< SparseDoubleVec >::const_iterator it1=mat.begin();it1!=mat.end();it1++)
@@ -619,7 +619,9 @@ void OverlapMapping::multiply(const MEDCouplingFieldDouble *fieldInput, MEDCoupl
   INTERP_KERNEL::AutoPtr<double> tmp=new double[nbOfCompo];
 
   // By default field value set to default value - so mark which cells are hit
-  INTERP_KERNEL::AutoPtr<bool> hit_cells = new bool[fieldOutput->getNumberOfTuples()];
+  mcIdType ntup = fieldOutput->getNumberOfTuples();
+  INTERP_KERNEL::AutoPtr<bool> hit_cells = new bool[ntup];
+  std::fill((bool *)hit_cells, (bool *)hit_cells+ntup, false);
 
   for(vector<int>::const_iterator itProc=_the_matrix_st_source_proc_id.begin(); itProc != _the_matrix_st_source_proc_id.end();itProc++)
   // For each source processor corresponding to a locally held matrix:
@@ -750,7 +752,7 @@ void OverlapMapping::multiply(const MEDCouplingFieldDouble *fieldInput, MEDCoupl
 
   // Fill in default values for cells which haven't been hit:
   int i = 0;
-  for(bool * hit_cells_ptr=hit_cells; i< fieldOutput->getNumberOfTuples(); hit_cells_ptr++,i++)
+  for(bool * hit_cells_ptr=hit_cells; i< ntup; hit_cells_ptr++,i++)
     if (!(*hit_cells_ptr))
       {
         double * targetPt=fieldOutput->getArray()->getPointer();