@@ -189,81 +189,73 @@ TEST_CASE("myPath", "[core]")
189189 Series series (" ../samples/myPath.json" , Access::CREATE);
190190 REQUIRE (pathOf (series) == vec_t {});
191191 auto iteration = series.iterations [1234 ];
192- REQUIRE (pathOf (iteration) == vec_t {" iterations " , " 1234" });
192+ REQUIRE (pathOf (iteration) == vec_t {" data " , " 1234" });
193193
194194 auto writeSomething = [](auto &recordComponent) {
195195 recordComponent.resetDataset ({Datatype::INT, {100 }});
196196 recordComponent.template makeConstant <int >(5678 );
197197 };
198198
199- REQUIRE (pathOf (iteration.meshes ) == vec_t {" iterations " , " 1234" , " meshes" });
199+ REQUIRE (pathOf (iteration.meshes ) == vec_t {" data " , " 1234" , " meshes" });
200200
201201 auto scalarMesh = iteration.meshes [" e_chargeDensity" ];
202202 REQUIRE (
203203 pathOf (scalarMesh) ==
204- vec_t {" iterations " , " 1234" , " meshes" , " e_chargeDensity" });
204+ vec_t {" data " , " 1234" , " meshes" , " e_chargeDensity" });
205205 auto scalarMeshComponent = scalarMesh[RecordComponent::SCALAR];
206206 REQUIRE (
207207 pathOf (scalarMeshComponent) ==
208- vec_t {" iterations " , " 1234" , " meshes" , " e_chargeDensity" });
208+ vec_t {" data " , " 1234" , " meshes" , " e_chargeDensity" });
209209 writeSomething (scalarMeshComponent);
210210
211211 auto vectorMesh = iteration.meshes [" E" ];
212- REQUIRE (pathOf (vectorMesh) == vec_t {" iterations " , " 1234" , " meshes" , " E" });
212+ REQUIRE (pathOf (vectorMesh) == vec_t {" data " , " 1234" , " meshes" , " E" });
213213 auto vectorMeshComponent = vectorMesh[" x" ];
214214 REQUIRE (
215215 pathOf (vectorMeshComponent) ==
216- vec_t {" iterations " , " 1234" , " meshes" , " E" , " x" });
216+ vec_t {" data " , " 1234" , " meshes" , " E" , " x" });
217217
218- REQUIRE (
219- pathOf (iteration.particles ) ==
220- vec_t {" iterations" , " 1234" , " particles" });
218+ REQUIRE (pathOf (iteration.particles ) == vec_t {" data" , " 1234" , " particles" });
221219
222220 auto speciesE = iteration.particles [" e" ];
223- REQUIRE (pathOf (speciesE) == vec_t {" iterations " , " 1234" , " particles" , " e" });
221+ REQUIRE (pathOf (speciesE) == vec_t {" data " , " 1234" , " particles" , " e" });
224222
225223 auto speciesPosition = speciesE[" position" ];
226224 REQUIRE (
227225 pathOf (speciesPosition) ==
228- vec_t {" iterations " , " 1234" , " particles" , " e" , " position" });
226+ vec_t {" data " , " 1234" , " particles" , " e" , " position" });
229227
230228 auto speciesPositionX = speciesPosition[" x" ];
231229 REQUIRE (
232230 pathOf (speciesPositionX) ==
233- vec_t {" iterations " , " 1234" , " particles" , " e" , " position" , " x" });
231+ vec_t {" data " , " 1234" , " particles" , " e" , " position" , " x" });
234232 writeSomething (speciesPositionX);
235233
236234 auto speciesWeighting = speciesE[" weighting" ];
237235 REQUIRE (
238236 pathOf (speciesWeighting) ==
239- vec_t {" iterations " , " 1234" , " particles" , " e" , " weighting" });
237+ vec_t {" data " , " 1234" , " particles" , " e" , " weighting" });
240238
241239 auto speciesWeightingX = speciesWeighting[RecordComponent::SCALAR];
242240 REQUIRE (
243241 pathOf (speciesWeightingX) ==
244- vec_t {" iterations " , " 1234" , " particles" , " e" , " weighting" });
242+ vec_t {" data " , " 1234" , " particles" , " e" , " weighting" });
245243 writeSomething (speciesWeightingX);
246244
247245 REQUIRE (
248246 pathOf (speciesE.particlePatches ) ==
249- vec_t {" iterations " , " 1234" , " particles" , " e" , " particlePatches" });
247+ vec_t {" data " , " 1234" , " particles" , " e" , " particlePatches" });
250248
251249 auto patchExtent = speciesE.particlePatches [" extent" ];
252250 REQUIRE (
253251 pathOf (patchExtent) ==
254- vec_t {
255- " iterations" ,
256- " 1234" ,
257- " particles" ,
258- " e" ,
259- " particlePatches" ,
260- " extent" });
252+ vec_t {" data" , " 1234" , " particles" , " e" , " particlePatches" , " extent" });
261253
262254 auto patchExtentX = patchExtent[" x" ];
263255 REQUIRE (
264256 pathOf (patchExtentX) ==
265257 vec_t {
266- " iterations " ,
258+ " data " ,
267259 " 1234" ,
268260 " particles" ,
269261 " e" ,
@@ -275,7 +267,7 @@ TEST_CASE("myPath", "[core]")
275267 REQUIRE (
276268 pathOf (patchNumParticles) ==
277269 vec_t {
278- " iterations " ,
270+ " data " ,
279271 " 1234" ,
280272 " particles" ,
281273 " e" ,
@@ -287,7 +279,7 @@ TEST_CASE("myPath", "[core]")
287279 REQUIRE (
288280 pathOf (patchNumParticlesComponent) ==
289281 vec_t {
290- " iterations " ,
282+ " data " ,
291283 " 1234" ,
292284 " particles" ,
293285 " e" ,
0 commit comments