Commit 05b0dab8 authored by Antonio Cervone's avatar Antonio Cervone
Browse files

Merge branch 'master' into 201204_CMakeIncludeDirFix

parents c1872f15 e3d65d30
...@@ -76,13 +76,13 @@ SET( LifeV_PACKAGES_AND_DIRS_AND_CLASSIFICATIONS ...@@ -76,13 +76,13 @@ SET( LifeV_PACKAGES_AND_DIRS_AND_CLASSIFICATIONS
Core lifev/core PS Core lifev/core PS
BCInterface lifev/bc_interface PS BCInterface lifev/bc_interface PS
OneDFSI lifev/one_d_fsi PS OneDFSI lifev/one_d_fsi PS
ZeroDimensional lifev/zero_dimensional PS
LevelSet lifev/level_set PS LevelSet lifev/level_set PS
Darcy lifev/darcy PS Darcy lifev/darcy PS
NavierStokes lifev/navier_stokes PS NavierStokes lifev/navier_stokes PS
Structure lifev/structure PS Structure lifev/structure PS
Heart lifev/heart PS Heart lifev/heart PS
FSI lifev/fsi PS FSI lifev/fsi PS
ZeroDimensional lifev/zero_dimensional PS
Multiscale lifev/multiscale PS Multiscale lifev/multiscale PS
Dummy lifev/dummy EX Dummy lifev/dummy EX
ETA lifev/eta EX ETA lifev/eta EX
......
...@@ -612,7 +612,7 @@ FSIMonolithic::assembleSolidBlock ( UInt iter, const vector_Type& solution ) ...@@ -612,7 +612,7 @@ FSIMonolithic::assembleSolidBlock ( UInt iter, const vector_Type& solution )
void void
FSIMonolithic::assembleFluidBlock (UInt iter, const vector_Type& solution) FSIMonolithic::assembleFluidBlock (UInt iter, const vector_Type& solution)
{ {
M_fluidBlock.reset (new FSIOperator::fluidPtr_Type::value_type::matrix_Type (*M_monolithicMap) ); M_fluidBlock.reset (new FSIOperator::fluid_Type::matrix_Type (*M_monolithicMap) );
Real alpha = M_fluidTimeAdvance->coefficientFirstDerivative ( 0 ) / M_data->dataFluid()->dataTime()->timeStep(); //mesh velocity w Real alpha = M_fluidTimeAdvance->coefficientFirstDerivative ( 0 ) / M_data->dataFluid()->dataTime()->timeStep(); //mesh velocity w
......
...@@ -99,7 +99,7 @@ public: ...@@ -99,7 +99,7 @@ public:
//@{ //@{
typedef FSIOperator super_Type; typedef FSIOperator super_Type;
typedef FSIOperator::fluidPtr_Type::value_type::matrix_Type matrix_Type; typedef FSIOperator::fluid_Type::matrix_Type matrix_Type;
typedef boost::shared_ptr<matrix_Type> matrixPtr_Type; typedef boost::shared_ptr<matrix_Type> matrixPtr_Type;
typedef super_Type::solution_Type solution_Type; typedef super_Type::solution_Type solution_Type;
typedef super_Type::solutionPtr_Type solutionPtr_Type; typedef super_Type::solutionPtr_Type solutionPtr_Type;
...@@ -578,7 +578,7 @@ protected: ...@@ -578,7 +578,7 @@ protected:
BCFunctionRobin M_bcfWs; BCFunctionRobin M_bcfWs;
UInt M_offset; UInt M_offset;
UInt M_solidAndFluidDim; UInt M_solidAndFluidDim;
FSIOperator::fluidPtr_Type::value_type::matrixPtr_Type M_fluidBlock; FSIOperator::fluid_Type::matrixPtr_Type M_fluidBlock;
matrixPtr_Type M_solidBlockPrec; matrixPtr_Type M_solidBlockPrec;
matrixPtr_Type M_robinCoupling; //uninitialized if not needed matrixPtr_Type M_robinCoupling; //uninitialized if not needed
matrixPtr_Type M_boundaryMass; matrixPtr_Type M_boundaryMass;
......
...@@ -374,7 +374,7 @@ void FSIMonolithicGI::setupBlockPrec() ...@@ -374,7 +374,7 @@ void FSIMonolithicGI::setupBlockPrec()
} }
} }
void FSIMonolithicGI::shapeDerivatives ( FSIOperator::fluidPtr_Type::value_type::matrixPtr_Type sdMatrix ) void FSIMonolithicGI::shapeDerivatives ( FSIOperator::fluid_Type::matrixPtr_Type sdMatrix )
{ {
Real alpha = M_fluidTimeAdvance->coefficientFirstDerivative ( 0 ) / M_data->dataFluid()->dataTime()->timeStep(); Real alpha = M_fluidTimeAdvance->coefficientFirstDerivative ( 0 ) / M_data->dataFluid()->dataTime()->timeStep();
vectorPtr_Type rhsNew (new vector_Type (*M_monolithicMap) ); vectorPtr_Type rhsNew (new vector_Type (*M_monolithicMap) );
......
...@@ -214,7 +214,7 @@ private: ...@@ -214,7 +214,7 @@ private:
(not in a right hand side representing the matrix-vector multiplication) (not in a right hand side representing the matrix-vector multiplication)
\param sdMatrix: output. Shape derivatives block to be summed to the Jacobian matrix. \param sdMatrix: output. Shape derivatives block to be summed to the Jacobian matrix.
*/ */
void shapeDerivatives ( FSIOperator::fluidPtr_Type::value_type::matrixPtr_Type sdMatrix ); void shapeDerivatives ( FSIOperator::fluid_Type::matrixPtr_Type sdMatrix );
//! assembles the mesh motion matrix. //! assembles the mesh motion matrix.
/*!In Particular it diagonalize the part of the matrix corresponding to the /*!In Particular it diagonalize the part of the matrix corresponding to the
...@@ -235,7 +235,7 @@ private: ...@@ -235,7 +235,7 @@ private:
vectorPtr_Type M_uk; vectorPtr_Type M_uk;
UInt M_interface; UInt M_interface;
matrixPtr_Type M_meshBlock; matrixPtr_Type M_meshBlock;
FSIOperator::fluidPtr_Type::value_type::matrixPtr_Type M_shapeDerivativesBlock; FSIOperator::fluid_Type::matrixPtr_Type M_shapeDerivativesBlock;
matrixPtr_Type M_solidDerBlock; matrixPtr_Type M_solidDerBlock;
//std::vector<fluidBchandlerPtr_Type> M_BChsLin; //std::vector<fluidBchandlerPtr_Type> M_BChsLin;
//@} //@}
......
...@@ -641,11 +641,11 @@ FSIOperator::imposedFluxes ( void ) ...@@ -641,11 +641,11 @@ FSIOperator::imposedFluxes ( void )
} }
void void
FSIOperator::initialize ( fluidPtr_Type::value_type::function_Type const& u0, FSIOperator::initialize ( fluid_Type::function_Type const& u0,
fluidPtr_Type::value_type::function_Type const& p0, fluid_Type::function_Type const& p0,
solidPtr_Type::value_type::function const& d0, solid_Type::function const& d0,
solidPtr_Type::value_type::function const& w0, solid_Type::function const& w0,
fluidPtr_Type::value_type::function_Type const& /*df0*/ ) fluid_Type::function_Type const& /*df0*/ )
{ {
debugStream ( 6220 ) << "FSI:: solid init \n"; debugStream ( 6220 ) << "FSI:: solid init \n";
if (this->isSolid() ) if (this->isSolid() )
......
...@@ -297,11 +297,11 @@ public: ...@@ -297,11 +297,11 @@ public:
* \param d0: initial solid displacement * \param d0: initial solid displacement
* \param w0: initial mesh velocity * \param w0: initial mesh velocity
*/ */
virtual void initialize ( fluidPtr_Type::value_type::function_Type const& u0, virtual void initialize ( fluid_Type::function_Type const& u0,
fluidPtr_Type::value_type::function_Type const& p0, fluid_Type::function_Type const& p0,
solidPtr_Type::value_type::function const& d0, solid_Type::function const& d0,
solidPtr_Type::value_type::function const& w0, solid_Type::function const& w0,
fluidPtr_Type::value_type::function_Type const& df0 ); fluid_Type::function_Type const& df0 );
//@} //@}
...@@ -597,24 +597,24 @@ public: ...@@ -597,24 +597,24 @@ public:
//! Getter-Setter for the fluid solver //! Getter-Setter for the fluid solver
/** \todo{mark as deprecated}*/ /** \todo{mark as deprecated}*/
fluidPtr_Type::value_type& fluid() fluid_Type& fluid()
{ {
return *M_fluid; return *M_fluid;
} }
//! Getter-Setter for the solid solver //! Getter-Setter for the solid solver
/** \todo{mark as deprecated}*/ /** \todo{mark as deprecated}*/
solidPtr_Type::value_type& solid() solid_Type& solid()
{ {
return *M_solid; return *M_solid;
} }
//! Getter-Setter for the mesh motion solver //! Getter-Setter for the mesh motion solver
/** \todo{mark as deprecated}*/ /** \todo{mark as deprecated}*/
meshMotionPtr_Type::value_type& meshMotion() meshMotion_Type& meshMotion()
{ {
return *M_meshMotion; return *M_meshMotion;
} }
// fluidLinPtr_Type::value_type& fluidLin() { return *M_fluidLin; } // fluidLin_Type & fluidLin() { return *M_fluidLin; }
// solidLinPtr_Type::value_type& solidLin() { return *M_solidLin; } // solidLin_Type & solidLin() { return *M_solidLin; }
//!getter for the FSI data container //!getter for the FSI data container
const data_Type& data() const const data_Type& data() const
......
...@@ -102,8 +102,8 @@ public: ...@@ -102,8 +102,8 @@ public:
typedef FSIOperator::mesh_Type mesh_Type; typedef FSIOperator::mesh_Type mesh_Type;
typedef FSIOperator::fluidPtr_Type::value_type fluid_Type; typedef FSIOperator::fluid_Type fluid_Type;
typedef FSIOperator::solidPtr_Type::value_type solid_Type; typedef FSIOperator::solid_Type solid_Type;
typedef fluid_Type::function_Type fluidFunction_Type; typedef fluid_Type::function_Type fluidFunction_Type;
typedef solid_Type::function solidFunction_Type; typedef solid_Type::function solidFunction_Type;
......
SET(LIB_REQUIRED_DEP_PACKAGES Core BCInterface) SET(LIB_REQUIRED_DEP_PACKAGES Core BCInterface)
SET(LIB_OPTIONAL_DEP_PACKAGES) SET(LIB_OPTIONAL_DEP_PACKAGES)
SET(TEST_REQUIRED_DEP_PACKAGES) SET(TEST_REQUIRED_DEP_PACKAGES Structure OneDFSI FSI)
SET(TEST_OPTIONAL_DEP_PACKAGES) SET(TEST_OPTIONAL_DEP_PACKAGES)
SET(LIB_REQUIRED_DEP_TPLS BLAS LAPACK Trilinos Boost) SET(LIB_REQUIRED_DEP_TPLS BLAS LAPACK Trilinos Boost)
SET(LIB_OPTIONAL_DEP_TPLS) SET(LIB_OPTIONAL_DEP_TPLS)
......
...@@ -56,7 +56,7 @@ CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d *.gcda * ...@@ -56,7 +56,7 @@ CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d *.gcda *
XERBLA = XERBLA =
EOF EOF
make clean make clean || true
make library make library
} }
......
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