Changeset 1961 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Timestamp:

10/12/20 11:26:40 (4 years ago)

Author:

ymipsl

Message:

Rewrite file writing filter.
YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Files:

• field.cpp (modified) (3 diffs)
• field.hpp (modified) (2 diffs)
• file.cpp (modified) (3 diffs)
• file.hpp (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.cpp

@@ -163 +163 @@
   CATCH
 
-  
+/*  
   void CField::writeUpdateData(const CArray<double,1>& data)
   TRY
@@ -169 +169 @@
     const CDate writeDate = last_Write_srv + freq_write_srv;
     last_Write_srv = writeDate;
-    // grid_->computeWrittenIndex(); -> obselete function need to be removed
-    /*
-    recvDataSrv.resize(data.numElements()) ;
-    recvDataSrv = data ;
-    */
     writeField(data);
     lastlast_Write_srv = last_Write_srv;
   }
   CATCH_DUMP_ATTR
-
-
+*/
+
+/*
   void CField::writeField(const CArray<double,1>& data)
   TRY
@@ -194 +190 @@
   }
   CATCH_DUMP_ATTR
-
+*/
+  
   /*
     Send a request for reading data.

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.hpp

@@ -203 +203 @@
         void recvUpdateDataFromCoupler(std::map<int,CBufferIn*>& rankBuffers); // old interface to be removed
         
-        void writeField(const CArray<double,1>& data);
+//        void writeField(const CArray<double,1>& data);
         bool sendReadDataRequest(const CDate& tsDataRequested);
         bool sendReadDataRequestIfNeeded(void);
@@ -246 +246 @@
         void recvAddVariableGroup(CBufferIn& buffer);        
         void sendAddAllVariables(CContextClient* client);
-        void writeUpdateData(const CArray<double,1>& data);
+        //void writeUpdateData(const CArray<double,1>& data);
 
         const std::vector<StdString>& getRefDomainAxisIds();

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/file.cpp

@@ -318 +318 @@
     {
       CContext* context = CContext::getCurrent();
-      // Done by classical server or secondary server
-      // This condition should be changed soon
-//ym      if (CServer::serverLevel == 0 || CServer::serverLevel == 2)
-       if (context->getServiceType()==CServicesManager::IO_SERVER || context->getServiceType()==CServicesManager::OUT_SERVER)
-       {
-        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?
-      }
+
+      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(); 
     }
     CATCH_DUMP_ATTR
@@ -417 +412 @@
           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 +427 @@
     }
     CATCH_DUMP_ATTR
+
 
    /*!

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/file.hpp

@@ -179 +179 @@
          CDate lastSync;
          CDate lastSplit;
+         
+         const CDate& getLastSplit(void) { return lastSplit ; }
+        
          int nbAxis, nbDomains;
          bool isOpen;