Changeset 942

Timestamp:

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

Author:

mhnguyen

Message:

Modifying some checking conditions of domain to be loosen

+) Loosen the check with unstructured domain

Test
+) On Curie
+) Work

File:

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

XIOS/trunk/src/node/domain.cpp

@@ -635 +635 @@
         nj = 1;
         jbegin = 0;
-        if (ni.isEmpty()) ni = i_index.numElements();
+        if (!i_index.isEmpty()) ni = i_index.numElements();
         j_index.resize(ni);
         for(int i=0;i<ni;++i) j_index(i)=0;
@@ -719 +719 @@
       {
         if (ibegin.isEmpty()) ibegin = i_index(0);
-      }
-
-      if (ni.getValue() < 0 || ibegin.getValue() < 0 ||
-         (ibegin.getValue() + ni.getValue()) > ni_glo.getValue())
+        if (ni.isEmpty()) ni = i_index.numElements();
+      }
+
+      if ((ni.getValue() < 0 || ibegin.getValue() < 0) ||
+         ((type_attr::unstructured != type) && ((ibegin.getValue() + ni.getValue()) > ni_glo.getValue())))
       {
         ERROR("CDomain::checkLocalIDomain(void)",
@@ -741 +742 @@
      {
        if (jbegin.isEmpty()) jbegin = j_index(0);
-     }
-
-      if (nj.getValue() < 0 || jbegin.getValue() < 0 ||
-         (jbegin.getValue() + nj.getValue()) > nj_glo.getValue())
+       if (nj.isEmpty()) nj = j_index.numElements();
+     }
+
+      if ((nj.getValue() < 0 || jbegin.getValue() < 0) ||
+         ((type_attr::unstructured != type) && ((jbegin.getValue() + nj.getValue()) > nj_glo.getValue())))
       {
         ERROR("CDomain::checkLocalJDomain(void)",