[cig-commits] [commit] master: Merge branch 'master' of https://github.com/geodynamics/aspect (9e2ada1)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/75930d530137a10b01acccaf4ee7a2dd0af1e210...9e2ada16bd6f0bd33a51d8085b87e3df5192d3e2

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

commit 9e2ada16bd6f0bd33a51d8085b87e3df5192d3e2
Merge: 356a782 75930d5
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Thu May 22 11:05:05 2014 -0500

    Merge branch 'master' of https://github.com/geodynamics/aspect



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

9e2ada16bd6f0bd33a51d8085b87e3df5192d3e2
 include/aspect/boundary_temperature/interface.h    | 15 +++++++++++
 source/boundary_temperature/interface.cc           |  6 +++++
 source/mesh_refinement/density.cc                  |  5 ++--
 source/mesh_refinement/nonadiabatic_temperature.cc |  5 ++--
 source/mesh_refinement/thermal_energy_density.cc   |  5 ++--
 source/mesh_refinement/viscosity.cc                |  5 ++--
 source/postprocess/visualization/density.cc        |  8 +++---
 .../postprocess/visualization/friction_heating.cc  | 10 ++++----
 source/postprocess/visualization/melt_fraction.cc  |  8 +++---
 .../visualization/nonadiabatic_pressure.cc         |  2 +-
 .../visualization/nonadiabatic_temperature.cc      |  4 +--
 source/postprocess/visualization/seismic_vp.cc     |  8 +++---
 source/postprocess/visualization/seismic_vs.cc     |  8 +++---
 source/postprocess/visualization/specific_heat.cc  |  8 +++---
 source/postprocess/visualization/strain_rate.cc    |  4 +--
 .../visualization/thermal_expansivity.cc           |  8 +++---
 .../visualization/thermodynamic_phase.cc           |  8 +++---
 source/postprocess/visualization/viscosity.cc      | 10 ++++----
 .../postprocess/visualization/viscosity_ratio.cc   | 10 ++++----
 source/simulator/core.cc                           |  3 +++
 source/simulator/helper_functions.cc               |  2 +-
 source/simulator/initial_conditions.cc             | 19 +++++++-------
 source/simulator/nullspace.cc                      |  6 ++---
 source/simulator/parameters.cc                     |  4 +--
 source/simulator/solver.cc                         | 29 ++++++++++++++--------
 25 files changed, 114 insertions(+), 86 deletions(-)

diff --cc source/simulator/initial_conditions.cc
index a4b4a54,c40d188..1b4d81b
--- a/source/simulator/initial_conditions.cc
+++ b/source/simulator/initial_conditions.cc
@@@ -164,14 -163,11 +163,14 @@@ namespace aspec
            }
  
          // then apply constraints and copy the
 -        // result into vectors with ghost elements
 -        constraints.distribute(initial_solution);
 +        // result into vectors with ghost elements. to do so,
 +        // we need the current constraints to be correct for
 +        // the current time
 +        compute_current_constraints ();
 +        current_constraints.distribute(initial_solution);
  
          // copy temperature/composition block only
-         const unsigned int blockidx = torc.block_index(introspection);
+         const unsigned int blockidx = advf.block_index(introspection);
          solution.block(blockidx) = initial_solution.block(blockidx);
          old_solution.block(blockidx) = initial_solution.block(blockidx);
          old_old_solution.block(blockidx) = initial_solution.block(blockidx);