Commit 894725c8 authored by grandper's avatar grandper
Browse files

astyle

parent ef66ddf3
......@@ -1637,7 +1637,7 @@ FESpace<MeshType, MapType>::setSpace ( const std::string& space, UInt dimension
{
switch (dimension)
{
// 1D case
// 1D case
case 1:
switch ( M_spaceMap[space] )
{
......@@ -1657,7 +1657,7 @@ FESpace<MeshType, MapType>::setSpace ( const std::string& space, UInt dimension
M_bdQr = &quadRuleNode1pt;
break;
// In 1D, P1Bubble are "somehow" equivalent to P2, so just use those (same pattern, same dimension of the system).
// In 1D, P1Bubble are "somehow" equivalent to P2, so just use those (same pattern, same dimension of the system).
case P1Bubble :
case P2 :
M_refFE = &feSegP2;
......@@ -1677,7 +1677,7 @@ FESpace<MeshType, MapType>::setSpace ( const std::string& space, UInt dimension
}
break;
// 2D case
// 2D case
case 2:
switch ( M_spaceMap[space] )
{
......@@ -1721,7 +1721,7 @@ FESpace<MeshType, MapType>::setSpace ( const std::string& space, UInt dimension
}
break;
// 3D case
// 3D case
case 3:
switch ( M_spaceMap[space] )
{
......@@ -1773,9 +1773,9 @@ FESpace<MeshType, MapType>::setSpace ( const std::string& space, UInt dimension
}
break;
// Other dimensions not supported
// Other dimensions not supported
default:
ERROR_MSG("Error! This dimension is not supported by LifeV.\n");
ERROR_MSG ("Error! This dimension is not supported by LifeV.\n");
}
}
......
......@@ -103,7 +103,7 @@ void LifeV::HDF5IO::openTable (const std::string& tableName,
tableHandle& currentTable = M_tableList[tableName];
#ifdef H5_USE_16_API
currentTable.dataset = H5Dopen (M_fileId, tableName.c_str());
currentTable.dataset = H5Dopen (M_fileId, tableName.c_str() );
#else
currentTable.dataset = H5Dopen (M_fileId, tableName.c_str(), H5P_DEFAULT);
#endif
......
......@@ -91,7 +91,7 @@ int atoi ( const std::string& s )
std::string operator+ ( const std::string& str, const int i )
{
int digits = i==0 ? 2 : std::log10( std::abs(i) ) + 2;
int digits = i == 0 ? 2 : std::log10 ( std::abs (i) ) + 2;
char* str_i = new char[ digits ];
sprintf ( str_i, "%i", i );
std::string str2 = str + str_i;
......@@ -101,7 +101,7 @@ std::string operator+ ( const std::string& str, const int i )
std::string operator+ ( const std::string& str, const long i )
{
int digits = i==0 ? 2 : std::log10( std::abs(i) ) + 2;
int digits = i == 0 ? 2 : std::log10 ( std::abs (i) ) + 2;
char* str_i = new char[ digits ];
sprintf ( str_i, "%ld", i );
std::string str2 = str + str_i;
......@@ -111,7 +111,7 @@ std::string operator+ ( const std::string& str, const long i )
std::string operator+ ( const std::string& str, const unsigned int i )
{
int digits = i==0 ? 2 : std::log10(i) + 2;
int digits = i == 0 ? 2 : std::log10 (i) + 2;
char* str_i = new char[ digits ];
sprintf ( str_i, "%u", i );
std::string str2 = str + str_i;
......
......@@ -227,7 +227,7 @@ void fillWithPartitionedMesh ( boost::shared_ptr< RegionMeshType >& meshLocal,
PartitionIO< RegionMeshType > partitionIO ( ( resourcesPath + meshName ).data(), Comm);
partitionIO.read (meshLocal);
#else
ASSERT(false,"You must compile LifeV with HDF5 to load partitioned meshes");
ASSERT (false, "You must compile LifeV with HDF5 to load partitioned meshes");
#endif
meshReadChrono.stop();
displayer.leaderPrint ("Loading time: ", meshReadChrono.diff(), " s.\n");
......
......@@ -122,9 +122,9 @@ NavierStokesCavity::mesh ( boost::shared_ptr< RegionMesh<LinearTetra> >& mesh )
std::cout << "ERROR: The mesh refinement requested is not valid." << std::endl;
exit ( 0 );
}
std::vector<Real> width(3,-1.0);
std::vector<Real> shift(3,-1.0);
std::vector<UInt> numMeshElem(3,M_refinement);
std::vector<Real> width (3, -1.0);
std::vector<Real> shift (3, -1.0);
std::vector<UInt> numMeshElem (3, M_refinement);
MeshUtility::fillWithStructuredMesh ( mesh, 1, numMeshElem, false, width, shift );
}
......
......@@ -145,9 +145,9 @@ NavierStokesEthierSteinman::mesh ( boost::shared_ptr< RegionMesh<LinearTetra> >&
std::cout << "ERROR: The mesh refinement requested is not valid." << std::endl;
exit ( 0 );
}
std::vector<Real> width(3,-1.0);
std::vector<Real> shift(3,-1.0);
std::vector<UInt> numMeshElem(3,M_refinement);
std::vector<Real> width (3, -1.0);
std::vector<Real> shift (3, -1.0);
std::vector<UInt> numMeshElem (3, M_refinement);
MeshUtility::fillWithStructuredMesh ( mesh, 1, numMeshElem, false, width, shift );
}
......
......@@ -93,8 +93,8 @@ struct AssemblyPolicyGeneralizedStokes
typedef Preconditioner preconditioner_Type;
typedef boost::shared_ptr<preconditioner_Type> preconditionerPtr_Type;
AssemblyPolicyGeneralizedStokes(){}
virtual ~AssemblyPolicyGeneralizedStokes(){}
AssemblyPolicyGeneralizedStokes() {}
virtual ~AssemblyPolicyGeneralizedStokes() {}
enum { BDFOrder = 1 };
......
......@@ -83,11 +83,11 @@ AssemblyPolicyNavierStokesNewton::assembleSystem ( matrixPtr_Type systemMatrix,
M_assembler->addNewtonConvection ( *systemMatrix, beta );
M_assembler->addConvectionRhs ( *rhs, 1.0, beta );
// if ( preconditioner->preconditionerType() == "PCD" )
// {
// PreconditionerPCD* pcdPtr = dynamic_cast<PreconditionerPCD*> ( preconditioner.get() );
// pcdPtr->updateBeta ( beta );
// }
// if ( preconditioner->preconditionerType() == "PCD" )
// {
// PreconditionerPCD* pcdPtr = dynamic_cast<PreconditionerPCD*> ( preconditioner.get() );
// pcdPtr->updateBeta ( beta );
// }
}
} // namespace LifeV
......@@ -81,11 +81,11 @@ AssemblyPolicyNavierStokesPicard::assembleSystem ( matrixPtr_Type systemMatrix,
beta += *solution;
M_assembler->addConvection ( *systemMatrix, 1.0, beta );
// if ( preconditioner->preconditionerType() == "PCD" )
// {
// PreconditionerPCD* pcdPtr = dynamic_cast<PreconditionerPCD*> ( preconditioner.get() );
// pcdPtr->updateBeta ( beta );
// }
// if ( preconditioner->preconditionerType() == "PCD" )
// {
// PreconditionerPCD* pcdPtr = dynamic_cast<PreconditionerPCD*> ( preconditioner.get() );
// pcdPtr->updateBeta ( beta );
// }
}
} // namespace LifeV
......@@ -81,11 +81,11 @@ AssemblyPolicyNavierStokesSemiImplicit::assembleSystem ( matrixPtr_Type systemMa
bdf()->extrapolation (beta);
M_assembler->addConvection ( *systemMatrix, 1.0, beta );
// if ( preconditioner->preconditionerType() == "PCD" )
// {
// PreconditionerPCD* pcdPtr = dynamic_cast<PreconditionerPCD*> ( preconditioner.get() );
// pcdPtr->updateBeta ( beta );
// }
// if ( preconditioner->preconditionerType() == "PCD" )
// {
// PreconditionerPCD* pcdPtr = dynamic_cast<PreconditionerPCD*> ( preconditioner.get() );
// pcdPtr->updateBeta ( beta );
// }
}
} // namespace LifeV
......@@ -92,8 +92,8 @@ struct InitPolicyProjection : public virtual SolverPolicy, public AssemblyPolicy
typedef boost::shared_ptr<bcContainer_Type> bcContainerPtr_Type;
typedef boost::shared_ptr< NavierStokesProblem > NSProblemPtr_Type;
InitPolicyProjection(){}
virtual ~InitPolicyProjection(){}
InitPolicyProjection() {}
virtual ~InitPolicyProjection() {}
void setupInit ( Teuchos::ParameterList& list );
......@@ -188,13 +188,13 @@ initSimulation ( bcContainerPtr_Type bchandler,
// We deal as in the semi-implicit way
AssemblyPolicyStokes::M_assembler->addConvection ( *systemMatrix, 1.0, *solution );
// if ( SolverPolicy::preconditioner()->preconditionerType() == "PCD" )
// {
// vector_Type beta ( systemMatrix->map(), Repeated );
// beta += *solution;
// PreconditionerPCD* pcdPtr = dynamic_cast<PreconditionerPCD*> ( SolverPolicy::preconditioner().get() );
// pcdPtr->updateBeta ( beta );
// }
// if ( SolverPolicy::preconditioner()->preconditionerType() == "PCD" )
// {
// vector_Type beta ( systemMatrix->map(), Repeated );
// beta += *solution;
// PreconditionerPCD* pcdPtr = dynamic_cast<PreconditionerPCD*> ( SolverPolicy::preconditioner().get() );
// pcdPtr->updateBeta ( beta );
// }
displayer().leaderPrint ( "done\n" );
......
......@@ -83,8 +83,8 @@ struct InitPolicySolver : public virtual TimeIterationPolicy
typedef boost::shared_ptr<bcContainer_Type> bcContainerPtr_Type;
typedef boost::shared_ptr< NavierStokesProblem > NSProblemPtr_Type;
InitPolicySolver(){}
virtual ~InitPolicySolver(){}
InitPolicySolver() {}
virtual ~InitPolicySolver() {}
void setupInit ( Teuchos::ParameterList& list );
......
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