Changeset 775 for XIOS/trunk/src/node/context.cpp

Timestamp:

11/02/15 11:46:25 (9 years ago)

Author:

mhnguyen

Message:

Implementing the reading of attributes of an axis from a file

+) 3d grid can be read directly from a file
+) Clean some redundant codes
+) Add new attribute declaration that allows to output only desired attributes

Test
+) On Curie
+) test_remap passes and result is correct

File:

• XIOS/trunk/src/node/context.cpp (modified) (5 diffs)

XIOS/trunk/src/node/context.cpp

@@ -313 +313 @@
      registryOut=new CRegistry(intraComm) ;
      registryOut->setPath(getId()) ;
- 
+
      MPI_Comm intraCommClient, interCommClient;
      if (cxtClient) // Attached mode
@@ -362 +362 @@
           if (server->intraCommRank==0) CXios::globalRegistry->mergeRegistry(*registryOut) ;
         }
-        
+
         for (std::list<MPI_Comm>::iterator it = comms.begin(); it != comms.end(); ++it)
           MPI_Comm_free(&(*it));
@@ -439 +439 @@
      for (unsigned int i = 0; i < this->enabledFiles.size(); i++)
      (void)this->enabledFiles[i]->getEnabledFields();
+   }
+
+   void CContext::findAllEnabledFieldsInReadModeFiles(void)
+   {
+     for (unsigned int i = 0; i < this->enabledReadModeFiles.size(); ++i)
+     (void)this->enabledReadModeFiles[i]->getEnabledFields();
+   }
+
+   void CContext::readAttributesOfEnabledFieldsInReadModeFiles()
+   {
+      for (unsigned int i = 0; i < this->enabledReadModeFiles.size(); ++i)
+        (void)this->enabledReadModeFiles[i]->readAttributesOfEnabledFieldsInReadMode();
    }
 
@@ -785 +797 @@
       // Find all enabled fields of each file
       this->findAllEnabledFields();
-
+      this->findAllEnabledFieldsInReadModeFiles();
+
+     if (hasClient && !hasServer)
+     {
+      // Try to read attributes of fields in file then fill in corresponding grid (or domain, axis)
+      this->readAttributesOfEnabledFieldsInReadModeFiles();
+     }
       // Search and rebuild all reference object of enabled fields
       this->solveAllRefOfEnabledFields(false);
@@ -1053 +1071 @@
       if (hasClient)
       {
-        checkPrefetchingOfEnabledReadModeFiles();
+        //checkPrefetchingOfEnabledReadModeFiles();
         garbageCollector.invalidate(calendar->getCurrentDate());
       }