Changeset 2019 for XIOS/dev/dev_trunk_graph/src/node/file.cpp

Timestamp:

01/22/21 12:00:29 (3 years ago)

Author:

yushan

Message:

Graph intermedia commit to a tmp branch

File:

• XIOS/dev/dev_trunk_graph/src/node/file.cpp (modified) (24 diffs)

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

@@ -145 +145 @@
    TRY
    {
-      if (!this->enabledFields.empty())
-         return (this->enabledFields);
-
-      const int _outputlevel =
-         (!output_level.isEmpty()) ? output_level.getValue() : default_outputlevel;
+      if (!this->enabledFields.empty()) return (this->enabledFields);
+
+      const int _outputlevel = (!output_level.isEmpty()) ? output_level.getValue() : default_outputlevel;
       std::vector<CField*>::iterator it;
       this->enabledFields = this->getAllFields();
@@ -176 +174 @@
 
          newEnabledFields.push_back(*it);
-         // Le champ est finalement actif, on y ajoute la rfrence au champ de base.
-         (*it)->setRelFile(CFile::get(this));
       }
       enabledFields = newEnabledFields;
@@ -226 +222 @@
       CContext* context = CContext::getCurrent();
       const CDate& currentDate = context->calendar->getCurrentDate();
-      CContextServer* server = context->server;
 
       lastSync  = currentDate;
@@ -245 +240 @@
       isOpen = false;      
 
-//      if (!record_offset.isEmpty() && record_offset < 0)
-//        ERROR("void CFile::initFile(void)",
-//              "Invalid 'record_offset', this attribute cannot be negative.");
-      const int recordOffset = record_offset.isEmpty() ? 0 : record_offset;
-
       set<StdString> setAxis;
       set<StdString> setDomains;
@@ -257 +247 @@
       {
          CField* field = *it;         
-         std::vector<CAxis*> vecAxis = field->grid->getAxis();
+         std::vector<CAxis*> vecAxis = field->getGrid()->getAxis();
          for (size_t i = 0; i < vecAxis.size(); ++i)
            setAxis.insert(vecAxis[i]->getAxisOutputName());
-         std::vector<CDomain*> vecDomains = field->grid->getDomains();
+         std::vector<CDomain*> vecDomains = field->getGrid()->getDomains();
          for (size_t i = 0; i < vecDomains.size(); ++i)
            setDomains.insert(vecDomains[i]->getDomainOutputName());
-
-         field->resetNStep(recordOffset);
       }
       nbAxis = setAxis.size();
@@ -272 +260 @@
       createSubComFile();
 
-      // if (time_counter.isEmpty()) time_counter.setValue(time_counter_attr::centered);
       if (time_counter_name.isEmpty()) time_counter_name = "time_counter";
     }
@@ -281 +268 @@
     TRY
     {
+      CContext* context = CContext::getCurrent();
       if (checkRead) return;
-      createSubComFile();
+      //createSubComFile();
+      allZoneEmpty = false; 
+      MPI_Comm_dup(context->intraComm_, &fileComm) ;
       checkRead = true;
     }
@@ -294 +284 @@
     {
       CContext* context = CContext::getCurrent();
-      CContextServer* server = context->server;
 
       // create sub communicator for file
@@ -302 +291 @@
       {
          CField* field = *it;
-         bool nullGrid = (0 == field->grid);
-         allZoneEmpty &= nullGrid ? false : !field->grid->doGridHaveDataToWrite();
+         bool nullGrid = (nullptr == field->getGrid());
+         allZoneEmpty &= nullGrid ? false : !field->getGrid()->doGridHaveDataToWrite();
       }
 
       int color = allZoneEmpty ? 0 : 1;
-      MPI_Comm_split(server->intraComm, color, server->intraCommRank, &fileComm);
+      MPI_Comm_split(context->intraComm_, color, context->intraCommRank_, &fileComm);
       if (allZoneEmpty) MPI_Comm_free(&fileComm);
     }
