[cig-commits] [commit] master: Merge pull request #32 from jdannberg/advection_field (fa9e02e)

[cig_noreply at geodynamics.org]

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

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

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

commit fa9e02e17c95bc1a8c6b635f193e536888750f41
Merge: 6aa7541 1fe64df
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Wed May 21 09:43:30 2014 -0500

    Merge pull request #32 from jdannberg/advection_field
    
    Advection field



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

fa9e02e17c95bc1a8c6b635f193e536888750f41
 include/aspect/simulator.h             |  30 ++++-----
 source/simulator/assembly.cc           | 112 ++++++++++++++++-----------------
 source/simulator/core.cc               |  52 +++++++--------
 source/simulator/helper_functions.cc   |  48 +++++++-------
 source/simulator/initial_conditions.cc |   6 +-
 source/simulator/simulator_access.cc   |   4 +-
 source/simulator/solver.cc             |  16 ++---
 7 files changed, 134 insertions(+), 134 deletions(-)