Commit 3b3882ac authored by thomaskummer's avatar thomaskummer
Browse files

intrepid lifev update

parent 912de021
......@@ -269,7 +269,7 @@ monodomain_xml_file = ParamListE.xml
[../newton]
maxiter = 50
reltol = 1.e-7
abstol = 3e-6
abstol = 1e-5
NonLinearLineSearch = 0
[../solver]
......
......@@ -26,12 +26,6 @@ public:
HeartData() {}
HeartData(const GetPot& datafile) :
M_datafile (datafile)
{
setupData();
}
virtual ~HeartData() {};
const Real& dt_activation () const { return M_dt_activation; }
......@@ -45,8 +39,10 @@ protected:
void setupData()
void setupData(GetPot& datafile)
{
M_datafile = datafile;
M_dt_activation = M_datafile ("activation/time_discretization/timestep", 0.05 );
M_dt_loadstep = M_datafile ( "solid/time_discretization/dt_loadstep", 1.0 );
M_activationLimit_loadstep = M_datafile ( "solid/time_discretization/activation_limit_loadstep", 0.0 );
......@@ -99,7 +95,7 @@ protected:
UInt M_couplingJFeSubStart;
UInt M_couplingJFeIter;
const GetPot M_datafile;
GetPot M_datafile;
};
......@@ -111,7 +107,8 @@ public:
HeartSolver(EmSolver& emSolver, Circulation& circulationSolver) :
M_emSolver (emSolver),
M_circulationSolver (circulationSolver)
M_circulationSolver (circulationSolver),
M_heartData (HeartData())
{}
virtual ~HeartSolver() {}
......@@ -125,7 +122,7 @@ public:
void setupData(const GetPot& datafile)
{
M_heartData = HeartData(datafile);
M_heartData.setupData(datafile);
}
......
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