@@ -321 +310 @@
     {
       CContext* context = CContext::getCurrent();
-      // Done by classical server or secondary server
-      // This condition should be changed soon
-      if (CServer::serverLevel == 0 || CServer::serverLevel == 2)
+
+      if (mode.isEmpty() || mode.getValue() == mode_attr::write)
       {
-        if (mode.isEmpty() || mode.getValue() == mode_attr::write)
-        {
-          CTimer::get("Files : create headers").resume();
-          if (!isOpen) createHeader();
-          CTimer::get("Files : create headers").suspend();
-          checkSync();
-        }        
-        checkSplit(); // REally need this?
-      }
+        CTimer::get("Files : create headers").resume();
+        if (!isOpen) createHeader();
+        CTimer::get("Files : create headers").suspend();
+        checkSync();
+      }        
+      checkSplit(); 
     }
     CATCH_DUMP_ATTR
@@ -349 +334 @@
       // Done by classical server or secondary server
       // TODO: This condition should be changed soon. It only works with maximum number of level as 2
-      if (CServer::serverLevel == 0 || CServer::serverLevel == 1)
-      {
+
+//ym      if (CServer::serverLevel == 0 || CServer::serverLevel == 1) 
+// ym client must doing it also
+//      if (context->getServiceType()==CServicesManager::IO_SERVER || context->getServiceType()==CServicesManager::GATHERER)
+//      {
         if (!mode.isEmpty() && mode.getValue() == mode_attr::read)
         {
@@ -360 +348 @@
         }
         //checkSplit(); // Really need for reading?
-      }
+ //     }
     }
     CATCH_DUMP_ATTR
@@ -416 +404 @@
           lastSplit = lastSplit + split_freq.getValue();
           std::vector<CField*>::iterator it, end = this->enabledFields.end();
-          for (it = this->enabledFields.begin(); it != end; it++)
+/*          for (it = this->enabledFields.begin(); it != end; it++)
           {
             (*it)->resetNStep();
             (*it)->resetNStepMax();
-          }
+          }*/
           if (mode.isEmpty() || mode.getValue() == mode_attr::write)
             createHeader();
@@ -432 +420 @@
     CATCH_DUMP_ATTR
 
+
    /*!
    \brief Create header of netcdf file
@@ -440 +429 @@
    {
       CContext* context = CContext::getCurrent();
-      CContextServer* server = context->server;
-
+      
       if (!allZoneEmpty)
       {
@@ -557 +545 @@
             MPI_Comm_rank(fileComm, &commRank);
 
-            if (server->intraCommSize > 1)
+            if (context->intraCommSize_ > 1)
             {
               oss << "_" ;
@@ -633 +621 @@
   {
     CContext* context = CContext::getCurrent();
-    CContextServer* server = context->server;
     MPI_Comm readComm = this->fileComm;
 
@@ -680 +667 @@
         MPI_Comm_rank(readComm, &commRank);
 
-        if (server->intraCommSize > 1)
+        if (context->intraCommSize_ > 1)
         {
           oss << "_";
@@ -696 +683 @@
       bool isCollective = par_access.isEmpty() || par_access == par_access_attr::collective;
       bool readMetaDataPar = true;
-      if (!context->hasServer) readMetaDataPar = (read_metadata_par.isEmpty()) ? false : read_metadata_par;
+      if (context->getServiceType()==CServicesManager::CLIENT) readMetaDataPar = (read_metadata_par.isEmpty()) ? false : read_metadata_par;
 
       if (isOpen) data_out->closeFile();
@@ -747 +734 @@
 
         // Now complete domain and axis associated with this field
-        enabledFields[idx]->solveGenerateGrid();
+       
+       //ym => this a problem in wich order are done the grid generation. Probably metadata are read in file and after the grid is ditributed by the filter
+       // => must be checked in detail. But solveGenerated grid is not existing any more with new transformation framework
+       // enabledFields[idx]->solveGenerateGrid();
 
         // Read necessary value from file
@@ -761 +751 @@
    CATCH_DUMP_ATTR
 
+   void CFile::readFieldAttributesMetaData(CField* field)
+   {
+     this->data_in->readFieldAttributesMetaData(field);
+   }
+
+   void CFile::readFieldAttributesValues(CField* field)
+   {
+     this->data_in->readFieldAttributesValues(field);
+   }
    /*!
    \brief Parse xml file and write information into file object
@@ -822 +821 @@
 
    //----------------------------------------------------------------
-
-   /*!
-   \brief Resolve all reference of active fields.
-      In order to know exactly which data each active field has, a search for all its
-   reference to find its parents or/and its base reference object must be done. Moreover
-   during this search, there are some information that can only be sent to server AFTER
-   all information of active fields are created on server side, e.g: checking mask or index
-   \param [in] sendToServer: Send all info to server (true) or only a part of it (false)
-   */
-   void CFile::solveOnlyRefOfEnabledFields(bool sendToServer)
-   TRY
-   {
-     int size = this->enabledFields.size();
-     for (int i = 0; i < size; ++i)
-     {
-       this->enabledFields[i]->solveOnlyReferenceEnabledField(sendToServer);
-     }
-   }
-   CATCH_DUMP_ATTR
 
    void CFile::checkGridOfEnabledFields()
