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

Timestamp:

06/12/18 14:21:57 (6 years ago)

Author:

yushan

Message:

add modif for workflow_cmip6

File:

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

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

@@ -714 +714 @@
 CDomainAlgorithmInterpolate::WriteNetCdf::WriteNetCdf(const StdString& filename, const ep_lib::MPI_Comm comm)
   : CNc4DataOutput(NULL, filename, false, false, true, comm, false, true) {}
+  
+CDomainAlgorithmInterpolate::WriteNetCdf::WriteNetCdf(const StdString& filename, bool exist, const ep_lib::MPI_Comm comm)
+  : CNc4DataOutput(NULL, filename, exist, false, true, comm, false, true) {}
+  
 int CDomainAlgorithmInterpolate::WriteNetCdf::addDimensionWrite(const StdString& name, 
                                                                 const StdSize size)
@@ -806 +810 @@
   std::vector<StdSize> count(1, localNbWeight);
   
-  WriteNetCdf netCdfWriter(filename, client->intraComm);  
-
-  // Define some dimensions
-  netCdfWriter.addDimensionWrite("n_src", n_src);
-  netCdfWriter.addDimensionWrite("n_dst", n_dst);
-  netCdfWriter.addDimensionWrite("n_weight", globalNbWeight);
-  
-  std::vector<StdString> dims(1,"n_weight");
-
-  // Add some variables
-  netCdfWriter.addVariableWrite("src_idx", NC_INT, dims);
-  netCdfWriter.addVariableWrite("dst_idx", NC_INT, dims);
-  netCdfWriter.addVariableWrite("weight", NC_DOUBLE, dims);
-
-  // End of definition
-  netCdfWriter.endDefinition();
-
-  // // Write variables
-  if (0 != localNbWeight)
-  {
-    netCdfWriter.writeDataIndex(src_idx, "src_idx", false, 0, &start, &count);
-    netCdfWriter.writeDataIndex(dst_idx, "dst_idx", false, 0, &start, &count);
-    netCdfWriter.writeDataIndex(weights, "weight", false, 0, &start, &count);
-  }
-
-  netCdfWriter.closeFile();
+  int my_rank_loc = client->intraComm->ep_comm_ptr->size_rank_info[1].first;
+  
+  cout<<"begin write weight info"<< endl;
+ 
+  WriteNetCdf *netCdfWriter;
+
+//  #pragma omp barrier
+//  #pragma omp master
+  MPI_Barrier_local(client->intraComm);
+  if(my_rank_loc==0)
+  {
+  
+    WriteNetCdf my_writer(filename, client->intraComm);  
+    netCdfWriter = &my_writer; 
+  
+    // Define some dimensions
+    netCdfWriter->addDimensionWrite("n_src", n_src);
+    netCdfWriter->addDimensionWrite("n_dst", n_dst);
+    netCdfWriter->addDimensionWrite("n_weight", globalNbWeight);
+  
+    std::vector<StdString> dims(1,"n_weight");
+
+    // Add some variables
+    netCdfWriter->addVariableWrite("src_idx", NC_INT, dims);
+    netCdfWriter->addVariableWrite("dst_idx", NC_INT, dims);
+    netCdfWriter->addVariableWrite("weight", NC_DOUBLE, dims);
+
+    // End of definition
+    netCdfWriter->endDefinition();
+  
+    netCdfWriter->closeFile();
+  }
+  
+//  #pragma omp barrier
+  MPI_Barrier_local(client->intraComm);
+  
+  #pragma omp critical (write_weight_data)
+  {
+    // open file
+    WriteNetCdf my_writer(filename, true, client->intraComm);  
+    netCdfWriter = &my_writer; 
+    
+    // // Write variables
+    if (0 != localNbWeight)
+    {
+      netCdfWriter->writeDataIndex(src_idx, "src_idx", false, 0, &start, &count);
+      netCdfWriter->writeDataIndex(dst_idx, "dst_idx", false, 0, &start, &count);
+      netCdfWriter->writeDataIndex(weights, "weight", false, 0, &start, &count);
+    }
+  }
+  
+  MPI_Barrier_local(client->intraComm);
+  
+//  #pragma omp barrier
+  cout<<"end write weight info"<< endl;
 }
 
