Commit a1a73134 authored by thomaskummer's avatar thomaskummer
Browse files

intrepid lifev update

parent 691023f6
......@@ -48,6 +48,8 @@ public:
const UInt& couplingJFeSubStart () const { return M_couplingJFeSubStart; }
const UInt& couplingJFeIter () const { return M_couplingJFeIter; }
const std::string& elementOrder () const { return M_elementOrder; }
const GetPot& datafile () { return M_datafile; }
protected:
......@@ -79,6 +81,9 @@ protected:
M_couplingJFeSubStart = M_datafile ( "solid/coupling/couplingJFeSubStart", 1 );
M_couplingJFeIter = M_datafile ( "solid/coupling/couplingJFeIter", 1 );
M_elementOrder = M_dataFile ( "solid/space_discretization/order", "P2");
// const Real dpMax = dataFile ( "solid/coupling/dpMax", 0.1 );
//
// std::vector<std::vector<std::string> > bcNames { { "lv" , "p" } , { "rv" , "p" } };
......@@ -116,6 +121,8 @@ protected:
UInt M_couplingJFeSubStart;
UInt M_couplingJFeIter;
M_elementOrder
GetPot M_datafile;
};
......
......@@ -126,18 +126,17 @@ public:
//solver.importHdf5();
// Load restart solutions from output files
std::string polynomialDegree = data().datafile() ( "solid/space_discretization/order", "P1");
std::string polynomialDegree = data().elementOrder();
ElectrophysiologyUtility::importVectorField ( M_emSolver.structuralOperatorPtr() -> displacementPtr(), "MechanicalSolution" , "displacement", M_emSolver.localMeshPtr(), restartDir, polynomialDegree, restartInput );
ElectrophysiologyUtility::importScalarField (M_emSolver.activationModelPtr() -> fiberActivationPtr(), "ActivationSolution" , "Activation", M_emSolver.localMeshPtr(), restartDir, polynomialDegree, restartInput );
//ElectrophysiologyUtility::importScalarField (solver.activationTimePtr(), "ActivationTimeSolution" , "Activation Time", solver.localMeshPtr(), restartDir, polynomialDegree, restartInput );
for ( unsigned int i = 0; i < M_emSolver.electroSolverPtr()->globalSolution().size() ; ++i )
{
ElectrophysiologyUtility::importScalarField (M_emSolver.electroSolverPtr()->globalSolution().at(i), "ElectroSolution" , ("Variable" + std::to_string(i)), M_emSolver.localMeshPtr(), restartDir, polynomialDegree, restartInput );
}
ElectrophysiologyUtility::importScalarField (M_emSolver.activationModelPtr() -> fiberActivationPtr(), "ActivationSolution" , "Activation", M_emSolver.localMeshPtr(), restartDir, polynomialDegree, restartInput );
//ElectrophysiologyUtility::importScalarField (solver.activationTimePtr(), "ActivationTimeSolution" , "Activation Time", solver.localMeshPtr(), restartDir, polynomialDegree, restartInput );
if ( 0 == M_emSolver.comm()->MyPID() )
{
std::cout << "\nLoad from restart: " << restartInput << ", nIterCirculation = " << nIter << ", time = " << t << std::endl;
......
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