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

[cig_noreply at geodynamics.org]

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

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

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

commit 9ac60271a85118840e50b8534fd247b96d6e10ad
Merge: 9cc3f08 77f8bf3
Author: Sylvain Barbot <sbarbot at ntu.edu.sg>
Date:   Tue Aug 5 15:59:31 2014 +0800

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



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

9ac60271a85118840e50b8534fd247b96d6e10ad
 .../elmayor/faults/elmayor_wei_km_highslip5.flt    |   148 +
 .../elmayor/faults/zeng+anderson00_km.flt          |  1682 ++
 .../california/mojave/faults/cohee+beroza94_km.flt |   205 +
 .../california/mojave/faults/hernandez+99_km.flt   |    49 +
 .../california/mojave/faults/salichon+04_km.flt    |   147 +
 .../california/mojave/faults/wald+heaton94_km.flt  |   187 +
 .../sanfrancisco/faults/beroza+spudich88_km.flt    |   673 +
 .../california/sanfrancisco/faults/beroza91_km.flt |  1217 ++
 .../california/sanfrancisco/faults/song+08_km.flt  |    50 +
 .../sanfrancisco/faults/zeng+anderson00_km.flt     |  2242 ++
 examples/chile/maule10/faults/lorito+11_km.flt     |   202 +
 examples/chile/maule10/faults/luttrel+11_km.flt    |   444 +
 .../tocopilla07/faults/bejar-pizzaro+10_km.flt     |   230 +
 examples/india/bhuj01/faults/copley+11_km.flt      |   119 +
 examples/italy/faults/atzori+09_km.flt             |   285 +
 examples/japan/tohoku11/faults/yamazaki+11_km.flt  |   172 +
 .../pakistan/balochistan13/faults/avouac+14_km.flt |   235 +
 examples/parkfield/faults/dreger+05_km.flt         |   165 +
 examples/parkfield/faults/ji04_km.flt              |   203 +
 examples/sumatra/wharton12/faults/chen07_km.flt    |   226 +
 examples/sumatra/wharton12/faults/hayes09_km.flt   |   390 +
 examples/sumatra/wharton12/faults/hayes12_km.flt   |    91 +
 .../sumatra/wharton12/faults/hayes_apr10_km.flt    |   361 +
 .../sumatra/wharton12/faults/hayes_may10_km.flt    |   226 +
 examples/sumatra/wharton12/faults/konca+07_km.flt  |   521 +
 examples/taiwan/faults/thomas+14_km.flt            |   665 +
 examples/taiwan/readme.txt                         |     4 +
 examples/turkey/van11/faults/elliott+13_km.flt     |     1 -
 latex/graphics/cover.pdf                           | 21480 ++++++++++---------
 latex/graphics/cover_image.pdf                     |   Bin 0 -> 3095038 bytes
 latex/relax.bbl                                    |    51 +-
 latex/relax.tex                                    |   310 +-
 man/man1/relax.1                                   |    80 +-
 share/ViBlGrWhYeOrRe.cpt                           |   106 +
 share/anatolia.cpt                                 |     8 +-
 share/etopo01.cpt                                  |    53 +
 share/haxby.cpt                                    |    39 +
 util/coulomb.sh                                    |   117 -
 util/erpatch.sh                                    |     5 +-
 util/erpatch_slip.sh                               |     9 +-
 util/extrude.sh                                    |     2 +-
 util/flt2vtp.sh                                    |     6 +
 util/flt2xyz.sh                                    |   101 +
 util/grdcoulomb.sh                                 |   211 +
 util/grdmap.sh                                     |    38 +-
 util/{grdmap.sh => grdview.sh}                     |   186 +-
 util/seg2flt.py                                    |     8 +-
 47 files changed, 22946 insertions(+), 11004 deletions(-)