Changeset 600

Timestamp:

05/27/15 11:03:22 (9 years ago)

Author:

rlacroix

Message:

Grid: Remove scalar_grid attribute.

It always was for internal use only. This avoids having to remove part of the automatically generated Fortran interface.

Location:

XIOS/trunk/src/node

Files:

• field.cpp (modified) (1 diff)
• grid.cpp (modified) (8 diffs)
• grid.hpp (modified) (2 diffs)

XIOS/trunk/src/node/field.cpp

@@ -738 +738 @@
            domList = grid->getDomainList();
            axisList = grid->getAxisList();
-           if (domList.empty() && axisList.empty() && (!(this->grid->scalar_grid.getValue())))
+           if (domList.empty() && axisList.empty())
            {
              this->grid = CGrid::createGrid(vecDom, vecAxis);

XIOS/trunk/src/node/grid.cpp

@@ -167 +167 @@
    {
      StdSize retvalue = 1;
-     if (true == scalar_grid.getValue()) return retvalue;
-      std::vector<int> dataNindex = clientDistribution_->getDataNIndex();
-
-      for (int i = 0; i < dataNindex.size(); ++i) retvalue *= dataNindex[i];
-      return (retvalue);
+     if (!isScalarGrid())
+     {
+       std::vector<int> dataNindex = clientDistribution_->getDataNIndex();
+       for (int i = 0; i < dataNindex.size(); ++i) retvalue *= dataNindex[i];
+     }
+     return retvalue;
    }
 
@@ -181 +182 @@
      std::map<int, size_t >::const_iterator itb = connectedDataSize_.begin(), it, itE = connectedDataSize_.end();
 
-     if (true == scalar_grid.getValue())
+     if (isScalarGrid())
      {
        for (it = itb; it != itE; ++it)
@@ -227 +228 @@
      CContextClient* client=context->client ;
 
-     if (true == scalar_grid)
+     if (isScalarGrid())
      {
        if (context->hasClient)
@@ -479 +480 @@
       }
 
-      if (domains.empty() && axis.empty()) grid->scalar_grid = true;
-      else grid->scalar_grid = false;
-
       grid->computeGridGlobalDimension(domains, axis, grid->axis_domain_order);
 
@@ -723 +721 @@
   }
 
+  bool CGrid::isScalarGrid() const
+  {
+    return (axisList_.empty() && domList_.empty());
+  }
+
   /*!
     Verify whether one server need to write data
@@ -757 +760 @@
   bool CGrid::doGridHaveDataDistributed()
   {
-    if (true == scalar_grid.getValue()) return false;
+    if (isScalarGrid()) return false;
     else
       return isDataDistributed_;
@@ -775 +778 @@
       size_t dataSize = 0;
 
-      if (true == scalar_grid)
+      if (isScalarGrid())
       {
         writtenDataSize_ = 1;
@@ -1242 +1245 @@
         axis_domain_order(i) = order[i];
       }
-      scalar_grid = false;
-    }
-    else scalar_grid = true;
+    }
 
     setDomainList();

XIOS/trunk/src/node/grid.hpp

@@ -36 +36 @@
    BEGIN_DECLARE_ATTRIBUTE_MAP(CGrid)
 #  include "grid_attribute.conf"
-     DECLARE_ATTRIBUTE(bool, scalar_grid)
    END_DECLARE_ATTRIBUTE_MAP(CGrid)
 
@@ -168 +167 @@
          std::vector<int> getAxisOrder();
          std::vector<int> getGlobalDimension();
+         bool isScalarGrid() const;
 
          bool doGridHaveDataToWrite();