Skip to content

some formatting and typo fixes #2017

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Nov 28, 2017
Merged

some formatting and typo fixes #2017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1da80f7
fix manual formatting
bartniday Nov 28, 2017
4274122
fix manual formatting
bartniday Nov 28, 2017
7f2a7ec
fix some typos
bartniday Nov 28, 2017
e2a18ab
fix typos
bartniday Nov 28, 2017
636c845
more formatting
bartniday Nov 28, 2017
b9cd53b
more formatting
bartniday Nov 28, 2017
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
10 changes: 5 additions & 5 deletions cookbooks/morency_doin_2004/morency_doin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,27 +184,27 @@ namespace aspect
Patterns::List(Patterns::Double(0)),
"List of densities, $\\rho$, for background mantle and compositional fields,"
"for a total of N+1 values, where N is the number of compositional fields."
"If only one values is given, then all use the same value. Units: $kg / m^3$");
"If only one value is given, then all use the same value. Units: $kg / m^3$");
prm.declare_entry ("Activation energies", "500",
Patterns::List(Patterns::Double(0)),
"List of activation energies, $E_a$, for background mantle and compositional fields,"
"for a total of N+1 values, where N is the number of compositional fields."
"If only one values is given, then all use the same value. Units: $kJ / mol$");
"If only one value is given, then all use the same value. Units: $kJ / mol$");
prm.declare_entry ("Thermal expansivities", "3.5e-5",
Patterns::List(Patterns::Double(0)),
"List of thermal expansivities for background mantle and compositional fields,"
"for a total of N+1 values, where N is the number of compositional fields."
"If only one values is given, then all use the same value. Units: $1 / K$");
"If only one value is given, then all use the same value. Units: $1 / K$");
prm.declare_entry ("Stress exponents for viscous rheology", "3",
Patterns::List(Patterns::Double(0)),
"List of stress exponents, $n_v$, for background mantle and compositional fields,"
"for a total of N+1 values, where N is the number of compositional fields."
"If only one values is given, then all use the same value. Units: None");
"If only one value is given, then all use the same value. Units: None");
prm.declare_entry ("Stress exponents for plastic rheology", "30",
Patterns::List(Patterns::Double(0)),
"List of stress exponents, $n_p$, for background mantle and compositional fields,"
"for a total of N+1 values, where N is the number of compositional fields."
"If only one values is given, then all use the same value. Units: None");
"If only one value is given, then all use the same value. Units: None");
prm.declare_entry ("Thermal diffusivity", "0.8e-6", Patterns::Double(0), "Units: $m^2/s$");
prm.declare_entry ("Heat capacity", "1.25e3", Patterns::Double(0), "Units: $J/kg/K$");
prm.declare_entry ("Activation volume", "6.4e-6", Patterns::Double(0), "($V_a$). Units: $m^3 / mol$");
Expand Down
28 changes: 14 additions & 14 deletions source/material_model/diffusion_dislocation.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,12 +378,12 @@ namespace aspect
Patterns::List(Patterns::Double(0)),
"List of densities, $\\rho$, for background mantle and compositional fields, "
"for a total of N+1 values, where N is the number of compositional fields. "
"If only one values is given, then all use the same value. Units: $kg / m^3$");
"If only one value is given, then all use the same value. Units: $kg / m^3$");
prm.declare_entry ("Thermal expansivities", "3.5e-5",
Patterns::List(Patterns::Double(0)),
"List of thermal expansivities for background mantle and compositional fields, "
"for a total of N+1 values, where N is the number of compositional fields. "
"If only one values is given, then all use the same value. Units: $1 / K$");
"If only one value is given, then all use the same value. Units: $1 / K$");

