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

Timestamp:

05/23/17 16:32:26 (7 years ago)

Author:

mhnguyen

Message:

Cleaning up some redundant codes

File:

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

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

@@ -526 +526 @@
    void CContext::postProcessingGlobalAttributes()
    {
-     if (allProcessed) return;
+     if (allProcessed) return;  
      
-     // if (hasClient)
-     // {
-       // After xml is parsed, there are some more works with post processing
-       postProcessing();
-
-       // Check grid and calculate its distribution
-       checkGridEnabledFields();
-
-     //}
-
-
+     // After xml is parsed, there are some more works with post processing
+     postProcessing();
+
+     // Check grid and calculate its distribution
+     checkGridEnabledFields();    
 
      setClientServerBuffer();
@@ -565 +559 @@
        // We have a xml tree on the server side and now, it should be also processed
        sendPostProcessing();
+
        sendGridEnabledFields();       
      }
@@ -605 +600 @@
 
    void CContext::recvPostProcessingGlobalAttributes(CBufferIn& buffer)
-   {
-      // CCalendarWrapper::get(CCalendarWrapper::GetDefName())->createCalendar();
+   {      
       postProcessingGlobalAttributes();
    }
@@ -632 +626 @@
       buildFilterGraphOfFieldsWithReadAccess();
     }
-
-    // if (hasClient) this->solveAllRefOfEnabledFields(true);    
-    checkGridEnabledFields();
-    // sendGridEnabledFields();
+    
+    checkGridEnabledFields();    
 
     if (hasClient) this->sendProcessingGridOfEnabledFields();
@@ -666 +658 @@
       for (unsigned int i = 0; i < this->enabledReadModeFiles.size(); ++i)
         (void)this->enabledReadModeFiles[i]->readAttributesOfEnabledFieldsInReadMode();
-   }
-
-   void CContext::solveAllEnabledFields()
-   {
-     int size = this->enabledFiles.size();
-     for (int i = 0; i < size; ++i)
-     {
-       this->enabledFiles[i]->solveOnlyRefOfEnabledFields(false);
-     }
-
-     for (int i = 0; i < size; ++i)
-     {
-       this->enabledFiles[i]->generateNewTransformationGridDest();
-     }
    }
 
@@ -1062 +1040 @@
       CBufferIn* buffer=event.subEvents.begin()->buffer;
       string id;
-      *buffer>>id;
-      //get(id)->solveOnlyRefOfEnabledFields(false);
+      *buffer>>id;      
    }
 
@@ -1156 +1133 @@
 
       // Check if some automatic time series should be generated
-      // Warning: This must be done after solving the inheritance and before the rest of post-processing
-      // prepareTimeseries();
+      // Warning: This must be done after solving the inheritance and before the rest of post-processing      
 
       // The timeseries should only be prepared in client
@@ -1164 +1140 @@
       //Initialisation du vecteur 'enabledFiles' contenant la liste des fichiers à sortir.
       this->findEnabledFiles();
-      // this->findEnabledReadModeFiles();
+      
       // For now, only read files with client and only one level server
       if (hasClient && !hasServer) this->findEnabledReadModeFiles();
-
 
       // Find all enabled fields of each file
@@ -1174 +1149 @@
       if (hasClient && !hasServer) this->findAllEnabledFieldsInReadModeFiles();
 
-//     if (hasClient)
-     if (hasClient && !hasServer)
-     {
-      // Try to read attributes of fields in file then fill in corresponding grid (or domain, axis)
-      this->readAttributesOfEnabledFieldsInReadModeFiles();
-     }
+
+      if (hasClient && !hasServer)
+      {
+       // Try to read attributes of fields in file then fill in corresponding grid (or domain, axis)
+       this->readAttributesOfEnabledFieldsInReadModeFiles();
+      }
 
       // Only search and rebuild all reference objects of enable fields, don't transform