]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix a few warnings in the tutorial programs. 1026/head
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Wed, 17 Jun 2015 19:24:37 +0000 (14:24 -0500)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Sun, 21 Jun 2015 16:10:15 +0000 (11:10 -0500)
examples/step-41/step-41.cc
examples/step-44/step-44.cc
examples/step-47/step-47.cc

index cc804370d95192df9eb3921b102c6aed992defb5..86f70c9b28ecef7f265ac356120919a9b2de4267 100644 (file)
@@ -127,7 +127,7 @@ namespace Step41
   };
 
   template <int dim>
-  double RightHandSide<dim>::value (const Point<dim> &p,
+  double RightHandSide<dim>::value (const Point<dim> &,
                                     const unsigned int component) const
   {
     Assert (component == 0, ExcNotImplemented());
@@ -148,7 +148,7 @@ namespace Step41
   };
 
   template <int dim>
-  double BoundaryValues<dim>::value (const Point<dim> &p,
+  double BoundaryValues<dim>::value (const Point<dim> &,
                                      const unsigned int component) const
   {
     Assert (component == 0, ExcNotImplemented());
index c6816bd525bea5c3eec43bb8491dccc57ee63399..b86dc668bfb8f41a38093149fda12d64a6a96df8 100644 (file)
@@ -3151,7 +3151,7 @@ namespace Step44
     Vector<double> soln(solution_n.size());
     for (unsigned int i = 0; i < soln.size(); ++i)
       soln(i) = solution_n(i);
-    MappingQEulerian<dim> q_mapping(degree, soln, dof_handler_ref);
+    MappingQEulerian<dim> q_mapping(degree, dof_handler_ref, soln);
     data_out.build_patches(q_mapping, degree);
 
     std::ostringstream filename;
index 156662a0a5a9e43e2c4fdab8e743e403e1949f23..f5ada85179204a7eabb33da63a54f6dc6068405d 100644 (file)
@@ -455,8 +455,8 @@ namespace Step47
   template <int dim>
   std::pair<unsigned int, Quadrature<dim> >
   LaplaceProblem<dim>::compute_quadrature (const Quadrature<dim> &plain_quadrature,
-                                           const typename hp::DoFHandler<dim>::active_cell_iterator &cell,
-                                           const std::vector<double> &level_set_values                    )
+                                           const typename hp::DoFHandler<dim>::active_cell_iterator &/*cell*/,
+                                           const std::vector<double> &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;
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.