Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use 'behavior' over 'behaviour.' #5282

Merged
merged 1 commit into from
Jul 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ namespace aspect
"Implementation of a model in which the initial temperature is calculated "
"from files containing absolute shear wave velocity (Vs) data in ascii format. "
"This plug-in allows you to select from a number of different models that"
"convert Vs into temperature, accounting for the anelastic behaviour of mantle material."
"convert Vs into temperature, accounting for the anelastic behavior of mantle material."
"Note the required format of the "
"input data: The first lines may contain any number of comments "
"if they begin with `#', but one of these lines needs to "
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/global_melt/doc/global_melt.prm
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ subsection Material model
# The bulk viscosity is computed as the reference value given here times
# a term that scales with one over the porosity. This means that for zero
# porosity, the rock can not dilate/compact any more, which is the same
# behaviour that we have for solid mantle convection.
# behavior that we have for solid mantle convection.
set Reference bulk viscosity = 1e19

# In dependence of how much melt is present, we also weaken the shear
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/global_melt/doc/global_no_melt.prm
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ end
# For the model without melt migration, we do not have to use
# mesh adaptivity, because time- and length scales of material
# motion does do not vary a lot across the model, and a global
# resolution of 4 is sufficient to capture the behaviour of
# resolution of 4 is sufficient to capture the behavior of
# upwellings and downwellings.
subsection Mesh refinement
set Initial adaptive refinement = 0
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/global_melt/global_melt.prm
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ subsection Material model
# The bulk viscosity is computed as the reference value given here times
# a term that scales with one over the porosity. This means that for zero
# porosity, the rock can not dilate/compact any more, which is the same
# behaviour that we have for solid mantle convection.
# behavior that we have for solid mantle convection.
set Reference bulk viscosity = 1e19

