[cig-commits] [commit] devel, master: Merge branch 'devel' into opencl (589f129)

[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 589f129774459ed9248724026516de90b31c1f12
Merge: b2c7b97 f218984
Author: Kevin Pouget <kevin.pouget at st.com>
Date:   Tue May 13 11:32:57 2014 +0200

    Merge branch 'devel' into opencl



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

589f129774459ed9248724026516de90b31c1f12
 DATA                                               |     2 +-
 .../figures/communication_from_clker_dot_com.svg   |    19 +
 ...atellite_clip_art_free_from_4vector_dot_com.svg |   395 +
 doc/USER_MANUAL/figures/specfem_3d_globe-cover.ai  | 35126 ++++++++++---------
 doc/USER_MANUAL/figures/specfem_3d_globe-cover.pdf |   707 +-
 doc/USER_MANUAL/manual_SPECFEM3D_GLOBE.pdf         |   Bin 24343368 -> 24396315 bytes
 doc/USER_MANUAL/manual_SPECFEM3D_GLOBE.tex         |    42 +-
 doc/USER_MANUAL/specfem_3d_globe-cover_small.jpg   |   Bin 48935 -> 51611 bytes
 ...llipticity_equations_from_Dahlen_Tromp_1998.pdf |   Bin 0 -> 3650396 bytes
 ...ocentric_coordinates_from_Dahlen_Tromp_1998.pdf |   Bin 0 -> 1023843 bytes
 setup/constants.h.in                               |    86 +-
 src/auxiliaries/combine_vol_data_shared.f90        |    22 +-
 src/meshfem3D/compute_coordinates_grid.f90         |    29 +-
 src/meshfem3D/finalize_mesher.f90                  |   123 +-
 src/meshfem3D/get_ellipticity.f90                  |     8 +-
 src/meshfem3D/initialize_layers.f90                |     1 -
 src/meshfem3D/meshfem3D_models.f90                 |     2 +-
 src/meshfem3D/meshfem3D_par.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 +-
 src/shared/make_ellipticity.f90                    |    22 +-
 src/shared/model_topo_bathy.f90                    |     2 -
 src/shared/rthetaphi_xyz.f90                       |   115 +-
 src/specfem3D/initialize_simulation.f90            |     5 +-
 utils/oldstuff/convert_etopo2_bin2ascii_Sun.f90    |    96 +
 utils/oldstuff/swap_topo_bathy_Sun.f90             |    40 +
 28 files changed, 19655 insertions(+), 17256 deletions(-)