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

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/relax/compare/2e49274e9240e59635b3fac22bed8e893b4b0458...5b0d8916062d3a2b3236477142e6d198e900119d

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

commit 5b0d8916062d3a2b3236477142e6d198e900119d
Merge: 05f5c0a 2e49274
Author: Sylvain Barbot <sbarbot at ntu.edu.sg>
Date:   Sat Aug 9 21:03:16 2014 +0800

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



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

5b0d8916062d3a2b3236477142e6d198e900119d
 INSTALL                        |   10 +
 cuda.py                        |   50 +
 src/cu_elastic.cu              | 3716 ++++++++++++++++++++++++++++++++++++++++
 src/cu_fft.cu                  | 3228 ++++++++++++++++++++++++++++++++++
 src/cu_include.h               |  306 ++++
 src/{relax.f90 => curelax.f90} |  728 +++-----
 src/elastic3d.f90              |    9 +-
 src/export.f90                 |   21 +-
 src/friction3d.f90             |    8 +
 src/green.f90                  |  169 +-
 src/papi_prof.c                |  270 +++
 src/viscoelastic3d.f90         |   53 +-
 wscript                        |  126 +-
 13 files changed, 8219 insertions(+), 475 deletions(-)