# In dependence of how much melt is present, we also weaken the shear
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/global_melt/global_no_melt.prm
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ end
# For the model without melt migration, we do not have to use
# mesh adaptivity, because time- and length scales of material
# motion does do not vary a lot across the model, and a global
# resolution of 4 is sufficient to capture the behaviour of
# resolution of 4 is sufficient to capture the behavior of
# upwellings and downwellings.
subsection Mesh refinement
set Initial adaptive refinement = 0
Expand Down
4 changes: 2 additions & 2 deletions cookbooks/onset_of_convection/doc/onset_of_convection.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ celestial body.
In order to do that, pick a celestial body from the list in Section 3. You can
also pick one that is not on my list, as long as you can convincingly argue
that it is made of rock or ice rather than gas (gases have such a low
viscosity that their physical behaviour is quite different, and we can assume
viscosity that their physical behavior is quite different, and we can assume
that a planetary body made of gas always convects). I have also listed
estimates for the thickness of the mantle for each celestial body (if you pick
your own, you will have to figure out an approximate value for the mantle
Expand Down Expand Up @@ -173,7 +173,7 @@ between models without and with convection. The temperatures should be in a
reasonable range (you can check the densities in the visualization output in
ParaView, if you have negative densities, your temperature is too large).

### Visualize the convective behaviour.
### Visualize the convective behavior.

Now that you know for what parameters convection starts, run a model series of
3 models for a longer time. Pick one parameter combination of temperature
Expand Down
2 changes: 1 addition & 1 deletion doc/manual/citing_aspect.bib
Original file line number Diff line number Diff line change
Expand Up @@ -1138,7 +1138,7 @@ @article{STEIN2022229276
url = {https://www.sciencedirect.com/science/article/pii/S0040195122000701},
author = {Claudia Stein and Matthew Comeau and Michael Becken and Ulrich Hansen},
keywords = {Numerical modelling delamination, Rayleigh-Taylor instability phase transition rheology},
abstract = {Delamination of the lower crust or lithospheric mantle is one explanation for the surface uplift observed in areas of mountain building. This process describes the removal of the lower part of the tectonic plate and can occur in various ways. Different styles of delamination typically have in common that the upper material (e.g., lowermost crust or lithospheric mantle) is denser than the underlying material (e.g., asthenosphere) and therefore sinks. It has been proposed that the higher density can be caused by the formation of eclogite. In this study we apply a thermomechanical model featuring a density increase within the lithosphere by a phase transition. The model setup is designed to investigate surface uplift and mountain building in an intracontinental setting. Specifically, the model is arranged to closely resemble central Mongolia. The models give insights into the dynamically evolving flow field with respect to the style of removal, therefore the general outcome is also applicable to other orogenic regions. In addition to a systematic study on the phase transition, we also investigate the influence of convergent motion and of the rheology of the crust. Our results reveal that for the absence of a dense (eclogite) layer, delamination initially occurs as a stationary Rayleigh-Taylor instability which appears as a late and short-lived event. In comparison, for a strong density contrast an early, long-lived peeling-off removal style with a stationary slab results. The subsequent asthenospheric upwelling causes further peeling-off events for all density contrasts. For this removal style a retreating slab is observed that occasionally breaks off giving way to a periodic behaviour. The findings confirm that a strong convergence and low viscosity of the crust promote delamination. In addition, the asthenospheric upwelling yields a wide and flat surface uplift. Such dome-like features are observed to be more pronounced for high density contrasts (i.e., strong eclogitisation).}
abstract = {Delamination of the lower crust or lithospheric mantle is one explanation for the surface uplift observed in areas of mountain building. This process describes the removal of the lower part of the tectonic plate and can occur in various ways. Different styles of delamination typically have in common that the upper material (e.g., lowermost crust or lithospheric mantle) is denser than the underlying material (e.g., asthenosphere) and therefore sinks. It has been proposed that the higher density can be caused by the formation of eclogite. In this study we apply a thermomechanical model featuring a density increase within the lithosphere by a phase transition. The model setup is designed to investigate surface uplift and mountain building in an intracontinental setting. Specifically, the model is arranged to closely resemble central Mongolia. The models give insights into the dynamically evolving flow field with respect to the style of removal, therefore the general outcome is also applicable to other orogenic regions. In addition to a systematic study on the phase transition, we also investigate the influence of convergent motion and of the rheology of the crust. Our results reveal that for the absence of a dense (eclogite) layer, delamination initially occurs as a stationary Rayleigh-Taylor instability which appears as a late and short-lived event. In comparison, for a strong density contrast an early, long-lived peeling-off removal style with a stationary slab results. The subsequent asthenospheric upwelling causes further peeling-off events for all density contrasts. For this removal style a retreating slab is observed that occasionally breaks off giving way to a periodic behavior. The findings confirm that a strong convergence and low viscosity of the crust promote delamination. In addition, the asthenospheric upwelling yields a wide and flat surface uplift. Such dome-like features are observed to be more pronounced for high density contrasts (i.e., strong eclogitisation).}
}

@article{https://doi.org/10.1029/2021JB023244,
Expand Down
2 changes: 1 addition & 1 deletion doc/modules/to-1.2.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
* <br>
* (Ryan Grove, 2014/12/09)
*
* <li> Changed: The behaviour when one changed the visualization
* <li> Changed: The behavior when one changed the visualization
* output_interval during a checkpoint restart was previously undefined, and
* working in slightly unexpected ways like never writing output for the first
* timestep after the restart. This now works as one would expect, e.g. every
Expand Down
6 changes: 3 additions & 3 deletions doc/modules/to-1.4.0.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@
* moved to its final location. If any of the steps failed it tried again by
* writing directly to the output location. This approach needed complicated
* logic and did not succeed on all systems. In order to increase stability
* the new default behaviour is to write straight to the output folder. This
* the new default behavior is to write straight to the output folder. This
* might decrease performance on clusters with slow network file systems.
* The old behaviour can be recovered by setting 'Write in background thread'
* The old behavior can be recovered by setting 'Write in background thread'
* to true and set a temporary storage location by 'set Temporary output
* location'. Note that this functionality was and is only available if
* 'Number of grouped files' is set to its default value of 0, and therefore
Expand Down Expand Up @@ -133,7 +133,7 @@
* the 'two merged boxes' geometry model previously threw an exception
* when asked for the depth of a point outside of the initial model domain.
* This is not longer appropriate for models with free surfaces and therefore
* the behaviour was changed to the behaviour of the 'spherical shell' geometry
* the behavior was changed to the behaviour of the 'spherical shell' geometry
* model, which is a cutoff of the depth to the range (0,maximal_depth).
* <br>
* (Rene Gassmoeller, Sascha Brune, 2016/01/11)
Expand Down
2 changes: 1 addition & 1 deletion doc/modules/to-1.5.0.h
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
*
* <li> New: Added parameter “Adapt by fraction of cells” to switch between
* refining a certain number of cells based on the fraction of total error
* (default behaviour) and the fraction of total number of cells
* (default behavior) and the fraction of total number of cells
* <br>
* (Lev Karatun, 2016/07/20)
*
Expand Down
2 changes: 1 addition & 1 deletion doc/modules/to-2.1.0.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
* for a field, this field will now be solved in the order it is listed
* in in the input file (as is done for all compositional fields) instead
* of being updated after all of the other fields are solved (the
* previous behaviour).
* previous behavior).
* <br>
* (Juliane Dannberg, 2018/10/31)
*
Expand Down
4 changes: 2 additions & 2 deletions doc/options.dox
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,9 @@ QT_AUTOBRIEF = NO

# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
# treat a multi-line C++ special comment block (i.e. a block of //! or ///
# comments) as a brief description. This used to be the default behaviour.
# comments) as a brief description. This used to be the default behavior.
# The new default is to treat a multi-line C++ comment block as a detailed
# description. Set this tag to YES if you prefer the old behaviour instead.
# description. Set this tag to YES if you prefer the old behavior instead.

MULTILINE_CPP_IS_BRIEF = NO

Expand Down
2 changes: 1 addition & 1 deletion doc/sphinx/user/cookbooks/teaching-setups.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ number of cookbooks that can be used for this purpose. Many of them are
modifications of existing cookbooks, but have been changed to run faster to be
more suitable for running them in the classroom, or they include additional
ideas for what parameters can be changed to learn more about the physical
behaviour that controls the model results.
behavior that controls the model results.

## Introduction to Geophysics

Expand Down
2 changes: 1 addition & 1 deletion include/aspect/material_model/rheology/visco_plastic.h
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ namespace aspect
bool use_adiabatic_pressure_in_creep;

/**
* List of exponents controlling the behaviour of the stress limiter
* List of exponents controlling the behavior of the stress limiter
* yielding mechanism.
*/
std::vector<double> exponents_stress_limiter;
Expand Down
2 changes: 1 addition & 1 deletion source/material_model/steinberger.cc
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ namespace aspect
"instead of the adiabatic temperature as reference for the "
"viscosity calculation. This ensures that the laterally averaged "
"viscosities remain more or less constant over the model "
"runtime. This behaviour might or might not be desired.");
"runtime. This behavior might or might not be desired.");
prm.declare_entry ("Number lateral average bands", "10",
Patterns::Integer (1),
"Number of bands to compute laterally averaged temperature within.");
Expand Down
2 changes: 1 addition & 1 deletion tests/ascii_data_boundary_composition_2d_box_time.prm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# simple test for ascii data composition
# This test is particularly designed to test the time dependent behaviour with
# This test is particularly designed to test the time dependent behavior with
# a set of files labeled with increasing file order.

