Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/aspect/plugins.h
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ namespace aspect

/**
* A function that is called at the beginning of each time step,
* calling the update function of the individual heating models.
* calling the update function of the individual plugins.
*/
void
update () override;
Expand Down
2 changes: 1 addition & 1 deletion source/boundary_convective_heating/interface.cc
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ namespace aspect
"For heat transfer coefficient --> zero, the boundary approaches "
"insulating (Neumann) behaviour; "
"For heat transfer coefficient --> infinity, the boundary approaches "
"a prescribed-temperature (Dirichlet) condition."
"a prescribed-temperature (Dirichlet) condition. "
"The unit of the heat transfer coefficient is \\si{\\watt\\per\\meter\\squared\\per\\kelvin}."
"At the moment, this list can only have one entry. \n\n"
"The following heat transfer coefficient models are available:\n\n"
Expand Down
4 changes: 2 additions & 2 deletions source/geometry_model/chunk.cc
Original file line number Diff line number Diff line change
Expand Up @@ -944,8 +944,8 @@ namespace aspect
"The dimensions of the model are specified by parameters "
"of the following form: "
"Chunk (minimum || maximum) (longitude || latitude): "
"edges of geographical quadrangle (in degrees)"
"Chunk (inner || outer) radius: Radii at bottom and top of chunk"
"edges of geographical quadrangle (in degrees). "
"Chunk (inner || outer) radius: Radii at bottom and top of chunk. "
"(Longitude || Latitude || Radius) repetitions: "
"number of cells in each coordinate direction."
"\n\n"
Expand Down
14 changes: 7 additions & 7 deletions source/simulator/parameters.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1131,7 +1131,7 @@ namespace aspect
prm.declare_entry ("List of compositional fields with disabled boundary entropy viscosity", "",
Patterns::List(Patterns::Anything()),
"Select for which compositional fields to skip the entropy viscosity "
"stabilization at dirichlet boundaries. This is "
"stabilization at Dirichlet boundaries. This is "
"only advisable for compositional fields "
"that have intrinsic physical diffusion terms, otherwise "
"oscillations may develop. The parameter should contain a list of "
Expand All @@ -1154,7 +1154,7 @@ namespace aspect
"Rather, the paper always uses 2 as the exponent in the definition "
"of the entropy, following equation (15) of the paper. The full "
"approach is discussed in \\cite{guermond:etal:2011}.) Note that this is not the "
"thermal expansion coefficient, also commonly referred to as $\\alpha$."
"thermal expansion coefficient, also commonly referred to as $\\alpha$. "
"Units: None.");
prm.declare_entry ("cR", "0.11",
Patterns::List(Patterns::Double (0.)),
Expand Down Expand Up @@ -1341,8 +1341,8 @@ namespace aspect
"determine the equation of state, rheology, and reactions."
"\n"
"* ``stress'': This type of field represents stress in the material. "
"Whether the fields represents a scalar stress invariant or "
"tensor components, and which type of stress is represented "
"Whether the field represents a scalar stress invariant or a "
"tensor component, and which type of stress is represented "
"depends on the interpretation of the material model."
"\n"
"* ``strain'': This type of field represents accumulated strain. "
Expand Down Expand Up @@ -1443,8 +1443,8 @@ namespace aspect
"field as mentioned in Section~\\ref{sec:methods:compositional-fields}, except that it is "
"advected with the Darcy velocity instead of the solid velocity. This method "
"requires there to be a compositional field named porosity that is advected "
"the darcy field method. We calculate the fluid velocity $u_f$ using an "
"approximation of Darcy's Law: $u_f = u_s - K_D / \\phi * (rho_s * g - rho_f * g)$."
"with the Darcy field method. We calculate the fluid velocity $u_f$ using an "
"approximation of Darcy's Law: $u_f = u_s - K_D / \\phi * (\\rho_s * g - \\rho_f * g)$."
"\n"
"* ``prescribed field'': The value of these fields is determined "
"in each time step from the material model. If a compositional field is "
Expand Down Expand Up @@ -2259,7 +2259,7 @@ namespace aspect
AssertThrow (porosity_idx != n_compositional_fields,
ExcMessage ("The Darcy advection field method only works if there is a compositional field named 'porosity'"));
AssertThrow (compositional_field_methods[porosity_idx] == AdvectionFieldMethod::fem_darcy_field,
ExcMessage ("When using the Darcy advection field method, the porosity field must be advected with the darcy method."));
ExcMessage ("When using the Darcy advection field method, the porosity field must be advected with the Darcy method."));
}

for (const auto &p : x_mapped_particle_properties)
Expand Down
2 changes: 1 addition & 1 deletion source/time_stepping/repeat_on_cutback.cc
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ namespace aspect
"shrinks by more than a user-controlled factor. In that situation, the previous "
"time step will be repeated with a smaller step size.\n"
"A large reduction in time step size typically happens when velocities change "
"abruptly. Repeating the time step ensure properly resolving this event. It is "
"abruptly. Repeating the time step ensures properly resolving this event. It is "
"useful to consider setting the \"Maximum relative increase in time step\" option "
"to avoid repeatedly repeating every other time step.")
}
Expand Down