// Rheological parameters
prm.declare_entry ("Grain size", "1e-3", Patterns::Double(0), "Units: $m$");
Expand All @@ -398,23 +398,23 @@ namespace aspect
Patterns::List(Patterns::Double(0)),
"List of viscosity prefactors, $A$, for background mantle and compositional fields, "
"for a total of N+1 values, where N is the number of compositional fields. "
"If only one values is given, then all use the same value. "
"Units: $Pa^{-n_{diffusion}} m^{n_{diffusion}/m_{diffusion}} s^{-1}$");
"If only one value is given, then all use the same value. "
"Units: $Pa^{-n_\\text{diffusion}} m^{n_\\text{diffusion}/m_\\text{diffusion}} s^{-1}$");
prm.declare_entry ("Stress exponents for diffusion creep", "1",
Patterns::List(Patterns::Double(0)),
"List of stress exponents, $n_diffusion$, for background mantle and compositional fields, "
"List of stress exponents, $n_\\text{diffusion}$, for background mantle and compositional fields, "
"for a total of N+1 values, where N is the number of compositional fields. "
"If only one values is given, then all use the same value. Units: None");
"If only one value is given, then all use the same value. Units: None");
prm.declare_entry ("Grain size exponents for diffusion creep", "3",
Patterns::List(Patterns::Double(0)),
"List of grain size exponents, $m_diffusion$, for background mantle and compositional fields, "
"List of grain size exponents, $m_\\text{diffusion}$, for background mantle and compositional fields, "
"for a total of N+1 values, where N is the number of compositional fields. "
"If only one values is given, then all use the same value. Units: None");
"If only one value is given, then all use the same value. Units: None");
prm.declare_entry ("Activation energies for diffusion creep", "375e3",
Patterns::List(Patterns::Double(0)),
"List of activation energies, $E_a$, for background mantle and compositional fields, "
"for a total of N+1 values, where N is the number of compositional fields. "
"If only one values is given, then all use the same value. Units: $J / mol$");
"If only one value is given, then all use the same value. Units: $J / mol$");
prm.declare_entry ("Activation volumes for diffusion creep", "6e-6",
Patterns::List(Patterns::Double(0)),
"List of activation volumes, $V_a$, for background mantle and compositional fields, "
Expand All @@ -426,18 +426,18 @@ namespace aspect
Patterns::List(Patterns::Double(0)),
"List of viscosity prefactors, $A$, for background mantle and compositional fields, "
"for a total of N+1 values, where N is the number of compositional fields. "
"If only one values is given, then all use the same value. "
"Units: $Pa^{-n_{dislocation}} m^{n_{dislocation}/m_{dislocation}} s^{-1}$");
"If only one value is given, then all use the same value. "
"Units: $Pa^{-n_\\text{dislocation}} m^{n_\\text{dislocation}/m_\\text{dislocation}} s^{-1}$");
prm.declare_entry ("Stress exponents for dislocation creep", "3.5",
Patterns::List(Patterns::Double(0)),
"List of stress exponents, $n_dislocation$, for background mantle and compositional fields, "
"List of stress exponents, $n_\\text{dislocation}$, for background mantle and compositional fields, "
"for a total of N+1 values, where N is the number of compositional fields. "
"If only one values is given, then all use the same value. Units: None");
"If only one value is given, then all use the same value. Units: None");
prm.declare_entry ("Activation energies for dislocation creep", "530e3",
Patterns::List(Patterns::Double(0)),
"List of activation energies, $E_a$, for background mantle and compositional fields, "
"for a total of N+1 values, where N is the number of compositional fields. "
"If only one values is given, then all use the same value. Units: $J / mol$");
"If only one value is given, then all use the same value. Units: $J / mol$");
prm.declare_entry ("Activation volumes for dislocation creep", "1.4e-5",
Patterns::List(Patterns::Double(0)),
"List of activation volumes, $V_a$, for background mantle and compositional fields, "
Expand Down
10 changes: 5 additions & 5 deletions source/material_model/visco_plastic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,15 +648,15 @@ namespace aspect
"List of viscosity prefactors, $A$, for background material and compositional fields, "
"for a total of N+1 values, where N is the number of compositional fields. "
"If only one value is given, then all use the same value. "
"Units: $Pa^{-n_{diffusion}} m^{n_{diffusion}/m_{diffusion}} s^{-1}$");
"Units: $Pa^{-n_\\text{diffusion}} m^{n_\\text{diffusion}/m_\\text{diffusion}} s^{-1}$");
prm.declare_entry ("Stress exponents for diffusion creep", "1",
Patterns::List(Patterns::Double(0)),
"List of stress exponents, $n_diffusion$, for background material and compositional fields, "
"List of stress exponents, $n_\\text{diffusion}$, for background material and compositional fields, "
"for a total of N+1 values, where N is the number of compositional fields. "
"If only one value is given, then all use the same value. Units: None");
prm.declare_entry ("Grain size exponents for diffusion creep", "3",
Patterns::List(Patterns::Double(0)),
"List of grain size exponents, $m_diffusion$, for background material and compositional fields, "
"List of grain size exponents, $m_\\text{diffusion}$, for background material and compositional fields, "
"for a total of N+1 values, where N is the number of compositional fields. "
"If only one value is given, then all use the same value. Units: None");
prm.declare_entry ("Activation energies for diffusion creep", "375e3",
Expand All @@ -676,10 +676,10 @@ namespace aspect
"List of viscosity prefactors, $A$, for background material and compositional fields, "
"for a total of N+1 values, where N is the number of compositional fields. "
"If only one value is given, then all use the same value. "
"Units: $Pa^{-n_{dislocation}} m^{n_{dislocation}/m_{dislocation}} s^{-1}$");
"Units: $Pa^{-n_\\text{dislocation}} m^{n_\\text{dislocation}/m_\\text{dislocation}} s^{-1}$");
prm.declare_entry ("Stress exponents for dislocation creep", "3.5",
Patterns::List(Patterns::Double(0)),
"List of stress exponents, $n_dislocation$, for background material and compositional fields, "
"List of stress exponents, $n_\\text{dislocation}$, for background material and compositional fields, "
"for a total of N+1 values, where N is the number of compositional fields. "
"If only one value is given, then all use the same value. Units: None");
prm.declare_entry ("Activation energies for dislocation creep", "530e3",
Expand Down