set Dimension = 2
Expand Down
2 changes: 1 addition & 1 deletion tests/ascii_data_boundary_temperature_2d_box_time.prm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##### simple test for ascii data temperature
# This test is particularly designed to test the time dependent behaviour with
# This test is particularly designed to test the time dependent behavior with
# a set of files labeled with increasing file order.

set Dimension = 2
Expand Down
2 changes: 1 addition & 1 deletion tests/ascii_data_boundary_velocity_2d_box_time.prm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##### simple test for ascii data
# This test is particularly designed to test the time dependent behaviour with
# This test is particularly designed to test the time dependent behavior with
# a set of files labeled with increasing file order.

set Dimension = 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##### simple test for ascii data
# This test is particularly designed to test the time dependent behaviour with
# This test is particularly designed to test the time dependent behavior with
# a set of files labeled with decreasing file order.

set Dimension = 2
Expand Down
2 changes: 1 addition & 1 deletion tests/average_density_boundary_fluid_pressure.prm
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ subsection Material model
# The bulk viscosity is computed as the reference value given here times
# a term that scales with one over the porosity. This means that for zero
# porosity, the rock can not dilate/compact any more, which is the same
# behaviour that we have for solid mantle convection.
# behavior that we have for solid mantle convection.
set Reference bulk viscosity = 1e19

# In dependence of how much melt is present, we also weaken the shear
Expand Down
2 changes: 1 addition & 1 deletion tests/melt_and_traction.prm
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ subsection Material model
# The bulk viscosity is computed as the reference value given here times
# a term that scales with one over the porosity. This means that for zero
# porosity, the rock can not dilate/compact any more, which is the same
# behaviour that we have for solid mantle convection.
# behavior that we have for solid mantle convection.
set Reference bulk viscosity = 1e19

# In dependence of how much melt is present, we also weaken the shear
Expand Down
2 changes: 1 addition & 1 deletion tests/particle_generator_ascii.prm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# conditions instead of the discontinuous ones in
# van-keken-discontinuous.prm. See the manual for more information.
# This test adds particles to the cookbook parameter file, and therefore
# tests the behaviour of the particles.
# tests the behavior of the particles.

