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

Typedef

parent e4d2b8c3
No related branches found
No related tags found
No related merge requests found
...@@ -143,25 +143,22 @@ void assemble_nonlinearity( ...@@ -143,25 +143,22 @@ void assemble_nonlinearity(
Dune::shared_ptr<Dune::GlobalNonlinearity<dim> const> &myGlobalNonlinearity, Dune::shared_ptr<Dune::GlobalNonlinearity<dim> const> &myGlobalNonlinearity,
Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>> Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>>
nodalIntegrals) { nodalIntegrals) {
typedef Dune::BlockVector<Dune::FieldVector<double, 1>> SingletonVectorType;
// {{{ Assemble terms for the nonlinearity // {{{ Assemble terms for the nonlinearity
auto mu = auto mu = Dune::make_shared<SingletonVectorType>(size);
Dune::make_shared<Dune::BlockVector<Dune::FieldVector<double, 1>>>(size);
*mu = parset.get<double>("boundary.friction.mu"); *mu = parset.get<double>("boundary.friction.mu");
auto normalStress = auto normalStress = Dune::make_shared<SingletonVectorType>(size);
Dune::make_shared<Dune::BlockVector<Dune::FieldVector<double, 1>>>(size);
*normalStress = parset.get<double>("boundary.friction.normalstress"); *normalStress = parset.get<double>("boundary.friction.normalstress");
std::string const friction_model = std::string const friction_model =
parset.get<std::string>("boundary.friction.model"); parset.get<std::string>("boundary.friction.model");
if (friction_model == std::string("Ruina")) { if (friction_model == std::string("Ruina")) {
auto a = Dune::make_shared<Dune::BlockVector<Dune::FieldVector<double, 1>>>( auto a = Dune::make_shared<SingletonVectorType>(size);
size);
*a = parset.get<double>("boundary.friction.ruina.a"); *a = parset.get<double>("boundary.friction.ruina.a");
auto eta = auto eta = Dune::make_shared<SingletonVectorType>(size);
Dune::make_shared<Dune::BlockVector<Dune::FieldVector<double, 1>>>(
size);
*eta = parset.get<double>("boundary.friction.eta"); *eta = parset.get<double>("boundary.friction.eta");
myGlobalNonlinearity = myGlobalNonlinearity =
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment