Changeset 1153 for XIOS/dev/branch_yushan_merged/src

Timestamp:

06/02/17 17:53:25 (7 years ago)

Author:

yushan

Message:

save modif

Location:

XIOS/dev/branch_yushan_merged/src

Files:

• io/netCdfInterface.cpp (modified) (3 diffs)
• node/field.cpp (modified) (1 diff)
• node/file.cpp (modified) (4 diffs)
• test/test_remap_omp.f90 (modified) (3 diffs)
• transformation/Functions/reduction.cpp (modified) (1 diff)
• transformation/scalar_algorithm_reduce_axis.cpp (modified) (1 diff)

XIOS/dev/branch_yushan_merged/src/io/netCdfInterface.cpp

@@ -75 +75 @@
 int CNetCdfInterface::open(const StdString& fileName, int oMode, int& ncId)
 {
-  int status = nc_open(fileName.c_str(), oMode, &ncId);
+  int status = NC_NOERR;
+  #pragma omp critical (_netcdf)
+  status = nc_open(fileName.c_str(), oMode, &ncId);
+  
   if (NC_NOERR != status)
   {
@@ -105 +108 @@
   int status;
   #pragma omp critical (_netcdf)
-  status = xios::nc_open_par(fileName.c_str(), oMode, comm, info, &ncId);
+  status = xios::nc_open_par(fileName.c_str(), oMode, comm, info, &ncId); // nc_open
   if (NC_NOERR != status)
   {
@@ -129 +132 @@
 {
   int status = NC_NOERR;
-  //#pragma omp critical (_netcdf)
-  #pragma omp master
+  #pragma omp critical (_netcdf)
+  //#pragma omp master
   {
   status = nc_close(ncId);

XIOS/dev/branch_yushan_merged/src/node/field.cpp

@@ -713 +713 @@
      if (context->hasClient)
      {
-       MPI_Barrier(context->client->intraComm);
-       printf("Proc %d enters function\n", myRank);
+       //MPI_Barrier(context->client->intraComm);
+       //printf("Proc %d enters function\n", myRank);
        solveTransformedGrid();
-       MPI_Barrier(context->client->intraComm);
-       printf("Proc %d exits function\n", myRank);
+       //MPI_Barrier(context->client->intraComm);
+       //printf("Proc %d exits function\n", myRank);
      }
 

XIOS/dev/branch_yushan_merged/src/node/file.cpp

@@ -578 +578 @@
       bool isCollective = par_access.isEmpty() || par_access == par_access_attr::collective;
 
+      #ifdef _usingEP
+      if(omp_get_num_threads() != 1 ) multifile = true;
+      #endif
+
       if (isOpen) data_out->closeFile();
       if (time_counter_name.isEmpty()) data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective));
@@ -609 +613 @@
 
      // It would probably be better to call initFile() somehow
+     
      MPI_Comm_dup(client->intraComm, &fileComm);
      if (time_counter_name.isEmpty()) time_counter_name = "time_counter";
 
-     //#pragma omp critical (_checkFile)
-     checkFile();
+     //#pragma omp critical (_readAttributesOfEnabledFieldsInReadMode_)
+     //{
+     checkFile(); // calls nc_open
 
      for (int idx = 0; idx < enabledFields.size(); ++idx)
@@ -627 +633 @@
 
         // Read necessary value from file
-        this->data_in->readFieldAttributesValues(enabledFields[idx]);
-
+        #pragma omp critical (_func)
+        {
+          //checkFile();
+          this->data_in->readFieldAttributesValues(enabledFields[idx]);
+          //close();
+        }
+        
         // Fill attributes for base reference
         enabledFields[idx]->solveGridDomainAxisBaseRef();
@@ -634 +645 @@
 
      // Now everything is ok, close it
-     //close();
+     close();
+     //}
+     
+     //if (fileComm != MPI_COMM_NULL) MPI_Comm_free(&fileComm);
+     
    }
 

XIOS/dev/branch_yushan_merged/src/test/test_remap_omp.f90

@@ -52 +52 @@
   if(rank < size-2) then
 
-  !$omp parallel default(firstprivate) 
+  !$omp parallel default(firstprivate) firstprivate(dtime)
 
 !!! XIOS Initialization (get the local communicator)
@@ -59 +59 @@
   CALL MPI_COMM_RANK(comm,rank,ierr)
   CALL MPI_COMM_SIZE(comm,size,ierr)
+  
+  rank = rank*omp_get_num_threads() + omp_get_thread_num()
+  size = size*omp_get_num_threads()
 
   
@@ -202 +205 @@
 
   CALL xios_close_context_definition()
+
+  CALL xios_get_domain_attr("src_domain_regular_read", ni=src_tmp_ni, nj=src_tmp_nj)
+  ALLOCATE(tmp_field_0(src_tmp_ni*src_tmp_nj))
+
+  CALL xios_get_axis_attr("src_axis_curvilinear_read", n=src_tmp_n)
+  CALL xios_get_domain_attr("src_domain_curvilinear_read", ni=src_tmp_ni, nj=src_tmp_nj)
+  ALLOCATE(tmp_field_1(src_tmp_ni*src_tmp_nj*src_tmp_n))
+
+  CALL xios_get_domain_attr("src_domain_unstructured_read", ni=src_tmp_ni, nj=src_tmp_nj)
+  ALLOCATE(tmp_field_2(src_tmp_ni*src_tmp_nj))
+  
+  CALL xios_recv_field("src_field_regular", tmp_field_0)
+  CALL xios_recv_field("src_field_curvilinear", tmp_field_1)
+  CALL xios_recv_field("src_field_unstructured", tmp_field_2)
+
+  DO ts=1,10
+    CALL xios_update_calendar(ts)
+    CALL xios_send_field("src_field_2D",src_field_2D)
+    
+    DO i=1,src_ni
+      src_field_2D_clone(i) = src_field_2D(i)
+      IF ((23.5 * ts < src_lat(i)) .AND. (src_lat(i) < 65.5 *ts) .AND. (0 < src_lon(i)) .AND. (src_lon(i) < 30*ts)) THEN      
+        src_field_2D_clone(i) = missing_value    
+      ENDIF
+    ENDDO
+
+    CALL xios_send_field("src_field_2D_clone",src_field_2D_clone)
+    CALL xios_send_field("src_field_3D",src_field_3D)
+    CALL xios_send_field("src_field_3D_clone",src_field_3D)
+    CALL xios_send_field("src_field_4D",src_field_4D)
+    CALL xios_send_field("src_field_3D_pression",src_field_pression)
+    CALL xios_send_field("tmp_field_0",tmp_field_0)
+    CALL xios_send_field("tmp_field_1",tmp_field_1)
+    CALL xios_send_field("tmp_field_2",tmp_field_2)
+    CALL wait_us(5000) ;
+   ENDDO
   
   CALL xios_context_finalize()
+
+  DEALLOCATE(src_lon, src_lat, src_boundslon,src_boundslat, src_field_2D)
+  DEALLOCATE(dst_lon, dst_lat, dst_boundslon,dst_boundslat)
+  DEALLOCATE(tmp_field_0, tmp_field_1, tmp_field_2)
   
   CALL xios_finalize()

XIOS/dev/branch_yushan_merged/src/transformation/Functions/reduction.cpp

@@ -50 +50 @@
   (*CReductionAlgorithm::ReductionOperations_ptr)["average"] = TRANS_REDUCE_AVERAGE;
   CAverageReductionAlgorithm::registerTrans();
+
+  printf("*CReductionAlgorithm::ReductionOperations_ptr = %p\t %p\n", *CReductionAlgorithm::ReductionOperations_ptr, &(*CReductionAlgorithm::ReductionOperations_ptr));
 }
 

XIOS/dev/branch_yushan_merged/src/transformation/scalar_algorithm_reduce_axis.cpp

@@ -75 +75 @@
   }
   
