Changeset 1545 for XIOS/dev/branch_openmp/src/transformation/domain_algorithm_interpolate.cpp

Timestamp:

06/18/18 20:32:55 (6 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1544

File:

• XIOS/dev/branch_openmp/src/transformation/domain_algorithm_interpolate.cpp (modified) (9 diffs)

XIOS/dev/branch_openmp/src/transformation/domain_algorithm_interpolate.cpp

@@ -8 +8 @@
  */
 #include "domain_algorithm_interpolate.hpp"
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
 #include "context.hpp"
 #include "context_client.hpp"
@@ -406 +406 @@
   CContext* context = CContext::getCurrent();
   CContextClient* client=context->client;
-  //int mykey;
-  //ep_lib::MPI_Comm_rank(client->intraComm, &mykey);
 
   ep_lib::MPI_Comm poleComme = MPI_COMM_NULL;
   ep_lib::MPI_Comm_split(client->intraComm, interMapValuePole.empty() ? 0 : 1, 0, &poleComme);
-  //ep_lib::MPI_Comm_split(client->intraComm, interMapValuePole.empty() ? 0 : 1, mykey, &poleComme);
-  //if (!poleComme.is_null())
   if (poleComme!=MPI_COMM_NULL)
   {
@@ -540 +536 @@
   TransformationWeightMap& transWeight = this->transformationWeight_[0];
 
-  boost::unordered_map<size_t,int> globalIndexOfDomainDest;
+  std::unordered_map<size_t,int> globalIndexOfDomainDest;
   int ni = domainDest_->ni.getValue();
   int nj = domainDest_->nj.getValue();
@@ -816 +812 @@
   WriteNetCdf *netCdfWriter;
 
-//  #pragma omp barrier
-//  #pragma omp master
+
   MPI_Barrier_local(client->intraComm);
   if(my_rank_loc==0)
@@ -843 +838 @@
   }
   
-//  #pragma omp barrier
+
   MPI_Barrier_local(client->intraComm);
   
@@ -863 +858 @@
   MPI_Barrier_local(client->intraComm);
   
-//  #pragma omp barrier
-  cout<<"end write weight info"<< endl;
+
 }
 
@@ -953 +947 @@
        renormalizationFactor=1 ;
      }
-     
+
     if (firstPass)
     {
@@ -969 +963 @@
       else
       {
-        dataOut(localIndex[idx].first) += *(dataInput + idx) * localIndex[idx].second;   
+        dataOut(localIndex[idx].first) += *(dataInput + idx) * localIndex[idx].second;
+        allMissing(localIndex[idx].first) = allMissing(localIndex[idx].first) && false; // Reset flag to indicate not all data source are nan
       }
     }
@@ -999 +994 @@
       if (renormalizationFactor.numElements()>0) dataOut/=renormalizationFactor ; // In some case, process doesn't received any data for interpolation (mask)
                                                                                  // so renormalizationFactor is not initialized
-    }    
-  }
-}
-
-}
+    }
+  }
+}
+
+}