Changeset 980 for XIOS/trunk/src/node/reduce_domain_to_axis.cpp

Timestamp:

10/24/16 16:16:40 (8 years ago)

Author:

mhnguyen

Message:

Minor improvements:

+) Change some type of variable to avoid some error-prone inputs
+) Change some class name to make it meaningful

Test
+) On Curie
+) Okie

File:

• XIOS/trunk/src/node/reduce_domain_to_axis.cpp (modified) (3 diffs)

XIOS/trunk/src/node/reduce_domain_to_axis.cpp

@@ -51 +51 @@
     int domain_nj_glo = domainSrc->nj_glo;
 
-    StdString opLists[]= {"sum","min","max"};
-    std::set<StdString> opString(opLists, opLists + sizeof(opLists)/sizeof(opLists[0]));
-
     if (this->operation.isEmpty())
       ERROR("CReduceDomainToAxis::checkValid(CAxis* axisDst, CDomain* domainSrc)",
@@ -60 +57 @@
              << "Axis destination " << axisDst->getId());
 
-    StdString op = this->operation;
-    if (opString.end() == opString.find(op))
+    if (this->direction.isEmpty())
       ERROR("CReduceDomainToAxis::checkValid(CAxis* axisDst, CDomain* domainSrc)",
-         << "Operation '" << op << "' not found. Please make sure to use a supported one"
-         << "Domain source " <<domainSrc->getId() << std::endl
-         << "Axis destination " << axisDst->getId());
+             << "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());
 
     if (this->direction.isEmpty())
@@ -72 +68 @@
              << "Domain source " <<domainSrc->getId() << std::endl
              << "Axis destination " << axisDst->getId());
+
+    
+    switch (direction)
+    {
+      case direction_attr::jDir:
+        if (axis_n_glo != domain_ni_glo)
+          ERROR("CReduceDomainToAxis::checkValid(CAxis* axisDst, CDomain* domainSrc)",
+            << "Extract 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);
+         break;
+
+      case direction_attr::iDir:
+        if (axis_n_glo != domain_nj_glo)
+          ERROR("CReduceDomainToAxis::checkValid(CAxis* axisDst, CDomain* domainSrc)",
+            << "Extract 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);
+        break;
+
+      default:
+        break;
+    }
   }