-  if ((*CReductionAlgorithm::ReductionOperations_ptr).end() == (*CReductionAlgorithm::ReductionOperations_ptr).find(op))
-    ERROR("CScalarAlgorithmReduceAxis::CScalarAlgorithmReduceAxis(CAxis* axisDestination, CAxis* axisSource, CReduceAxisToScalar* algo)",
-       << "Operation '" << op << "' not found. Please make sure to use a supported one"
-       << "Axis source " <<axisSource->getId() << std::endl
-       << "Scalar destination " << scalarDestination->getId());
+  //if ((*CReductionAlgorithm::ReductionOperations_ptr).end() == (*CReductionAlgorithm::ReductionOperations_ptr).find(op))
+  //  if ((CReductionAlgorithm::ReductionOperations_ptr)->end() == (CReductionAlgorithm::ReductionOperations_ptr)->find(op))
+  //  ERROR("CScalarAlgorithmReduceAxis::CScalarAlgorithmReduceAxis(CAxis* axisDestination, CAxis* axisSource, CReduceAxisToScalar* algo)",
+  //     << "Operation '" << op << "' not found. Please make sure to use a supported one"
+  //     << "Axis source " <<axisSource->getId() << std::endl
+  //     << "Scalar destination " << scalarDestination->getId());
 
   reduction_ = CReductionAlgorithm::createOperation((*CReductionAlgorithm::ReductionOperations_ptr)[op]);