From c81ad910ce33f0d9bad0237b82f5919c852e200b Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Wed, 17 Jun 2015 14:24:37 -0500 Subject: [PATCH] Fix a few warnings in the tutorial programs. --- examples/step-41/step-41.cc | 4 ++-- examples/step-44/step-44.cc | 2 +- examples/step-47/step-47.cc | 15 ++++++++++----- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/examples/step-41/step-41.cc b/examples/step-41/step-41.cc index cc804370d9..86f70c9b28 100644 --- a/examples/step-41/step-41.cc +++ b/examples/step-41/step-41.cc @@ -127,7 +127,7 @@ namespace Step41 }; template - double RightHandSide::value (const Point &p, + double RightHandSide::value (const Point &, const unsigned int component) const { Assert (component == 0, ExcNotImplemented()); @@ -148,7 +148,7 @@ namespace Step41 }; template - double BoundaryValues::value (const Point &p, + double BoundaryValues::value (const Point &, const unsigned int component) const { Assert (component == 0, ExcNotImplemented()); diff --git a/examples/step-44/step-44.cc b/examples/step-44/step-44.cc index c6816bd525..b86dc668bf 100644 --- a/examples/step-44/step-44.cc +++ b/examples/step-44/step-44.cc @@ -3151,7 +3151,7 @@ namespace Step44 Vector soln(solution_n.size()); for (unsigned int i = 0; i < soln.size(); ++i) soln(i) = solution_n(i); - MappingQEulerian q_mapping(degree, soln, dof_handler_ref); + MappingQEulerian q_mapping(degree, dof_handler_ref, soln); data_out.build_patches(q_mapping, degree); std::ostringstream filename; diff --git a/examples/step-47/step-47.cc b/examples/step-47/step-47.cc index 156662a0a5..f5ada85179 100644 --- a/examples/step-47/step-47.cc +++ b/examples/step-47/step-47.cc @@ -455,8 +455,8 @@ namespace Step47 template std::pair > LaplaceProblem::compute_quadrature (const Quadrature &plain_quadrature, - const typename hp::DoFHandler::active_cell_iterator &cell, - const std::vector &level_set_values ) + const typename hp::DoFHandler::active_cell_iterator &/*cell*/, + const std::vector &level_set_values) { unsigned int type = 0; @@ -476,9 +476,14 @@ namespace Step47 // ++++, ---- type 2: -+++, +-++, ++-+, +++-, +---, -+--, --+-, ---+ type // 3: +--+, ++--, +-+-, -++-, --++, -+-+ - if ( sign_ls[0]==sign_ls[1] & sign_ls[0]==sign_ls[2] & sign_ls[0]==sign_ls[3] ) type =1; - else if ( sign_ls[0]*sign_ls[1]*sign_ls[2]*sign_ls[3] < 0 ) type = 2; - else type = 3; + if ( sign_ls[0]==sign_ls[1] && + sign_ls[0]==sign_ls[2] && + sign_ls[0]==sign_ls[3] ) + type = 1; + else if ( sign_ls[0]*sign_ls[1]*sign_ls[2]*sign_ls[3] < 0 ) + type = 2; + else + type = 3; unsigned int Pos = 100; -- 2.39.5