Changeset 938

Timestamp:

09/22/16 10:59:07 (8 years ago)

Author:

mhnguyen

Message:

Modifying reduce_axis_to_domain attribute to prevent error-prone

+) Change attribute from string to enum
+) Remove some redundant codes

Test
+) Ok

Location:

XIOS/trunk/src

Files:

• config/reduce_domain_to_axis_attribute.conf (modified) (1 diff)
• node/reduce_domain_to_axis.cpp (modified) (2 diffs)
• transformation/axis_algorithm_reduce_domain.cpp (modified) (1 diff)

XIOS/trunk/src/config/reduce_domain_to_axis_attribute.conf

@@ -2 +2 @@
 
 /* Direction to apply operation (i, j) */
-DECLARE_ATTRIBUTE(StdString, direction)
+DECLARE_ENUM2(direction,  iDir, jDir)

XIOS/trunk/src/node/reduce_domain_to_axis.cpp

@@ -54 +54 @@
     std::set<StdString> opString(opLists, opLists + sizeof(opLists)/sizeof(opLists[0]));
 
-    StdString dirLists[]= {"i","j"};
-    std::set<StdString> dirString(dirLists, dirLists + sizeof(dirLists)/sizeof(dirLists[0]));
-
     if (this->operation.isEmpty())
       ERROR("CReduceDomainToAxis::checkValid(CAxis* axisDst, CDomain* domainSrc)",
@@ -72 +69 @@
     if (this->direction.isEmpty())
       ERROR("CReduceDomainToAxis::checkValid(CAxis* axisDst, CDomain* domainSrc)",
-             << "A direction to apply the operation must be defined. It should be: 'i' or 'j'"
+             << "A direction to apply the operation must be defined. It should be: 'iDir' or 'jDir'"
              << "Domain source " <<domainSrc->getId() << std::endl
              << "Axis destination " << axisDst->getId());
-
-    StdString direction = this->direction;
-    if (dirString.end() == dirString.find(direction))
-    {
-      ERROR("CReduceDomainToAxis::checkValid(CAxis* axisDst, CDomain* domainSrc)",
-       << "Direction '" << direction << " is undefined. Please make sure to use a supported one: i or j"
-       << "Domain source " <<domainSrc->getId() << std::endl
-       << "Axis destination " << axisDst->getId());
-    }
-    else
-    {
-      if (0 == direction.compare("j"))
-      {
-        if (axis_n_glo != domain_ni_glo)
-         ERROR("CReduceDomainToAxis::checkValid(CAxis* axisDst, CDomain* domainSrc)",
-           << "Reduce domain along j, axis destination should have n_glo equal to ni_glo of domain source"
-           << "Domain source " <<domainSrc->getId() << " has nj_glo " << domain_ni_glo << std::endl
-           << "Axis destination " << axisDst->getId() << " has n_glo " << axis_n_glo);
-      }
-      if (0 == direction.compare("i"))
-      {
-        if (axis_n_glo != domain_nj_glo)
-         ERROR("CReduceDomainToAxis::checkValid(CAxis* axisDst, CDomain* domainSrc)",
-           << "Reduce domain along i, axis destination should have n_glo equal to nj_glo of domain source"
-           << "Domain source " <<domainSrc->getId() << " has nj_glo " << domain_nj_glo << std::endl
-           << "Axis destination " << axisDst->getId() << " has n_glo " << axis_n_glo);
-      }
-    }
   }
 

XIOS/trunk/src/transformation/axis_algorithm_reduce_domain.cpp

@@ -48 +48 @@
   algo->checkValid(axisDestination, domainSource);
   StdString op = algo->operation;
-  StdString direction = algo->direction;
-  dir_ = (0 == direction.compare("i")) ? iDir : jDir;
+  dir_ = (CReduceDomainToAxis::direction_attr::iDir == algo->direction)  ? iDir : jDir;
   reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations[op]);
 }