[cig-commits] [commit] master: simplify base_element logic (68c9250)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/76d4275352ef2cae5de9a073acd1c03a92c2670c...4f3d06fd1f3754419813db37ec9ef7f0f6f3cb15

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

commit 68c9250367a5fbae448a3c42bf7c50398e8994a1
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri May 16 13:11:50 2014 -0400

    simplify base_element logic


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

68c9250367a5fbae448a3c42bf7c50398e8994a1
 source/simulator/initial_conditions.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/source/simulator/initial_conditions.cc b/source/simulator/initial_conditions.cc
index b4a4e51..ba2b699 100644
--- a/source/simulator/initial_conditions.cc
+++ b/source/simulator/initial_conditions.cc
@@ -76,9 +76,8 @@ namespace aspect
         : TemperatureOrComposition::composition(n-1);
         initial_solution.reinit(system_rhs, false);
 
-        const unsigned int base_element = (torc.is_temperature() ?
-                                           introspection.base_elements.temperature :
-                                           introspection.base_elements.compositional_fields);
+        const unsigned int base_element = torc.base_element(introspection);
+
 
         // get the temperature/composition support points
         const std::vector<Point<dim> > support_points