Skip to content

Commit 6c6b71e

Browse files
Merge pull request #263 from ax3l/fix-offsetRead
DataContainer: Fix Offset Read
2 parents ccfc703 + ea30cab commit 6c6b71e

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

src/include/splash/domains/DataContainer.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,10 @@ namespace splash
8383

8484
for (uint32_t i = 0; i < DSP_DIM_MAX; ++i)
8585
{
86-
offset[i] = std::min(entryOffset[i], offset[i]);
86+
if (subdomains.empty())
87+
offset[i] = entryOffset[i];
88+
else
89+
offset[i] = std::min(entryOffset[i], offset[i]);
8790
size[i] = std::max(entryBack[i] + 1 - offset[i], size[i]);
8891
}
8992

tests/DomainsTest.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,11 @@ void DomainsTest::subTestGridDomains(const Dimensions mpiSize,
222222
Dimensions subdomain_offset = subdomain->getOffset();
223223

224224
#if defined TESTS_DEBUG
225+
std::cout << "container->getSize() = " << container->getSize().toString() << std::endl;
225226
std::cout << "subdomain->getOffset() = " << subdomain->getOffset().toString() << std::endl;
226227
std::cout << "subdomain->getElements() = " << subdomain_elements.toString() << std::endl;
227228
#endif
229+
CPPUNIT_ASSERT(container->getSize() == partition_size);
228230

229231
int *subdomain_data = (int*) (subdomain->getData());
230232
CPPUNIT_ASSERT(subdomain_elements == global_grid_size - offset);

0 commit comments

Comments
 (0)