Skip to content
Snippets Groups Projects
Commit 08722574 authored by Elias Pipping's avatar Elias Pipping Committed by Elias Pipping
Browse files

Enable caching for the laursen nonlinearity

parent 56648e34
Branches
No related tags found
No related merge requests found
...@@ -23,7 +23,17 @@ class GlobalLaursenNonlinearity ...@@ -23,7 +23,17 @@ class GlobalLaursenNonlinearity
shared_ptr<BlockVector<FieldVector<double, 1>> const> mu, shared_ptr<BlockVector<FieldVector<double, 1>> const> mu,
shared_ptr<BlockVector<FieldVector<double, 1>> const> normalStress, shared_ptr<BlockVector<FieldVector<double, 1>> const> normalStress,
shared_ptr<BlockVector<FieldVector<double, 1>> const> nodalIntegrals) shared_ptr<BlockVector<FieldVector<double, 1>> const> nodalIntegrals)
: mu(mu), normalStress(normalStress), nodalIntegrals(nodalIntegrals) {} : mu(mu),
normalStress(normalStress),
nodalIntegrals(nodalIntegrals),
trivialNonlinearity(
new LocalNonlinearity<dim>(make_shared<TrivialFunction const>())),
restrictions(nodalIntegrals->size()) // TODO: can we get the size from
// another place?
{
for (auto &x : restrictions)
x = shared_ptr<LocalNonlinearity<dim> const>();
}
/* /*
Return a restriction of the outer function to the i'th node. If Return a restriction of the outer function to the i'th node. If
...@@ -40,18 +50,29 @@ class GlobalLaursenNonlinearity ...@@ -40,18 +50,29 @@ class GlobalLaursenNonlinearity
sigma_n [id + mu id] = sigma_n (1 + mu) id sigma_n [id + mu id] = sigma_n (1 + mu) id
*/ */
virtual shared_ptr<LocalNonlinearity<dim> const> restriction(int i) const { virtual shared_ptr<LocalNonlinearity<dim> const> restriction(int i) const {
if ((*nodalIntegrals)[i][0] == 0)
return trivialNonlinearity;
if (restrictions[i] != nullptr)
return restrictions[i];
double coefficient = (*nodalIntegrals)[i][0]; double coefficient = (*nodalIntegrals)[i][0];
coefficient *= (*normalStress)[i]; coefficient *= (*normalStress)[i];
coefficient *= 1 + (*mu)[i]; coefficient *= 1 + (*mu)[i];
auto const func = make_shared<OuterFunctionType const>(coefficient); auto const func = make_shared<OuterFunctionType const>(coefficient);
return make_shared<LocalNonlinearity<dim> const>(func); restrictions[i] = make_shared<LocalNonlinearity<dim> const>(func);
return restrictions[i];
} }
private: private:
shared_ptr<LocalNonlinearity<dim> const> const trivialNonlinearity;
shared_ptr<BlockVector<FieldVector<double, 1>> const> mu; shared_ptr<BlockVector<FieldVector<double, 1>> const> mu;
shared_ptr<BlockVector<FieldVector<double, 1>> const> normalStress; shared_ptr<BlockVector<FieldVector<double, 1>> const> normalStress;
shared_ptr<BlockVector<FieldVector<double, 1>> const> nodalIntegrals; shared_ptr<BlockVector<FieldVector<double, 1>> const> nodalIntegrals;
std::vector<shared_ptr<LocalNonlinearity<dim> const>> mutable restrictions;
}; };
} }
#endif #endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment