[cig-commits] [commit] master: some more renaming (1fe64df)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/6aa7541c733b8fd1cc1b0c74536c8804aaeb7015...fa9e02e17c95bc1a8c6b635f193e536888750f41

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

commit 1fe64df059cc9dfc6620a828fa38654ba8b7c7af
Author: Juliane Dannberg <dannberg at gfz-potsdam.de>
Date:   Tue May 20 20:37:11 2014 +0200

    some more renaming


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

1fe64df059cc9dfc6620a828fa38654ba8b7c7af
 source/simulator/helper_functions.cc   | 2 +-
 source/simulator/initial_conditions.cc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/simulator/helper_functions.cc b/source/simulator/helper_functions.cc
index 52d04c0..8fa78da 100644
--- a/source/simulator/helper_functions.cc
+++ b/source/simulator/helper_functions.cc
@@ -109,7 +109,7 @@ namespace aspect
 
   template <int dim>
   unsigned int
-  Simulator<dim>::TemperatureOrComposition::component_index(const Introspection<dim> &introspection) const
+  Simulator<dim>::AdvectionField::component_index(const Introspection<dim> &introspection) const
   {
     if (this->is_temperature())
       return introspection.component_indices.temperature;
diff --git a/source/simulator/initial_conditions.cc b/source/simulator/initial_conditions.cc
index 5f9e563..53b3535 100644
--- a/source/simulator/initial_conditions.cc
+++ b/source/simulator/initial_conditions.cc
@@ -71,8 +71,8 @@ namespace aspect
 // integer 'n'
     for (unsigned int n=0; n<1+parameters.n_compositional_fields; ++n)
       {
-        TemperatureOrComposition torc = (n==0) ? TemperatureOrComposition::temperature()
-        : TemperatureOrComposition::composition(n-1);
+        AdvectionField torc = (n==0) ? AdvectionField::temperature()
+        : AdvectionField::composition(n-1);
         initial_solution.reinit(system_rhs, false);
 
         const unsigned int base_element = torc.base_element(introspection);