Skip to content
Snippets Groups Projects
Commit 9cb731f6 authored by Lisa Julia Nebel's avatar Lisa Julia Nebel Committed by Sander, Oliver
Browse files

Adjust calls to interpolate and to makeDiscreteGloablBasisFunction to correct syntax

parent 8e071367
No related branches found
No related tags found
1 merge request!39Update to upstream changes
...@@ -31,9 +31,9 @@ class CosseratVTKWriter ...@@ -31,9 +31,9 @@ class CosseratVTKWriter
v1Embedded[i] = v1[i].globalCoordinates(); v1Embedded[i] = v1[i].globalCoordinates();
// Interpolate // Interpolate
auto function = Dune::Functions::makeDiscreteGlobalBasisFunction<Dune::FieldVector<double,7> >(basis1, Dune::TypeTree::hybridTreePath(), v1Embedded); auto function = Dune::Functions::makeDiscreteGlobalBasisFunction<Dune::FieldVector<double,7> >(basis1, v1Embedded);
std::vector<Dune::FieldVector<double,7> > v2Embedded; std::vector<Dune::FieldVector<double,7> > v2Embedded;
Dune::Functions::interpolate(basis2, Dune::TypeTree::hybridTreePath(), v2Embedded, function); Dune::Functions::interpolate(basis2, v2Embedded, function);
// Copy back from R^7 into RigidBodyMotions // Copy back from R^7 into RigidBodyMotions
v2.resize(v2Embedded.size()); v2.resize(v2Embedded.size());
...@@ -51,9 +51,9 @@ class CosseratVTKWriter ...@@ -51,9 +51,9 @@ class CosseratVTKWriter
v1Embedded[i] = v1[i].globalCoordinates(); v1Embedded[i] = v1[i].globalCoordinates();
// Interpolate // Interpolate
auto function = Dune::Functions::makeDiscreteGlobalBasisFunction<Dune::FieldVector<double,3> >(basis1, Dune::TypeTree::hybridTreePath(), v1Embedded); auto function = Dune::Functions::makeDiscreteGlobalBasisFunction<Dune::FieldVector<double,3> >(basis1, v1Embedded);
std::vector<Dune::FieldVector<double,3> > v2Embedded; std::vector<Dune::FieldVector<double,3> > v2Embedded;
Dune::Functions::interpolate(basis2, Dune::TypeTree::hybridTreePath(), v2Embedded, function); Dune::Functions::interpolate(basis2, v2Embedded, function);
// Copy back from FieldVector to RealTuple // Copy back from FieldVector to RealTuple
v2.resize(v2Embedded.size()); v2.resize(v2Embedded.size());
......
...@@ -242,7 +242,6 @@ int main (int argc, char *argv[]) try ...@@ -242,7 +242,6 @@ int main (int argc, char *argv[]) try
xEmbedded[i] = x[i].globalCoordinates(); xEmbedded[i] = x[i].globalCoordinates();
auto xFunction = Dune::Functions::makeDiscreteGlobalBasisFunction<TargetSpace::CoordinateType>(feBasis, auto xFunction = Dune::Functions::makeDiscreteGlobalBasisFunction<TargetSpace::CoordinateType>(feBasis,
TypeTree::hybridTreePath(),
xEmbedded); xEmbedded);
SubsamplingVTKWriter<GridType::LeafGridView> vtkWriter(grid->leafGridView(),refinementLevels(0)); SubsamplingVTKWriter<GridType::LeafGridView> vtkWriter(grid->leafGridView(),refinementLevels(0));
...@@ -282,7 +281,6 @@ int main (int argc, char *argv[]) try ...@@ -282,7 +281,6 @@ int main (int argc, char *argv[]) try
xEmbedded[i] = x[i].globalCoordinates(); xEmbedded[i] = x[i].globalCoordinates();
auto xFunction = Dune::Functions::makeDiscreteGlobalBasisFunction<TargetSpace::CoordinateType>(feBasis, auto xFunction = Dune::Functions::makeDiscreteGlobalBasisFunction<TargetSpace::CoordinateType>(feBasis,
TypeTree::hybridTreePath(),
xEmbedded); xEmbedded);
SubsamplingVTKWriter<GridType::LeafGridView> vtkWriter(grid->leafGridView(),refinementLevels(0)); SubsamplingVTKWriter<GridType::LeafGridView> vtkWriter(grid->leafGridView(),refinementLevels(0));
......
...@@ -108,7 +108,7 @@ void fillVTKWriter(Writer& vtkWriter, const Basis& feBasis, const SolutionType& ...@@ -108,7 +108,7 @@ void fillVTKWriter(Writer& vtkWriter, const Basis& feBasis, const SolutionType&
} }
else else
{ {
auto xFunction = Dune::Functions::makeDiscreteGlobalBasisFunction<TargetSpace::CoordinateType>(feBasis,TypeTree::hybridTreePath(),xEmbedded); auto xFunction = Dune::Functions::makeDiscreteGlobalBasisFunction<TargetSpace::CoordinateType>(feBasis,xEmbedded);
vtkWriter.addVertexData(xFunction, VTK::FieldInfo("orientation", VTK::FieldInfo::Type::vector, xEmbedded[0].size())); vtkWriter.addVertexData(xFunction, VTK::FieldInfo("orientation", VTK::FieldInfo::Type::vector, xEmbedded[0].size()));
......
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