Skip to content

Commit d44f6dc

Browse files
committed
Fix tests with this
1 parent ad53848 commit d44f6dc

2 files changed

Lines changed: 26 additions & 18 deletions

File tree

test/SerialIOTest.cpp

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,9 @@ inline void empty_dataset_test(std::string const &file_ending)
809809
}
810810
{
811811
Series series(
812-
"../samples/empty_datasets." + file_ending, Access::READ_ONLY);
812+
"../samples/empty_datasets." + file_ending,
813+
Access::READ_ONLY,
814+
R"({"verify_homogeneous_extents": false})");
813815

814816
REQUIRE(series.iterations.contains(1));
815817
REQUIRE(series.iterations.count(1) == 1);
@@ -2722,7 +2724,8 @@ TEST_CASE("empty_alternate_fbpic", "[serial][hdf5]")
27222724
{
27232725
Series s = Series(
27242726
"../samples/issue-sample/empty_alternate_fbpic_%T.h5",
2725-
Access::READ_ONLY);
2727+
Access::READ_ONLY,
2728+
R"({"verify_homogeneous_extents": false})");
27262729
REQUIRE(s.iterations.contains(50));
27272730
REQUIRE(s.iterations[50].particles.contains("electrons"));
27282731
REQUIRE(
@@ -5856,21 +5859,21 @@ void variableBasedSeries(std::string const &file)
58565859

58575860
// this tests changing extents and dimensionalities
58585861
// across iterations
5859-
auto E_y = iteration.meshes["E"]["y"];
5862+
auto B_y = iteration.meshes["B"]["y"];
58605863
unsigned dimensionality = i % 3 + 1;
58615864
unsigned len = i + 1;
58625865
Extent changingExtent(dimensionality, len);
5863-
E_y.resetDataset({openPMD::Datatype::INT, changingExtent});
5866+
B_y.resetDataset({openPMD::Datatype::INT, changingExtent});
58645867
std::vector<int> changingData(
58655868
std::pow(len, dimensionality), dimensionality);
5866-
E_y.storeChunk(
5869+
B_y.storeChunk(
58675870
changingData, Offset(dimensionality, 0), changingExtent);
58685871

58695872
// this tests datasets that are present in one iteration, but not
58705873
// in others
5871-
auto E_z = iteration.meshes["E"][std::to_string(i)];
5872-
E_z.resetDataset({Datatype::INT, {1}});
5873-
E_z.makeConstant(i);
5874+
auto rho_i = iteration.meshes["rho"][std::to_string(i)];
5875+
rho_i.resetDataset({Datatype::INT, {1}});
5876+
rho_i.makeConstant(i);
58745877
// this tests attributes that are present in one iteration, but not
58755878
// in others
58765879
iteration.meshes["E"].setAttribute("attr_" + std::to_string(i), i);
@@ -5973,11 +5976,11 @@ void variableBasedSeries(std::string const &file)
59735976
REQUIRE(chunk.get()[i] == int(iteration.iterationIndex));
59745977
}
59755978

5976-
auto E_y = iteration.meshes["E"]["y"];
5979+
auto B_y = iteration.meshes["B"]["y"];
59775980
unsigned dimensionality = iteration.iterationIndex % 3 + 1;
59785981
unsigned len = iteration.iterationIndex + 1;
59795982
Extent changingExtent(dimensionality, len);
5980-
REQUIRE(E_y.getExtent() == changingExtent);
5983+
REQUIRE(B_y.getExtent() == changingExtent);
59815984

59825985
last_iteration_index = iteration.iterationIndex;
59835986

@@ -5992,7 +5995,7 @@ void variableBasedSeries(std::string const &file)
59925995
{
59935996
// component is present <=> (otherIteration == i)
59945997
REQUIRE(
5995-
iteration.meshes["E"].contains(
5998+
iteration.meshes["rho"].contains(
59965999
std::to_string(otherIteration)) ==
59976000
(otherIteration == iteration.iterationIndex));
59986001
REQUIRE(
@@ -6001,7 +6004,8 @@ void variableBasedSeries(std::string const &file)
60016004
(otherIteration <= iteration.iterationIndex));
60026005
}
60036006
REQUIRE(
6004-
iteration.meshes["E"][std::to_string(iteration.iterationIndex)]
6007+
iteration
6008+
.meshes["rho"][std::to_string(iteration.iterationIndex)]
60056009
.getAttribute("value")
60066010
.get<int>() == int(iteration.iterationIndex));
60076011
REQUIRE(
@@ -6733,7 +6737,11 @@ void extendDataset(std::string const &ext, std::string const &jsonConfig)
67336737
}
67346738

67356739
{
6736-
Series read(filename, Access::READ_ONLY, jsonConfig);
6740+
Series read(
6741+
filename,
6742+
Access::READ_ONLY,
6743+
json::merge(
6744+
jsonConfig, R"({"verify_homogeneous_extents": false})"));
67376745
auto E_x = read.iterations[0].meshes["E"]["x"];
67386746
REQUIRE(E_x.getExtent() == Extent{10, 5});
67396747
auto chunk = E_x.loadChunk<int>({0, 0}, {10, 5});

test/python/unittest/API/APITest.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1905,9 +1905,9 @@ def makeIteratorRoundTrip(self, backend, file_ending):
19051905
E_x.reset_dataset(DS(np.dtype("int"), extent))
19061906
E_x.store_chunk(data, [0], extent)
19071907

1908-
E_y = it.meshes["E"]["y"]
1909-
E_y.reset_dataset(DS(np.dtype("int"), [2, 2]))
1910-
span = E_y.store_chunk().current_buffer()
1908+
B_y = it.meshes["B"]["y"]
1909+
B_y.reset_dataset(DS(np.dtype("int"), [2, 2]))
1910+
span = B_y.store_chunk().current_buffer()
19111911
span[0, 0] = 0
19121912
span[0, 1] = 1
19131913
span[1, 0] = 2
@@ -1930,8 +1930,8 @@ def makeIteratorRoundTrip(self, backend, file_ending):
19301930
lastIterationIndex = it.iteration_index
19311931
E_x = it.meshes["E"]["x"]
19321932
chunk = E_x.load_chunk([0], extent)
1933-
E_y = it.meshes["E"]["y"]
1934-
chunk2 = E_y.load_chunk([0, 0], [2, 2])
1933+
B_y = it.meshes["B"]["y"]
1934+
chunk2 = B_y.load_chunk([0, 0], [2, 2])
19351935
it.close()
19361936

19371937
for i in range(len(data)):

0 commit comments

Comments
 (0)