Changeset 1153 for XIOS/dev/branch_yushan_merged/src/node

Timestamp:

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

Author:

yushan

Message:

save modif

Location:

XIOS/dev/branch_yushan_merged/src/node

Files:

• field.cpp (modified) (1 diff)
• file.cpp (modified) (4 diffs)

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);
+     
    }