Commit e4088277 authored by thomaskummer's avatar thomaskummer
Browse files

intrepid lifev update

parent d06c4f42
......@@ -210,7 +210,7 @@ monodomain_xml_file = ParamListE.xml
[./EssentialPatchCircular1]
flag = 464
type = EssentialPatchBCCircular
type = EssentialPatchBCCircularSmooth
center = '-1.8 -7.0 -4.5'
radius = 2.5
component = '0 2'
......@@ -221,7 +221,7 @@ monodomain_xml_file = ParamListE.xml
[../EssentialPatchCircular2]
flag = 464
type = EssentialPatchBCCircular
type = EssentialPatchBCCircularSmooth
center = '3.5 -7.0 1.0'
radius = 2.5
component = '0 2'
......
......@@ -168,8 +168,6 @@ int main (int argc, char** argv)
//============================================
// Resize mesh
//============================================
if ( 0 == comm->MyPID() ) std::cout << "\nResizing mesh ... " << '\r' << std::flush;
Vector3D scale, rotate, translate;
for ( UInt j (0); j < 3; ++j )
{
......@@ -184,7 +182,7 @@ int main (int argc, char** argv)
transformerFull.transformMesh (scale, rotate, translate);
transformerLocal.transformMesh (scale, rotate, translate);
if ( 0 == comm->MyPID() ) std::cout << "Resizing mesh done" << '\r' << std::flush;
if ( 0 == comm->MyPID() ) std::cout << "\nResizing mesh done" << std::endl;
if ( 0 == comm->MyPID() ) solver.fullMeshPtr()->showMe();
......
......@@ -134,7 +134,7 @@ public:
{
// if (M_commPtr -> MyPID() == 0)
// {
// std::cout << "\n\nEMSolver: loadMesh ... " << '\r' << std::flush;
// std::cout << "\n\nEMSolver: loadMesh ... " << std::endl;
// }
M_fullMeshPtr.reset( new Mesh() );
......@@ -220,7 +220,7 @@ public:
{
// if (M_commPtr -> MyPID() == 0)
// {
// std::cout << "\nEMSolver: setupActivation ... " << '\r' << std::flush;
// std::cout << "\nEMSolver: setupActivation ... " << std::endl;
// }
M_activationModelPtr.reset ( Activation::EMActivationFactory::instance().createObject ( M_data.activationParameter<std::string>( "ActivationModel" ) ) );
......@@ -244,7 +244,7 @@ public:
void buildMechanicalSystem()
{
// if (M_commPtr -> MyPID() == 0) std::cout << "\nEMSolver: buildMechanicalSystem ... " << '\r' << std::flush;
// if (M_commPtr -> MyPID() == 0) std::cout << "\nEMSolver: buildMechanicalSystem ... " << std::endl;
//Here we call the buildSystem Of the Structural operator
// the coefficient is the density in front of the mass matrix
......@@ -255,7 +255,7 @@ public:
void buildElectroSystem()
{
// if (M_commPtr -> MyPID() == 0) std::cout << "\nEMSolver: buildElectroSystem ... " << '\r' << std::flush;
// if (M_commPtr -> MyPID() == 0) std::cout << "\nEMSolver: buildElectroSystem ... " << std::endl;
M_electroSolverPtr -> setupMatrices();
......@@ -270,7 +270,7 @@ public:
void initializeElectroVariables()
{
// if (M_commPtr -> MyPID() == 0) std::cout << "\nEMSolver: initializeElectroVariables ... " << '\r' << std::flush;
// if (M_commPtr -> MyPID() == 0) std::cout << "\nEMSolver: initializeElectroVariables ... " << std::endl;
M_electroSolverPtr -> setInitialConditions();
......@@ -294,7 +294,7 @@ public:
const std::string& postDir = "./",
const std::string& polynomialDegree = "P1" )
{
// if (M_commPtr -> MyPID() == 0) std::cout << "\nEMSolver: setupFiberVector ... " << '\r' << std::flush;
// if (M_commPtr -> MyPID() == 0) std::cout << "\nEMSolver: setupFiberVector ... " << std::endl;
setupMechanicalFiberVector(fileName, fieldName, postDir, polynomialDegree);
M_electroSolverPtr->setFiberPtr(getMechanicsFibers());
......@@ -308,7 +308,7 @@ public:
const std::string& postDir = "./",
const std::string& polynomialDegree = "P1" )
{
// if (M_commPtr -> MyPID() == 0) std::cout << "\nEMSolver: setupMechanicalFiberVector ... " << '\r' << std::flush;
// if (M_commPtr -> MyPID() == 0) std::cout << "\nEMSolver: setupMechanicalFiberVector ... " << std::endl;
ElectrophysiologyUtility::importVectorField (getMechanicsFibers(), fileName, fieldName, M_localMeshPtr, postDir, polynomialDegree );
......@@ -328,7 +328,7 @@ public:
const std::string& postDir = "./",
const std::string& polynomialDegree = "P1" )
{
// if (M_commPtr -> MyPID() == 0) std::cout << "\nEMSolver: setupMechanicalSheetVector ... " << '\r' << std::flush;
// if (M_commPtr -> MyPID() == 0) std::cout << "\nEMSolver: setupMechanicalSheetVector ... " << std::endl;
ElectrophysiologyUtility::importVectorField (getMechanicsSheets(), fileName, fieldName, M_localMeshPtr, postDir, polynomialDegree );
if (M_commPtr -> MyPID() == 0) std::cout << "\nEMSolver: setupMechanicalSheetVector - done";
......@@ -604,7 +604,7 @@ EMSolver<Mesh, ElectroSolver>::setupElectroSolver ( GetPot& dataFile )
{
// if (M_commPtr -> MyPID() == 0)
// {
// std::cout << "\nEMSolver: setupElectroSolver ... " << '\r' << std::flush;
// std::cout << "\nEMSolver: setupElectroSolver ... " << std::endl;
// }
ionicModelPtr_Type ionicModelPtr;
std::string ionicModelName = M_data.electroParameter<std::string>("IonicModel");
......@@ -649,7 +649,7 @@ EMSolver<Mesh, ElectroSolver>::setupMechanicalSolver ( GetPot& dataFile)
{
// if (M_commPtr -> MyPID() == 0)
// {
// std::cout << "\nEMSolver: setupMechanicalSolver ... " << '\r' << std::flush;
// std::cout << "\nEMSolver: setupMechanicalSolver ... " << std::endl;
// }
boost::shared_ptr<StructuralConstitutiveLawData> dataStructure (new StructuralConstitutiveLawData( ) );
......@@ -698,7 +698,7 @@ EMSolver<Mesh, ElectroSolver>::setupMechanicalBC (std::string data_file_name,
{
// if (M_commPtr -> MyPID() == 0)
// {
// std::cout << "\nEMSolver: setupMechanicalBC ... " << '\r' << std::flush;
// std::cout << "\nEMSolver: setupMechanicalBC ... " << std::endl;
// }
M_bcInterfacePtr.reset (new bcInterface_Type() );
......@@ -742,7 +742,7 @@ EMSolver<Mesh, ElectroSolver>::setupExporters ( std::string problemFolder,
{
// if (M_commPtr -> MyPID() == 0)
// {
// std::cout << "\nEMSolver: setupExporters ... " << '\r' << std::flush;
// std::cout << "\nEMSolver: setupExporters ... " << std::endl;
// }
// Electrophysiology
......@@ -967,7 +967,7 @@ EMSolver<Mesh, ElectroSolver>::solveElectrophysiology (function_Type& stimulus,
{
// if (M_commPtr -> MyPID() == 0)
// {
// std::cout << "\nEMSolver: solveElectrophysiology ... " << '\r' << std::flush;
// std::cout << "\nEMSolver: solveElectrophysiology ... " << std::endl;
// }
setAppliedCurrent ( stimulus, time );
......@@ -992,7 +992,7 @@ EMSolver<Mesh, ElectroSolver>::solveActivation (Real dt)
{
// if (M_commPtr -> MyPID() == 0)
// {
// std::cout << "\nEMSolver: solveActivation ... " << '\r' << std::flush;
// std::cout << "\nEMSolver: solveActivation ... " << std::endl;
// }
computeI4f (M_activationModelPtr->I4f(), *M_EMStructuralOperatorPtr->EMMaterial()->fiberVectorPtr(), *M_EMStructuralOperatorPtr->displacementPtr(), M_EMStructuralOperatorPtr->dispFESpacePtr());
......
......@@ -1487,11 +1487,6 @@ EMStructuralConstitutiveLaw<MeshType>::setup ( const FESpacePtr_Type&
const dataPtr_Type& dataMaterial,
const displayerPtr_Type& displayer)
{
if (displayer->isLeader())
{
std::cout << "\nEMStructuralConstitutiveLaw: setup ... " << '\r' << std::flush;
}
this->M_displayer = displayer;
this->M_dataMaterial = dataMaterial;
......
......@@ -59,11 +59,6 @@ std::string createOutputFolder (GetPot& command_line, Epetra_Comm& comm)
std::string problemFolder = command_line.follow ("Output", 2, "-o", "--output"); //) command_line.follow ( "Output", 2, "-o", "--output" );
// Create the problem folder
if (comm.MyPID() == 0)
{
std::cout << "\nEMUtility: createOutputFolder (" << problemFolder << ") ... " << '\r' << std::flush;
}
if ( problemFolder.compare ("./") )
{
problemFolder += "/";
......@@ -76,7 +71,7 @@ std::string createOutputFolder (GetPot& command_line, Epetra_Comm& comm)
if (comm.MyPID() == 0)
{
std::cout << "EMUtility: createOutputFolder (" << problemFolder << ") - done " << '\r' << std::flush;
std::cout << "EMUtility: createOutputFolder (" << problemFolder << ") - done " << std::endl;
}
return problemFolder;
......
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