Changeset 1077 for XIOS/dev/dev_olga/src/node/context.cpp

Timestamp:

03/17/17 15:05:36 (7 years ago)

Author:

oabramkina

Message:

dev: Intermediate commit

Done:
Registries: ok with two server levels

To do (on a single server level):
test_complete
reading

File:

• XIOS/dev/dev_olga/src/node/context.cpp (modified) (4 diffs)

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

@@ -460 +460 @@
          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));
-//       comms.clear();
-
       }
    }
+
    //! Free internally allocated communicators
    void CContext::freeComms(void)
@@ -562 +558 @@
    void CContext::closeDefinition(void)
    {
-     // There is nothing client need to send to server
-//      if (hasClient)
-//     if (hasClient && !hasServer)
-//      if (hasClient)
-//      {
-//        // After xml is parsed, there are some more works with post processing
-//        postProcessing();
-//      }
-
-//      setClientServerBuffer();
-
-// //     if (hasClient && !hasServer)
-//      if (hasClient)
-//      {
-//       // Send all attributes of current context to server
-//       this->sendAllAttributesToServer();
-
-//       // Send all attributes of current calendar
-//       CCalendarWrapper::get(CCalendarWrapper::GetDefName())->sendAllAttributesToServer();
-
-//       // We have enough information to send to server
-//       // First of all, send all enabled files
-//        sendEnabledFiles();
-
-//       // Then, send all enabled fields
-//        sendEnabledFields();
-
-//       // At last, we have all info of domain and axis, then send them
-//        sendRefDomainsAxis();
-
-//       // After that, send all grid (if any)
-//        sendRefGrid();
-
-//        // // We have a xml tree on the server side and now, it should be also processed
-//        sendPostProcessing();
-//      }
-
-
-     // Now tell server that it can process all messages from client
-     // if (hasClient) this->sendCloseDefinition();
     postProcessingGlobalAttributes();
 
@@ -611 +567 @@
      if (hasClient && !hasServer)
     {
-      // this->buildFilterGraphOfEnabledFields();  // references are resolved here (access xml file)
       buildFilterGraphOfFieldsWithReadAccess();
-      // this->solveAllRefOfEnabledFields(true);
     }
 
@@ -619 +573 @@
     this->processGridEnabledFields();
     if (hasClient) this->sendProcessingGridOfEnabledFields();
-    // if (hasClient)        // We have a xml tree on the server side and now, it should be also processed
-    //    sendPostProcessing();
-//    // Now tell server that it can process all messages from client
-////    if (hasClient && !hasServer) this->sendCloseDefinition();
-   if (hasClient) this->sendCloseDefinition();
+    if (hasClient) this->sendCloseDefinition();
 
     // Nettoyage de l'arborescence
-//    if (hasClient && !hasServer) CleanTree(); // Only on client side??
     if (hasClient) CleanTree(); // Only on client side??