[cig-commits] [commit] devel, master: Merge branch 'devel' of github.com:Nanosim-LIG/specfem3d_globe into devel (d635170)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Nov 6 08:30:04 PST 2014
Repository : https://github.com/geodynamics/specfem3d_globe
On branches: devel,master
Link : https://github.com/geodynamics/specfem3d_globe/compare/bc58e579b3b0838a0968725a076f5904845437ca...be63f20cbb6f462104e949894dbe205d2398cd7f
>---------------------------------------------------------------
commit d63517024f36c470d273b8ddd156ab5bac76dd3a
Merge: 6f85594 1eaaa62
Author: buildbot <buildbot at seismobot.Princeton.EDU>
Date: Thu Sep 4 14:40:54 2014 -0400
Merge branch 'devel' of github.com:Nanosim-LIG/specfem3d_globe into devel
>---------------------------------------------------------------
d63517024f36c470d273b8ddd156ab5bac76dd3a
src/gpu/boast/assemble_boundary_accel_on_device.rb | 2 +-
src/gpu/boast/compute_acoustic_kernel.rb | 2 +-
.../boast/compute_add_sources_adjoint_kernel.rb | 2 +-
src/gpu/boast/compute_add_sources_kernel.rb | 2 +-
src/gpu/boast/compute_ani_kernel.rb | 2 +-
src/gpu/boast/compute_ani_undo_att_kernel.rb | 2 +-
src/gpu/boast/compute_coupling_fluid_CMB_kernel.rb | 2 +-
src/gpu/boast/compute_coupling_ocean_kernel.rb | 2 +-
src/gpu/boast/compute_hess_kernel.rb | 2 +-
src/gpu/boast/compute_iso_kernel.rb | 2 +-
src/gpu/boast/compute_rho_kernel.rb | 2 +-
src/gpu/boast/compute_stacey_acoustic_kernel.rb | 2 +-
src/gpu/boast/compute_stacey_elastic_kernel.rb | 2 +-
src/gpu/boast/compute_strain_kernel.rb | 2 +-
src/gpu/boast/compute_strength_noise_kernel.rb | 2 +-
src/gpu/boast/get_maximum_scalar_kernel.rb | 2 +-
src/gpu/boast/inner_core_impl_kernel_forward.rb | 2 +-
src/gpu/boast/kernels.rb | 8 +--
.../boast/noise_add_source_master_rec_kernel.rb | 2 +-
src/gpu/boast/noise_add_surface_movie_kernel.rb | 2 +-
.../boast/noise_transfer_surface_to_host_kernel.rb | 2 +-
src/gpu/boast/outer_core_impl_kernel_forward.rb | 2 +-
src/gpu/boast/prepare_boundary_accel_on_device.rb | 2 +-
src/gpu/boast/update_disp_veloc_kernel.rb | 2 +-
...rite_seismograms_transfer_from_device_kernel.rb | 2 +-
.../assemble_boundary_accel_on_device.cu | 6 +--
.../assemble_boundary_accel_on_device_cl.c | 6 +--
.../assemble_boundary_potential_on_device.cu | 6 +--
.../assemble_boundary_potential_on_device_cl.c | 6 +--
src/gpu/kernels.gen/compute_acoustic_kernel.cu | 6 +--
src/gpu/kernels.gen/compute_acoustic_kernel_cl.c | 6 +--
.../compute_add_sources_adjoint_kernel.cu | 4 +-
.../compute_add_sources_adjoint_kernel_cl.c | 4 +-
src/gpu/kernels.gen/compute_add_sources_kernel.cu | 6 +--
.../kernels.gen/compute_add_sources_kernel_cl.c | 6 +--
src/gpu/kernels.gen/compute_ani_kernel.cu | 16 +++---
src/gpu/kernels.gen/compute_ani_kernel_cl.c | 16 +++---
src/gpu/kernels.gen/compute_ani_undo_att_kernel.cu | 22 ++++----
.../kernels.gen/compute_ani_undo_att_kernel_cl.c | 22 ++++----
.../compute_coupling_CMB_fluid_kernel.cu | 6 +--
.../compute_coupling_CMB_fluid_kernel_cl.c | 6 +--
.../compute_coupling_ICB_fluid_kernel.cu | 6 +--
.../compute_coupling_ICB_fluid_kernel_cl.c | 6 +--
.../compute_coupling_fluid_CMB_kernel.cu | 4 +-
.../compute_coupling_fluid_CMB_kernel_cl.c | 4 +-
.../compute_coupling_fluid_ICB_kernel.cu | 4 +-
.../compute_coupling_fluid_ICB_kernel_cl.c | 4 +-
.../kernels.gen/compute_coupling_ocean_kernel.cu | 4 +-
.../kernels.gen/compute_coupling_ocean_kernel_cl.c | 4 +-
src/gpu/kernels.gen/compute_hess_kernel.cu | 4 +-
src/gpu/kernels.gen/compute_hess_kernel_cl.c | 4 +-
src/gpu/kernels.gen/compute_iso_kernel.cu | 4 +-
src/gpu/kernels.gen/compute_iso_kernel_cl.c | 4 +-
src/gpu/kernels.gen/compute_iso_undo_att_kernel.cu | 10 ++--
.../kernels.gen/compute_iso_undo_att_kernel_cl.c | 10 ++--
src/gpu/kernels.gen/compute_rho_kernel.cu | 4 +-
src/gpu/kernels.gen/compute_rho_kernel_cl.c | 4 +-
.../compute_stacey_acoustic_backward_kernel.cu | 34 ++++++-------
.../compute_stacey_acoustic_backward_kernel_cl.c | 34 ++++++-------
.../kernels.gen/compute_stacey_acoustic_kernel.cu | 36 +++++++-------
.../compute_stacey_acoustic_kernel_cl.c | 36 +++++++-------
.../compute_stacey_elastic_backward_kernel.cu | 30 +++++------
.../compute_stacey_elastic_backward_kernel_cl.c | 30 +++++------
.../kernels.gen/compute_stacey_elastic_kernel.cu | 32 ++++++------
.../kernels.gen/compute_stacey_elastic_kernel_cl.c | 32 ++++++------
src/gpu/kernels.gen/compute_strain_kernel.cu | 12 ++---
src/gpu/kernels.gen/compute_strain_kernel_cl.c | 12 ++---
.../kernels.gen/compute_strength_noise_kernel.cu | 4 +-
.../kernels.gen/compute_strength_noise_kernel_cl.c | 4 +-
.../crust_mantle_impl_kernel_adjoint.cu | 58 +++++++++++-----------
.../crust_mantle_impl_kernel_adjoint_cl.c | 58 +++++++++++-----------
.../crust_mantle_impl_kernel_forward.cu | 58 +++++++++++-----------
.../crust_mantle_impl_kernel_forward_cl.c | 58 +++++++++++-----------
src/gpu/kernels.gen/get_maximum_scalar_kernel.cu | 10 ++--
src/gpu/kernels.gen/get_maximum_scalar_kernel_cl.c | 10 ++--
src/gpu/kernels.gen/get_maximum_vector_kernel.cu | 10 ++--
src/gpu/kernels.gen/get_maximum_vector_kernel_cl.c | 10 ++--
.../kernels.gen/inner_core_impl_kernel_adjoint.cu | 54 ++++++++++----------
.../inner_core_impl_kernel_adjoint_cl.c | 54 ++++++++++----------
.../kernels.gen/inner_core_impl_kernel_forward.cu | 54 ++++++++++----------
.../inner_core_impl_kernel_forward_cl.c | 54 ++++++++++----------
.../noise_add_source_master_rec_kernel.cu | 2 +-
.../noise_add_source_master_rec_kernel_cl.c | 2 +-
.../kernels.gen/noise_add_surface_movie_kernel.cu | 4 +-
.../noise_add_surface_movie_kernel_cl.c | 4 +-
.../noise_transfer_surface_to_host_kernel.cu | 4 +-
.../noise_transfer_surface_to_host_kernel_cl.c | 4 +-
.../kernels.gen/outer_core_impl_kernel_adjoint.cu | 26 +++++-----
.../outer_core_impl_kernel_adjoint_cl.c | 26 +++++-----
.../kernels.gen/outer_core_impl_kernel_forward.cu | 26 +++++-----
.../outer_core_impl_kernel_forward_cl.c | 26 +++++-----
.../prepare_boundary_accel_on_device.cu | 6 +--
.../prepare_boundary_accel_on_device_cl.c | 6 +--
.../prepare_boundary_potential_on_device.cu | 6 +--
.../prepare_boundary_potential_on_device_cl.c | 6 +--
.../kernels.gen/update_accel_acoustic_kernel.cu | 4 +-
.../kernels.gen/update_accel_acoustic_kernel_cl.c | 4 +-
src/gpu/kernels.gen/update_accel_elastic_kernel.cu | 4 +-
.../kernels.gen/update_accel_elastic_kernel_cl.c | 4 +-
src/gpu/kernels.gen/update_disp_veloc_kernel.cu | 4 +-
src/gpu/kernels.gen/update_disp_veloc_kernel_cl.c | 4 +-
src/gpu/kernels.gen/update_potential_kernel.cu | 4 +-
src/gpu/kernels.gen/update_potential_kernel_cl.c | 4 +-
.../kernels.gen/update_veloc_acoustic_kernel.cu | 4 +-
.../kernels.gen/update_veloc_acoustic_kernel_cl.c | 4 +-
src/gpu/kernels.gen/update_veloc_elastic_kernel.cu | 4 +-
.../kernels.gen/update_veloc_elastic_kernel_cl.c | 4 +-
...rite_seismograms_transfer_from_device_kernel.cu | 4 +-
...te_seismograms_transfer_from_device_kernel_cl.c | 4 +-
...ismograms_transfer_strain_from_device_kernel.cu | 4 +-
...mograms_transfer_strain_from_device_kernel_cl.c | 4 +-
111 files changed, 638 insertions(+), 638 deletions(-)
More information about the CIG-COMMITS
mailing list