Changeset 620 for XIOS/trunk/src/node/field_impl.hpp

Timestamp:

06/22/15 13:36:17 (9 years ago)

Author:

mhnguyen

Message:

Implementing generic transformation algorithm (local commit)

+) Implement 3 important classes:

-gridTransformation to read transformation info from grid and interface with the rest of XIOS
-transformationMapping to be in charge of sending/receiving transformation info among clients
-transformationAlgorithm to represent various algorithms

+) Make some change on field to use the new classes

Test
+) Only test_new_features with inversed axis

File:

• XIOS/trunk/src/node/field_impl.hpp (modified) (2 diffs)

XIOS/trunk/src/node/field_impl.hpp

@@ -33 +33 @@
         if (!fieldFilterSources.empty())
         {
-          itFilterSrc = fieldFilterSources.begin(); iteFilterSrc = fieldFilterSources.end();
-          for (; itFilterSrc != iteFilterSrc; ++itFilterSrc) (*itFilterSrc)->updateDataWithoutOperation(_data);
-          (*it)->applyFilter();
-          std::cout << "it data " << (*it)->data << std::endl;
-          std::cout << "it filtered data " << (*it)->filteredData << std::endl;
+          itFilterSrc  = fieldFilterSources.begin();
+          iteFilterSrc = fieldFilterSources.end();
+          for (; itFilterSrc != iteFilterSrc; ++itFilterSrc)
+          {
+            (*itFilterSrc)->updateDataWithoutOperation(_data, (*itFilterSrc)->data);
+            (*it)->updateDataWithoutOperation(_data, (*it)->filteredData);
+            (*it)->applyFilter((*itFilterSrc)->data, (*it)->filteredData);
+          }
           if ((*it)->hasOutputFile || (*it)->hasFieldOut) (*it)->updateFilteredData((*it)->filteredData);
+//          itFilterSrc = fieldFilterSources.begin(); iteFilterSrc = fieldFilterSources.end();
+//          for (; itFilterSrc != iteFilterSrc; ++itFilterSrc) (*itFilterSrc)->updateDataWithoutOperation(_data);
+//          (*it)->applyFilter();
+//          std::cout << "it data " << (*it)->data << std::endl;
+//          std::cout << "it filtered data " << (*it)->filteredData << std::endl;
+//          if ((*it)->hasOutputFile || (*it)->hasFieldOut) (*it)->updateFilteredData((*it)->filteredData);
         }
         else
@@ -70 +79 @@
 
    template<int N>
-   void CField::updateDataWithoutOperation(const CArray<double, N>& _data)
+   void CField::updateDataWithoutOperation(const CArray<double, N>& _data, CArray<double,1>& updatedData)
    {
-     if (this->data.numElements() != this->grid->storeIndex_client.numElements())
+     if (updatedData.numElements() != this->grid->storeIndex_client.numElements())
      {
-        this->data.resize(this->grid->storeIndex_client.numElements());
-        this->grid->inputField(_data, this->data);
+        updatedData.resize(this->grid->storeIndex_client.numElements());
+        this->grid->inputField(_data, updatedData);
      }
    }