From 77d1ed15feeed36d9c6d9496920435afd5b903be Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Wed, 14 Mar 2018 00:46:16 +0100 Subject: [PATCH] Fix ElastoplasticTorsion --- ElastoplasticTorsion/ElastoplasticTorsion.cc | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ElastoplasticTorsion/ElastoplasticTorsion.cc b/ElastoplasticTorsion/ElastoplasticTorsion.cc index 7ce1f82..3792099 100644 --- a/ElastoplasticTorsion/ElastoplasticTorsion.cc +++ b/ElastoplasticTorsion/ElastoplasticTorsion.cc @@ -60,16 +60,16 @@ #include #include #include -#include #include #include #include +#include #include #include #include #include -#include +#include #include #include @@ -175,7 +175,7 @@ namespace nsp void ParameterReader::read_parameters (const std::string parameter_file) { declare_parameters(); - prm.read_input (parameter_file); + prm.parse_input (parameter_file); } // ******************************************************************************************// @@ -390,7 +390,7 @@ namespace nsp template - double BoundaryValues::value (const Point &pto, + double BoundaryValues::value (const Point &/*pto*/, const unsigned int /*component*/) const { // could be anything else (theory works provided |Dg|_infty < 1/2) @@ -430,7 +430,7 @@ namespace nsp }; template - double RightHandSide::value (const Point &p, + double RightHandSide::value (const Point &/*p*/, const unsigned int /*component*/) const { // set to constant = 4, for which explicit solution to compare exists @@ -623,7 +623,7 @@ namespace nsp newton_update.reinit (dof_handler.n_dofs()); system_rhs.reinit (dof_handler.n_dofs()); - CompressedSparsityPattern c_sparsity(dof_handler.n_dofs()); + DynamicSparsityPattern c_sparsity(dof_handler.n_dofs()); DoFTools::make_sparsity_pattern (dof_handler, c_sparsity); hanging_node_constraints.condense (c_sparsity); sparsity_pattern.copy_from(c_sparsity); @@ -645,13 +645,13 @@ namespace nsp } template - double ElastoplasticTorsion::Wp (double Du2) const + double ElastoplasticTorsion::Wp (double /*Du2*/) const { return 1.0; } template - double ElastoplasticTorsion::G (double Du2) const + double ElastoplasticTorsion::G (double /*Du2*/) const { return 1.0; } @@ -1088,8 +1088,8 @@ namespace nsp { // For the unit disk around the origin GridGenerator::hyper_ball (triangulation); - static const HyperBallBoundary boundary; - triangulation.set_boundary (0, boundary); + static const SphericalManifold boundary; + triangulation.set_manifold (0, boundary); } else if (domain_id==1) { @@ -1246,7 +1246,7 @@ namespace nsp ) break; } - ptime=timer(); + ptime=timer.cpu_time(); if (well_solved) output_results (cycle); @@ -1289,7 +1289,7 @@ namespace nsp break; } //inner iterations finished - ptime=timer(); + ptime=timer.cpu_time(); if (well_solved) output_results (cycle); -- 2.39.5