Changeset 1021 for XIOS/dev/dev_olga/src/node/file.cpp

Timestamp:

01/10/17 14:36:29 (7 years ago)

Author:

oabramkina

Message:

Intermeadiate version for merging with new server functionalities.

File:

• XIOS/dev/dev_olga/src/node/file.cpp (modified) (10 diffs)

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

@@ -14 +14 @@
 #include "type.hpp"
 #include "xios_spl.hpp"
-#include "context_client.hpp"
 #include "mpi.hpp"
 
@@ -376 +375 @@
          {
            middlePart=filename.substr(pos1,pos2-pos1) ;
-           cout<<pos2<<endl ;
            pos2+=strEndDate.size() ;
            lastPart=filename.substr(pos2,filename.size()-pos2) ;
@@ -746 +744 @@
      int size = this->enabledFields.size();
      for (int i = 0; i < size; ++i)
-       this->enabledFields[i]->sendReadDataRequest();
+       this->enabledFields[i]->sendReadDataRequest(CContext::getCurrent()->getCalendar()->getCurrentDate());
    }
 
@@ -822 +820 @@
    {
      return vVariableGroup->createChildGroup(id);
+   }
+
+   void CFile::setContextClient(CContextClient* newContextClient)
+   {
+     client = newContextClient;
+   }
+
+   CContextClient* CFile::getContextClient()
+   {
+     return client;
    }
 
@@ -853 +861 @@
    }
 
-   void CFile::sendAddField(const string& id, const int srvPool)
-   {
-      sendAddItem(id, EVENT_ID_ADD_FIELD, srvPool);
+   void CFile::sendAddField(const string& id, CContextClient* client)
+   {
+      sendAddItem(id, EVENT_ID_ADD_FIELD, client);
     // CContext* context = CContext::getCurrent();
 
@@ -974 +982 @@
    }
 
-   void CFile::sendAddAllVariables(const int srvPool)
+   void CFile::sendAddAllVariables(CContextClient* client)
    {
      std::vector<CVariable*> allVar = getAllVariables();
@@ -982 +990 @@
      for (; it != itE; ++it)
      {
-       this->sendAddVariable((*it)->getId(), srvPool);
-       (*it)->sendAllAttributesToServer(srvPool);
-       (*it)->sendValue(srvPool);
+       this->sendAddVariable((*it)->getId(), client);
+       (*it)->sendAllAttributesToServer(client);
+       (*it)->sendValue(client);
      }
    }
@@ -1046 +1054 @@
    }
 
-   void CFile::sendAddVariable(const string& id, const int srvPool)
-   {
-      sendAddItem(id, (int)EVENT_ID_ADD_VARIABLE, srvPool);
+   void CFile::sendAddVariable(const string& id, CContextClient* client)
+   {
+      sendAddItem(id, (int)EVENT_ID_ADD_VARIABLE, client);
     // CContext* context = CContext::getCurrent();
 
@@ -1126 +1134 @@
    Remark: This function must be called AFTER all active (enabled) files have been created on the server side
    */
-   void CFile::sendEnabledFields()
+//   void CFile::sendEnabledFields()
+//   {
+//     size_t size = this->enabledFields.size();
+//     for (size_t i = 0; i < size; ++i)
+//     {
+//       CField* field = this->enabledFields[i];
+//       this->sendAddField(field->getId());
+//       field->sendAllAttributesToServer();
+//       field->sendAddAllVariables();
+//     }
+//   }
+
+   /*!
+     \brief Sending all active (enabled) fields from client to server.
+   Each field is identified uniquely by its string identity. Not only should we
+   send the id to server but also we need to send ids of reference domain and reference axis.
+   With these two id, it's easier to make reference to grid where all data should be written.
+   Remark: This function must be called AFTER all active (enabled) files have been created on the server side
+   */   void CFile::sendEnabledFields(CContextClient* client)
    {
      size_t size = this->enabledFields.size();
@@ -1132 +1158 @@
      {
        CField* field = this->enabledFields[i];
-       this->sendAddField(field->getId());
-       field->sendAllAttributesToServer();
-       field->sendAddAllVariables();
+       this->sendAddField(field->getId(), client);
+       field->sendAllAttributesToServer(client);
+       field->sendAddAllVariables(client);
      }
    }
 
-   void CFile::sendEnabledFields(const int srvPool)
-   {
-     size_t size = this->enabledFields.size();
-     for (size_t i = 0; i < size; ++i)
-     {
-       CField* field = this->enabledFields[i];
-       this->sendAddField(field->getId(), srvPool);
-       field->sendAllAttributesToServer(srvPool);
-       field->sendAddAllVariables(srvPool);
-     }
-   }
 
    /*!