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
cmake_minimum_required(VERSION 3.13)
project(dune-curvedsurfacegrid LANGUAGES CXX VERSION 2.8)
project(dune-curvedgrid LANGUAGES CXX VERSION 2.8)
if(NOT (dune-common_DIR OR dune-common_ROOT OR
"${CMAKE_PREFIX_PATH}" MATCHES ".*dune-common.*"))
......@@ -18,8 +18,6 @@ include(DuneMacros)
# start a dune project with information from dune.module
dune_project()
dune_enable_all_packages()
add_subdirectory(cmake/modules)
add_subdirectory(doc)
add_subdirectory(dune)
......
install(FILES
DuneCurvedsurfacegridMacros.cmake
DuneCurvedgridMacros.cmake
DESTINATION ${DUNE_INSTALL_MODULEDIR})
/* begin dune-curvedsurfacegrid
/* begin dune-curvedgrid
put the definitions for config.h specific to
your project here. Everything above will be
overwritten
......@@ -28,18 +28,18 @@
/* end private */
/* Define to the version of dune-curvedsurfacegrid */
#define DUNE_CURVEDSURFACEGRID_VERSION "@DUNE_CURVEDSURFACEGRID_VERSION@"
/* Define to the version of dune-curvedgrid */
#define DUNE_CURVEDGRID_VERSION "@DUNE_CURVEDGRID_VERSION@"
/* Define to the major version of dune-curvedsurfacegrid */
#define DUNE_CURVEDSURFACEGRID_VERSION_MAJOR @DUNE_CURVEDSURFACEGRID_VERSION_MAJOR@
/* Define to the major version of dune-curvedgrid */
#define DUNE_CURVEDGRID_VERSION_MAJOR @DUNE_CURVEDGRID_VERSION_MAJOR@
/* Define to the minor version of dune-curvedsurfacegrid */
#define DUNE_CURVEDSURFACEGRID_VERSION_MINOR @DUNE_CURVEDSURFACEGRID_VERSION_MINOR@
/* Define to the minor version of dune-curvedgrid */
#define DUNE_CURVEDGRID_VERSION_MINOR @DUNE_CURVEDGRID_VERSION_MINOR@
/* Define to the revision of dune-curvedsurfacegrid */
#define DUNE_CURVEDSURFACEGRID_VERSION_REVISION @DUNE_CURVEDSURFACEGRID_VERSION_REVISION@
/* Define to the revision of dune-curvedgrid */
#define DUNE_CURVEDGRID_VERSION_REVISION @DUNE_CURVEDGRID_VERSION_REVISION@
/* end dune-curvedsurfacegrid
/* end dune-curvedgrid
Everything below here will be overwritten
*/
......@@ -3,7 +3,7 @@
################################
#Name of the module
Module: dune-curvedsurfacegrid
Module: dune-curvedgrid
Version: 2.8
Maintainer: florian.stenger@tu-dresden.de
Depends: dune-common dune-geometry dune-grid dune-curvedgeometry
......
add_subdirectory(curvedsurfacegrid)
add_subdirectory(curvedgrid)
#ifndef DUNE_CURVEDSURFACEGRID_BACKUPRESTORE_HH
#define DUNE_CURVEDSURFACEGRID_BACKUPRESTORE_HH
#ifndef DUNE_CURVEDGRID_BACKUPRESTORE_HH
#define DUNE_CURVEDGRID_BACKUPRESTORE_HH
#include <dune/curvedsurfacegrid/capabilities.hh>
#include <dune/curvedgrid/capabilities.hh>
#include <dune/grid/common/backuprestore.hh>
......@@ -43,13 +43,13 @@ namespace Curved {
} // end namespace Curved
// BackupRestoreFacility for CurvedSurfaceGrid
// BackupRestoreFacility for CurvedGrid
// -------------------------------------------
template <class GridFunction, bool useInterpolation>
struct BackupRestoreFacility<CurvedSurfaceGrid<GridFunction, useInterpolation>>
struct BackupRestoreFacility<CurvedGrid<GridFunction, useInterpolation>>
{
using Grid = CurvedSurfaceGrid<GridFunction, useInterpolation>;
using Grid = CurvedGrid<GridFunction, useInterpolation>;
using HostGrid = typename Grid::HostGrid;
using HostBackupRestoreFacility = BackupRestoreFacility<HostGrid>;
......@@ -67,17 +67,17 @@ struct BackupRestoreFacility<CurvedSurfaceGrid<GridFunction, useInterpolation>>
static Grid* restore (const std::string& filename)
{
assert(false && "Restore not yet implemented for CurvedSurfaceGrid");
assert(false && "Restore not yet implemented for CurvedGrid");
return nullptr;
}
static Grid* restore (const std::istream& stream)
{
assert(false && "Restore not yet implemented for CurvedSurfaceGrid");
assert(false && "Restore not yet implemented for CurvedGrid");
return nullptr;
}
};
} // end namespace Dune
#endif // DUNE_CURVEDSURFACEGRID_BACKUPRESTORE_HH
#endif // DUNE_CURVEDGRID_BACKUPRESTORE_HH
#ifndef DUNE_CURVEDSURFACEGRID_CAPABILITIES_HH
#define DUNE_CURVEDSURFACEGRID_CAPABILITIES_HH
#ifndef DUNE_CURVEDGRID_CAPABILITIES_HH
#define DUNE_CURVEDGRID_CAPABILITIES_HH
#include <cassert>
#include <utility>
#include <dune/common/hybridutilities.hh>
#include <dune/curvedsurfacegrid/declaration.hh>
#include <dune/curvedsurfacegrid/gridfunctions/gridfunction.hh>
#include <dune/curvedgrid/declaration.hh>
#include <dune/curvedgrid/gridfunctions/gridfunction.hh>
#include <dune/grid/common/capabilities.hh>
#include <dune/grid/geometrygrid/capabilities.hh>
......@@ -20,7 +20,7 @@ namespace Capabilities {
// ---------------------------
template <class GridFunction, bool useInterpolation>
struct hasSingleGeometryType<CurvedSurfaceGrid<GridFunction,useInterpolation>>
struct hasSingleGeometryType<CurvedGrid<GridFunction,useInterpolation>>
{
using HostGrid = GridOf_t<GridFunction>;
static const bool v = hasSingleGeometryType<HostGrid>::v;
......@@ -28,14 +28,14 @@ struct hasSingleGeometryType<CurvedSurfaceGrid<GridFunction,useInterpolation>>
};
template <class GridFunction, bool useInterpolation, int codim>
struct hasEntity<CurvedSurfaceGrid<GridFunction,useInterpolation>, codim>
struct hasEntity<CurvedGrid<GridFunction,useInterpolation>, codim>
{
using HostGrid = GridOf_t<GridFunction>;
static const bool v = hasEntity<HostGrid,codim>::v;
};
template <class GridFunction, bool useInterpolation, int codim>
struct hasEntityIterator<CurvedSurfaceGrid<GridFunction,useInterpolation>, codim>
struct hasEntityIterator<CurvedGrid<GridFunction,useInterpolation>, codim>
{
using HostGrid = GridOf_t<GridFunction>;
static const bool v = hasEntityIterator<HostGrid,codim>::v;
......@@ -43,13 +43,13 @@ struct hasEntityIterator<CurvedSurfaceGrid<GridFunction,useInterpolation>, codim
/// \brief Implements geometry only for codim=0 entity
template <class GridFunction, bool useInterpolation, int codim>
struct hasGeometry<CurvedSurfaceGrid<GridFunction,useInterpolation>, codim>
struct hasGeometry<CurvedGrid<GridFunction,useInterpolation>, codim>
{
static const bool v = (codim == 0);
};
template <class GridFunction, bool useInterpolation, int codim>
struct canCommunicate<CurvedSurfaceGrid<GridFunction,useInterpolation>, codim>
struct canCommunicate<CurvedGrid<GridFunction,useInterpolation>, codim>
{
using HostGrid = GridOf_t<GridFunction>;
static const bool v = canCommunicate<HostGrid, codim>::v && hasEntity<HostGrid, codim>::v;
......@@ -58,7 +58,7 @@ struct canCommunicate<CurvedSurfaceGrid<GridFunction,useInterpolation>, codim>
/// \brief Conformity of the grid is not guaranteed since it depends on the GridFunction that
/// \brief must be continuous in that case.
template <class GridFunction, bool useInterpolation>
struct isLevelwiseConforming<CurvedSurfaceGrid<GridFunction,useInterpolation>>
struct isLevelwiseConforming<CurvedGrid<GridFunction,useInterpolation>>
{
static const bool v = false;
};
......@@ -66,7 +66,7 @@ struct isLevelwiseConforming<CurvedSurfaceGrid<GridFunction,useInterpolation>>
/// \brief Conformity of the grid is not guaranteed since it depends on the GridFunction that
/// \brief must be continuous in that case.
template <class GridFunction, bool useInterpolation>
struct isLeafwiseConforming<CurvedSurfaceGrid<GridFunction,useInterpolation>>
struct isLeafwiseConforming<CurvedGrid<GridFunction,useInterpolation>>
{
static const bool v = false;
};
......@@ -74,7 +74,7 @@ struct isLeafwiseConforming<CurvedSurfaceGrid<GridFunction,useInterpolation>>
/// \brief Implements only partial backup-restore facilities, since the gridfunction is not
/// \brief backuped automatically.
template <class GridFunction, bool useInterpolation>
struct hasBackupRestoreFacilities<CurvedSurfaceGrid<GridFunction,useInterpolation>>
struct hasBackupRestoreFacilities<CurvedGrid<GridFunction,useInterpolation>>
{
using HostGrid = GridOf_t<GridFunction>;
static const bool v = hasBackupRestoreFacilities<HostGrid>::v;
......@@ -85,7 +85,7 @@ struct hasBackupRestoreFacilities<CurvedSurfaceGrid<GridFunction,useInterpolatio
// -------------
template <class GridFunction, bool useInterpolation, int codim>
struct hasHostEntity<CurvedSurfaceGrid<GridFunction,useInterpolation>, codim>
struct hasHostEntity<CurvedGrid<GridFunction,useInterpolation>, codim>
{
using HostGrid = GridOf_t<GridFunction>;
static const bool v = hasEntity<HostGrid, codim>::v;
......@@ -94,4 +94,4 @@ struct hasHostEntity<CurvedSurfaceGrid<GridFunction,useInterpolation>, codim>
} // end namespace Capabilities
} // end namespace Dune
#endif // DUNE_CURVEDSURFACEGRID_CAPABILITIES_HH
#endif // DUNE_CURVEDGRID_CAPABILITIES_HH
#ifndef DUNE_CURVEDSURFACEGRID_CONCEPTS_HH
#define DUNE_CURVEDSURFACEGRID_CONCEPTS_HH
#ifndef DUNE_CURVEDGRID_CONCEPTS_HH
#define DUNE_CURVEDGRID_CONCEPTS_HH
#include <dune/common/concept.hh>
......@@ -68,4 +68,4 @@ constexpr bool isGridFunction ()
} // end namespace Concept
} // end namespace Dune
#endif // DUNE_CURVEDSURFACEGRID_CONCEPTS_HH
\ No newline at end of file
#endif // DUNE_CURVEDGRID_CONCEPTS_HH
\ No newline at end of file
#ifndef DUNE_CURVEDGRID_HH
#define DUNE_CURVEDGRID_HH
#include <dune/curvedgrid/grid.hh>
#endif // DUNE_CURVEDGRID_HH
#ifndef DUNE_CURVEDSURFACEGRID_DATAHANDLE_HH
#define DUNE_CURVEDSURFACEGRID_DATAHANDLE_HH
#ifndef DUNE_CURVEDGRID_DATAHANDLE_HH
#define DUNE_CURVEDGRID_DATAHANDLE_HH
#include <dune/common/typetraits.hh>
#include <dune/curvedsurfacegrid/entity.hh>
#include <dune/curvedgrid/entity.hh>
#include <dune/grid/common/datahandleif.hh>
#include <dune/grid/common/grid.hh>
......@@ -79,4 +79,4 @@ private:
} // end namespace Curved
} // end namespace Dune
#endif // DUNE_CURVEDSURFACEGRID_DATAHANDLE_HH
#endif // DUNE_CURVEDGRID_DATAHANDLE_HH
#ifndef DUNE_CURVEDSURFACEGRID_DECLARATION_HH
#define DUNE_CURVEDSURFACEGRID_DECLARATION_HH
#ifndef DUNE_CURVEDGRID_DECLARATION_HH
#define DUNE_CURVEDGRID_DECLARATION_HH
namespace Dune {
template <class GridFunction, bool useInterpolation>
class CurvedSurfaceGrid;
class CurvedGrid;
} // end namespace Dune
#endif // DUNE_CURVEDSURFACEGRID_DECLARATION_HH
#endif // DUNE_CURVEDGRID_DECLARATION_HH
#ifndef DUNE_CURVEDSURFACEGRID_ENTITY_HH
#define DUNE_CURVEDSURFACEGRID_ENTITY_HH
#ifndef DUNE_CURVEDGRID_ENTITY_HH
#define DUNE_CURVEDGRID_ENTITY_HH
#include <optional>
#include <dune/curvedsurfacegrid/geometry.hh>
#include <dune/curvedgrid/geometry.hh>
#include <dune/geometry/referenceelements.hh>
#include <dune/grid/common/grid.hh>
......@@ -18,7 +18,7 @@ namespace Curved {
* \ingroup CurvedGeo
*
* \tparam codim codimension of the entity
* \tparam Grid CurvedSurfaceGrid, this entity belongs to
* \tparam Grid CurvedGrid, this entity belongs to
*/
template <int codim, class Grid>
class EntityBase;
......@@ -33,7 +33,7 @@ class EntityBase;
*
* \tparam codim codimension of the entity
* \tparam dim dimension of the Grid (redundant information)
* \tparam Grid CurvedSurfaceGrid, this entity belongs to
* \tparam Grid CurvedGrid, this entity belongs to
*/
template <int codim, int dim, class Grid>
class Entity;
......@@ -456,4 +456,4 @@ public:
} // end namespace Curved
} // end namespace Dune
#endif // DUNE_CURVEDSURFACEGRID_ENTITY_HH
#endif // DUNE_CURVEDGRID_ENTITY_HH
#ifndef DUNE_CURVEDSURFACEGRID_ENTITYSEED_HH
#define DUNE_CURVEDSURFACEGRID_ENTITYSEED_HH
#ifndef DUNE_CURVEDGRID_ENTITYSEED_HH
#define DUNE_CURVEDGRID_ENTITYSEED_HH
#include <dune/common/typetraits.hh>
#include <dune/curvedsurfacegrid/capabilities.hh>
#include <dune/curvedgrid/capabilities.hh>
#include <dune/grid/common/entityseed.hh>
namespace Dune {
......@@ -48,4 +48,4 @@ private:
} // end namespace Curved
} // end namespace Dune
#endif // DUNE_CURVEDSURFACEGRID_ENTITYSEED_HH
#endif // DUNE_CURVEDGRID_ENTITYSEED_HH
#ifndef DUNE_CURVEDSURFACEGRID_ELLIPSOID_GRIDFUNCTION_HH
#define DUNE_CURVEDSURFACEGRID_ELLIPSOID_GRIDFUNCTION_HH
#ifndef DUNE_CURVEDGRID_ELLIPSOID_GRIDFUNCTION_HH
#define DUNE_CURVEDGRID_ELLIPSOID_GRIDFUNCTION_HH
#include <cmath>
#include <dune/common/fmatrix.hh>
#include <dune/common/fvector.hh>
#include <dune/common/math.hh>
#include <dune/curvedsurfacegrid/gridfunctions/analyticgridfunction.hh>
#include <dune/curvedgrid/gridfunctions/analyticgridfunction.hh>
#include "implicitsurface.hh"
......@@ -103,4 +103,4 @@ auto ellipsoidGridFunction (T a, T b, T c)
} // end namespace Dune
#endif // DUNE_CURVEDSURFACEGRID_ELLIPSOID_GRIDFUNCTION_HH
#endif // DUNE_CURVEDGRID_ELLIPSOID_GRIDFUNCTION_HH
#ifndef DUNE_CURVEDSURFACEGRID_EXPLICIT_SURFACE_PROJECTION_HH
#define DUNE_CURVEDSURFACEGRID_EXPLICIT_SURFACE_PROJECTION_HH
#ifndef DUNE_CURVEDGRID_EXPLICIT_SURFACE_PROJECTION_HH
#define DUNE_CURVEDGRID_EXPLICIT_SURFACE_PROJECTION_HH
#include <cmath>
#include <dune/curvedsurfacegrid/gridfunctions/analyticgridfunction.hh>
#include <dune/curvedsurfacegrid/utility/kdtree.hh>
#include <dune/curvedsurfacegrid/utility/vertexcache.hh>
#include <dune/curvedgrid/gridfunctions/analyticgridfunction.hh>
#include <dune/curvedgrid/utility/kdtree.hh>
#include <dune/curvedgrid/utility/vertexcache.hh>
#if COLLECTOR_BENCHMARK
#include <dune/common/timer.hh>
......@@ -328,4 +328,4 @@ auto explicitSurfaceProjection (Grid& grid, bool cached = true)
} // end namespace Dune
#endif // DUNE_CURVEDSURFACEGRID_EXPLICIT_SURFACE_PROJECTION_HH
#endif // DUNE_CURVEDGRID_EXPLICIT_SURFACE_PROJECTION_HH
#ifndef DUNE_CURVEDSURFACEGRID_IMPLICIT_SURFACE_PROJECTION_HH
#define DUNE_CURVEDSURFACEGRID_IMPLICIT_SURFACE_PROJECTION_HH
#ifndef DUNE_CURVEDGRID_IMPLICIT_SURFACE_PROJECTION_HH
#define DUNE_CURVEDGRID_IMPLICIT_SURFACE_PROJECTION_HH
#include <cmath>
#include <type_traits>
#include <dune/common/parametertree.hh>
#include <dune/common/typeutilities.hh>
#include <dune/curvedsurfacegrid/gridfunctions/analyticgridfunction.hh>
#include <dune/curvedgrid/gridfunctions/analyticgridfunction.hh>
namespace Dune {
......@@ -279,4 +279,4 @@ auto implicitSurfaceGridFunction (const F& phi, int maxIter = 10)
} // end namespace Dune
#endif // DUNE_CURVEDSURFACEGRID_IMPLICIT_SURFACE_PROJECTION_HH
#endif // DUNE_CURVEDGRID_IMPLICIT_SURFACE_PROJECTION_HH
Markdown is supported
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