Changeset 1594 for XIOS/dev/dev_olga/src

Timestamp:

11/15/18 09:32:29 (5 years ago)

Author:

oabramkina

Message:

Bugfix on dev: NaNs? were not necessarily replaced upon writing by default_value in case of grid mask.

Location:

XIOS/dev/dev_olga/src

Files:

• filter/file_writer_filter.cpp (modified) (1 diff)
• node/field.cpp (modified) (1 diff)
• node/field.hpp (modified) (1 diff)
• node/grid.cpp (modified) (1 diff)
• node/grid.hpp (modified) (1 diff)

XIOS/dev/dev_olga/src/filter/file_writer_filter.cpp

@@ -17 +17 @@
   void CFileWriterFilter::onInputReady(std::vector<CDataPacketPtr> data)
   {
-    const bool detectMissingValue = (!field->detect_missing_value.isEmpty()
-                                      && !field->default_value.isEmpty()
-                                      && field->detect_missing_value == true);
+    const bool detectMissingValue = ( !field->default_value.isEmpty() &&
+                               ( (!field->detect_missing_value.isEmpty() || field->detect_missing_value == true)
+                                 || field->hasGridMask()) );
 
     CArray<double, 1> dataArray = (detectMissingValue) ? data[0]->data.copy() : data[0]->data;

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

@@ -1727 +1727 @@
    }
 
+   bool CField::hasGridMask(void) const
+   {
+     return (this->grid->hasMask());
+   }
 
    DEFINE_REF_FUNC(Field,field)

XIOS/dev/dev_olga/src/node/field.hpp

@@ -209 +209 @@
         bool hasExpression(void) const;
 
+        bool hasGridMask(void) const;
+
       public:
          /// Propriétés privées ///

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

@@ -338 +338 @@
      if (!(this->hasTransform() && (!this->isGenerated())))
       this->isChecked = true;
+   }
+
+   bool CGrid::hasMask() const
+   {
+     return (!mask_1d.isEmpty() || !mask_2d.isEmpty() || !mask_3d.isEmpty() ||
+             !mask_4d.isEmpty() || !mask_5d.isEmpty() || !mask_6d.isEmpty() || !mask_7d.isEmpty());
    }
 

XIOS/dev/dev_olga/src/node/grid.hpp

@@ -250 +250 @@
          CArray<size_t,1> indexFromClients;
 
+         bool hasMask(void) const;
          void checkMask(void);
          void createMask(void);