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

[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 e1ce7fe0698e5e4c95edbe736f03e44d6d0c602e
Merge: cd5bc89 615d1f7
Author: Dimitri Komatitsch <komatits at users.noreply.github.com>
Date:   Mon May 19 00:18:28 2014 +0200

    Merge pull request #96 from komatits/devel
    
    tried to use the same notations in model_crust_1_0.f90 and model_crust_2...



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

e1ce7fe0698e5e4c95edbe736f03e44d6d0c602e
 src/gpu/assemble_MPI_scalar_gpu.c          |   0
 src/gpu/assemble_MPI_vector_gpu.c          |   0
 src/gpu/check_fields_gpu.c                 |   0
 src/gpu/compute_add_sources_elastic_gpu.c  |   0
 src/gpu/compute_coupling_gpu.c             |   0
 src/gpu/compute_forces_crust_mantle_gpu.c  |   0
 src/gpu/compute_forces_inner_core_gpu.c    |   0
 src/gpu/compute_forces_outer_core_gpu.c    |   0
 src/gpu/compute_kernels_gpu.c              |   0
 src/gpu/compute_stacey_acoustic_gpu.c      |   0
 src/gpu/compute_stacey_elastic_gpu.c       |   0
 src/gpu/initialize_gpu.c                   |   0
 src/gpu/mesh_constants_gpu.h               |   0
 src/gpu/mesh_constants_ocl.h               |   0
 src/gpu/noise_tomography_gpu.c             |   0
 src/gpu/prepare_mesh_constants_gpu.c       |   0
 src/gpu/update_displacement_gpu.c          |   0
 src/gpu/write_seismograms_gpu.c            |   2 +-
 src/meshfem3D/compute_coordinates_grid.f90 |   0
 src/meshfem3D/meshfem3D_models.f90         |  14 +-
 src/meshfem3D/model_crust_1_0.f90          | 129 ++++++-----
 src/meshfem3D/model_crust_2_0.f90          | 348 ++++++++---------------------
 src/meshfem3D/model_crustmaps.f90          | 173 ++++++++++++++
 src/specfem3D/specfem3D_gpu_method_stubs.c |   0
 24 files changed, 333 insertions(+), 333 deletions(-)