[cig-commits] [commit] master: Change case of enumerations (cf07b44)

[cig_noreply at geodynamics.org]

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

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

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

commit cf07b4475651f59a288f638a8a11e1cf83d81496
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Mon May 19 16:01:28 2014 -0500

    Change case of enumerations


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

cf07b4475651f59a288f638a8a11e1cf83d81496
 include/aspect/material_model/multicomponent.h | 10 +++++-----
 source/material_model/multicomponent.cc        | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/aspect/material_model/multicomponent.h b/include/aspect/material_model/multicomponent.h
index bc455a8..2669ff3 100644
--- a/include/aspect/material_model/multicomponent.h
+++ b/include/aspect/material_model/multicomponent.h
@@ -179,15 +179,15 @@ namespace aspect
 
         /**
          * Enumeration for selecting which viscosity averaging scheme to use.  Select
-         * between Harmonic, Arithmetic, Geometric, and MaximumComposition.  The 
+         * between harmonic, arithmetic, geometric, and maximum_composition.  The 
          * max composition scheme simply uses the viscosity of whichever field has 
          * the highes volume fraction.
          */
         enum {
-            Harmonic,
-            Arithmetic,
-            Geometric,
-            MaximumComposition
+            harmonic,
+            arithmetic,
+            geometric,
+            maximum_composition
         } ViscosityAveraging;
 
         /**
diff --git a/source/material_model/multicomponent.cc b/source/material_model/multicomponent.cc
index aba07bc..50c2a2f 100644
--- a/source/material_model/multicomponent.cc
+++ b/source/material_model/multicomponent.cc
@@ -81,20 +81,20 @@ namespace aspect
 
       switch (ViscosityAveraging)
         {
-          case Arithmetic:
+          case arithmetic:
             {
               for(unsigned int i=0; i< volume_fractions.size(); ++i)
                   visc += volume_fractions[i]*viscosities[i];
               break;
             }
-          case Harmonic:
+          case harmonic:
             {
               for(unsigned int i=0; i< volume_fractions.size(); ++i)
                 visc += volume_fractions[i]/(viscosities[i]);
               visc = 1.0/visc;
               break;
             }
-          case Geometric:
+          case geometric:
             {
               double geometric_mean = 0.0;
               for(unsigned int i=0; i < volume_fractions.size(); ++i)
@@ -102,7 +102,7 @@ namespace aspect
               visc = std::exp(visc);
               break;
             }
-          case MaximumComposition:
+          case maximum_composition:
             {
               unsigned int i = (unsigned int)(std::max_element( volume_fractions.begin(), 
                                                               volume_fractions.end() )
@@ -389,13 +389,13 @@ namespace aspect
           reference_T                = prm.get_double ("Reference temperature");
  
           if (prm.get ("Viscosity averaging scheme") == "Harmonic")
-            ViscosityAveraging = Harmonic; 
+            ViscosityAveraging = harmonic; 
           else if (prm.get ("Viscosity averaging scheme") == "Arithmetic")
-            ViscosityAveraging = Arithmetic; 
+            ViscosityAveraging = arithmetic; 
           else if (prm.get ("Viscosity averaging scheme") == "Geometric")
-            ViscosityAveraging = Geometric; 
+            ViscosityAveraging = geometric; 
           else if (prm.get ("Viscosity averaging scheme") == "Maximum composition")
-            ViscosityAveraging = MaximumComposition; 
+            ViscosityAveraging = maximum_composition; 
 
           std::vector<double> x_values;