@@ -861 +894 @@
   }
                   
-  nc_open(filename.c_str(),NC_NOWRITE, &ncid) ;
-  nc_inq_dimid(ncid,"n_weight",&weightDimId) ;
-  nc_inq_dimlen(ncid,weightDimId,&nbWeightGlo) ;
-
-  size_t nbWeight ;
-  size_t start ;
-  size_t div = nbWeightGlo/clientSize ;
-  size_t mod = nbWeightGlo%clientSize ;
-  if (clientRank < mod)
-  {
-    nbWeight=div+1 ;
-    start=clientRank*(div+1) ;
-  }
-  else
-  {
-    nbWeight=div ;
-    start= mod * (div+1) + (clientRank-mod) * div ;
-  }
-
-  double* weight=new double[nbWeight] ;
-  int weightId ;
-  nc_inq_varid (ncid, "weight", &weightId) ;
-  nc_get_vara_double(ncid, weightId, &start, &nbWeight, weight) ;
-
-  long* srcIndex=new long[nbWeight] ;
-  int srcIndexId ;
-  nc_inq_varid (ncid, "src_idx", &srcIndexId) ;
-  nc_get_vara_long(ncid, srcIndexId, &start, &nbWeight, srcIndex) ;
-
-  long* dstIndex=new long[nbWeight] ;
-  int dstIndexId ;
-  nc_inq_varid (ncid, "dst_idx", &dstIndexId) ;
-  nc_get_vara_long(ncid, dstIndexId, &start, &nbWeight, dstIndex) ;
-
-  int indexOffset=0 ;
-  if (fortranConvention) indexOffset=1 ;
-    for(size_t ind=0; ind<nbWeight;++ind)
-      interpMapValue[dstIndex[ind]-indexOffset].push_back(make_pair(srcIndex[ind]-indexOffset,weight[ind]));
- }
+  #pragma omp critical (read_weight_data)
+  {
+    nc_open(filename.c_str(),NC_NOWRITE, &ncid) ;
+    nc_inq_dimid(ncid,"n_weight",&weightDimId) ;
+    nc_inq_dimlen(ncid,weightDimId,&nbWeightGlo) ;
+
+    size_t nbWeight ;
+    size_t start ;
+    size_t div = nbWeightGlo/clientSize ;
+    size_t mod = nbWeightGlo%clientSize ;
+    if (clientRank < mod)
+    {
+      nbWeight=div+1 ;
+      start=clientRank*(div+1) ;
+    }
+    else
+    {
+      nbWeight=div ;
+      start= mod * (div+1) + (clientRank-mod) * div ;
+    }
+
+    double* weight=new double[nbWeight] ;
+    int weightId ;
+    nc_inq_varid (ncid, "weight", &weightId) ;
+    nc_get_vara_double(ncid, weightId, &start, &nbWeight, weight) ;
+
+    long* srcIndex=new long[nbWeight] ;
+    int srcIndexId ;
+    nc_inq_varid (ncid, "src_idx", &srcIndexId) ;
+    nc_get_vara_long(ncid, srcIndexId, &start, &nbWeight, srcIndex) ;
+
+    long* dstIndex=new long[nbWeight] ;
+    int dstIndexId ;
+    nc_inq_varid (ncid, "dst_idx", &dstIndexId) ;
+    nc_get_vara_long(ncid, dstIndexId, &start, &nbWeight, dstIndex) ;
+
+    int indexOffset=0 ;
+    if (fortranConvention) indexOffset=1 ;
+      for(size_t ind=0; ind<nbWeight;++ind)
+        interpMapValue[dstIndex[ind]-indexOffset].push_back(make_pair(srcIndex[ind]-indexOffset,weight[ind]));
+  }
+}
 
 void CDomainAlgorithmInterpolate::apply(const std::vector<std::pair<int,double> >& localIndex,