From 5ada89c6d957ee7b339c69e751f898cabf7f7b88 Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Sat, 1 Sep 2018 13:32:44 +0200
Subject: [PATCH] examples cleaned up
---
src/datacollector.cc | 14 +++++++-------
src/geometrygrid.cc | 10 +++++-----
src/legacyvtkwriter.cc | 2 +-
src/pvdwriter.cc | 14 +++++++-------
src/structuredgridwriter.cc | 12 ++++++------
src/timeserieswriter.cc | 6 +++---
src/vtkreader.cc | 2 +-
src/vtkwriter.cc | 17 +++++++++--------
8 files changed, 39 insertions(+), 38 deletions(-)
diff --git a/src/datacollector.cc b/src/datacollector.cc
index 482f45d..3ed8fe4 100644
--- a/src/datacollector.cc
+++ b/src/datacollector.cc
@@ -38,7 +38,7 @@ void write_dc (std::string prefix, GridView const& gridView, Fct1 const& fct1, F
vtkWriter.addPointData(fct2, "q1");
vtkWriter.addCellData(fct2, "q0");
- vtkWriter.write(prefix + "_" + std::to_string(GridView::dimension) + "d_ascii.vtu");
+ vtkWriter.write(prefix + "_" + std::to_string(GridView::dimensionworld) + "d_ascii.vtu");
}
template <class GridView>
@@ -47,10 +47,10 @@ void write (std::string prefix, GridView const& gridView)
using namespace BasisFactory;
auto basis = makeBasis(gridView, lagrange<1>());
- FieldVector<double,GridView::dimension> c;
- if (GridView::dimension > 0) c[0] = 11.0;
- if (GridView::dimension > 1) c[1] = 7.0;
- if (GridView::dimension > 2) c[2] = 3.0;
+ FieldVector<double,GridView::dimensionworld> c;
+ if (GridView::dimensionworld > 0) c[0] = 11.0;
+ if (GridView::dimensionworld > 1) c[1] = 7.0;
+ if (GridView::dimensionworld > 2) c[2] = 3.0;
std::vector<double> vec(basis.dimension());
interpolate(basis, vec, [&c](auto const& x) { return c.dot(x); });
@@ -77,8 +77,8 @@ int main(int argc, char** argv)
{
using GridType = YaspGrid<dim.value>;
FieldVector<double,dim.value> upperRight; upperRight = 1.0;
- auto numElements = filledArray<dim.value,int>(4);
- GridType grid(upperRight, numElements);
+ auto numElements = filledArray<dim.value,int>(8);
+ GridType grid(upperRight, numElements, 0, 0);
write("yasp", grid.leafGridView());
});
}
diff --git a/src/geometrygrid.cc b/src/geometrygrid.cc
index 1fe36b3..31c4409 100644
--- a/src/geometrygrid.cc
+++ b/src/geometrygrid.cc
@@ -46,10 +46,10 @@ private:
template <class GridView>
void write (std::string prefix, GridView const& gridView)
{
- FieldVector<double,GridView::dimension> c;
- if (GridView::dimension > 0) c[0] = 11.0;
- if (GridView::dimension > 1) c[1] = 7.0;
- if (GridView::dimension > 2) c[2] = 3.0;
+ FieldVector<double,GridView::dimensionworld> c;
+ if (GridView::dimensionworld > 0) c[0] = 11.0;
+ if (GridView::dimensionworld > 1) c[1] = 7.0;
+ if (GridView::dimensionworld > 2) c[2] = 3.0;
auto p1Analytic = makeAnalyticGridViewFunction([&c](auto const& x) { return c.dot(x); }, gridView);
@@ -66,7 +66,7 @@ int main (int argc, char** argv)
using HostGrid = YaspGrid<2>;
FieldVector<double,2> bbox = {2.0*M_PI, 2.0*M_PI};
std::array<int,2> num = {4, 12};
- HostGrid hostGrid{bbox, num}; //, std::bitset<2>{"11"}};
+ HostGrid hostGrid{bbox, num, 0, 0}; //, std::bitset<2>{"11"}};
// grid build up of mapped coordinates
double R = 1.0, r = 0.25;
diff --git a/src/legacyvtkwriter.cc b/src/legacyvtkwriter.cc
index c28688d..1842e12 100644
--- a/src/legacyvtkwriter.cc
+++ b/src/legacyvtkwriter.cc
@@ -28,7 +28,7 @@ int main(int argc, char** argv)
using GridType = YaspGrid<dim>;
FieldVector<double,dim> upperRight; upperRight = 1.0;
auto numElements = filledArray<dim,int>(8);
- GridType grid(upperRight,numElements);
+ GridType grid(upperRight,numElements,0,0);
using GridView = typename GridType::LeafGridView;
GridView gridView = grid.leafGridView();
diff --git a/src/pvdwriter.cc b/src/pvdwriter.cc
index fd1192d..7d35be6 100644
--- a/src/pvdwriter.cc
+++ b/src/pvdwriter.cc
@@ -30,10 +30,10 @@ void write (std::string prefix, GridView const& gridView)
using namespace BasisFactory;
auto basis = makeBasis(gridView, lagrange<1>());
- FieldVector<double,GridView::dimension> c;
- if (GridView::dimension > 0) c[0] = 11.0;
- if (GridView::dimension > 1) c[1] = 7.0;
- if (GridView::dimension > 2) c[2] = 3.0;
+ FieldVector<double,GridView::dimensionworld> c;
+ if (GridView::dimensionworld > 0) c[0] = 11.0;
+ if (GridView::dimensionworld > 1) c[1] = 7.0;
+ if (GridView::dimensionworld > 2) c[2] = 3.0;
// write analytic function
auto p1Analytic = makeAnalyticGridViewFunction([&c](auto const& x) { return c.dot(x); }, gridView);
@@ -44,7 +44,7 @@ void write (std::string prefix, GridView const& gridView)
pvdWriter.addPointData(p1Analytic, "p1");
pvdWriter.addCellData(p1Analytic, "p0");
for (double t = 0.0; t < 10.0; t += 1.0) {
- pvdWriter.write(t, prefix + "_" + std::to_string(GridView::dimension) + "d_ascii.vtu");
+ pvdWriter.write(t, prefix + "_" + std::to_string(GridView::dimensionworld) + "d_ascii.vtu");
}
}
@@ -58,7 +58,7 @@ int main (int argc, char** argv)
// Test PvdWriter for YaspGrid
using GridType = YaspGrid<2>;
FieldVector<double,2> upperRight; upperRight = 1.0;
- auto numElements = filledArray<2,int>(4);
- GridType grid(upperRight, numElements);
+ auto numElements = filledArray<2,int>(8);
+ GridType grid(upperRight, numElements, 0, 0);
write("yasp", grid.leafGridView());
}
\ No newline at end of file
diff --git a/src/structuredgridwriter.cc b/src/structuredgridwriter.cc
index e28067a..9cbdd47 100644
--- a/src/structuredgridwriter.cc
+++ b/src/structuredgridwriter.cc
@@ -36,10 +36,10 @@ using int_ = std::integral_constant<int,dim>;
template <class GridView>
void write(std::string prefix, GridView const& gridView)
{
- FieldVector<double,GridView::dimension> c;
- if (GridView::dimension > 0) c[0] = 11.0;
- if (GridView::dimension > 1) c[1] = 7.0;
- if (GridView::dimension > 2) c[2] = 3.0;
+ FieldVector<double,GridView::dimensionworld> c;
+ if (GridView::dimensionworld > 0) c[0] = 11.0;
+ if (GridView::dimensionworld > 1) c[1] = 7.0;
+ if (GridView::dimensionworld > 2) c[2] = 3.0;
auto fct2 = makeAnalyticGridViewFunction([&c](auto const& x) -> float { return c.dot(x); }, gridView);
@@ -77,7 +77,7 @@ void write_yaspgrid(std::integral_constant<int,dim>)
{
using GridType = YaspGrid<dim>;
FieldVector<double,dim> upperRight; upperRight = 1.0;
- auto numElements = filledArray<dim,int>(12);
+ auto numElements = filledArray<dim,int>(8);
GridType grid(upperRight,numElements,0,0);
grid.globalRefine(1);
@@ -90,7 +90,7 @@ void write_spgrid(std::integral_constant<int,dim>)
#if HAVE_DUNE_SPGRID
using GridType = SPGrid<double,dim, SPIsotropicRefinement>;
FieldVector<double,dim> upperRight; upperRight = 1.0;
- auto numElements = filledArray<dim,int>(12);
+ auto numElements = filledArray<dim,int>(8);
GridType grid(SPDomain<double,dim>::unitCube(),numElements);
// grid.globalRefine(1);
diff --git a/src/timeserieswriter.cc b/src/timeserieswriter.cc
index e999b22..e733144 100644
--- a/src/timeserieswriter.cc
+++ b/src/timeserieswriter.cc
@@ -24,14 +24,14 @@ using namespace Dune::Functions;
template <class GridView>
void write (std::string prefix, GridView const& gridView)
{
- FieldVector<double,GridView::dimension> c{11.0, 7.0, 3.0};
+ FieldVector<double,GridView::dimensionworld> c{11.0, 7.0, 3.0};
auto p1Analytic = makeAnalyticGridViewFunction([&c](auto const& x) -> float { return c.dot(x); }, gridView);
using Writer = VtkUnstructuredGridWriter<GridView>;
VtkTimeseriesWriter<Writer> seriesWriter(gridView, Vtk::BINARY, Vtk::FLOAT32);
seriesWriter.addPointData(p1Analytic, "q1");
seriesWriter.addCellData(p1Analytic, "q0");
- std::string filename = prefix + "_" + std::to_string(GridView::dimension) + "d_binary32.vtu";
+ std::string filename = prefix + "_" + std::to_string(GridView::dimensionworld) + "d_binary32.vtu";
for (double t = 0.0; t < 5; t += 0.5) {
seriesWriter.writeTimestep(t, filename);
}
@@ -50,6 +50,6 @@ int main (int argc, char** argv)
using GridType = YaspGrid<3>;
FieldVector<double,3> upperRight; upperRight = 1.0;
auto numElements = filledArray<3,int>(8);
- GridType grid(upperRight, numElements);
+ GridType grid(upperRight, numElements, 0, 0);
write("yasp", grid.leafGridView());
}
\ No newline at end of file
diff --git a/src/vtkreader.cc b/src/vtkreader.cc
index d82e96b..8453d99 100644
--- a/src/vtkreader.cc
+++ b/src/vtkreader.cc
@@ -31,7 +31,7 @@ int main(int argc, char** argv)
{
FieldVector<double,dim> lowerLeft; lowerLeft = 0.0;
FieldVector<double,dim> upperRight; upperRight = 1.0;
- auto numElements = filledArray<dim,unsigned int>(4);
+ auto numElements = filledArray<dim,unsigned int>(8);
auto gridPtr = StructuredGridFactory<GridType>::createSimplexGrid(lowerLeft, upperRight, numElements);
auto& grid = *gridPtr;
diff --git a/src/vtkwriter.cc b/src/vtkwriter.cc
index d6819bc..5399e88 100644
--- a/src/vtkwriter.cc
+++ b/src/vtkwriter.cc
@@ -40,11 +40,12 @@ void write (std::string prefix, GridView const& gridView)
using namespace BasisFactory;
auto basis = makeBasis(gridView, lagrange<1>());
- FieldVector<double,GridView::dimension> c;
- if (GridView::dimension > 0) c[0] = 11.0;
- if (GridView::dimension > 1) c[1] = 7.0;
- if (GridView::dimension > 2) c[2] = 3.0;
+ FieldVector<double,GridView::dimensionworld> c;
+ if (GridView::dimensionworld > 0) c[0] = 11.0;
+ if (GridView::dimensionworld > 1) c[1] = 7.0;
+ if (GridView::dimensionworld > 2) c[2] = 3.0;
+ assert(basis.dimension() > 0);
std::vector<double> vec(basis.dimension());
interpolate(basis, vec, [&c](auto const& x) { return c.dot(x); });
@@ -60,7 +61,7 @@ void write (std::string prefix, GridView const& gridView)
vtkWriter.addCellData(p1Interpol, "p0");
vtkWriter.addPointData(p1Analytic, "q1");
vtkWriter.addCellData(p1Analytic, "q0");
- vtkWriter.write(prefix + "_" + std::to_string(GridView::dimension) + "d_" + std::get<0>(test_case) + ".vtu");
+ vtkWriter.write(prefix + "_" + std::to_string(GridView::dimensionworld) + "d_" + std::get<0>(test_case) + ".vtu");
}
}
@@ -79,7 +80,7 @@ int main (int argc, char** argv)
{
FieldVector<double,dim.value> lowerLeft; lowerLeft = 0.0;
FieldVector<double,dim.value> upperRight; upperRight = 1.0;
- auto numElements = filledArray<dim.value,unsigned int>(4);
+ auto numElements = filledArray<dim.value,unsigned int>(8);
auto gridPtr = StructuredGridFactory<GridType>::createSimplexGrid(lowerLeft, upperRight, numElements);
write("ug", gridPtr->leafGridView());
@@ -92,8 +93,8 @@ int main (int argc, char** argv)
{
using GridType = YaspGrid<dim.value>;
FieldVector<double,dim.value> upperRight; upperRight = 1.0;
- auto numElements = filledArray<dim.value,int>(4);
- GridType grid(upperRight, numElements);
+ auto numElements = filledArray<dim.value,int>(8);
+ GridType grid(upperRight, numElements, 0, 0);
write("yasp", grid.leafGridView());
});
}
\ No newline at end of file
--
GitLab