[cig-commits] [commit] master: rename variable (c280c07)

[cig_noreply at geodynamics.org]

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

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

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

commit c280c07ea10d2b937301f3f7f627c5b8b8d74333
Author: Timo Heister <timo.heister at gmail.com>
Date:   Mon May 19 22:42:46 2014 -0400

    rename variable


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

c280c07ea10d2b937301f3f7f627c5b8b8d74333
 include/aspect/introspection.h | 2 +-
 source/simulator/core.cc       | 6 +++---
 source/simulator/solver.cc     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/aspect/introspection.h b/include/aspect/introspection.h
index e024aba..71365f0 100644
--- a/include/aspect/introspection.h
+++ b/include/aspect/introspection.h
@@ -253,7 +253,7 @@ namespace aspect
          * Pressure unknowns that are locally owned. This IndexSet is needed
          * if velocity and pressure end up in the same block.
          */
-        IndexSet locally_owned_pressure;
+        IndexSet locally_owned_pressure_dofs;
       };
       /**
        * A variable that contains index sets describing which of the globally
diff --git a/source/simulator/core.cc b/source/simulator/core.cc
index 601fccf..1ce6ac4 100644
--- a/source/simulator/core.cc
+++ b/source/simulator/core.cc
@@ -995,12 +995,12 @@ namespace aspect
       introspection.index_sets.system_partitioning.push_back(system_index_set.get_view(0,n_u));
       if (n_p != 0)
         {
-          introspection.index_sets.locally_owned_pressure = system_index_set.get_view(n_u,n_u+n_p);
-          introspection.index_sets.system_partitioning.push_back(introspection.index_sets.locally_owned_pressure);
+          introspection.index_sets.locally_owned_pressure_dofs = system_index_set.get_view(n_u,n_u+n_p);
+          introspection.index_sets.system_partitioning.push_back(introspection.index_sets.locally_owned_pressure_dofs);
         }
       else
         {
-          introspection.index_sets.locally_owned_pressure = system_index_set & extract_component_subset(dof_handler, introspection.component_masks.pressure);
+          introspection.index_sets.locally_owned_pressure_dofs = system_index_set & extract_component_subset(dof_handler, introspection.component_masks.pressure);
         }
       introspection.index_sets.system_partitioning.push_back(system_index_set.get_view(n_u+n_p,n_u+n_p+n_T));
 
diff --git a/source/simulator/solver.cc b/source/simulator/solver.cc
index 3fdac5b..b5ffe63 100644
--- a/source/simulator/solver.cc
+++ b/source/simulator/solver.cc
@@ -394,9 +394,9 @@ namespace aspect
         current_constraints.distribute (distributed_stokes_solution);
 
         // now rescale the pressure back to real physical units:
-        for (unsigned int i=0;i< introspection.index_sets.locally_owned_pressure.n_elements(); ++i)
+        for (unsigned int i=0;i< introspection.index_sets.locally_owned_pressure_dofs.n_elements(); ++i)
           {
-            types::global_dof_index idx = introspection.index_sets.locally_owned_pressure.nth_index_in_set(i);
+            types::global_dof_index idx = introspection.index_sets.locally_owned_pressure_dofs.nth_index_in_set(i);
 
             distributed_stokes_solution(idx) *= pressure_scaling;
           }