[cig-commits] [commit] devel, master: Merge pull request #87 from komatits/devel (f2de2cd)

[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 f2de2cd92b07d0fc4dc63b24a7f67e403ce436cd
Merge: e63245c ffd536a
Author: Dimitri Komatitsch <komatits at users.noreply.github.com>
Date:   Sun May 11 14:34:27 2014 +0200

    Merge pull request #87 from komatits/devel
    
    renamed model_crust to model_crust_2_0 to be consistent with existing mo...



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

f2de2cd92b07d0fc4dc63b24a7f67e403ce436cd
 setup/constants.h.in                               | 28 ++++++++++++-------
 src/meshfem3D/meshfem3D_models.f90                 |  2 +-
 src/meshfem3D/model_crust_1_0.f90                  | 31 ++++++----------------
 .../{model_crust.f90 => model_crust_2_0.f90}       | 27 +++++++++----------
 src/meshfem3D/model_crustmaps.f90                  |  5 +++-
 src/meshfem3D/rules.mk                             |  4 +--
 6 files changed, 46 insertions(+), 51 deletions(-)