Skip to content

Commit

Permalink
Indent
Browse files Browse the repository at this point in the history
  • Loading branch information
anne-glerum committed Mar 27, 2023
1 parent 0fb0042 commit 46cea17
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion source/material_model/rheology/elasticity.cc
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ namespace aspect
// for the fields, which for the first nonlinear iteration means the extrapolated solution from
// the last and previous to last timesteps. In later iterations, it holds the current solution.
// This can lead to alternately computing a reaction term that is correct and one that is zero.
// Therefore we subtract the old stress stress_t.
// Therefore we subtract the old stress stress_t.
for (unsigned int j = 0; j < SymmetricTensor<2, dim>::n_independent_components; ++j)
{
//out.reaction_terms[i][j] = -in.composition[i][j] + stress_0[SymmetricTensor<2, dim>::unrolled_to_component_indices(j)];
Expand Down
2 changes: 1 addition & 1 deletion source/material_model/viscoelastic.cc
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace aspect

// Store which components to exclude during volume fraction computation.
ComponentMask composition_mask(this->n_compositional_fields(), true);
// Assign compositional fields associated with the viscoelastic stress
// Assign compositional fields associated with the viscoelastic stress
// or the old viscoelastic stress a value of 0.
// Assume these fields are listed first.
for (unsigned int i=0; i < 2*SymmetricTensor<2,dim>::n_independent_components; ++i)
Expand Down
6 changes: 3 additions & 3 deletions source/particle/property/elastic_stress.cc
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ namespace aspect
// plugins, the data position is moved forward each time. However, here we want to apply
// an update to properties that have already been updated by another plugin. I.e., we
// want to update the 'composition' properties, which carry the stress tensor components.
// This plugin is necessary because it updates the composition properties with the
// This plugin is necessary because it updates the composition properties with the
// newest solution, i.e. the one including the operator splitting update.
// The current plugin then applies the reaction term (the rotation). Note that the reaction_terms
// will be zero for ve_stress_**_old, so we only loop over n_independent_components instead of
Expand Down Expand Up @@ -151,8 +151,8 @@ namespace aspect
std::vector<std::pair<std::string, unsigned int>>
ElasticStress<dim>::get_property_information() const
{
// No need to return anything.
return std::vector<std::pair<std::string, unsigned int>>();
// No need to return anything.
return std::vector<std::pair<std::string, unsigned int>>();
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions source/simulator/solver_schemes.cc
Original file line number Diff line number Diff line change
Expand Up @@ -344,14 +344,14 @@ namespace aspect
stress_indices.push_back(introspection.compositional_index_for_name("ve_stress_yy"));
if (dim == 2)
{
stress_indices.push_back(introspection.compositional_index_for_name("ve_stress_xy"));
stress_indices.push_back(introspection.compositional_index_for_name("ve_stress_xy"));
}
else if (dim == 3)
{
stress_indices.push_back(introspection.compositional_index_for_name("ve_stress_zz"));
stress_indices.push_back(introspection.compositional_index_for_name("ve_stress_xy"));
stress_indices.push_back(introspection.compositional_index_for_name("ve_stress_xz"));
stress_indices.push_back(introspection.compositional_index_for_name("ve_stress_yz"));
stress_indices.push_back(introspection.compositional_index_for_name("ve_stress_zz"));
stress_indices.push_back(introspection.compositional_index_for_name("ve_stress_xy"));
stress_indices.push_back(introspection.compositional_index_for_name("ve_stress_xz"));
stress_indices.push_back(introspection.compositional_index_for_name("ve_stress_yz"));
}


Expand Down

0 comments on commit 46cea17

Please sign in to comment.