Commit 540f2549 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

rename curvedsurfacegrid to curvedgrid

parent c44cd2d7
Pipeline #4997 passed with stage
in 21 minutes and 52 seconds
......@@ -12,7 +12,7 @@
#include <dune/common/parallel/mpihelper.hh> // An initializer of MPI
#include <dune/common/test/testsuite.hh>
#include <dune/curvedsurfacegrid/curvedsurfacegrid.hh>
#include <dune/curvedgrid/curvedgrid.hh>
#include <dune/foamgrid/foamgrid.hh>
#include <dune/geometry/quadraturerules.hh>
#include <dune/grid/io/file/gmshreader.hh>
......@@ -31,11 +31,11 @@
#endif
#if GEOMETRY_TYPE == 1
#include <dune/curvedsurfacegrid/geometries/sphere.hh>
#include <dune/curvedgrid/geometries/sphere.hh>
#elif GEOMETRY_TYPE == 2
#include <dune/curvedsurfacegrid/geometries/ellipsoid.hh>
#include <dune/curvedgrid/geometries/ellipsoid.hh>
#elif GEOMETRY_TYPE == 3
#include <dune/curvedsurfacegrid/geometries/torus.hh>
#include <dune/curvedgrid/geometries/torus.hh>
#else
#error "Unknown GEOMETRY_TYPE. Must bei either 1, 2, or 3"
#endif
......@@ -68,7 +68,7 @@ int main (int argc, char** argv)
auto gridFct = torusGridFunction<HostGrid>(2.0, 1.0);
#endif
CurvedSurfaceGrid grid(*hostGrid, gridFct, order);
CurvedGrid grid(*hostGrid, gridFct, order);
using Grid = decltype(grid);
std::vector<typename Grid::ctype> inf_errors, L2_errors, normal_errors, curvature_errors, edge_lengths;
for (int i = 0; i < num_levels; ++i) {
......
......@@ -13,9 +13,9 @@
#include <dune/common/parallel/mpihelper.hh> // An initializer of MPI
#include <dune/common/test/testsuite.hh>
#include <dune/curvedsurfacegrid/curvedsurfacegrid.hh>
#include <dune/curvedsurfacegrid/geometries/sphere.hh>
#include <dune/curvedsurfacegrid/gridfunctions/discretegridviewfunction.hh>
#include <dune/curvedgrid/curvedgrid.hh>
#include <dune/curvedgrid/geometries/sphere.hh>
#include <dune/curvedgrid/gridfunctions/discretegridviewfunction.hh>
#include <dune/foamgrid/foamgrid.hh>
#include <dune/functions/functionspacebases/interpolate.hh>
#include <dune/grid/io/file/gmshreader.hh>
......@@ -45,7 +45,7 @@ int main (int argc, char** argv)
auto sphere = SphereProjection<3>{1.0};
auto sphereGridFct = discreteGridViewFunction<3,-1,ctype>(hostGrid->leafGridView(), order);
using Grid = CurvedSurfaceGrid<decltype(sphereGridFct)>;
using Grid = CurvedGrid<decltype(sphereGridFct)>;
Grid grid(*hostGrid, sphereGridFct);
std::vector<ctype> inf_errors, L2_errors, normal_errors, curvature_errors, edge_lengths;
......
......@@ -10,10 +10,10 @@
#endif
#include <dune/common/parallel/mpihelper.hh> // An initializer of MPI
#include <dune/curvedsurfacegrid/curvedsurfacegrid.hh>
#include <dune/curvedsurfacegrid/geometries/explicitsurface.hh>
#include <dune/curvedsurfacegrid/geometries/sphere.hh>
#include <dune/curvedsurfacegrid/gridfunctions/discretegridviewfunction.hh>
#include <dune/curvedgrid/curvedgrid.hh>
#include <dune/curvedgrid/geometries/explicitsurface.hh>
#include <dune/curvedgrid/geometries/sphere.hh>
#include <dune/curvedgrid/gridfunctions/discretegridviewfunction.hh>
#include <dune/foamgrid/foamgrid.hh>
#include <dune/functions/functionspacebases/interpolate.hh>
#include <dune/grid/io/file/gmshreader.hh>
......@@ -40,7 +40,7 @@ int main (int argc, char** argv)
auto sphere = SphereProjection<3>{1.0};
ExplicitSurfaceProjection sphereGridFct{*fineGrid, true};
CurvedSurfaceGrid grid(*hostGrid, std::ref(sphereGridFct), order);
CurvedGrid grid(*hostGrid, std::ref(sphereGridFct), order);
std::vector<ctype> inf_errors, L2_errors, normal_errors, curvature_errors, edge_lengths;
for (int i = 0; i < num_levels; ++i) {
......
......@@ -8,10 +8,10 @@
#include <dune/common/parallel/mpihelper.hh> // An initializer of MPI
#include <dune/common/test/testsuite.hh>
#include <dune/curvedsurfacegrid/curvedsurfacegrid.hh>
#include <dune/curvedsurfacegrid/geometries/implicitsurface.hh>
#include <dune/curvedsurfacegrid/geometries/sphere.hh>
#include <dune/curvedsurfacegrid/gridfunctions/discretegridviewfunction.hh>
#include <dune/curvedgrid/curvedgrid.hh>
#include <dune/curvedgrid/geometries/implicitsurface.hh>
#include <dune/curvedgrid/geometries/sphere.hh>
#include <dune/curvedgrid/gridfunctions/discretegridviewfunction.hh>
#include <dune/foamgrid/foamgrid.hh>
#include <dune/functions/functionspacebases/interpolate.hh>
#include <dune/grid/io/file/gmshreader.hh>
......@@ -65,7 +65,7 @@ int main (int argc, char** argv)
auto sphere = SphereProjection<3>{1.0};
auto sphereGridFct = implicitSurfaceGridFunction<HostGrid>(ImplicitSphere<3>{1.0});
using Grid = CurvedSurfaceGrid<decltype(sphereGridFct), true>;
using Grid = CurvedGrid<decltype(sphereGridFct), true>;
Grid grid(*hostGrid, sphereGridFct, order);
std::vector<ctype> inf_errors, L2_errors, normal_errors, curvature_errors, edge_lengths;
......
#ifndef DUNE_CURVEDSURFACEGRID_KDTREE_HH
#define DUNE_CURVEDSURFACEGRID_KDTREE_HH
#ifndef DUNE_CURVEDGRID_KDTREE_HH
#define DUNE_CURVEDGRID_KDTREE_HH
#include <cstdlib>
#include <iostream>
......@@ -130,4 +130,4 @@ public:
} // end namespace Dune
#endif // DUNE_CURVEDSURFACEGRID_KDTREE_HH
#endif // DUNE_CURVEDGRID_KDTREE_HH
#ifndef DUNE_CURVEDSURFACEGRID_VERTEXCACHE_HH
#define DUNE_CURVEDSURFACEGRID_VERTEXCACHE_HH
#ifndef DUNE_CURVEDGRID_VERTEXCACHE_HH
#define DUNE_CURVEDGRID_VERTEXCACHE_HH
#include <dune/common/fvector.hh>
......@@ -241,4 +241,4 @@ public:
} // end namespace Dune
#endif // DUNE_CURVEDSURFACEGRID_VERTEXCACHE_HH
#endif // DUNE_CURVEDGRID_VERTEXCACHE_HH
#ifndef DUNE_CURVEDSURFACEGRID_HH
#define DUNE_CURVEDSURFACEGRID_HH
#include <dune/curvedsurfacegrid/grid.hh>
#endif // DUNE_CURVEDSURFACEGRID_HH
#include "config.h"
#include <dune/common/parallel/mpihelper.hh>
#include <dune/curvedsurfacegrid/curvedsurfacegrid.hh>
#include <dune/curvedsurfacegrid/gridfunctions/analyticdiscretefunction.hh>
#include <dune/curvedgrid/curvedgrid.hh>
#include <dune/curvedgrid/gridfunctions/analyticdiscretefunction.hh>
#include <dune/grid/io/file/gmshreader.hh>
using namespace Dune;
......@@ -27,5 +27,5 @@ int main(int argc, char** argv)
auto sphereGF = analyticDiscreteFunction(sphere, *refGrid, /*order*/ 3);
// 3. Wrap the reference grid to build a curved grid
CurvedSurfaceGrid grid{*refGrid, sphereGF};
CurvedGrid grid{*refGrid, sphereGF};
}
\ No newline at end of file
......@@ -3,7 +3,7 @@
#include <type_traits>
#include <dune/common/parallel/mpihelper.hh>
#include <dune/curvedsurfacegrid/curvedsurfacegrid.hh>
#include <dune/curvedgrid/curvedgrid.hh>
#include <dune/grid/io/file/gmshreader.hh>
using namespace Dune;
......@@ -28,5 +28,5 @@ int main(int argc, char** argv)
auto sphere = [](const auto& x) { return x / x.two_norm(); };
// Wrap the reference grid to build a curved grid
CurvedSurfaceGrid grid{*refGrid, sphere, 3};
CurvedGrid grid{*refGrid, sphere, 3};
}
\ No newline at end of file
#include "config.h"
#include <dune/common/parallel/mpihelper.hh>
#include <dune/curvedsurfacegrid/curvedsurfacegrid.hh>
#include <dune/curvedsurfacegrid/gridfunctions/discretegridviewfunction.hh>
#include <dune/curvedgrid/curvedgrid.hh>
#include <dune/curvedgrid/gridfunctions/discretegridviewfunction.hh>
#include <dune/functions/functionspacebases/interpolate.hh>
#include <dune/grid/io/file/gmshreader.hh>
......@@ -33,5 +33,5 @@ int main(int argc, char** argv)
Functions::interpolate(f.basis(), f.coefficients(), sphere);
// Wrap the reference grid and the grid-function
CurvedSurfaceGrid grid{*refGrid, f};
CurvedGrid grid{*refGrid, f};
}
\ No newline at end of file
......@@ -17,8 +17,8 @@
#include <dune/vtk/datacollectors/lagrangedatacollector.hh>
#include <dune/foamgrid/foamgrid.hh>
#include <dune/curvedsurfacegrid/curvedsurfacegrid.hh>
#include <dune/curvedsurfacegrid/geometries/sphere.hh>
#include <dune/curvedgrid/curvedgrid.hh>
#include <dune/curvedgrid/geometries/sphere.hh>
#include <dune/grid/io/file/gmshreader.hh>
using namespace Dune;
......@@ -45,7 +45,7 @@ int main(int argc, char** argv)
auto sphere = sphereGridFunction<GridType>(1.0);
// Wrap the reference grid to build a curved grid
CurvedSurfaceGrid grid{*refGrid, sphere};
CurvedGrid grid{*refGrid, sphere};
write_grid<3>(grid, "sphere_order3.vtu");
}
......@@ -59,7 +59,7 @@ int main(int argc, char** argv)
reader.read("sphere_order3.vtu");
std::unique_ptr grid = reader.createGrid();
CurvedSurfaceGrid curvedGrid{*grid, creator, 3};
CurvedGrid curvedGrid{*grid, creator, 3};
write_grid<3>(*grid, "sphere_order3_test.vtu");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment