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

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/filter

Files:

• file_writer_store_filter.cpp (modified) (2 diffs)
• file_writer_store_filter.hpp (modified) (2 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/filter/file_writer_store_filter.cpp

@@ -2 +2 @@
 #include "exception.hpp"
 #include "field.hpp"
+#include "file.hpp"
+#include "context.hpp"
 
 namespace xios
@@ -7 +9 @@
   CFileWriterStoreFilter::CFileWriterStoreFilter(CGarbageCollector& gc, CField* field)
     : CInputPin(gc, 1)
-    , field(field)
+    , field_(field)
+
   {
-    if (!field)
-      ERROR("CFileWriterStoreFilter::CFileWriterStoreFilter(CField* field)",
-            "The field cannot be null.");
+    CContext* context = CContext::getCurrent();
+
+    if (!field) ERROR("CFileWriterStoreFilter::CFileWriterStoreFilter(CField* field)", "The field cannot be null.");
+    file_ = field->getFileOut() ;
+    grid_= field->getGrid() ;
+    freqWrite_ = file_->output_freq ;
+    lastWrite_ = context->getCalendar()->getInitDate();
+    if (!file_->isEmptyZone() && (field->getGrid()->doGridHaveDataToWrite() || file_->type == CFile::type_attr::one_file))
+         needToWrite_=true ;
+    else needToWrite_=false;
+    lastFileSplit_ = file_->getLastSplit() ;
+    nstep_ = 0 ;
+    if (!field->scale_factor.isEmpty()) { scaleFactor_ = field->scale_factor ; hasScaleFactor_ = true ; }
+    if (!field->add_offset.isEmpty()) { addOffset_ = field->add_offset ; hasAddOffset_ = true ; }
+    if (!field->prec.isEmpty() && field->prec == 2) hasRounding_ = true ;
+    if (!field->default_value.isEmpty()) {hasDefaultValue_=true ; defaultValue_ = field->default_value ;}
   }
 
   void CFileWriterStoreFilter::onInputReady(std::vector<CDataPacketPtr> data)
   {
-    field->writeUpdateData(data[0]->data);
+    const CDate currentWrite = lastWrite_ + freqWrite_;
+    if (needToWrite_)
+    {
+      file_->checkWriteFile();
+      if (file_->getLastSplit() != lastFileSplit_)
+      {
+        nstep_ = 0 ;
+        lastFileSplit_ = file_->getLastSplit() ;
+      }
+      nstep_ = nstep_+1;
+      
+      CArray<double,1> dataIn = data[0]->data ;
+      CArray<double,1> fieldData ;
+
+      if (hasAddOffset_ || hasScaleFactor_ || hasRounding_) dataIn = data[0]->data ;
+      else dataIn.reference(data[0]->data) ;
+
+      if (hasAddOffset_)   dataIn = dataIn - addOffset_ ;
+      if (hasScaleFactor_) dataIn = dataIn / scaleFactor_;
+      if (hasRounding_)    dataIn = round(dataIn);
+
+      if (hasDefaultValue_)
+      {
+        size_t nbData=dataIn.numElements() ;
+        for (size_t idx = 0; idx < nbData; ++idx) if ( NumTraits<double>::isNan(dataIn(idx)) ) dataIn(idx)=defaultValue_ ;
+      }
+
+      if (field_->getUseCompressedOutput()) fieldData.reference(dataIn) ;
+      else
+      {
+        fieldData.resize(grid_->getWorkflowToFullConnector()->getDstSize());
+        if (hasDefaultValue_) grid_->getWorkflowToFullConnector()->transfer(dataIn, fieldData, defaultValue_ ) ;
+        else grid_->getWorkflowToFullConnector()->transfer(dataIn, fieldData ) ;
+      }  
+      nstep_ = file_->getDataOutput()->writeFieldData(field_, fieldData, lastWrite_,currentWrite, nstep_);
+    }
+
+    lastWrite_ = currentWrite ;
+
   }
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/filter/file_writer_store_filter.hpp

@@ -7 +7 @@
 {
   class CField;
+  class CFile;
+  class CGrid;
 
   /*!
@@ -46 +48 @@
 
     private:
-      CField* field; //<! The associated field
-      std::map<Time, CDataPacketPtr> packets; //<! The stored packets
+      CField* field_; //<! The associated field
+      CFile* file_ ;
+      CGrid* grid_ ;
+      CDate lastWrite_ ;
+      CDate lastFileSplit_ ;
+      CDuration freqWrite_ ;
+      int nstep_ ;
+      bool needToWrite_ ;
+      double scaleFactor_ = 1.0;
+      double addOffset_ = 0.0;
+      bool hasScaleFactor_ = false ;
+      bool hasAddOffset_ = false ;
+      double defaultValue_ ;
+      bool hasDefaultValue_=false;
+      bool hasRounding_=false ;
+
   }; // class CFileWriterStoreFilter
 } // namespace xios