Commit 5083a62e authored by Marcus Mohr's avatar Marcus Mohr
Browse files

Renames EdgeDoFFunction::interpolateExtended()

Commit changes EdgeDoFFunction::interpolateExtended() to
EdgeDoFFunction::interpolate() so that naming is consistent
with that in P1Function, P2Function and FaceDoFFunction_old.
parent cc7e887b
Pipeline #40749 passed with stages
in 105 minutes and 59 seconds
This diff is collapsed.
......@@ -52,9 +52,9 @@ uint_t edgeDoFMacroFaceFunctionMemorySize( const uint_t& level, const Primitive&
uint_t edgeDoFMacroCellFunctionMemorySize( const uint_t& level, const Primitive& primitive );
unsigned long long edgeDoFLocalFunctionMemorySize( const uint_t & level, const std::shared_ptr< PrimitiveStorage > & storage );
unsigned long long edgeDoFLocalFunctionMemorySize( const uint_t& level, const std::shared_ptr< PrimitiveStorage >& storage );
unsigned long long edgeDoFGlobalFunctionMemorySize( const uint_t & level, const std::shared_ptr< PrimitiveStorage > & storage );
unsigned long long edgeDoFGlobalFunctionMemorySize( const uint_t& level, const std::shared_ptr< PrimitiveStorage >& storage );
///@}
......@@ -82,20 +82,20 @@ class EdgeDoFFunction final : public Function< EdgeDoFFunction< ValueType > >
const uint_t& maxLevel,
const BoundaryCondition& boundaryCondition );
bool hasMemoryAllocated( const uint_t & level, const Vertex & vertex ) const;
bool hasMemoryAllocated( const uint_t & level, const Edge & edge ) const;
bool hasMemoryAllocated( const uint_t & level, const Face & face ) const;
bool hasMemoryAllocated( const uint_t & level, const Cell & cell ) const;
bool hasMemoryAllocated( const uint_t& level, const Vertex& vertex ) const;
bool hasMemoryAllocated( const uint_t& level, const Edge& edge ) const;
bool hasMemoryAllocated( const uint_t& level, const Face& face ) const;
bool hasMemoryAllocated( const uint_t& level, const Cell& cell ) const;
void allocateMemory( const uint_t & level, const Vertex & vertex );
void allocateMemory( const uint_t & level, const Edge & edge );
void allocateMemory( const uint_t & level, const Face & face );
void allocateMemory( const uint_t & level, const Cell & cell );
void allocateMemory( const uint_t& level, const Vertex& vertex );
void allocateMemory( const uint_t& level, const Edge& edge );
void allocateMemory( const uint_t& level, const Face& face );
void allocateMemory( const uint_t& level, const Cell& cell );
void deleteMemory( const uint_t & level, const Vertex & vertex );
void deleteMemory( const uint_t & level, const Edge & edge );
void deleteMemory( const uint_t & level, const Face & face );
void deleteMemory( const uint_t & level, const Cell & cell );
void deleteMemory( const uint_t& level, const Vertex& vertex );
void deleteMemory( const uint_t& level, const Edge& edge );
void deleteMemory( const uint_t& level, const Face& face );
void deleteMemory( const uint_t& level, const Cell& cell );
void swap( const EdgeDoFFunction< ValueType >& other, const uint_t& level, const DoFType& flag = All ) const;
......@@ -141,10 +141,10 @@ class EdgeDoFFunction final : public Function< EdgeDoFFunction< ValueType > >
void interpolate( const std::function< ValueType( const Point3D& ) >& expr, uint_t level, BoundaryUID boundaryUID ) const;
void interpolateExtended( const std::function< ValueType( const Point3D&, const std::vector< ValueType >& ) >& expr,
const std::vector< std::reference_wrapper< const EdgeDoFFunction< ValueType > > >& srcFunctions,
uint_t level,
BoundaryUID boundaryUID ) const;
void interpolate( const std::function< ValueType( const Point3D&, const std::vector< ValueType >& ) >& expr,
const std::vector< std::reference_wrapper< const EdgeDoFFunction< ValueType > > >& srcFunctions,
uint_t level,
BoundaryUID boundaryUID ) const;
//@}
/// @name Member functions for interpolation using DoFType flags
......@@ -153,10 +153,10 @@ class EdgeDoFFunction final : public Function< EdgeDoFFunction< ValueType > >
void interpolate( const std::function< ValueType( const Point3D& ) >& expr, uint_t level, DoFType flag = All ) const;
void interpolateExtended( const std::function< ValueType( const Point3D&, const std::vector< ValueType >& ) >& expr,
const std::vector< std::reference_wrapper< const EdgeDoFFunction< ValueType > > >& srcFunctions,
uint_t level,
DoFType flag = All ) const;
void interpolate( const std::function< ValueType( const Point3D&, const std::vector< ValueType >& ) >& expr,
const std::vector< std::reference_wrapper< const EdgeDoFFunction< ValueType > > >& srcFunctions,
uint_t level,
DoFType flag = All ) const;
void interpolate( const std::vector< std::function< ValueType( const Point3D& ) > >& expr,
uint_t level,
......@@ -212,10 +212,10 @@ class EdgeDoFFunction final : public Function< EdgeDoFFunction< ValueType > >
ValueType getMaxMagnitude( uint_t level, DoFType flag = All, bool mpiReduce = true ) const;
inline BoundaryCondition getBoundaryCondition() const { return boundaryCondition_; }
inline void setBoundaryCondition( BoundaryCondition bc ) { boundaryCondition_ = bc; }
inline void setBoundaryCondition( BoundaryCondition bc ) { boundaryCondition_ = bc; }
template< typename OtherFunctionValueType >
inline void copyBoundaryConditionFromFunction( const EdgeDoFFunction< OtherFunctionValueType > & other )
template < typename OtherFunctionValueType >
inline void copyBoundaryConditionFromFunction( const EdgeDoFFunction< OtherFunctionValueType >& other )
{
setBoundaryCondition( other.getBoundaryCondition() );
}
......@@ -251,7 +251,7 @@ class EdgeDoFFunction final : public Function< EdgeDoFFunction< ValueType > >
/// asynchronous tasks. endAdditiveCommunication has to be called manually!
/// See communicateAdditively( const uint_t& ) const for more details
template < typename SenderType, typename ReceiverType >
inline void startAdditiveCommunication( const uint_t& level, const bool & zeroOutDestination = true ) const
inline void startAdditiveCommunication( const uint_t& level, const bool& zeroOutDestination = true ) const
{
if ( isDummy() )
{
......@@ -272,7 +272,7 @@ class EdgeDoFFunction final : public Function< EdgeDoFFunction< ValueType > >
inline void startAdditiveCommunication( const uint_t& level,
const DoFType boundaryTypeToSkipDuringAdditiveCommunication,
const PrimitiveStorage& primitiveStorage,
const bool & zeroOutDestination = true ) const
const bool& zeroOutDestination = true ) const
{
if ( isDummy() )
{
......@@ -327,7 +327,7 @@ class EdgeDoFFunction final : public Function< EdgeDoFFunction< ValueType > >
/// \param zeroOutDestination if true, sets all values on the destination function to zero
/// otherwise, the dst array is not modified
template < typename SenderType, typename ReceiverType >
inline void communicateAdditively( const uint_t& level, const bool & zeroOutDestination = true ) const
inline void communicateAdditively( const uint_t& level, const bool& zeroOutDestination = true ) const
{
startAdditiveCommunication< SenderType, ReceiverType >( level, zeroOutDestination );
endAdditiveCommunication< SenderType, ReceiverType >( level );
......
......@@ -142,7 +142,7 @@ void P2Function< ValueType >::interpolate(
}
vertexDoFFunction_.interpolate( expr, vertexDoFFunctions, level, flag );
edgeDoFFunction_.interpolateExtended( expr, edgeDoFFunctions, level, flag );
edgeDoFFunction_.interpolate( expr, edgeDoFFunctions, level, flag );
}
template < typename ValueType >
......
......@@ -24,6 +24,8 @@
#include "hyteg/dataexport/VTKOutput.hpp"
#include "hyteg/facedofspace_old/FaceDoFFunction.hpp"
#include "hyteg/dgfunctionspace/DGFunction.hpp"
#include "hyteg/p0functionspace/P0Function.hpp"
#include "hyteg/p1functionspace/P1Function.hpp"
#include "hyteg/primitivestorage/PrimitiveStorage.hpp"
#include "hyteg/primitivestorage/SetupPrimitiveStorage.hpp"
......@@ -224,14 +226,22 @@ int main( int argc, char* argv[] )
hyteg::run2DTest< P1Function< real_t > >( CONST_FUNCS, storage, "P1Function" );
hyteg::run2DTest< P1Function< real_t > >( POLY_RAT, storage, "P1Function" );
// hyteg::run2DTest< EdgeDoFFunction< real_t > >( CONST_FUNCS, storage, "EdgeDoFFunction" );
// hyteg::run2DTest< EdgeDoFFunction< real_t > >( POLY_RAT, storage, "EdgeDoFFunction" );
hyteg::run2DTest< EdgeDoFFunction< real_t > >( CONST_FUNCS, storage, "EdgeDoFFunction" );
hyteg::run2DTest< EdgeDoFFunction< real_t > >( POLY_RAT, storage, "EdgeDoFFunction" );
hyteg::run2DTest< P2Function< real_t > >( CONST_FUNCS, storage, "P2Function" );
hyteg::run2DTest< P2Function< real_t > >( POLY_RAT, storage, "P2Function" );
hyteg::run2DTest< FaceDoFFunction_old< real_t > >( CONST_FUNCS, storage, "DGFunction" );
hyteg::run2DTest< FaceDoFFunction_old< real_t > >( POLY_RAT, storage, "DGFunction" );
hyteg::run2DTest< FaceDoFFunction_old< real_t > >( CONST_FUNCS, storage, "FaceDoFFunction_old" );
hyteg::run2DTest< FaceDoFFunction_old< real_t > >( POLY_RAT, storage, "FaceDoFFunction_old" );
// NOT IMPLEMENTED FOR P0Function
// hyteg::run2DTest< P0Function< real_t > >( CONST_FUNCS, storage, "P0Function" );
// hyteg::run2DTest< P0Function< real_t > >( POLY_RAT, storage, "P0Function" );
// NOT IMPLEMENTED FOR DGFunction (and those need more c'tor arguments)
// hyteg::run2DTest< DGFunction< real_t > >( CONST_FUNCS, storage, "DGFunction" );
// hyteg::run2DTest< DGFunction< real_t > >( POLY_RAT, storage, "DGFunction" );
// ------------
// 3D Testing
......@@ -246,8 +256,8 @@ int main( int argc, char* argv[] )
hyteg::run3DTest< P1Function< real_t > >( CONST_FUNCS, storage3D, "P1Function" );
hyteg::run3DTest< P1Function< real_t > >( POLY_RAT, storage3D, "P1Function" );
// hyteg::run3DTest< EdgeDoFFunction< real_t > >( CONST_FUNCS, storage3D, "EdgeDoFFunction" );
// hyteg::run3DTest< EdgeDoFFunction< real_t > >( POLY_RAT, storage3D, "EdgeDoFFunction" );
hyteg::run3DTest< EdgeDoFFunction< real_t > >( CONST_FUNCS, storage3D, "EdgeDoFFunction" );
hyteg::run3DTest< EdgeDoFFunction< real_t > >( POLY_RAT, storage3D, "EdgeDoFFunction" );
hyteg::run3DTest< P2Function< real_t > >( CONST_FUNCS, storage3D, "P2Function" );
hyteg::run3DTest< P2Function< real_t > >( POLY_RAT, storage3D, "P2Function" );
......
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