Merge remote-tracking branch 'upstream/master' into aspect-1.3

geodynamics · May 18, 2015 · d99fab6 · d99fab6
2 parents 0d8554d + d1cdf8b
commit d99fab6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/source/postprocess/visualization/viscosity_ratio.cc b/source/postprocess/visualization/viscosity_ratio.cc
@@ -67,12 +67,6 @@ namespace aspect
             const double temperature = uh[q][this->introspection().component_indices.temperature];
 
             const SymmetricTensor<2,dim> strain_rate = symmetrize (grad_u);
-            const SymmetricTensor<2,dim> compressible_strain_rate
-              = (this->get_material_model().is_compressible()
-                 ?
-                 strain_rate - 1./3 * trace(strain_rate) * unit_symmetric_tensor<dim>()
-                 :
-                 strain_rate);
 
             std::vector<double> composition(this->n_compositional_fields());
             for (unsigned int c=0; c<this->n_compositional_fields(); ++c)

diff --git a/source/prescribed_stokes_solution/interface.cc b/source/prescribed_stokes_solution/interface.cc
@@ -40,13 +40,13 @@ namespace aspect
     template <int dim>
     void
     Interface<dim>::
-    declare_parameters (dealii::ParameterHandler &prm)
+    declare_parameters (dealii::ParameterHandler &/*prm*/)
     {}
 
 
     template <int dim>
     void
-    Interface<dim>::parse_parameters (dealii::ParameterHandler &prm)
+    Interface<dim>::parse_parameters (dealii::ParameterHandler &/*prm*/)
     {}
 
 

diff --git a/source/simulator/assembly.cc b/source/simulator/assembly.cc
@@ -791,9 +791,6 @@ namespace aspect
         Assert (scratch.grad_phi_field.size() == advection_dofs_per_cell, ExcInternalError());
         Assert (scratch.phi_field.size() == advection_dofs_per_cell, ExcInternalError());
 
-        const unsigned int solution_component
-          = advection_field.component_index(introspection);
-
         const FEValuesExtractors::Scalar solution_field
           = (advection_field.is_temperature()
              ?