[cig-commits] [commit] master: Merge branch 'master' of https://github.com/geodynamics/relax (6b5c008)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/relax/compare/a2137b97dbb8a6df14cb0c52ffc490873b572448...6b5c00835931ec59a0d327ed8d5eccd1fbf02bc9

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

commit 6b5c00835931ec59a0d327ed8d5eccd1fbf02bc9
Merge: 29f2912 a2137b9
Author: Sylvain Barbot <sbarbot at ntu.edu.sg>
Date:   Mon Sep 8 12:11:35 2014 +0800

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



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

6b5c00835931ec59a0d327ed8d5eccd1fbf02bc9
 INSTALL                | 22 ++++++++--------
 cuda.py                | 48 +++++++++++++++++------------------
 latex/relax.tex        | 54 ++++++++++++++++++++++++++++++++++++++-
 src/cu_elastic.cu      | 68 +++++++++++++++++++++++++++++++++++++++++++++++---
 src/input.f90          |  2 +-
 src/relax.f90          |  4 +--
 src/viscoelastic3d.f90 |  3 ++-
 util/grdmap.sh         | 18 +++++++++----
 util/obsres.py         | 39 +++++++++++++++++++++--------
 wscript                | 22 ++++++++--------
 10 files changed, 211 insertions(+), 69 deletions(-)