Skip to content
GitLab
Commit 75106fc1 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

renamed CGeo namespace to Curved

parent 8b0c4cb8
Show whitespace changes
Inline Side-by-side
dune/curvedsurfacegrid/backuprestore.hh
View file @ 75106fc1
......@@ -9,7 +9,7 @@
namespace Dune
{
namespace CGeo
namespace Curved
{
// BackupRestoreFacilities
......@@ -44,7 +44,7 @@ namespace Dune
}
};
} // namespace CGeo
} // namespace Curved
......
dune/curvedsurfacegrid/coordfunctionimplementations.hh
View file @ 75106fc1
......@@ -30,11 +30,11 @@ namespace Dune
//convertDuneGridToCrvsrfMesh
template<class GridPtr>
CGeo::Mesh *convertDuneGridToCrvsrfMesh(GridPtr &grid){
Curved::Mesh *convertDuneGridToCrvsrfMesh(GridPtr &grid){
auto gridView = grid->leafGridView();
//determine coordinate-extrema
CGeo::Vertex minc(DBL_MAX, DBL_MAX, DBL_MAX), maxc(-DBL_MAX, -DBL_MAX, -DBL_MAX);
Curved::Vertex minc(DBL_MAX, DBL_MAX, DBL_MAX), maxc(-DBL_MAX, -DBL_MAX, -DBL_MAX);
for(const auto &vertexEntity : vertices(gridView)){
const auto &vertex = vertexEntity.geometry().corner(0);
for(int i = 0; i < grid->dimensionworld; ++i){
......@@ -43,19 +43,19 @@ namespace Dune
}
}
CGeo::Mesh *surface_mesh = new CGeo::Mesh(grid->dimension, grid->dimensionworld);
CGeo::VertexMap<int> vmap(minc, maxc, grid->dimensionworld);
Curved::Mesh *surface_mesh = new Curved::Mesh(grid->dimension, grid->dimensionworld);
Curved::VertexMap<int> vmap(minc, maxc, grid->dimensionworld);
//build mesh
int next_index = 0;
for(const auto &element : elements(gridView)){
if(element.geometry().corners() != 3){
CGeo::error("Element is not a triangle in convertDuneGridToCrvsrfMesh.");
Curved::error("Element is not a triangle in convertDuneGridToCrvsrfMesh.");
}
int32_t el[grid->dimension + 1];
for(int i = 0; i <= grid->dimension; ++i){
auto coords = element.geometry().corner(i);
CGeo::Vertex v(coords[0], coords[1], coords[2]);
Curved::Vertex v(coords[0], coords[1], coords[2]);
if(!vmap.find_3d(v, el[i])){
surface_mesh->add_vertex(v);
el[i] = next_index;
......@@ -93,7 +93,7 @@ namespace Dune
input *= radius_ / input.two_norm();
}
double run_time = dbl_time() - start_time;
std::cout << "csphere time: " << CGeo::ft(run_time, 11, 9)
std::cout << "csphere time: " << Curved::ft(run_time, 11, 9)
<< ", count: " << inputs.size() << std::endl;
}
#endif
......@@ -135,7 +135,7 @@ namespace Dune
for(int i = 0; i < 3; ++i) input[i] = center_[i] + direction[i] * factor;
}
double run_time = dbl_time() - start_time;
std::cout << "sphere time: " << CGeo::ft(run_time, 11, 9)
std::cout << "sphere time: " << Curved::ft(run_time, 11, 9)
<< ", count: " << inputs.size() << std::endl;
}
#endif
......@@ -162,29 +162,29 @@ namespace Dune
SurfaceDistanceCoordFunction(const GridPtr &gridPtr,
double expansion_width=-1.0, bool no_scaling=false) : cache(nullptr){
if(gridPtr->dimension != 2 || gridPtr->dimensionworld != 3){
CGeo::error("SurfaceDistanceCoordFunction needs a triangle-surface-mesh!");
Curved::error("SurfaceDistanceCoordFunction needs a triangle-surface-mesh!");
}
surface_mesh = convertDuneGridToCrvsrfMesh(gridPtr);
backgrid = new CGeo::BackGrid(*surface_mesh, expansion_width, no_scaling);
backgrid = new Curved::BackGrid(*surface_mesh, expansion_width, no_scaling);
if(cached){
CGeo::Vertex c_begin, c_end;
Curved::Vertex c_begin, c_end;
surface_mesh->determine_coordinate_extrema(c_begin, c_end);
CGeo::Vertex c_expansion = (c_end - c_begin) * 0.1;
cache = new CGeo::VertexMap<CGeo::Vertex>(c_begin - c_expansion, c_end + c_expansion, 3);
Curved::Vertex c_expansion = (c_end - c_begin) * 0.1;
cache = new Curved::VertexMap<Curved::Vertex>(c_begin - c_expansion, c_end + c_expansion, 3);
}
}
//constructor using vtu-reader to read "file"
SurfaceDistanceCoordFunction(const char *file,
double expansion_width=-1.0, bool no_scaling=false) : cache(nullptr){
surface_mesh = new CGeo::Mesh(2, 3);
surface_mesh = new Curved::Mesh(2, 3);
read_vtu_file(file, *surface_mesh);
backgrid = new CGeo::BackGrid(*surface_mesh, expansion_width, no_scaling);
backgrid = new Curved::BackGrid(*surface_mesh, expansion_width, no_scaling);
if(cached){
CGeo::Vertex c_begin, c_end;
Curved::Vertex c_begin, c_end;
surface_mesh->determine_coordinate_extrema(c_begin, c_end);
CGeo::Vertex c_expansion = (c_end - c_begin) * 0.1;
cache = new CGeo::VertexMap<CGeo::Vertex>(c_begin - c_expansion, c_end + c_expansion, 3);
Curved::Vertex c_expansion = (c_end - c_begin) * 0.1;
cache = new Curved::VertexMap<Curved::Vertex>(c_begin - c_expansion, c_end + c_expansion, 3);
}
}
......@@ -202,18 +202,18 @@ namespace Dune
}
//resetCache
void resetCache(CGeo::Vertex begin = CGeo::Vertex(),
CGeo::Vertex end = CGeo::Vertex(),
void resetCache(Curved::Vertex begin = Curved::Vertex(),
Curved::Vertex end = Curved::Vertex(),
double expansion_factor = 0.1){
if(cached){
delete cache;
if(begin.is_origin() && end.is_origin()){
surface_mesh->determine_coordinate_extrema(begin, end);
}
CGeo::Vertex c_expansion = (end - begin) * expansion_factor;
cache = new CGeo::VertexMap<CGeo::Vertex>(begin - c_expansion, end + c_expansion, 3);
Curved::Vertex c_expansion = (end - begin) * expansion_factor;
cache = new Curved::VertexMap<Curved::Vertex>(begin - c_expansion, end + c_expansion, 3);
}else{
CGeo::error("Cannot reset cache in uncached SurfaceDistanceCoordFunction!");
Curved::error("Cannot reset cache in uncached SurfaceDistanceCoordFunction!");
}
}
......@@ -232,8 +232,8 @@ namespace Dune
int uncached_cnt = 0;
double start_time = dbl_time();
for(auto &input : inputs){
CGeo::Vertex hit_vertex;
CGeo::Vertex v(input[0], input[1], input[2]);
Curved::Vertex hit_vertex;
Curved::Vertex v(input[0], input[1], input[2]);
if(!cache->find_3d(v, hit_vertex)){
backgrid->distance_to_surface_3d(v, hit_vertex);
cache->insert(v, hit_vertex);
......@@ -241,17 +241,17 @@ namespace Dune
}
}
double run_time = dbl_time() - start_time;
std::cout << "surfdist time: " << CGeo::ft(run_time, 11, 9) << ", count: "<< inputs.size()
std::cout << "surfdist time: " << Curved::ft(run_time, 11, 9) << ", count: "<< inputs.size()
<< ", uncached: " << uncached_cnt << std::endl;
}else{ //uncached
double start_time = dbl_time();
for(auto &input : inputs){
CGeo::Vertex hit_vertex;
CGeo::Vertex v(input[0], input[1], input[2]);
Curved::Vertex hit_vertex;
Curved::Vertex v(input[0], input[1], input[2]);
backgrid->distance_to_surface_3d(v, hit_vertex);
}
double run_time = dbl_time() - start_time;
std::cout << "surfdist time: " << CGeo::ft(run_time, 11, 9)
std::cout << "surfdist time: " << Curved::ft(run_time, 11, 9)
<< ", count: "<< inputs.size() << std::endl;
}
}
......@@ -262,16 +262,16 @@ namespace Dune
if(cached){
cache->debug_output_statistics();
}else{
CGeo::error("Cannot output vertexmap-statistics in "
Curved::error("Cannot output vertexmap-statistics in "
"uncached SurfaceDistanceCoordFunction!");
}
}
#endif
private:
CGeo::Mesh *surface_mesh;
CGeo::BackGrid *backgrid;
CGeo::VertexMap<CGeo::Vertex> *cache;
Curved::Mesh *surface_mesh;
Curved::BackGrid *backgrid;
Curved::VertexMap<Curved::Vertex> *cache;
#if COLLECTOR_BENCHMARK != 0
mutable std::vector<FieldVector<double, 3> > inputs;
#endif
......@@ -284,8 +284,8 @@ namespace Dune
#if COLLECTOR_BENCHMARK != 0
inputs.push_back(x);
#endif
CGeo::Vertex hit_vertex;
CGeo::Vertex v(x[0], x[1], x[2]);
Curved::Vertex hit_vertex;
Curved::Vertex v(x[0], x[1], x[2]);
if(!cache->find_3d(v, hit_vertex)){
backgrid->distance_to_surface_3d(v, hit_vertex);
cache->insert(v, hit_vertex);
......@@ -301,8 +301,8 @@ namespace Dune
#if COLLECTOR_BENCHMARK != 0
inputs.push_back(x);
#endif
CGeo::Vertex hit_vertex;
CGeo::Vertex v(x[0], x[1], x[2]);
Curved::Vertex hit_vertex;
Curved::Vertex v(x[0], x[1], x[2]);
backgrid->distance_to_surface_3d(v, hit_vertex);
return {hit_vertex[0], hit_vertex[1], hit_vertex[2]};
}
......
dune/curvedsurfacegrid/datahandle.hh
View file @ 75106fc1
......@@ -11,7 +11,7 @@
namespace Dune
{
namespace CGeo
namespace Curved
{
// CommDataHandle
......@@ -81,7 +81,7 @@ namespace Dune
WrappedHandle& wrappedHandle_;
};
} // namespace CGeo
} // namespace Curved
} // namespace Dune
#endif // DUNE_CURVED_SURFACE_GRID_DATAHANDLE_HH
dune/curvedsurfacegrid/entity.hh
View file @ 75106fc1
......@@ -11,7 +11,7 @@
namespace Dune
{
namespace CGeo
namespace Curved
{
// Internal Forward Declarations
......@@ -337,7 +337,7 @@ namespace Dune
using LocalGeometry = typename Traits::template Codim<0>::LocalGeometry;
//! facade type for entities
using EntityFacade = Dune::Entity<0, dim, G, Dune::CGeo::Entity>;
using EntityFacade = Dune::Entity<0, dim, G, Dune::Curved::Entity>;
//! type of hierarchic iterator
using HierarchicIterator = typename Traits::HierarchicIterator;
......@@ -362,25 +362,25 @@ namespace Dune
LevelIntersectionIterator ilevelbegin () const
{
using IteratorImpl = CGeo::IntersectionIterator<Grid, typename HostGrid::LevelIntersectionIterator>;
using IteratorImpl = Curved::IntersectionIterator<Grid, typename HostGrid::LevelIntersectionIterator>;
return IteratorImpl(*this, Super::hostEntity().ilevelbegin());
}
LevelIntersectionIterator ilevelend () const
{
using IteratorImpl = CGeo::IntersectionIterator<Grid, typename HostGrid::LevelIntersectionIterator>;
using IteratorImpl = Curved::IntersectionIterator<Grid, typename HostGrid::LevelIntersectionIterator>;
return IteratorImpl(*this, Super::hostEntity().ilevelend());
}
LeafIntersectionIterator ileafbegin () const
{
using IteratorImpl = CGeo::IntersectionIterator<Grid, typename HostGrid::LeafIntersectionIterator>;
using IteratorImpl = Curved::IntersectionIterator<Grid, typename HostGrid::LeafIntersectionIterator>;
return IteratorImpl(*this, Super::hostEntity().ileafbegin());
}
LeafIntersectionIterator ileafend () const
{
using IteratorImpl = CGeo::IntersectionIterator<Grid, typename HostGrid::LeafIntersectionIterator>;
using IteratorImpl = Curved::IntersectionIterator<Grid, typename HostGrid::LeafIntersectionIterator>;
return IteratorImpl(*this, Super::hostEntity().ileafend());
}
......@@ -411,13 +411,13 @@ namespace Dune
HierarchicIterator hbegin (int maxLevel) const
{
using IteratorImpl = CGeo::HierarchicIterator<G>;
using IteratorImpl = Curved::HierarchicIterator<G>;
return IteratorImpl(Super::gridFunction(), Super::hostEntity().hbegin(maxLevel));
}
HierarchicIterator hend (int maxLevel) const
{
using IteratorImpl = CGeo::HierarchicIterator<G>;
using IteratorImpl = Curved::HierarchicIterator<G>;
return IteratorImpl(Super::gridFunction(), Super::hostEntity().hend(maxLevel));
}
......@@ -437,7 +437,7 @@ namespace Dune
}
};
} // namespace CGeo
} // namespace Curved
} // namespace Dune
#endif // DUNE_CURVED_SURFACE_GRID_ENTITY_HH
dune/curvedsurfacegrid/entityseed.hh
View file @ 75106fc1
......@@ -10,7 +10,7 @@
namespace Dune
{
namespace CGeo
namespace Curved
{
// EntitySeed
......@@ -50,7 +50,7 @@ namespace Dune
HostEntitySeed hostEntitySeed_ = {};
};
} // namespace CGeo
} // namespace Curved
} // namespace Dune
#endif // DUNE_CURVED_SURFACE_GRID_ENTITYSEED_HH
dune/curvedsurfacegrid/geometry.hh
View file @ 75106fc1
......@@ -29,7 +29,7 @@
namespace Dune
{
namespace CGeo
namespace Curved
{
/// \brief Curved geometry implementation based on local basis function parametrization
/**
......@@ -220,7 +220,7 @@ namespace Dune
#endif // DOXYGEN
} // end namespace CGeo
} // end namespace Curved
} // namespace Dune
#endif // DUNE_CURVED_SURFACE_GRID_GEOMETRY_HH
dune/curvedsurfacegrid/grid.hh
View file @ 75106fc1
......@@ -29,8 +29,8 @@ namespace Dune
using HG = GridOf_t<GridFunction>;
using type = GridDefaultImplementation<
HG::dimension, CGeo::DimRange<GridFunction>::value, typename HG::ctype,
CGeo::GridFamily<GridFunction,order>
HG::dimension, Curved::DimRange<GridFunction>::value, typename HG::ctype,
Curved::GridFamily<GridFunction,order>
>;
};
}
......@@ -82,18 +82,18 @@ namespace Dune
template< class GF, int ORDER >
class CurvedSurfaceGrid
: public CurvedSurfaceGridBase<GF,ORDER>
, public CGeo::BackupRestoreFacilities<CurvedSurfaceGrid<GF,ORDER> >
, public Curved::BackupRestoreFacilities<CurvedSurfaceGrid<GF,ORDER> >
{
using Self = CurvedSurfaceGrid;
using Super = CurvedSurfaceGridBase<GF,ORDER>;
// friend declarations
template< class, class > friend class CGeo::IdSet;
template< class, class > friend class CGeo::IndexSet;
template< class, class > friend class Curved::IdSet;
template< class, class > friend class Curved::IndexSet;
public:
using GridFunction = GF;
using GridFamily = CGeo::GridFamily<GF,ORDER>;
using GridFamily = Curved::GridFamily<GF,ORDER>;
/** \name Traits
* \{ */
......@@ -441,7 +441,7 @@ namespace Dune
bool loadBalance (CommDataHandleIF<DataHandle, Data>& datahandle)
{
using DataHandleIF = CommDataHandleIF<DataHandle, Data>;
using WrappedDataHandle = CGeo::CommDataHandle<Self, DataHandleIF>;
using WrappedDataHandle = Curved::CommDataHandle<Self, DataHandleIF>;
WrappedDataHandle wrappedDataHandle(*this, datahandle);
const bool gridChanged = hostGrid().loadBalance(wrappedDataHandle);
......
dune/curvedsurfacegrid/gridfamily.hh
View file @ 75106fc1
......@@ -29,7 +29,7 @@ namespace Dune
/** \brief namespace containing the implementations of CurvedSurfaceGrid
* \ingroup CurvedGeo
*/
namespace CGeo
namespace Curved
{
template< class GF >
struct DimRange
......@@ -74,17 +74,17 @@ namespace Dune
static const int dimensionworld = DimRange<GridFunction>::value;
using LeafIntersection
= Dune::Intersection<const Grid, CGeo::Intersection<const Grid, typename HostGrid::LeafIntersection>>;
= Dune::Intersection<const Grid, Curved::Intersection<const Grid, typename HostGrid::LeafIntersection>>;
using LevelIntersection
= Dune::Intersection<const Grid, CGeo::Intersection<const Grid, typename HostGrid::LevelIntersection>>;
= Dune::Intersection<const Grid, Curved::Intersection<const Grid, typename HostGrid::LevelIntersection>>;
using LeafIntersectionIterator
= Dune::IntersectionIterator<const Grid, CGeo::IntersectionIterator<const Grid, typename HostGrid::LeafIntersectionIterator>, CGeo::Intersection<const Grid, typename HostGrid::LeafIntersection> >;
= Dune::IntersectionIterator<const Grid, Curved::IntersectionIterator<const Grid, typename HostGrid::LeafIntersectionIterator>, Curved::Intersection<const Grid, typename HostGrid::LeafIntersection> >;
using LevelIntersectionIterator
= Dune::IntersectionIterator<const Grid, CGeo::IntersectionIterator<const Grid, typename HostGrid::LevelIntersectionIterator >, CGeo::Intersection<const Grid, typename HostGrid::LevelIntersection> >;
= Dune::IntersectionIterator<const Grid, Curved::IntersectionIterator<const Grid, typename HostGrid::LevelIntersectionIterator >, Curved::Intersection<const Grid, typename HostGrid::LevelIntersection> >;
using HierarchicIterator
= Dune::EntityIterator<0, const Grid, CGeo::HierarchicIterator<const Grid>>;
= Dune::EntityIterator<0, const Grid, Curved::HierarchicIterator<const Grid>>;
template< int codim >
struct Codim
......@@ -93,31 +93,31 @@ namespace Dune
using LocalTransformation = std::conditional_t<(codim == 0),
DefaultLocalGeometry<ctype, dimension, dimension>,
CGeo::LocalGeometryWrapper<LocalGeometry>>;
Curved::LocalGeometryWrapper<LocalGeometry>>;
template < int mydim, int cdim, class GridImpl >
using GeometryImplTemplate
= CGeo::Geometry<ctype, mydim, cdim, LocalFunction, LocalTransformation, order>;
= Curved::Geometry<ctype, mydim, cdim, LocalFunction, LocalTransformation, order>;
// geometry types
using GeometryImpl = GeometryImplTemplate<dimension-codim, dimensionworld, const Grid>;
using Geometry = Dune::Geometry<dimension-codim, dimensionworld, const Grid, GeometryImplTemplate>;
// entity types
using EntityImpl = CGeo::Entity<codim, dimension, const Grid>;
using Entity = Dune::Entity<codim, dimension, const Grid, CGeo::Entity>;
using EntityImpl = Curved::Entity<codim, dimension, const Grid>;
using Entity = Dune::Entity<codim, dimension, const Grid, Curved::Entity>;
using EntitySeed = Dune::EntitySeed<const Grid, CGeo::EntitySeed<codim, const Grid> >;
using EntitySeed = Dune::EntitySeed<const Grid, Curved::EntitySeed<codim, const Grid> >;
template< PartitionIteratorType pitype >
struct Partition
{
using LeafIteratorImp
= CGeo::Iterator<typename HostGrid::LeafGridView, codim, pitype, const Grid>;
= Curved::Iterator<typename HostGrid::LeafGridView, codim, pitype, const Grid>;
using LeafIterator = Dune::EntityIterator<codim, const Grid, LeafIteratorImp>;
using LevelIteratorImp
= CGeo::Iterator<typename HostGrid::LevelGridView, codim, pitype, const Grid>;
= Curved::Iterator<typename HostGrid::LevelGridView, codim, pitype, const Grid>;
using LevelIterator = Dune::EntityIterator<codim, const Grid, LevelIteratorImp>;
};
......@@ -126,24 +126,24 @@ namespace Dune
};
// index-sets
using LeafIndexSet = CGeo::IndexSet<const Grid, typename HostGrid::Traits::LeafIndexSet>;
using LevelIndexSet = CGeo::IndexSet<const Grid, typename HostGrid::Traits::LevelIndexSet>;
using LeafIndexSet = Curved::IndexSet<const Grid, typename HostGrid::Traits::LeafIndexSet>;
using LevelIndexSet = Curved::IndexSet<const Grid, typename HostGrid::Traits::LevelIndexSet>;
// id-sets
using GlobalIdSet = CGeo::IdSet<const Grid, typename HostGrid::Traits::GlobalIdSet>;
using LocalIdSet = CGeo::IdSet<const Grid, typename HostGrid::Traits::LocalIdSet>;
using GlobalIdSet = Curved::IdSet<const Grid, typename HostGrid::Traits::GlobalIdSet>;
using LocalIdSet = Curved::IdSet<const Grid, typename HostGrid::Traits::LocalIdSet>;
using CollectiveCommunication = typename HostGrid::Traits::CollectiveCommunication;
// grid views
using LeafGridView
= Dune::GridView<CGeo::GridViewTraits<typename HostGrid::LeafGridView, GF, order>>;
= Dune::GridView<Curved::GridViewTraits<typename HostGrid::LeafGridView, GF, order>>;
using LevelGridView
= Dune::GridView<CGeo::GridViewTraits<typename HostGrid::LevelGridView, GF, order>>;
= Dune::GridView<Curved::GridViewTraits<typename HostGrid::LevelGridView, GF, order>>;
};
};
} // namespace CGeo
} // namespace Curved
} // namespace Dune
#endif // DUNE_CURVED_SURFACE_GRID_GRIDFAMILY_HH
dune/curvedsurfacegrid/gridview.hh
View file @ 75106fc1
......@@ -16,7 +16,7 @@
namespace Dune
{
namespace CGeo
namespace Curved
{
// Internal Forward Declarations
......@@ -44,19 +44,19 @@ namespace Dune
public:
using GridViewImp = GridView<HostGridView, GridFunction, order>;
using Grid = Dune::CurvedSurfaceGrid<GridFunction, order>;
using IndexSet = CGeo::IndexSet<const Grid, typename HostGridView::IndexSet>;
using IndexSet = Curved::IndexSet<const Grid, typename HostGridView::IndexSet>;
using Intersection = Dune::Intersection<const Grid, CGeo::Intersection<const Grid, HostIntersection> >;
using Intersection = Dune::Intersection<const Grid, Curved::Intersection<const Grid, HostIntersection> >;
using IntersectionIterator
= Dune::IntersectionIterator<const Grid, CGeo::IntersectionIterator<const Grid, HostIntersectionIterator>, CGeo::Intersection<const Grid, HostIntersection> >;
= Dune::IntersectionIterator<const Grid, Curved::IntersectionIterator<const Grid, HostIntersectionIterator>, Curved::Intersection<const Grid, HostIntersection> >;
using CollectiveCommunication = typename HostGridView::CollectiveCommunication;
template< int codim >
struct Codim
{
using IteratorImp = CGeo::Iterator<HostGridView, codim, All_Partition, const Grid>;
using IteratorImp = Curved::Iterator<HostGridView, codim, All_Partition, const Grid>;
using Iterator = Dune::EntityIterator<codim, const Grid, IteratorImp>;
using Entity = typename Grid::Traits::template Codim<codim>::Entity;
......@@ -67,7 +67,7 @@ namespace Dune
template< PartitionIteratorType pit >
struct Partition
{
using IteratorImp = CGeo::Iterator<HostGridView, codim, pit, const Grid>;
using IteratorImp = Curved::Iterator<HostGridView, codim, pit, const Grid>;
using Iterator = Dune::EntityIterator<codim, const Grid, IteratorImp>;
};
};
......@@ -197,13 +197,13 @@ namespace Dune
IntersectionIterator ibegin (const typename Codim<0>::Entity& entity) const
{
using IteratorImpl = CGeo::IntersectionIterator<const Grid, typename HostGridView::IntersectionIterator>;
using IteratorImpl = Curved::IntersectionIterator<const Grid, typename HostGridView::IntersectionIterator>;
return IteratorImpl(entity, hostGridView().ibegin(entity.impl().hostEntity()));
}
IntersectionIterator iend (const typename Codim<0>::Entity& entity) const
{
using IteratorImpl = CGeo::IntersectionIterator<const Grid, typename HostGridView::IntersectionIterator>;
using IteratorImpl = Curved::IntersectionIterator<const Grid, typename HostGridView::IntersectionIterator>;
return IteratorImpl(entity, hostGridView().iend(entity.impl().hostEntity()));
}
......@@ -228,7 +228,7 @@ namespace Dune
CommunicationDirection direction) const
{
using DataHandleIF = CommDataHandleIF<DataHandle, Data>;
using WrappedDataHandle = CGeo::CommDataHandle<Grid, DataHandleIF>;
using WrappedDataHandle = Curved::CommDataHandle<Grid, DataHandleIF>;
WrappedDataHandle wrappedDataHandle(grid(), dataHandle);
hostGridView().communicate(wrappedDataHandle, interface, direction);
......@@ -242,7 +242,7 @@ namespace Dune
mutable IndexSet indexSet_;
};
} // namespace CGeo
} // namespace Curved
} // namespace Dune
#endif // DUNE_CURVED_SURFACE_GRID_GRIDVIEW_HH
dune/curvedsurfacegrid/idset.hh
View file @ 75106fc1
......@@ -9,7 +9,7 @@
namespace Dune
{
namespace CGeo
namespace Curved
{
// IdSet
......@@ -73,7 +73,7 @@ namespace Dune
const HostIdSet* hostIdSet_ = nullptr;
};
} // namespace CGeo
} // namespace Curved
} // namespace Dune
#endif // DUNE_CURVED_SURFACE_GRID_IDSET_HH
dune/curvedsurfacegrid/indexsets.hh
View file @ 75106fc1
......@@ -11,7 +11,7 @@
namespace Dune
{
namespace CGeo
namespace Curved
{
// IndexSet
......@@ -98,7 +98,7 @@ namespace Dune
const HostIndexSet* hostIndexSet_ = nullptr;
};