[cig-commits] [commit] master: Change name of ViscosityAveraging to viscosity_averaging (97e4136)

[cig_noreply at geodynamics.org]

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

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

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

commit 97e413659eef9e5c46f9e42738d4e881ffc1cae7
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Mon May 19 16:10:36 2014 -0500

    Change name of ViscosityAveraging to viscosity_averaging


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

97e413659eef9e5c46f9e42738d4e881ffc1cae7
 include/aspect/material_model/multicomponent.h |  2 +-
 source/material_model/multicomponent.cc        | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/aspect/material_model/multicomponent.h b/include/aspect/material_model/multicomponent.h
index 2669ff3..b8ea5e1 100644
--- a/include/aspect/material_model/multicomponent.h
+++ b/include/aspect/material_model/multicomponent.h
@@ -188,7 +188,7 @@ namespace aspect
             arithmetic,
             geometric,
             maximum_composition
-        } ViscosityAveraging;
+        } viscosity_averaging;
 
         /**
          * Vector for field densities.
diff --git a/source/material_model/multicomponent.cc b/source/material_model/multicomponent.cc
index 32041c9..e884699 100644
--- a/source/material_model/multicomponent.cc
+++ b/source/material_model/multicomponent.cc
@@ -79,7 +79,7 @@ namespace aspect
       std::vector<double> volume_fractions(this->n_compositional_fields() + 1);
       compute_volume_fractions( composition, volume_fractions);
 
-      switch (ViscosityAveraging)
+      switch (viscosity_averaging)
         {
           case arithmetic:
             {
@@ -389,13 +389,13 @@ namespace aspect
           reference_T                = prm.get_double ("Reference temperature");
  
           if (prm.get ("Viscosity averaging scheme") == "Harmonic")
-            ViscosityAveraging = harmonic; 
+            viscosity_averaging = harmonic; 
           else if (prm.get ("Viscosity averaging scheme") == "Arithmetic")
-            ViscosityAveraging = arithmetic; 
+            viscosity_averaging = arithmetic; 
           else if (prm.get ("Viscosity averaging scheme") == "Geometric")
-            ViscosityAveraging = geometric; 
+            viscosity_averaging = geometric; 
           else if (prm.get ("Viscosity averaging scheme") == "Maximum composition")
-            ViscosityAveraging = maximum_composition; 
+            viscosity_averaging = maximum_composition; 
 
           std::vector<double> x_values;