Changeset 1882 for XIOS/dev/dev_ym/XIOS_COUPLING/src/io

Timestamp:

05/18/20 10:11:57 (4 years ago)

Author:

ymipsl

Message:

Xios coupling branch
Refactor and simplify file writer filter management on server side.

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/io

Files:

• nc4_data_input.cpp (modified) (3 diffs)
• nc4_data_input.hpp (modified) (1 diff)
• nc4_data_output.cpp (modified) (3 diffs)
• nc4_data_output.hpp (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/src/io/nc4_data_input.cpp

@@ -43 +43 @@
   CATCH
 
-  void CNc4DataInput::readFieldData_(CField* field)
+  void CNc4DataInput::readFieldData_(CField* field, CArray<double,1>& dataOut)
   TRY
   {
@@ -113 +113 @@
     }
 
-    field->inputField(fieldData);
+    field->inputField(fieldData, dataOut);
 
     if (!field->scale_factor.isEmpty() || !field->add_offset.isEmpty())
@@ -120 +120 @@
       if (!field->scale_factor.isEmpty()) scaleFactor = field->scale_factor;
       if (!field->add_offset.isEmpty()) addOffset = field->add_offset;
-      field->invertScaleFactorAddOffset(scaleFactor, addOffset);
+      field->invertScaleFactorAddOffset(dataOut,scaleFactor, addOffset);
     }
   }

XIOS/dev/dev_ym/XIOS_COUPLING/src/io/nc4_data_input.hpp

@@ -37 +37 @@
     // Read methods
     virtual StdSize getFieldNbRecords_(CField* field);
-    virtual void readFieldData_(CField* field);
+    virtual void readFieldData_(CField* field, CArray<double,1>& data);
     virtual void readFieldAttributes_(CField* field, bool readAttributeValues);
     virtual void closeFile_(void);

XIOS/dev/dev_ym/XIOS_COUPLING/src/io/nc4_data_output.cpp

@@ -2343 +2343 @@
       //---------------------------------------------------------------
 
-      void CNc4DataOutput::writeFieldData_ (CField*  field)
+      void CNc4DataOutput::writeFieldData_ (CField*  field, const CArray<double,1>& data)
       {
         CContext* context = CContext::getCurrent();
         CGrid* grid = field->getGrid();
+        CArray<double,1> dataIn(data.copy()) ;
 
         if (field->getNStep()<1) 
@@ -2457 +2458 @@
            if (!field->scale_factor.isEmpty()) scaleFactor = field->scale_factor;
            if (!field->add_offset.isEmpty()) addOffset = field->add_offset;
-           field->scaleFactorAddOffset(scaleFactor, addOffset);
+           field->scaleFactorAddOffset(dataIn, scaleFactor, addOffset);
          }
 
@@ -2472 +2473 @@
 
            if (field->getUseCompressedOutput())
-             field->outputCompressedField(fieldData);
+             field->outputCompressedField(dataIn, fieldData);
            else
-             field->outputField(fieldData);
+             field->outputField(dataIn, fieldData);
 
            if (!field->prec.isEmpty() && field->prec == 2) fieldData = round(fieldData);

XIOS/dev/dev_ym/XIOS_COUPLING/src/io/nc4_data_output.hpp

@@ -56 +56 @@
             virtual void writeAttribute_(CVariable* var);
             virtual void writeAttribute_(CVariable* var, const string& fieldId);
-            virtual void writeFieldData_(CField* field);
+            virtual void writeFieldData_(CField* field, const CArray<double,1>& data);
             virtual void writeFile_     (CFile* file);
             virtual void closeFile_     (void);