[cig-commits] [commit] master: Change case of parameters (b4132ec)

[cig_noreply at geodynamics.org]

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

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

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

commit b4132ec4fc145048dbfc5723fa08b776560d983d
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Mon May 19 16:18:41 2014 -0500

    Change case of parameters


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

b4132ec4fc145048dbfc5723fa08b776560d983d
 source/material_model/multicomponent.cc  | 16 +++++++++++-----
 tests/multicomponent_arithmetic.prm      |  2 +-
 tests/multicomponent_geometric.prm       |  2 +-
 tests/multicomponent_harmonic.prm        |  2 +-
 tests/multicomponent_max_composition.prm |  2 +-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/source/material_model/multicomponent.cc b/source/material_model/multicomponent.cc
index e884699..4d77955 100644
--- a/source/material_model/multicomponent.cc
+++ b/source/material_model/multicomponent.cc
@@ -20,6 +20,7 @@
 
 
 #include <aspect/material_model/multicomponent.h>
+#include <aspect/simulator.h>
 #include <deal.II/base/parameter_handler.h>
 
 #include <numeric>
@@ -104,12 +105,17 @@ namespace aspect
             }
           case maximum_composition:
             {
-              unsigned int i = (unsigned int)(std::max_element( volume_fractions.begin(), 
-                                                              volume_fractions.end() )
-                                            - volume_fractions.begin());
+              const unsigned int i = (unsigned int)(std::max_element( volume_fractions.begin(), 
+                                      volume_fractions.end() )
+                                      - volume_fractions.begin());
               visc = viscosities[i];
               break;
             }
+          default:
+            {
+              AssertThrow( false, ExcNotImplemented() );
+              break;
+            }
         }
       return visc;
     }
@@ -354,8 +360,8 @@ namespace aspect
                              "List of thermal conductivities for background mantle 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: $W/m/K$ ");
-          prm.declare_entry("Viscosity averaging scheme", "Harmonic",
-                             Patterns::Selection("Arithmetic|Harmonic|Geometric|Maximum composition"),
+          prm.declare_entry("Viscosity averaging scheme", "harmonic",
+                             Patterns::Selection("arithmetic|harmonic|geometric|maximum composition"),
                              "When more than one compositional field is present at a point "
                              "with different viscosities, we need to come up with an average "
                              "viscosity at that point.  Select a weighted harmonic, arithmetic, "
diff --git a/tests/multicomponent_arithmetic.prm b/tests/multicomponent_arithmetic.prm
index 67f41e2..a8be136 100644
--- a/tests/multicomponent_arithmetic.prm
+++ b/tests/multicomponent_arithmetic.prm
@@ -72,7 +72,7 @@ subsection Material model
     set Thermal conductivities = 4.7
     set Thermal expansivities = 4e-5
     set Viscosities = 1.e21, 1.e20, 1.e23, 1.e22
-    set Viscosity averaging scheme = Arithmetic
+    set Viscosity averaging scheme = arithmetic
   end
 end
 
diff --git a/tests/multicomponent_geometric.prm b/tests/multicomponent_geometric.prm
index 121fd65..2c0c594 100644
--- a/tests/multicomponent_geometric.prm
+++ b/tests/multicomponent_geometric.prm
@@ -72,7 +72,7 @@ subsection Material model
     set Thermal conductivities = 4.7
     set Thermal expansivities = 4e-5
     set Viscosities = 1.e21, 1.e20, 1.e23, 1.e22
-    set Viscosity averaging scheme = Geometric
+    set Viscosity averaging scheme = geometric
   end
 end
 
diff --git a/tests/multicomponent_harmonic.prm b/tests/multicomponent_harmonic.prm
index 3832900..9a509b4 100644
--- a/tests/multicomponent_harmonic.prm
+++ b/tests/multicomponent_harmonic.prm
@@ -72,7 +72,7 @@ subsection Material model
     set Thermal conductivities = 4.7
     set Thermal expansivities = 4e-5
     set Viscosities = 1.e21, 1.e20, 1.e23, 1.e22
-    set Viscosity averaging scheme = Harmonic
+    set Viscosity averaging scheme = harmonic
   end
 end
 
diff --git a/tests/multicomponent_max_composition.prm b/tests/multicomponent_max_composition.prm
index 2744507..15e2e9b 100644
--- a/tests/multicomponent_max_composition.prm
+++ b/tests/multicomponent_max_composition.prm
@@ -72,7 +72,7 @@ subsection Material model
     set Thermal conductivities = 4.7
     set Thermal expansivities = 4e-5
     set Viscosities = 1.e21, 1.e20, 1.e23, 1.e22
-    set Viscosity averaging scheme = Maximum composition
+    set Viscosity averaging scheme = maximum composition
   end
 end