Changeset 775 for XIOS/trunk/src/node/file.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/file.cpp (modified) (3 diffs)

XIOS/trunk/src/node/file.cpp

@@ -24 +24 @@
       : CObjectTemplate<CFile>(), CFileAttributes()
       , vFieldGroup(), data_out(), enabledFields(), fileComm(MPI_COMM_NULL)
+      , allDomainEmpty(false), isOpen(false)
    {
      setVirtualFieldGroup();
@@ -32 +33 @@
       : CObjectTemplate<CFile>(id), CFileAttributes()
       , vFieldGroup(), data_out(), enabledFields(), fileComm(MPI_COMM_NULL)
+      , allDomainEmpty(false), isOpen(false)
     {
       setVirtualFieldGroup();
@@ -543 +545 @@
    //----------------------------------------------------------------
 
+   void CFile::readAttributesOfEnabledFieldsInReadMode()
+   {
+     if (enabledFields.empty()) return;
+
+     // Just check file and try to open it
+     CContext* context = CContext::getCurrent();
+     CContextClient* client=context->client;
+
+     MPI_Comm_dup(client->intraComm, &fileComm);
+     checkFile();
+     for (int idx = 0; idx < enabledFields.size(); ++idx)
+     {
+        // First of all, find out which domain and axis associated with this field
+        enabledFields[idx]->solveGridReference();
+
+        // Read attributes of domain and axis from this file
+        this->data_in->readFieldAttributesMetaData(enabledFields[idx]);
+
+        // Now complete domain and axis associated with this field
+        enabledFields[idx]->solveGenerateGrid();
+
+        // Read necessary value from file
+        this->data_in->readFieldAttributesValues(enabledFields[idx]);
+
+        // Fill attributes for base reference
+        enabledFields[idx]->solveGridDomainAxisBaseRef();
+     }
+
+     // Now everything is ok, close it
+     close();
+
+   }
+
+
    /*!
    \brief Parse xml file and write information into file object