Commit 4f3fdcd5 authored by Cristiano Malossi's avatar Cristiano Malossi
Browse files

BCInterface functions are now templetized on the BCHandler.

parent d7ae432f
...@@ -236,7 +236,7 @@ BCInterface0D< BcHandler, PhysicalSolverType >::addBcToHandler() ...@@ -236,7 +236,7 @@ BCInterface0D< BcHandler, PhysicalSolverType >::addBcToHandler()
this->createHandler(); this->createHandler();
} }
this->M_handler->setBC ( M_data.flag(), M_data.type(), boost::bind ( &BCInterfaceFunction<PhysicalSolverType>::functionTime, this->M_vectorFunction.back(), _1 ) ); this->M_handler->setBC ( M_data.flag(), M_data.type(), boost::bind ( &BCInterfaceFunction<BcHandler, PhysicalSolverType>::functionTime, this->M_vectorFunction.back(), _1 ) );
} }
} // Namespace LifeV } // Namespace LifeV
......
...@@ -45,11 +45,11 @@ namespace LifeV ...@@ -45,11 +45,11 @@ namespace LifeV
// =================================================== // ===================================================
template< > template< >
void void
BCInterfaceFunctionParserSolver< ZeroDimensionalData >::updatePhysicalSolverVariables() BCInterfaceFunctionParserSolver< ZeroDimensionalBCHandler, ZeroDimensionalData >::updatePhysicalSolverVariables()
{ {
#ifdef HAVE_LIFEV_DEBUG #ifdef HAVE_LIFEV_DEBUG
debugStream ( 5023 ) << "BCInterfaceFunctionSolver<ZeroDimensionalData>::updatePhysicalSolverVariables" << "\n"; debugStream ( 5023 ) << "BCInterfaceFunctionSolver<ZeroDimensionalBCHandler, ZeroDimensionalData>::updatePhysicalSolverVariables" << "\n";
#endif #endif
// Create/Update variables // Create/Update variables
...@@ -90,11 +90,11 @@ BCInterfaceFunctionParserSolver< ZeroDimensionalData >::updatePhysicalSolverVari ...@@ -90,11 +90,11 @@ BCInterfaceFunctionParserSolver< ZeroDimensionalData >::updatePhysicalSolverVari
// =================================================== // ===================================================
template< > template< >
void void
BCInterfaceFunctionParserSolver< ZeroDimensionalData >::createAccessList ( const BCInterfaceData& data ) BCInterfaceFunctionParserSolver< ZeroDimensionalBCHandler, ZeroDimensionalData >::createAccessList ( const BCInterfaceData& data )
{ {
#ifdef HAVE_LIFEV_DEBUG #ifdef HAVE_LIFEV_DEBUG
debugStream ( 5023 ) << "BCInterfaceFunctionSolver<ZeroDimensionalData>::createAccessList( data )" << "\n"; debugStream ( 5023 ) << "BCInterfaceFunctionSolver<ZeroDimensionalBCHandler, ZeroDimensionalData>::createAccessList( data )" << "\n";
#endif #endif
std::map< std::string, physicalSolverList > mapList; std::map< std::string, physicalSolverList > mapList;
......
...@@ -51,14 +51,14 @@ namespace LifeV ...@@ -51,14 +51,14 @@ namespace LifeV
// =================================================== // ===================================================
template< > template< >
void void
BCInterfaceFunctionParserSolver< ZeroDimensionalData >::updatePhysicalSolverVariables(); BCInterfaceFunctionParserSolver< ZeroDimensionalBCHandler, ZeroDimensionalData >::updatePhysicalSolverVariables();
// =================================================== // ===================================================
// Protected Methods // Protected Methods
// =================================================== // ===================================================
template< > template< >
void void
BCInterfaceFunctionParserSolver< ZeroDimensionalData >::createAccessList ( const BCInterfaceData& data ); BCInterfaceFunctionParserSolver< ZeroDimensionalBCHandler, ZeroDimensionalData >::createAccessList ( const BCInterfaceData& data );
} // Namespace LifeV } // Namespace LifeV
......
...@@ -114,6 +114,9 @@ public: ...@@ -114,6 +114,9 @@ public:
typedef typename bcInterface_Type::bcFunctionPtr_Type bcFunctionPtr_Type; typedef typename bcInterface_Type::bcFunctionPtr_Type bcFunctionPtr_Type;
typedef typename bcInterface_Type::vectorFunction_Type vectorFunction_Type; typedef typename bcInterface_Type::vectorFunction_Type vectorFunction_Type;
typedef typename bcInterface_Type::bcFunctionParserSolver_Type bcFunctionParserSolver_Type;
typedef typename bcInterface_Type::bcFunctionParserSolverPtr_Type bcFunctionParserSolverPtr_Type;
typedef typename bcInterface_Type::bcFunctionSolverDefinedPtr_Type bcFunctionSolverDefinedPtr_Type; typedef typename bcInterface_Type::bcFunctionSolverDefinedPtr_Type bcFunctionSolverDefinedPtr_Type;
typedef typename bcInterface_Type::vectorFunctionSolverDefined_Type vectorFunctionSolverDefined_Type; typedef typename bcInterface_Type::vectorFunctionSolverDefined_Type vectorFunctionSolverDefined_Type;
...@@ -307,8 +310,7 @@ BCInterface1D< BcHandler, PhysicalSolverType >::setSolution ( const solutionPtr_ ...@@ -307,8 +310,7 @@ BCInterface1D< BcHandler, PhysicalSolverType >::setSolution ( const solutionPtr_
//for ( typename vectorFunction_Type::const_iterator i = M_vectorFunction.begin() ; i < M_vectorFunction.end() ; ++i ) //for ( typename vectorFunction_Type::const_iterator i = M_vectorFunction.begin() ; i < M_vectorFunction.end() ; ++i )
for ( UInt i ( 0 ); i < this->M_vectorFunction.size(); ++i ) for ( UInt i ( 0 ); i < this->M_vectorFunction.size(); ++i )
{ {
boost::shared_ptr< BCInterfaceFunctionParserSolver< physicalSolver_Type > > castedFunctionSolver = bcFunctionParserSolverPtr_Type castedFunctionSolver = boost::dynamic_pointer_cast< bcFunctionParserSolver_Type > ( this->M_vectorFunction[i] );
boost::dynamic_pointer_cast< BCInterfaceFunctionParserSolver< physicalSolver_Type > > ( this->M_vectorFunction[i] );
if ( castedFunctionSolver != 0 ) if ( castedFunctionSolver != 0 )
{ {
......
...@@ -45,7 +45,7 @@ namespace LifeV ...@@ -45,7 +45,7 @@ namespace LifeV
// =================================================== // ===================================================
template< > template< >
void void
BCInterfaceFunctionParserSolver< OneDFSISolver >::updatePhysicalSolverVariables() BCInterfaceFunctionParserSolver< OneDFSIBCHandler, OneDFSISolver >::updatePhysicalSolverVariables()
{ {
#ifdef HAVE_LIFEV_DEBUG #ifdef HAVE_LIFEV_DEBUG
...@@ -187,7 +187,7 @@ BCInterfaceFunctionParserSolver< OneDFSISolver >::updatePhysicalSolverVariables( ...@@ -187,7 +187,7 @@ BCInterfaceFunctionParserSolver< OneDFSISolver >::updatePhysicalSolverVariables(
// =================================================== // ===================================================
template< > template< >
void void
BCInterfaceFunctionParserSolver< OneDFSISolver >::createAccessList ( const BCInterfaceData& data ) BCInterfaceFunctionParserSolver< OneDFSIBCHandler, OneDFSISolver >::createAccessList ( const BCInterfaceData& data )
{ {
#ifdef HAVE_LIFEV_DEBUG #ifdef HAVE_LIFEV_DEBUG
......
...@@ -51,14 +51,14 @@ namespace LifeV ...@@ -51,14 +51,14 @@ namespace LifeV
// =================================================== // ===================================================
template< > template< >
void void
BCInterfaceFunctionParserSolver< OneDFSISolver >::updatePhysicalSolverVariables(); BCInterfaceFunctionParserSolver< OneDFSIBCHandler, OneDFSISolver >::updatePhysicalSolverVariables();
// =================================================== // ===================================================
// Protected Methods // Protected Methods
// =================================================== // ===================================================
template< > template< >
void void
BCInterfaceFunctionParserSolver< OneDFSISolver >::createAccessList ( const BCInterfaceData& data ); BCInterfaceFunctionParserSolver< OneDFSIBCHandler, OneDFSISolver >::createAccessList ( const BCInterfaceData& data );
} // Namespace LifeV } // Namespace LifeV
......
...@@ -42,7 +42,7 @@ namespace LifeV ...@@ -42,7 +42,7 @@ namespace LifeV
// =================================================== // ===================================================
// Constructors // Constructors
// =================================================== // ===================================================
BCInterfaceFunctionSolverDefined< OneDFSISolver >::BCInterfaceFunctionSolverDefined() : BCInterfaceFunctionSolverDefined< OneDFSIBCHandler, OneDFSISolver >::BCInterfaceFunctionSolverDefined() :
M_defaultFunction (), M_defaultFunction (),
M_function () M_function ()
{ {
...@@ -57,7 +57,7 @@ BCInterfaceFunctionSolverDefined< OneDFSISolver >::BCInterfaceFunctionSolverDefi ...@@ -57,7 +57,7 @@ BCInterfaceFunctionSolverDefined< OneDFSISolver >::BCInterfaceFunctionSolverDefi
// Methods // Methods
// =================================================== // ===================================================
void void
BCInterfaceFunctionSolverDefined< OneDFSISolver >::assignFunction ( OneDFSIFunction& base ) BCInterfaceFunctionSolverDefined< OneDFSIBCHandler, OneDFSISolver >::assignFunction ( OneDFSIFunction& base )
{ {
switch ( M_defaultFunction ) switch ( M_defaultFunction )
{ {
...@@ -95,7 +95,7 @@ BCInterfaceFunctionSolverDefined< OneDFSISolver >::assignFunction ( OneDFSIFunct ...@@ -95,7 +95,7 @@ BCInterfaceFunctionSolverDefined< OneDFSISolver >::assignFunction ( OneDFSIFunct
// Set Methods // Set Methods
// =================================================== // ===================================================
void void
BCInterfaceFunctionSolverDefined< OneDFSISolver >::setData ( const BCInterfaceData1D& data ) BCInterfaceFunctionSolverDefined< OneDFSIBCHandler, OneDFSISolver >::setData ( const BCInterfaceData1D& data )
{ {
#ifdef HAVE_LIFEV_DEBUG #ifdef HAVE_LIFEV_DEBUG
......
...@@ -65,17 +65,18 @@ namespace LifeV ...@@ -65,17 +65,18 @@ namespace LifeV
* </ol> * </ol>
*/ */
template< > template< >
class BCInterfaceFunctionSolverDefined< OneDFSISolver > class BCInterfaceFunctionSolverDefined< OneDFSIBCHandler, OneDFSISolver >
{ {
public: public:
//! @name Type definitions //! @name Type definitions
//@{ //@{
typedef OneDFSIBCHandler bcHandler_Type;
typedef OneDFSISolver physicalSolver_Type; typedef OneDFSISolver physicalSolver_Type;
typedef boost::shared_ptr< physicalSolver_Type > physicalSolverPtr_Type; typedef boost::shared_ptr< physicalSolver_Type > physicalSolverPtr_Type;
typedef OneDFSIBC bc_Type; typedef bcHandler_Type::bc_Type bc_Type;
typedef bc_Type::bcFunctionSolverDefinedPtr_Type bcFunctionSolverDefinedPtr_Type; typedef bc_Type::bcFunctionSolverDefinedPtr_Type bcFunctionSolverDefinedPtr_Type;
typedef bc_Type::vectorPtrContainer_Type vectorPtrContainer_Type; typedef bc_Type::vectorPtrContainer_Type vectorPtrContainer_Type;
......
...@@ -45,11 +45,11 @@ namespace LifeV ...@@ -45,11 +45,11 @@ namespace LifeV
// =================================================== // ===================================================
template< > template< >
void void
BCInterfaceFunctionParserSolver< OseenSolver< RegionMesh< LinearTetra > > >::updatePhysicalSolverVariables() BCInterfaceFunctionParserSolver< BCHandler, OseenSolver< RegionMesh< LinearTetra > > >::updatePhysicalSolverVariables()
{ {
#ifdef HAVE_LIFEV_DEBUG #ifdef HAVE_LIFEV_DEBUG
debugStream ( 5023 ) << "BCInterfaceFunctionSolver<OseenSolver>::updatePhysicalSolverVariables" << "\n"; debugStream ( 5023 ) << "BCInterfaceFunctionSolver<BCHandler, OseenSolver>::updatePhysicalSolverVariables" << "\n";
#endif #endif
// Create/Update variables // Create/Update variables
...@@ -123,11 +123,11 @@ BCInterfaceFunctionParserSolver< OseenSolver< RegionMesh< LinearTetra > > >::upd ...@@ -123,11 +123,11 @@ BCInterfaceFunctionParserSolver< OseenSolver< RegionMesh< LinearTetra > > >::upd
template< > template< >
void void
BCInterfaceFunctionParserSolver< OseenSolverShapeDerivative< RegionMesh< LinearTetra > > >::updatePhysicalSolverVariables() BCInterfaceFunctionParserSolver< BCHandler, OseenSolverShapeDerivative< RegionMesh< LinearTetra > > >::updatePhysicalSolverVariables()
{ {
#ifdef HAVE_LIFEV_DEBUG #ifdef HAVE_LIFEV_DEBUG
debugStream ( 5023 ) << "BCInterfaceFunctionSolver<OseenSolverShapeDerivative>::updatePhysicalSolverVariables" << "\n"; debugStream ( 5023 ) << "BCInterfaceFunctionSolver<BCHandler, OseenSolverShapeDerivative>::updatePhysicalSolverVariables" << "\n";
#endif #endif
// Create/Update variables // Create/Update variables
...@@ -204,11 +204,11 @@ BCInterfaceFunctionParserSolver< OseenSolverShapeDerivative< RegionMesh< LinearT ...@@ -204,11 +204,11 @@ BCInterfaceFunctionParserSolver< OseenSolverShapeDerivative< RegionMesh< LinearT
// =================================================== // ===================================================
template< > template< >
void void
BCInterfaceFunctionParserSolver< OseenSolver< RegionMesh< LinearTetra > > >::createAccessList ( const BCInterfaceData& data ) BCInterfaceFunctionParserSolver< BCHandler, OseenSolver< RegionMesh< LinearTetra > > >::createAccessList ( const BCInterfaceData& data )
{ {
#ifdef HAVE_LIFEV_DEBUG #ifdef HAVE_LIFEV_DEBUG
debugStream ( 5023 ) << "BCInterfaceFunctionSolver<OseenSolver>::createAccessList( data )" << "\n"; debugStream ( 5023 ) << "BCInterfaceFunctionSolver<BCHandler, OseenSolver>::createAccessList( data )" << "\n";
#endif #endif
std::map< std::string, physicalSolverList > mapList; std::map< std::string, physicalSolverList > mapList;
...@@ -224,11 +224,11 @@ BCInterfaceFunctionParserSolver< OseenSolver< RegionMesh< LinearTetra > > >::cre ...@@ -224,11 +224,11 @@ BCInterfaceFunctionParserSolver< OseenSolver< RegionMesh< LinearTetra > > >::cre
template< > template< >
void void
BCInterfaceFunctionParserSolver< OseenSolverShapeDerivative< RegionMesh< LinearTetra > > >::createAccessList ( const BCInterfaceData& data ) BCInterfaceFunctionParserSolver< BCHandler, OseenSolverShapeDerivative< RegionMesh< LinearTetra > > >::createAccessList ( const BCInterfaceData& data )
{ {
#ifdef HAVE_LIFEV_DEBUG #ifdef HAVE_LIFEV_DEBUG
debugStream ( 5023 ) << "BCInterfaceFunctionSolver<OseenSolverShapeDerivative>::createAccessList( data )" << "\n"; debugStream ( 5023 ) << "BCInterfaceFunctionSolver<BCHandler, OseenSolverShapeDerivative>::createAccessList( data )" << "\n";
#endif #endif
std::map< std::string, physicalSolverList > mapList; std::map< std::string, physicalSolverList > mapList;
......
...@@ -51,22 +51,22 @@ namespace LifeV ...@@ -51,22 +51,22 @@ namespace LifeV
// =================================================== // ===================================================
template< > template< >
void void
BCInterfaceFunctionParserSolver< OseenSolver< RegionMesh< LinearTetra > > >::updatePhysicalSolverVariables(); BCInterfaceFunctionParserSolver< BCHandler, OseenSolver< RegionMesh< LinearTetra > > >::updatePhysicalSolverVariables();
template< > template< >
void void
BCInterfaceFunctionParserSolver< OseenSolverShapeDerivative< RegionMesh< LinearTetra > > >::updatePhysicalSolverVariables(); BCInterfaceFunctionParserSolver< BCHandler, OseenSolverShapeDerivative< RegionMesh< LinearTetra > > >::updatePhysicalSolverVariables();
// =================================================== // ===================================================
// Protected Methods // Protected Methods
// =================================================== // ===================================================
template< > template< >
void void
BCInterfaceFunctionParserSolver< OseenSolver< RegionMesh< LinearTetra > > >::createAccessList ( const BCInterfaceData& data ); BCInterfaceFunctionParserSolver< BCHandler, OseenSolver< RegionMesh< LinearTetra > > >::createAccessList ( const BCInterfaceData& data );
template< > template< >
void void
BCInterfaceFunctionParserSolver< OseenSolverShapeDerivative< RegionMesh< LinearTetra > > >::createAccessList ( const BCInterfaceData& data ); BCInterfaceFunctionParserSolver< BCHandler, OseenSolverShapeDerivative< RegionMesh< LinearTetra > > >::createAccessList ( const BCInterfaceData& data );
} // Namespace LifeV } // Namespace LifeV
......
...@@ -45,11 +45,11 @@ namespace LifeV ...@@ -45,11 +45,11 @@ namespace LifeV
// =================================================== // ===================================================
template< > template< >
void void
BCInterfaceFunctionParserSolver< FSIOperator >::updatePhysicalSolverVariables() BCInterfaceFunctionParserSolver< BCHandler, FSIOperator >::updatePhysicalSolverVariables()
{ {
#ifdef HAVE_LIFEV_DEBUG #ifdef HAVE_LIFEV_DEBUG
debugStream ( 5023 ) << "BCInterfaceFunctionSolver<FSIOperator>::updatePhysicalSolverVariables" << "\n"; debugStream ( 5023 ) << "BCInterfaceFunctionSolver<BCHandler, FSIOperator>::updatePhysicalSolverVariables" << "\n";
#endif #endif
// Create/Update variables // Create/Update variables
...@@ -189,11 +189,11 @@ BCInterfaceFunctionParserSolver< FSIOperator >::updatePhysicalSolverVariables() ...@@ -189,11 +189,11 @@ BCInterfaceFunctionParserSolver< FSIOperator >::updatePhysicalSolverVariables()
// =================================================== // ===================================================
template< > template< >
void void
BCInterfaceFunctionParserSolver< FSIOperator >::createAccessList ( const BCInterfaceData& data ) BCInterfaceFunctionParserSolver< BCHandler, FSIOperator >::createAccessList ( const BCInterfaceData& data )
{ {
#ifdef HAVE_LIFEV_DEBUG #ifdef HAVE_LIFEV_DEBUG
debugStream ( 5023 ) << "BCInterfaceFunctionSolver<FSIOperator>::createAccessList( data )" << "\n"; debugStream ( 5023 ) << "BCInterfaceFunctionSolver<BCHandler, FSIOperator>::createAccessList( data )" << "\n";
#endif #endif
std::map< std::string, physicalSolverList > mapList; std::map< std::string, physicalSolverList > mapList;
......
...@@ -51,14 +51,14 @@ namespace LifeV ...@@ -51,14 +51,14 @@ namespace LifeV
// =================================================== // ===================================================
template< > template< >
void void
BCInterfaceFunctionParserSolver< FSIOperator >::updatePhysicalSolverVariables(); BCInterfaceFunctionParserSolver< BCHandler, FSIOperator >::updatePhysicalSolverVariables();
// =================================================== // ===================================================
// Protected Methods // Protected Methods
// =================================================== // ===================================================
template< > template< >
void void
BCInterfaceFunctionParserSolver< FSIOperator >::createAccessList ( const BCInterfaceData& data ); BCInterfaceFunctionParserSolver< BCHandler, FSIOperator >::createAccessList ( const BCInterfaceData& data );
} // Namespace LifeV } // Namespace LifeV
......
...@@ -42,7 +42,7 @@ namespace LifeV ...@@ -42,7 +42,7 @@ namespace LifeV
// =================================================== // ===================================================
// Constructors // Constructors
// =================================================== // ===================================================
BCInterfaceFunctionSolverDefined< FSIOperator >::BCInterfaceFunctionSolverDefined() : BCInterfaceFunctionSolverDefined< BCHandler, FSIOperator >::BCInterfaceFunctionSolverDefined() :
M_FSIFunction (), M_FSIFunction (),
M_physicalSolver (), M_physicalSolver (),
M_name (), M_name (),
...@@ -66,7 +66,7 @@ BCInterfaceFunctionSolverDefined< FSIOperator >::BCInterfaceFunctionSolverDefine ...@@ -66,7 +66,7 @@ BCInterfaceFunctionSolverDefined< FSIOperator >::BCInterfaceFunctionSolverDefine
// Methods // Methods
// =================================================== // ===================================================
void void
BCInterfaceFunctionSolverDefined< FSIOperator >::exportData ( BCInterfaceData3D& data ) BCInterfaceFunctionSolverDefined< BCHandler, FSIOperator >::exportData ( BCInterfaceData3D& data )
{ {
#ifdef HAVE_LIFEV_DEBUG #ifdef HAVE_LIFEV_DEBUG
...@@ -81,7 +81,7 @@ BCInterfaceFunctionSolverDefined< FSIOperator >::exportData ( BCInterfaceData3D& ...@@ -81,7 +81,7 @@ BCInterfaceFunctionSolverDefined< FSIOperator >::exportData ( BCInterfaceData3D&
} }
void void
BCInterfaceFunctionSolverDefined< FSIOperator >::updatePhysicalSolverVariables() BCInterfaceFunctionSolverDefined< BCHandler, FSIOperator >::updatePhysicalSolverVariables()
{ {
#ifdef HAVE_LIFEV_DEBUG #ifdef HAVE_LIFEV_DEBUG
...@@ -100,8 +100,7 @@ BCInterfaceFunctionSolverDefined< FSIOperator >::updatePhysicalSolverVariables() ...@@ -100,8 +100,7 @@ BCInterfaceFunctionSolverDefined< FSIOperator >::updatePhysicalSolverVariables()
// Update the physical solver variables // Update the physical solver variables
for ( UInt i ( 0 ); i < M_vectorFunctionRobin.size(); ++i ) for ( UInt i ( 0 ); i < M_vectorFunctionRobin.size(); ++i )
{ {
boost::shared_ptr< BCInterfaceFunctionParserSolver< physicalSolver_Type > > castedFunctionSolver = functionParserSolverPtr_Type castedFunctionSolver = boost::dynamic_pointer_cast< functionParserSolver_Type > ( M_vectorFunctionRobin[i] );
boost::dynamic_pointer_cast< BCInterfaceFunctionParserSolver< physicalSolver_Type > > ( M_vectorFunctionRobin[i] );
if ( castedFunctionSolver != 0 ) if ( castedFunctionSolver != 0 )
{ {
...@@ -161,7 +160,7 @@ BCInterfaceFunctionSolverDefined< FSIOperator >::updatePhysicalSolverVariables() ...@@ -161,7 +160,7 @@ BCInterfaceFunctionSolverDefined< FSIOperator >::updatePhysicalSolverVariables()
// Set Methods // Set Methods
// =================================================== // ===================================================
void void
BCInterfaceFunctionSolverDefined< FSIOperator >::setData ( const BCInterfaceData3D& data ) BCInterfaceFunctionSolverDefined< BCHandler, FSIOperator >::setData ( const BCInterfaceData3D& data )
{ {
#ifdef HAVE_LIFEV_DEBUG #ifdef HAVE_LIFEV_DEBUG
...@@ -213,7 +212,7 @@ BCInterfaceFunctionSolverDefined< FSIOperator >::setData ( const BCInterfaceData ...@@ -213,7 +212,7 @@ BCInterfaceFunctionSolverDefined< FSIOperator >::setData ( const BCInterfaceData
// Get Methods // Get Methods
// =================================================== // ===================================================
baseContainer_Type baseContainer_Type
BCInterfaceFunctionSolverDefined< FSIOperator >::baseType() const BCInterfaceFunctionSolverDefined< BCHandler, FSIOperator >::baseType() const
{ {
switch ( M_FSIFunction ) switch ( M_FSIFunction )
{ {
......
...@@ -86,21 +86,26 @@ namespace LifeV ...@@ -86,21 +86,26 @@ namespace LifeV
* </ol> * </ol>
*/ */
template< > template< >
class BCInterfaceFunctionSolverDefined< FSIOperator > class BCInterfaceFunctionSolverDefined< BCHandler, FSIOperator >
{ {
public: public:
//! @name Type definitions //! @name Type definitions
//@{ //@{
typedef FSIOperator physicalSolver_Type; typedef BCHandler bcHandler_Type;
typedef boost::shared_ptr< physicalSolver_Type > physicalSolverPtr_Type; typedef boost::shared_ptr< bcHandler_Type > bcHandlerPtr_Type;
typedef BCInterfaceFactory< FSIOperator > factory_Type; typedef FSIOperator physicalSolver_Type;
typedef boost::shared_ptr< physicalSolver_Type > physicalSolverPtr_Type;
typedef BCInterfaceFunction< physicalSolver_Type > bcFunction_Type; typedef BCInterfaceFactory< bcHandler_Type, physicalSolver_Type > factory_Type;
typedef boost::shared_ptr< bcFunction_Type > bcFunctionPtr_Type; typedef BCInterfaceFunction< bcHandler_Type, physicalSolver_Type > bcFunction_Type;
typedef std::vector< bcFunctionPtr_Type > vectorFunction_Type; typedef boost::shared_ptr< bcFunction_Type > bcFunctionPtr_Type;
typedef std::vector< bcFunctionPtr_Type > vectorFunction_Type;
typedef BCInterfaceFunctionParserSolver< bcHandler_Type, physicalSolver_Type > functionParserSolver_Type;
typedef boost::shared_ptr< functionParserSolver_Type > functionParserSolverPtr_Type;
//@} //@}
...@@ -245,7 +250,7 @@ private: ...@@ -245,7 +250,7 @@ private:
// =================================================== // ===================================================
template< class BCBaseType > template< class BCBaseType >
inline void inline void
BCInterfaceFunctionSolverDefined< FSIOperator >::assignFunction ( BCBaseType& base ) BCInterfaceFunctionSolverDefined< BCHandler, FSIOperator >::assignFunction ( BCBaseType& base )
{ {
//Set mapMethod //Set mapMethod
std::map< std::string, FSIMethod > mapMethod; std