[cig-commits] [commit] devel, master: Merge pull request #167 from QuLogic/binary-topography (741ee67)

[cig_noreply at geodynamics.org]

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

On branches: devel,master
Link       : https://github.com/geodynamics/specfem3d_globe/compare/bc58e579b3b0838a0968725a076f5904845437ca...be63f20cbb6f462104e949894dbe205d2398cd7f

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

commit 741ee6773bfcdb5273c3a4e28a7d340ec0e28070
Merge: 22de8b7 657aad2
Author: Dimitri Komatitsch <komatits at users.noreply.github.com>
Date:   Mon Jul 7 01:19:32 2014 +0200

    Merge pull request #167 from QuLogic/binary-topography
    
    Binary topography files



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

741ee6773bfcdb5273c3a4e28a7d340ec0e28070
 DATA/topo_bathy/.gitattributes                     |   1 +
 DATA/topo_bathy/ascii2bin.py                       |  34 +++++++++++++++++++
 .../topo_bathy_etopo4_smoothed_window_7.bin        | Bin 25158686 -> 29160002 bytes
 setup/constants.h.in                               |  16 ++++-----
 src/meshfem3D/rules.mk                             |   1 +
 src/shared/model_topo_bathy.f90                    |  37 ++++++++++-----------
 src/shared/write_c_binary.c                        |   3 +-
 7 files changed, 63 insertions(+), 29 deletions(-)