@@ -931 +911 @@
    CATCH_DUMP_ATTR
 
-   void CFile::generateNewTransformationGridDest()
-   TRY
-   {
-     int size = this->enabledFields.size();
-     for (int i = 0; i < size; ++i)
-     {
-       this->enabledFields[i]->generateNewTransformationGridDest();
-     }
-   }
-   CATCH_DUMP_ATTR
-
-   /*!
-   \brief Resolve all reference of active fields.
-      In order to know exactly which data each active field has, a search for all its
-   reference to find its parents or/and its base reference object must be done. Moreover
-   during this search, there are some information that can only be sent to server AFTER
-   all information of active fields are created on server side, e.g: checking mask or index
-   \param [in] sendToServer: Send all info to server (true) or only a part of it (false)
-   */
-   void CFile::solveAllRefOfEnabledFieldsAndTransform(bool sendToServer)
-   TRY
-   {
-     int size = this->enabledFields.size();
-     for (int i = 0; i < size; ++i)
-     {       
-      this->enabledFields[i]->solveAllEnabledFieldsAndTransform();
-     }
-   }
-   CATCH_DUMP_ATTR
-
-   /*!
-    * Constructs the filter graph for each active field.
-    *
-    * \param gc the garbage collector to use when building the filter graph
-    */
-   void CFile::buildFilterGraphOfEnabledFields(CGarbageCollector& gc)
-   TRY
-   {
-     int size = this->enabledFields.size();
-     for (int i = 0; i < size; ++i)
-     {
-       this->enabledFields[i]->buildFilterGraph(gc, true);
-     }
-   }
-   CATCH_DUMP_ATTR
 
    /*!
@@ -1350 +1285 @@
    CATCH_DUMP_ATTR
 
+
+  
+   /*!
+    * Send file attribute, related variable and chield field tree to a given file server.
+    * \param[in] client : the context client where to send file
+    */
+   void CFile::sendFileToFileServer(CContextClient* client)
+   TRY
+   {
+     if (sendFileToFileServer_done_.count(client)!=0) return ;
+     else sendFileToFileServer_done_.insert(client) ;
+     
+     StdString fileDefRoot("file_definition");
+     CFileGroup* cfgrpPtr = CFileGroup::get(fileDefRoot);
+     cfgrpPtr->sendCreateChild(this->getId(), client);
+     this->sendAllAttributesToServer(client);
+     this->sendAddAllVariables(client);
+     for(auto field : enabledFields) this->sendAddField(field->getId(), client);
+   }
+   CATCH_DUMP_ATTR
    /*!
    \brief Dispatch event received from client