[cig-commits] [commit] master: Clarify wording (48a546c)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/ed4caebc0ab942d8c7bc1a6a3ba70e37f93accde...dbe66e1b6d25d5ff21653c48f14f343e10ae69f4

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

commit 48a546ce8d6dfa3a034f9ac0add325089da6297e
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Mon May 19 15:51:47 2014 -0500

    Clarify wording


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

48a546ce8d6dfa3a034f9ac0add325089da6297e
 doc/modules/changes.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/doc/modules/changes.h b/doc/modules/changes.h
index 1b5cd8a..010d2b5 100644
--- a/doc/modules/changes.h
+++ b/doc/modules/changes.h
@@ -5,12 +5,15 @@
  * 1.0. All entries are signed with the names of the author. </p>
  *
  * <ol>
- * <li> New: there is a new material model for having an arbitrary
- * number of compositional fields with different material properties.
- * Within each compositional field the material properties are constant,
- * and when more than one field is present, arithmetic averaging is 
- * employed.  For viscosity, the averaging may also be geometric,
- * harmonic, or selecting the viscosity of the maximum composition.
+ * <li> New: There is a new material model called multicomponent for 
+ * having an arbitrary number of compositional fields with different
+ * material properties, where each compositional field represents a rock
+ * type. Within each rock type the material properties are assumed to
+ * be constant.  When more than one rock type is present, the material
+ * model averages their properties with a weighted arithmetic average. 
+ * An exception is viscosity, where the user may specify a harmonic,
+ * geometric, or arithmetic averaging, or selecting the viscosity of
+ * the maximum composition.
  * <br>
  * (Ian Rose, 2014/05/19)
  *