Changeset 664 for XIOS/trunk/src/distribution_client.cpp

Timestamp:

08/24/15 14:53:17 (9 years ago)

Author:

mhnguyen

Message:

Changing some domain attributes

+) Longitude and latitude from now on can be 2 dimension array

Test
+) On Curie
+) test_client, test_complete pass and are correct

File:

• XIOS/trunk/src/distribution_client.cpp (modified) (2 diffs)

XIOS/trunk/src/distribution_client.cpp

@@ -132 +132 @@
   for (int i = 0; i < domainNum_;++i)
   {
-    domainMasks_[i].resize(domList[i]->mask.extent(0), domList[i]->mask.extent(1));
-    domainMasks_[i] = domList[i]->mask;
+    domainMasks_[i].resize(domList[i]->mask_1d.numElements());
+    domainMasks_[i] = domList[i]->mask_1d;
   }
 
@@ -274 +274 @@
         if ((iIdx >= nBeginLocal_[indexMap_[i]]) && (iIdx < nLocal_[indexMap_[i]]) &&
            (jIdx >= nBeginLocal_[indexMap_[i]+1]) && (jIdx < nLocal_[indexMap_[i]+1]) &&
-           (domainMasks_[idxDomain](iIdx, jIdx)))
+           (domainMasks_[idxDomain](iIdx + jIdx*nLocal_[indexMap_[i]])))
         {
           (localDomainIndex_[idxDomain]).push_back(iIdx);