fixup

Author: MFraters

source/material_model/interface.cc

@@ -1000,7 +1000,7 @@ namespace aspect
 
     namespace
     {
-      std::vector<std::string> make_prescribed_dilation_outputs_names()
+      std::vector<std::string> make_prescribed_dilation_outputs_names(int dim)
       {
         std::vector<std::string> names;
         names.emplace_back("dilation_lhs_term");
@@ -1016,9 +1016,9 @@ namespace aspect
 
     template <int dim>
     PrescribedPlasticDilation<dim>::PrescribedPlasticDilation (const unsigned int n_points)
-      : NamedAdditionalMaterialOutputs<dim>(make_prescribed_dilation_outputs_names()),
+      : NamedAdditionalMaterialOutputs<dim>(make_prescribed_dilation_outputs_names(dim)),
         dilation_lhs_term(n_points, numbers::signaling_nan<double>()),
-        dilation(dim, std::vector<double>(n_points, numbers::signaling_nan<double>()))
+        dilation_rhs_term(dim, std::vector<double>(n_points, numbers::signaling_nan<double>()))
     {}
 
 

source/material_model/visco_plastic.cc

@@ -291,10 +291,11 @@ namespace aspect
                 = MaterialUtilities::average_value(volume_fractions,
                                                    isostrain_viscosities.dilation_lhs_terms,
                                                    MaterialUtilities::arithmetic);
-              plastic_dilation->dilation_rhs_term[i]
-                = MaterialUtilities::average_value(volume_fractions,
-                                                   isostrain_viscosities.dilation_rhs_terms,
-                                                   MaterialUtilities::arithmetic);
+              for (unsigned int dim_i = 0; dim_i < dim; ++dim_i)
+                plastic_dilation->dilation_rhs_term[dim_i][i]
+                  = MaterialUtilities::average_value(volume_fractions,
+                                                     isostrain_viscosities.dilation_rhs_terms,
+                                                     MaterialUtilities::arithmetic);
             }
         }
 

source/simulator/assemblers/newton_stokes.cc

@@ -436,6 +436,7 @@ namespace aspect
 
           const double JxW = scratch.finite_element_values.JxW(q);
           const double pressure_scaling = this->get_pressure_scaling();
+          bool material_model_is_compressible = (this->get_material_model().is_compressible());
 
           // first assemble the rhs
           for (unsigned int i=0; i<stokes_dofs_per_cell; ++i)
@@ -470,7 +471,7 @@ namespace aspect
                                            - pressure_scaling
                                            * (prescribed_dilation->dilation_rhs_term[index_direction][q] -
                                               prescribed_dilation->dilation_lhs_term[q] *
-                                              scrasch.material_model_inputs.pressure[q])
+                                              scratch.material_model_inputs.pressure[q])
                                            * scratch.phi_p[i]
                                          ) * JxW;
                 }

source/simulator/assemblers/stokes.cc

@@ -436,6 +436,7 @@ namespace aspect
           const double density = scratch.material_model_outputs.densities[q];
           const double JxW = scratch.finite_element_values.JxW(q);
 
+          bool material_model_is_compressible = (this->get_material_model().is_compressible());
           for (unsigned int i=0; i<stokes_dofs_per_cell; ++i)
             {
               data.local_rhs(i) += (density * gravity * scratch.phi_u[i])