[cig-commits] [commit] master: rename variables (2c2604a)

[cig_noreply at geodynamics.org]

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

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

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

commit 2c2604a40a34b39a573a0a5a20813ee290e07650
Author: Timo Heister <timo.heister at gmail.com>
Date:   Mon May 19 20:35:26 2014 -0400

    rename variables


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

2c2604a40a34b39a573a0a5a20813ee290e07650
 source/simulator/assembly.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/simulator/assembly.cc b/source/simulator/assembly.cc
index 5e75f4f..3d4442d 100644
--- a/source/simulator/assembly.cc
+++ b/source/simulator/assembly.cc
@@ -1254,9 +1254,9 @@ namespace aspect
           Assert (false, ExcNotImplemented());
       }
 
-    unsigned int blockidx = temperature_or_composition.block_index(introspection);
+    const unsigned int block_idx = temperature_or_composition.block_index(introspection);
     preconditioner.reset (new LinearAlgebra::PreconditionILU());
-    preconditioner->initialize (system_matrix.block(blockidx, blockidx));
+    preconditioner->initialize (system_matrix.block(block_idx, block_idx));
     computing_timer.exit_section();
   }
 
@@ -1626,8 +1626,8 @@ namespace aspect
         computing_timer.enter_section ("   Assemble temperature system");
     else
         computing_timer.enter_section ("   Assemble composition system");
-    unsigned int blockidx = temperature_or_composition.block_index(introspection);
-    system_matrix.block(blockidx, blockidx) = 0;
+    const unsigned int block_idx = temperature_or_composition.block_index(introspection);
+    system_matrix.block(block_idx, block_idx) = 0;
     system_rhs = 0;
 
     const std::pair<double,double>