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

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/relax

On branch  : master
Link       : https://github.com/geodynamics/relax/compare/db1b5c1faa54651a122f7782d0b1f2b0d621ce8d...3636c032c11009cef9eed4bf22bfbd4cdb1928e0

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

commit de4113bc307d651226fd7aa4d5d0b05e0264c81a
Merge: c8834a2 db1b5c1
Author: Sylvain Barbot <sbarbot at ntu.edu.sg>
Date:   Mon Feb 10 10:38:25 2014 +0800

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



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

de4113bc307d651226fd7aa4d5d0b05e0264c81a
 examples/japan/tohoku11/faults/izu_30km.flt      |   107 +
 examples/japan/tohoku11/faults/kurils_30km.flt   |   457 +
 examples/japan/tohoku11/faults/ryukyu_30km.flt   |   208 +
 examples/japan/tohoku11/paraview/coasts_km.vtp   | 16204 ++++++++++++++++++++-
 examples/japan/tohoku11/paraview/izu_30km.vtp    |  3021 ++++
 examples/japan/tohoku11/paraview/kurils_30km.vtp | 13171 +++++++++++++++++
 examples/japan/tohoku11/paraview/ryukyu_30km.vtp |  5950 ++++++++
 examples/japan/tohoku11/viscous-3d.sh            |    73 +
 release/fink/readme.txt                          |     3 +
 release/fink/relax.info                          |    28 +-
 release/{fink => ports}/readme.txt               |    15 +-
 release/ports/science/relax3d/Portfile           |    16 +-
 {util => share}/anatolia.cpt                     |     0
 util/my_creep.cpt => share/creep.cpt             |     0
 util/my_hot.cpt => share/hot.cpt                 |     0
 util/my_hot_inv.cpt => share/hot_inv.cpt         |     0
 util/my_jet.cpt => share/jet.cpt                 |     0
 util/my_phase.cpt => share/phase.cpt             |     0
 util/{flt2vtk.sh => flt2vtp.sh}                  |     6 +-
 util/{grd2vtk.sh => grd2vtp.sh}                  |    12 +-
 util/grdmap.sh                                   |    38 +-
 util/obsres.py                                   |     2 +-
 util/{xyz2vtk.sh => xyz2vtp.sh}                  |     0
 23 files changed, 38462 insertions(+), 849 deletions(-)