# MPI: 4

Expand Down
2 changes: 1 addition & 1 deletion tests/particle_generator_box.prm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# conditions instead of the discontinuous ones in
# van-keken-discontinuous.prm. See the manual for more information.
# This test adds particles to the cookbook parameter file, and therefore
# tests the behaviour of the particles.
# tests the behavior of the particles.

set Dimension = 2
set End time = 70
Expand Down
2 changes: 1 addition & 1 deletion tests/particle_generator_quadrature_points.prm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# conditions instead of the discontinuous ones in
# van-keken-discontinuous.prm. See the manual for more information.
# This test adds particles to the cookbook parameter file, and therefore
# tests the behaviour of the particles.
# tests the behavior of the particles.

# MPI: 2

Expand Down
2 changes: 1 addition & 1 deletion tests/particle_generator_radial.prm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# conditions instead of the discontinuous ones in
# van-keken-discontinuous.prm. See the manual for more information.
# This test adds particles to the cookbook parameter file, and therefore
# tests the behaviour of the particles.
# tests the behavior of the particles.

set Dimension = 2
set End time = 70
Expand Down
2 changes: 1 addition & 1 deletion tests/particle_generator_reference_cell.prm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# conditions instead of the discontinuous ones in
# van-keken-discontinuous.prm. See the manual for more information.
# This test adds particles to the cookbook parameter file, and therefore
# tests the behaviour of the particles.
# tests the behavior of the particles.

# MPI: 2

Expand Down
2 changes: 1 addition & 1 deletion tests/particle_initial_adaptive_output.prm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This tests the behaviour of the particles postprocessor, when the
# This tests the behavior of the particles postprocessor, when the
# 'Run postprocessors on initial refinement option is set. We do not
# want to advect the particles in this case, because we are solving the
# first timestep multiple times.
Expand Down
2 changes: 1 addition & 1 deletion tests/particle_initial_adaptive_refinement.prm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# conditions instead of the discontinuous ones in
# van-keken-discontinuous.prm. See the manual for more information.
# This test adds particles to the cookbook parameter file, and therefore
# tests the behaviour of the particles.
# tests the behavior of the particles.

set Dimension = 2
set End time = 70
Expand Down
2 changes: 1 addition & 1 deletion tests/particle_integrator_euler.prm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# conditions instead of the discontinuous ones in
# van-keken-discontinuous.prm. See the manual for more information.
# This test adds particles to the cookbook parameter file, and therefore
# tests the behaviour of the particles.
# tests the behavior of the particles.

set Dimension = 2
set End time = 70
Expand Down
2 changes: 1 addition & 1 deletion tests/particle_integrator_rk2_first_order_time.prm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This test is like particle_integrator_euler.prm, but
# tests the behaviour of the particles when integrated using the RK2
# tests the behavior of the particles when integrated using the RK2
# integrator, and only using one velocity field.

set Dimension = 2
Expand Down
2 changes: 1 addition & 1 deletion tests/particle_integrator_rk4.prm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# conditions instead of the discontinuous ones in
# van-keken-discontinuous.prm. See the manual for more information.
# This test adds particles to the cookbook parameter file, and therefore
# tests the behaviour of the particles.
# tests the behavior of the particles.

set Dimension = 2
set End time = 70
Expand Down
2 changes: 1 addition & 1 deletion tests/particle_timing_information.prm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This tests the behaviour of the particles postprocessor, when the
# This tests the behavior of the particles postprocessor, when the
# 'Run postprocessors on initial refinement option is set. We do not
# want to advect the particles in this case, because we are solving the
# first timestep multiple times.
Expand Down
4 changes: 2 additions & 2 deletions tests/pressure_compatibility_2.prm
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# This is a compressible test case that shall
# test the behaviour of the pressure compatibility
# test the behavior of the pressure compatibility
# mechanism in case of prescribed normal velocities
# integrated over the boundaries. It is converging
# in this setup, but if the solver tolerance is
# decreased or the prescribed normal velocity is
# increased it fails to converge, which is exactly
# the behaviour we intend.
# the behavior we intend.

set CFL number = 1
set End time = 400
Expand Down
2 changes: 1 addition & 1 deletion tests/pressure_compatibility_3.prm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This is a compressible test case that tests
# the behaviour of the pressure compatibility
# the behavior of the pressure compatibility
# mechanism in case of prescribed normal velocities
# whose integral over the boundaries is non-zero.
# This checks that the linear solver converges, even
Expand Down