[cig-commits] [commit] master: Add a check to avoid this bug. (132bc47)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/c8a768302669a8e36315e909a8424d21633411c8...edfb97aa260e07cee2b465ac2f4d96f9ff1192e8

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

commit 132bc476cb5b663a18f58ddd3fa1a29c36ee7673
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Wed Oct 1 14:33:10 2014 -0700

    Add a check to avoid this bug.


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

132bc476cb5b663a18f58ddd3fa1a29c36ee7673
 source/material_model/multicomponent.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/material_model/multicomponent.cc b/source/material_model/multicomponent.cc
index c4addfa..62fdeb1 100644
--- a/source/material_model/multicomponent.cc
+++ b/source/material_model/multicomponent.cc
@@ -396,6 +396,8 @@ namespace aspect
             viscosity_averaging = geometric;
           else if (prm.get ("Viscosity averaging scheme") == "maximum composition")
             viscosity_averaging = maximum_composition;
+          else
+            AssertThrow(false, ExcMessage("Not a valid viscosity averaging scheme"));
 
           std::vector<double> x_values;