revert some changes.

Author: MFraters

source/simulator/assemblers/newton_stokes.cc

@@ -466,7 +466,7 @@ namespace aspect
                   if (introspection.is_stokes_component(index_direction+1))
                     data.local_rhs(i) += (
                                            - pressure_scaling
-                                           * (prescribed_dilation->dilation_rhs_term[q][index_direction] -
+                                           * (prescribed_dilation->dilation_rhs_term[index_direction][q] -
                                               prescribed_dilation->dilation_lhs_term[q] *
                                               scratch.material_model_inputs.pressure[q])
                                            * scratch.phi_p[i]
@@ -669,8 +669,10 @@ namespace aspect
       Assert(!this->get_parameters().enable_prescribed_dilation
              ||
              (outputs.template get_additional_output_object<MaterialModel::PrescribedPlasticDilation<dim>>()->dilation_lhs_term.size() == n_points &&
-              outputs.template get_additional_output_object<MaterialModel::PrescribedPlasticDilation<dim>>()->dilation_rhs_term.size() == n_points
-             ),
+              outputs.template get_additional_output_object<MaterialModel::PrescribedPlasticDilation<dim>>()->dilation_rhs_term.size() == dim &&
+              outputs.template get_additional_output_object<MaterialModel::PrescribedPlasticDilation<dim>>()->dilation_rhs_term[0].size() == n_points &&
+              outputs.template get_additional_output_object<MaterialModel::PrescribedPlasticDilation<dim>>()->dilation_rhs_term[1].size() == n_points &&
+              (dim == 2 || (dim == 3 && outputs.template get_additional_output_object<MaterialModel::PrescribedPlasticDilation<dim>>()->dilation_rhs_term[2].size() == n_points))),
              ExcInternalError());
 
       if (this->get_newton_handler().parameters.newton_derivative_scaling_factor != 0)

tests/prescribed_dilation.cc

@@ -207,11 +207,11 @@ namespace aspect
                 }
               if (prescribed_dilation)
                 {
-                  prescribed_dilation->dilation_lhs_term[i] = 0;
                   prescribed_dilation->dilation_rhs_term[0][i] = x;
                   prescribed_dilation->dilation_rhs_term[1][i] = x;
                   if (dim == 3)
                     prescribed_dilation->dilation_rhs_term[2][i] = x;
+                  prescribed_dilation->dilation_lhs_term[i] = 0;
                 }
 
             }