Changeset 2116 for XIOS/dev/dev_ym/XIOS_COUPLING

Timestamp:

03/24/21 09:22:46 (3 years ago)

Author:

jderouillat

Message:

Backport fix 1919 about checkValid in extract_domain_to_axis

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/extract_domain_to_axis.cpp (modified) (2 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/extract_domain_to_axis.cpp

@@ -67 +67 @@
     {
       case direction_attr::jDir:
-        if (axis_n_glo != domain_ni_glo)
+        if (axis_n_glo != domain_nj_glo)
           ERROR("CExtractDomainToAxis::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
+            << "Extract domain along j, 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);
-        if ((position < 0) || (position > domain_ni_glo))
+        if ((position < 0) || (position >= domain_ni_glo))
         ERROR("CExtractDomainToAxis::checkValid(CAxis* axisDst, CDomain* domainSrc)",
-          << "Extract domain along j, position should be inside 0 and ni_glo of domain source"
-          << "Domain source " <<domainSrc->getId() << " has nj_glo " << domain_ni_glo << std::endl
+          << "Extract domain along j, position should be inside 0 and ni_glo-1 of domain source"
+          << "Domain source " <<domainSrc->getId() << " has ni_glo " << domain_ni_glo << std::endl
           << "Axis destination " << axisDst->getId() << std::endl
           << "Position " << position);
@@ -81 +81 @@
 
       case direction_attr::iDir:
-        if (axis_n_glo != domain_nj_glo)
+        if (axis_n_glo != domain_ni_glo)
           ERROR("CExtractDomainToAxis::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
+            << "Extract domain along i, axis destination should have n_glo equal to ni_glo of domain source"
+            << "Domain source " <<domainSrc->getId() << " has ni_glo " << domain_ni_glo << std::endl
             << "Axis destination " << axisDst->getId() << " has n_glo " << axis_n_glo);
-        if ((position < 0) || (position > domain_nj_glo))
+        if ((position < 0) || (position >= domain_nj_glo))
         ERROR("CExtractDomainToAxis::checkValid(CAxis* axisDst, CDomain* domainSrc)",
-          << "Extract domain along i, position should be inside 0 and nj_glo of domain source"
-          << "Domain source " <<domainSrc->getId() << " has nj_glo " << domain_ni_glo << std::endl
+          << "Extract domain along i, position should be inside 0 and nj_glo-1 of domain source"
+          << "Domain source " <<domainSrc->getId() << " has nj_glo " << domain_nj_glo << std::endl
           << "Axis destination " << axisDst->getId() << std::endl
           << "Position " << position);