Skip to content
Snippets Groups Projects
Commit cc6f61b7 authored by Paul Gessinger's avatar Paul Gessinger Committed by Paul Gessinger
Browse files

fix tests to run with sa-no-te branch

parent a5015c03
No related branches found
No related tags found
1 merge request!413Serialization to variant_data and json
...@@ -291,12 +291,12 @@ namespace Test { ...@@ -291,12 +291,12 @@ namespace Test {
R * std::sin(loc[0] - angleShift), R * std::sin(loc[0] - angleShift),
loc[1]); loc[1]);
}; };
SurfaceArray::SurfaceGridLookup<decltype(phiAxis), decltype(zAxis)> sl( auto sl = std::make_unique<SurfaceArray::SurfaceGridLookup<decltype(phiAxis), decltype(zAxis)>>(
transform, transform,
itransform, itransform,
std::make_tuple(std::move(phiAxis), std::move(zAxis))); std::make_tuple(std::move(phiAxis), std::move(zAxis)));
sl.fill(brl); sl->fill(brl);
SurfaceArray sa(sl, brl); SurfaceArray sa(std::move(sl), brl);
sa.dump(std::cout); sa.dump(std::cout);
variant_data data = sa.toVariantData(); variant_data data = sa.toVariantData();
...@@ -353,13 +353,13 @@ namespace Test { ...@@ -353,13 +353,13 @@ namespace Test {
auto itransform = [](const std::array<double, 1>& loc) { auto itransform = [](const std::array<double, 1>& loc) {
return Vector3D(0, 0, loc[0]); return Vector3D(0, 0, loc[0]);
}; };
SurfaceArray::SurfaceGridLookup<decltype(zAxis)> sl( auto sl = std::make_unique<SurfaceArray::SurfaceGridLookup<decltype(zAxis)>>(
transform, itransform, std::make_tuple(zAxis)); transform, itransform, std::make_tuple(zAxis));
// same thing in 1D // same thing in 1D
SrfVec line = straightLineSurfaces(); SrfVec line = straightLineSurfaces();
sl.fill(line); sl->fill(line);
SurfaceArray sa(sl, line); SurfaceArray sa(std::move(sl), line);
sa.dump(std::cout); sa.dump(std::cout);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment