Commit fd3702ac authored by thomaskummer's avatar thomaskummer
Browse files

intrepid lifev update

parent 061b5c69
......@@ -978,6 +978,7 @@ EMSolver<Mesh, ElectroSolver>::solveElectrophysiology (function_Type& stimulus,
M_electroSolverPtr -> solveOneICIStep();
M_electroSolverPtr -> registerActivationTime (*M_activationTimePtr, time, 0.9);
if (M_commPtr -> MyPID() == 0)
{
std::cout << "\nEMSolver: solveElectrophysiology - done";
......
......@@ -276,7 +276,8 @@ public:
m_exporter->addVariable ( ExporterData<RegionMesh<LinearTetra> >::VectorField,
"Sheets",
M_emSolver.structuralOperatorPtr()->dispFESpacePtr(),
M_emSolver.structuralOperatorPtr()->EMMaterial()->sheetVectorPtr(),
M_emSolver.structuralOperatorPtr()->sPtr(),
//M_emSolver.structuralOperatorPtr()->EMMaterial()->sheetVectorPtr(),
UInt (0) );
m_exporter->addVariable ( ExporterData<RegionMesh<LinearTetra> >::ScalarField,
......@@ -328,6 +329,8 @@ public:
// Compute deformed fiber direction
M_emSolver.computeDeformedFiberDirection (M_emSolver.structuralOperatorPtr()->f(), *M_emSolver.structuralOperatorPtr()->EMMaterial()->fiberVectorPtr(), *M_emSolver.structuralOperatorPtr()->displacementPtr(), M_emSolver.structuralOperatorPtr()->dispFESpacePtr());
// Compute deformed sheet direction
M_emSolver.computeDeformedFiberDirection (M_emSolver.structuralOperatorPtr()->s(), *M_emSolver.structuralOperatorPtr()->EMMaterial()->sheetVectorPtr(), *M_emSolver.structuralOperatorPtr()->displacementPtr(), M_emSolver.structuralOperatorPtr()->dispFESpacePtr());
// Write on hdf5 output file
m_exporter->postProcess(time);
......
......@@ -197,6 +197,16 @@ public:
{
return *M_fPtr;
}
vectorPtr_Type sPtr()
{
return M_sPtr;
}
VectorEpetra& s()
{
return *M_sPtr;
}
protected:
......@@ -214,6 +224,7 @@ protected:
vectorPtr_Type M_I4fPtr;
vectorPtr_Type M_fPtr;
vectorPtr_Type M_sPtr;
};
......@@ -250,9 +261,11 @@ EMStructuralOperator<Mesh>::setup (boost::shared_ptr<data_Type> data,
M_I4fPtr.reset(new vector_Type ( M_EMMaterial->scalarETFESpacePtr()->map() ) );
*M_I4fPtr += 1.0;
// Setup deformed fiber vector
// Setup deformed fiber and sheet vectors
M_fPtr.reset(new vector_Type ( this->M_disp->map() ));
*M_fPtr *= 0.;
M_sPtr.reset(new vector_Type ( this->M_disp->map() ));
*M_sPtr *= 0.;
}
......
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