[cig-commits] [commit] master: Merge pull request #34 from MFraters/extra_statistics (450a040)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/dda1edd743a39bfe5b21db0f612927a420cf25c5...450a04072c3e64be3c5b43c961481ad07c80df06

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

commit 450a04072c3e64be3c5b43c961481ad07c80df06
Merge: dda1edd 861d78f
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Wed May 21 10:55:12 2014 -0500

    Merge pull request #34 from MFraters/extra_statistics
    
    Added extra timing and nonlinear information in the screen/opla output



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

450a04072c3e64be3c5b43c961481ad07c80df06
 source/simulator/core.cc       | 7 +++++--
 source/simulator/parameters.cc | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)