Commit 53674ede authored by thomaskummer's avatar thomaskummer
Browse files

intrepid lifev update

parent 0d2b949e
......@@ -566,12 +566,18 @@ EMSolver<Mesh, ElectroSolver>::setup ( GetPot& dataFile )
if (M_commPtr -> MyPID() == 0)
{
std::cout << "\n\nEMSolver: setup ... ";
std::cout << "endtime = " << M_data.activationParameter<Real>("endtime");
}
setupElectroSolver ( dataFile );
setupMechanicalSolver ( dataFile );
setupActivation ( M_electroSolverPtr -> potentialPtr() ->map() );
if (M_commPtr -> MyPID() == 0)
{
std::cout << "\nEMSolver: setup - done ";
std::cout << "(simulation endtime = " << M_data.activationParameter<Real>("endtime") << ")";
}
}
......@@ -607,6 +613,7 @@ EMSolver<Mesh, ElectroSolver>::setupElectroSolver ( GetPot& dataFile )
}
M_electroSolverPtr -> setup (dataFile, ionicModelPtr->Size() );
// }
if (M_commPtr -> MyPID() == 0)
{
std::cout << " done";
......
......@@ -1432,7 +1432,7 @@ EMStructuralConstitutiveLaw<MeshType>::setup ( const FESpacePtr_Type&
{
if (displayer->isLeader())
{
std::cout << "\EMStructuralConstitutiveLaw: setup ... " << '\r' << std::flush;
std::cout << "\nEMStructuralConstitutiveLaw: setup ... " << '\r' << std::flush;
}
this->M_displayer = displayer;
......@@ -1461,7 +1461,7 @@ EMStructuralConstitutiveLaw<MeshType>::setup ( const FESpacePtr_Type&
if (displayer->isLeader())
{
std::cout << "EMStructuralConstitutiveLaw: setup - Active strain Holzapfel-Ogden material" << '\r' << std::flush;
std::cout << "EMStructuralConstitutiveLaw: setup - Orthotropic active strain Holzapfel-Ogden material created" << '\r' << std::flush;
}
}
......
......@@ -61,8 +61,7 @@ std::string createOutputFolder (GetPot& command_line, Epetra_Comm& comm)
if (comm.MyPID() == 0)
{
std::cout << "\nEMUtility: createOutputFolder ... ";
std::cout << "(with name: " << problemFolder << ") ";
std::cout << "\nEMUtility: createOutputFolder (with name: " << problemFolder << ") ... " << '\r' << std::flush;
}
if ( problemFolder.compare ("./") )
......@@ -77,7 +76,7 @@ std::string createOutputFolder (GetPot& command_line, Epetra_Comm& comm)
if (comm.MyPID() == 0)
{
std::cout << "done";
std::cout << "EMUtility: createOutputFolder (with name: " << problemFolder << ") - done " << '\r' << std::flush;
}
return problemFolder;
......
......@@ -1630,7 +1630,7 @@ void
StructuralOperator<Mesh>::setDataFromGetPot ( const GetPot& dataFile )
{
M_Displayer->leaderPrint ( "Setting up Preconditioner... \n" );
M_Displayer->leaderPrint ( "\nSetting up Preconditioner... \n" );
//Setting up the preconditioner
const std::string preconditionerType = dataFile ( "solid/prec/prectype", "Ifpack" );
const std::string xmlFileName = dataFile ( "solid/prec/xmlName", "xmlParameters.xml" );
......
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