[cig-commits] [commit] master: fix a few typos (e758675)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/8d9c25c1a7eeb792e442d488d9d570d7b3032696...a0ff764d4a56253ce634eb4fe07261cd2cd8a9b5

>---------------------------------------------------------------

commit e758675bac7ff72fcacfc41a39543127b8930f80
Author: Timo Heister <timo.heister at gmail.com>
Date:   Thu Jan 29 17:11:37 2015 -0500

    fix a few typos


>---------------------------------------------------------------

e758675bac7ff72fcacfc41a39543127b8930f80
 include/aspect/material_model/interface.h | 8 ++++----
 source/main.cc                            | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/aspect/material_model/interface.h b/include/aspect/material_model/interface.h
index ed64d1e..7294eed 100644
--- a/include/aspect/material_model/interface.h
+++ b/include/aspect/material_model/interface.h
@@ -583,7 +583,7 @@ namespace aspect
            * scale of reactions is normally much shorter than that of
            * convection), so the quantity returned by this function is an
            * actual change in the amount of material, which is added to or
-           * substracted from the current value of the compositional field,
+           * subtracted from the current value of the compositional field,
            * and NOT a reaction rate. The idea is, that in dependence of
            * temperature, pressure, position and the compositional fields
            * themselves an equilibrium can be calculated, and the difference
@@ -592,7 +592,7 @@ namespace aspect
            *
            * For mass conservation it should ALWAYS be checked that what is
            * subtracted from one field is added to another field (and the
-           * other way round) and that one never substracts more than the
+           * other way round) and that one never subtracts more than the
            * actual value of a field (so it does not get negative).
            *
            * This function has a default implementation that sets the reaction
@@ -765,7 +765,7 @@ namespace aspect
          * compositional fields (because the time scale of reactions is
          * normally much shorter than that of convection), so the quantity
          * returned by this function is an actual change in the amount of
-         * material, which is added to or substracted from the current value
+         * material, which is added to or subtracted from the current value
          * of the compositional field, and NOT a reaction rate. The idea is,
          * that in dependence of temperature, pressure, position and the
          * compositional fields themselves an equilibrium can be calculated,
@@ -774,7 +774,7 @@ namespace aspect
          *
          * For mass conservation it should ALWAYS be checked that what is
          * subtracted from one field is added to another field (and the other
-         * way round) and that one never substracts more than the actual value
+         * way round) and that one never subtracts more than the actual value
          * of a field (so it does not get negative).
          *
          * This function has a default implementation that sets the reaction
diff --git a/source/main.cc b/source/main.cc
index 084fadf..7481c6d 100644
--- a/source/main.cc
+++ b/source/main.cc
@@ -471,10 +471,10 @@ int main (int argc, char *argv[])
     }
   catch (aspect::QuietException &)
     {
-      // quitly treat an exception used on processors other than
+      // Quietly treat an exception used on processors other than
       // root when we already know that processor 0 will generate
-      // an exception. we do this to avoid creating too much
-      // (duplicate) screen output
+      // an exception. We do this to avoid creating too much
+      // (duplicate) screen output.
       return 1;
     }
   catch (...)