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

Use make_shared

parent 198d48f4
No related branches found
No related tags found
No related merge requests found
......@@ -29,8 +29,8 @@ class GlobalRuinaNonlinearity
mu(mu),
eta(eta),
normalStress(normalStress),
trivialNonlinearity(new LocalNonlinearity<dim>(
shared_ptr<NiceFunction const>(new TrivialFunction))) {}
trivialNonlinearity(
new LocalNonlinearity<dim>(make_shared<TrivialFunction const>())) {}
/*
Return a restriction of the outer function to the i'th node.
......@@ -40,10 +40,10 @@ class GlobalRuinaNonlinearity
return trivialNonlinearity;
// TODO: cache functions
shared_ptr<NiceFunction const> const func(
new RuinaFunction((*nodalIntegrals)[i][0], (*a)[i][0], (*mu)[i][0],
(*eta)[i][0], (*normalStress)[i][0]));
return shared_ptr<LocalNonlinearity<dim>>(new LocalNonlinearity<dim>(func));
auto const func = make_shared<RuinaFunction const>(
(*nodalIntegrals)[i][0], (*a)[i][0], (*mu)[i][0], (*eta)[i][0],
(*normalStress)[i][0]);
return make_shared<LocalNonlinearity<dim> const>(func);
}
private:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment