[cig-commits] [commit] master: Merge remote-tracking branch 'origin/devel' (1300e56)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Sat Nov 1 06:42:49 PDT 2014
Repository : https://github.com/geodynamics/specfem3d_globe
On branch : master
Link : https://github.com/geodynamics/specfem3d_globe/compare/cba41c84e02c57fd94b718043da17a781d5ff938...1300e56709140f2d98f36f4b2c1f35c562e62f78
>---------------------------------------------------------------
commit 1300e56709140f2d98f36f4b2c1f35c562e62f78
Merge: cba41c8 70fbc91
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date: Sat Nov 1 14:43:04 2014 +0100
Merge remote-tracking branch 'origin/devel'
>---------------------------------------------------------------
1300e56709140f2d98f36f4b2c1f35c562e62f78
DATA/Par_file | 17 +-
DATA/s362ani/old_src_f77/mod.h | 74 +-
DATA/s362ani/src_f90/evradker.f90 | 2 +-
DATA/s362ani/src_f90/gt3dmodl.f90 | 2 +-
DATA/s362ani/src_f90/read_model_s362ani.f90 | 6 +-
.../global_long/adj_traveltime_filter.f90 | 44 +-
.../global_short/adj_traveltime_filter.f90 | 44 +-
.../regional/adj_traveltime_filter.f90 | 44 +-
.../test_global/adj_traveltime_filter.f90 | 44 +-
.../test_regional/adj_traveltime_filter.f90 | 44 +-
.../adj_traveltime_filter.f90 | 44 +-
Makefile.in | 39 +-
configure | 1141 ++++++------
configure.ac | 12 +-
doc/USER_MANUAL/bibliography.bib | 12 +
doc/USER_MANUAL/manual_SPECFEM3D_GLOBE.pdf | Bin 24378184 -> 24382097 bytes
doc/USER_MANUAL/manual_SPECFEM3D_GLOBE.tex | 26 +-
flags.guess | 15 +-
m4 | 2 +-
...st_of_things_to_do_in_the_SPECFEM3D_package.txt | 3 +
setup/constants.h.in | 7 +-
setup/constants_tomography.h.in | 135 ++
src/auxiliaries/combine_AVS_DX.f90 | 8 +-
src/auxiliaries/combine_paraview_strain_data.f90 | 4 +-
src/auxiliaries/combine_surf_data.f90 | 18 +-
src/auxiliaries/combine_vol_data.F90 | 26 +-
src/auxiliaries/combine_vol_data_adios_impl.f90 | 6 +-
src/auxiliaries/create_movie_AVS_DX.f90 | 2 +-
src/auxiliaries/create_movie_GMT_global.f90 | 32 +-
src/auxiliaries/rules.mk | 13 +-
src/create_header_file/rules.mk | 1 -
src/gpu/assemble_MPI_scalar_gpu.c | 314 ++--
src/gpu/assemble_MPI_vector_gpu.c | 1017 ++++-------
src/gpu/boast/FUNCTIONS.rb | 12 +
src/gpu/boast/README | 2 +-
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 | 13 +-
...att_kernel.rb => compute_ani_undoatt_kernel.rb} | 36 +-
src/gpu/boast/compute_coupling_fluid_CMB_kernel.rb | 2 +-
src/gpu/boast/compute_coupling_ocean_kernel.rb | 2 +-
...rb => compute_element_strain_undoatt_helper.rb} | 4 +-
src/gpu/boast/compute_hess_kernel.rb | 2 +-
src/gpu/boast/compute_iso_kernel.rb | 2 +-
src/gpu/boast/compute_iso_undo_att_kernel.rb | 9 -
src/gpu/boast/compute_iso_undoatt_kernel.rb | 9 +
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 | 20 +-
src/gpu/boast/compute_strain_product_helper.rb | 11 +-
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 | 131 +-
src/gpu/boast/kernels.rb | 25 +-
.../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 | 123 +-
src/gpu/boast/prepare_boundary_accel_on_device.rb | 2 +-
...att_kernel.cu => compute_ani_undoatt_kernel.cu} | 76 +-
...att_kernel.cu => compute_iso_undoatt_kernel.cu} | 78 +-
src/gpu/boast/references/compute_strain_kernel.cu | 34 +-
src/gpu/boast/update_disp_veloc_kernel.rb | 2 +-
...rite_seismograms_transfer_from_device_kernel.rb | 2 +-
src/gpu/check_fields_gpu.c | 60 +-
src/gpu/compute_coupling_gpu.c | 348 ++--
src/gpu/compute_forces_crust_mantle_gpu.c | 7 +-
src/gpu/compute_forces_inner_core_gpu.c | 4 +-
src/gpu/compute_forces_outer_core_gpu.c | 14 +-
src/gpu/compute_kernels_gpu.c | 366 ++--
src/gpu/compute_stacey_acoustic_gpu.c | 168 +-
src/gpu/compute_stacey_elastic_gpu.c | 204 +--
src/gpu/compute_strain_gpu.c | 247 ++-
src/gpu/helper_functions_gpu.c | 12 +-
src/gpu/initialize_gpu.c | 4 +-
.../assemble_boundary_accel_on_device.cu | 12 +-
.../assemble_boundary_accel_on_device_cl.c | 12 +-
.../assemble_boundary_potential_on_device.cu | 8 +-
.../assemble_boundary_potential_on_device_cl.c | 8 +-
src/gpu/kernels.gen/compute_acoustic_kernel.cu | 64 +-
src/gpu/kernels.gen/compute_acoustic_kernel_cl.c | 64 +-
.../compute_add_sources_adjoint_kernel.cu | 14 +-
.../compute_add_sources_adjoint_kernel_cl.c | 14 +-
src/gpu/kernels.gen/compute_add_sources_kernel.cu | 16 +-
.../kernels.gen/compute_add_sources_kernel_cl.c | 16 +-
src/gpu/kernels.gen/compute_ani_kernel.cu | 78 +-
src/gpu/kernels.gen/compute_ani_kernel_cl.c | 78 +-
...att_kernel.cu => compute_ani_undoatt_kernel.cu} | 142 +-
...kernel_cl.c => compute_ani_undoatt_kernel_cl.c} | 144 +-
.../compute_coupling_CMB_fluid_kernel.cu | 22 +-
.../compute_coupling_CMB_fluid_kernel_cl.c | 22 +-
.../compute_coupling_ICB_fluid_kernel.cu | 22 +-
.../compute_coupling_ICB_fluid_kernel_cl.c | 22 +-
.../compute_coupling_fluid_CMB_kernel.cu | 24 +-
.../compute_coupling_fluid_CMB_kernel_cl.c | 24 +-
.../compute_coupling_fluid_ICB_kernel.cu | 24 +-
.../compute_coupling_fluid_ICB_kernel_cl.c | 24 +-
.../kernels.gen/compute_coupling_ocean_kernel.cu | 26 +-
.../kernels.gen/compute_coupling_ocean_kernel_cl.c | 26 +-
src/gpu/kernels.gen/compute_hess_kernel.cu | 6 +-
src/gpu/kernels.gen/compute_hess_kernel_cl.c | 6 +-
src/gpu/kernels.gen/compute_iso_kernel.cu | 6 +-
src/gpu/kernels.gen/compute_iso_kernel_cl.c | 6 +-
...att_kernel.cu => compute_iso_undoatt_kernel.cu} | 98 +-
...kernel_cl.c => compute_iso_undoatt_kernel_cl.c} | 100 +-
src/gpu/kernels.gen/compute_rho_kernel.cu | 6 +-
src/gpu/kernels.gen/compute_rho_kernel_cl.c | 6 +-
.../compute_stacey_acoustic_backward_kernel.cu | 32 +-
.../compute_stacey_acoustic_backward_kernel_cl.c | 32 +-
.../kernels.gen/compute_stacey_acoustic_kernel.cu | 46 +-
.../compute_stacey_acoustic_kernel_cl.c | 46 +-
.../compute_stacey_elastic_backward_kernel.cu | 36 +-
.../compute_stacey_elastic_backward_kernel_cl.c | 36 +-
.../kernels.gen/compute_stacey_elastic_kernel.cu | 62 +-
.../kernels.gen/compute_stacey_elastic_kernel_cl.c | 62 +-
src/gpu/kernels.gen/compute_strain_kernel.cu | 92 +-
src/gpu/kernels.gen/compute_strain_kernel_cl.c | 92 +-
.../kernels.gen/compute_strength_noise_kernel.cu | 10 +-
.../kernels.gen/compute_strength_noise_kernel_cl.c | 10 +-
.../crust_mantle_impl_kernel_adjoint.cu | 564 +++---
.../crust_mantle_impl_kernel_adjoint_cl.c | 579 +++---
.../crust_mantle_impl_kernel_forward.cu | 564 +++---
.../crust_mantle_impl_kernel_forward_cl.c | 579 +++---
src/gpu/kernels.gen/get_maximum_scalar_kernel.cu | 12 +-
src/gpu/kernels.gen/get_maximum_scalar_kernel_cl.c | 12 +-
src/gpu/kernels.gen/get_maximum_vector_kernel.cu | 12 +-
src/gpu/kernels.gen/get_maximum_vector_kernel_cl.c | 12 +-
.../kernels.gen/inner_core_impl_kernel_adjoint.cu | 520 +++---
.../inner_core_impl_kernel_adjoint_cl.c | 533 +++---
.../kernels.gen/inner_core_impl_kernel_forward.cu | 520 +++---
.../inner_core_impl_kernel_forward_cl.c | 533 +++---
src/gpu/kernels.gen/kernel_cuda.mk | 4 +-
src/gpu/kernels.gen/kernel_inc_cl.c | 4 +-
src/gpu/kernels.gen/kernel_list.h | 4 +-
src/gpu/kernels.gen/kernel_proto.cu.h | 4 +-
.../noise_add_source_master_rec_kernel.cu | 12 +-
.../noise_add_source_master_rec_kernel_cl.c | 12 +-
.../kernels.gen/noise_add_surface_movie_kernel.cu | 26 +-
.../noise_add_surface_movie_kernel_cl.c | 26 +-
.../noise_transfer_surface_to_host_kernel.cu | 12 +-
.../noise_transfer_surface_to_host_kernel_cl.c | 12 +-
.../kernels.gen/outer_core_impl_kernel_adjoint.cu | 168 +-
.../outer_core_impl_kernel_adjoint_cl.c | 180 +-
.../kernels.gen/outer_core_impl_kernel_forward.cu | 168 +-
.../outer_core_impl_kernel_forward_cl.c | 180 +-
.../prepare_boundary_accel_on_device.cu | 12 +-
.../prepare_boundary_accel_on_device_cl.c | 12 +-
.../prepare_boundary_potential_on_device.cu | 8 +-
.../prepare_boundary_potential_on_device_cl.c | 8 +-
.../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 | 8 +-
.../kernels.gen/update_accel_elastic_kernel_cl.c | 8 +-
src/gpu/kernels.gen/update_disp_veloc_kernel.cu | 8 +-
src/gpu/kernels.gen/update_disp_veloc_kernel_cl.c | 8 +-
src/gpu/kernels.gen/update_potential_kernel.cu | 8 +-
src/gpu/kernels.gen/update_potential_kernel_cl.c | 8 +-
.../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 | 8 +-
.../kernels.gen/update_veloc_elastic_kernel_cl.c | 8 +-
...rite_seismograms_transfer_from_device_kernel.cu | 14 +-
...te_seismograms_transfer_from_device_kernel_cl.c | 14 +-
...ismograms_transfer_strain_from_device_kernel.cu | 10 +-
...mograms_transfer_strain_from_device_kernel_cl.c | 10 +-
src/gpu/mesh_constants_cuda.h | 2 +
src/gpu/mesh_constants_gpu.h | 20 +-
src/gpu/mesh_constants_ocl.h | 30 +-
src/gpu/prepare_mesh_constants_gpu.c | 57 +-
src/gpu/transfer_fields_gpu.c | 8 +-
src/gpu/update_displacement_gpu.c | 473 +++--
src/meshfem3D/add_topography_410_650.f90 | 40 +-
src/meshfem3D/compute_element_properties.f90 | 6 +-
src/meshfem3D/compute_volumes_and_areas.F90 | 2 +-
src/meshfem3D/create_MPI_interfaces.f90 | 4 +-
src/meshfem3D/create_addressing.f90 | 2 +-
src/meshfem3D/create_chunk_buffers.f90 | 5 +-
src/meshfem3D/create_mass_matrices.f90 | 7 +-
src/meshfem3D/create_regions_mesh.F90 | 21 +-
src/meshfem3D/create_regions_mesh_adios.f90 | 2 +-
src/meshfem3D/get_MPI_1D_buffers.f90 | 2 +-
src/meshfem3D/get_MPI_cutplanes_eta.f90 | 2 +-
src/meshfem3D/get_MPI_cutplanes_xi.f90 | 4 +-
src/meshfem3D/get_absorb.f90 | 2 +-
src/meshfem3D/get_absorb_adios.F90 | 2 +-
src/meshfem3D/get_model.F90 | 6 +-
src/meshfem3D/meshfem3D_models.F90 | 12 +-
src/meshfem3D/meshfem3D_par.f90 | 4 +-
src/meshfem3D/model_1dref.f90 | 3 +
src/meshfem3D/model_aniso_inner_core.f90 | 3 +
src/meshfem3D/model_aniso_mantle.f90 | 8 +-
src/meshfem3D/model_atten3D_QRFSI12.f90 | 2 +-
src/meshfem3D/model_attenuation.f90 | 5 +-
src/meshfem3D/model_cem.f90 | 116 +-
src/meshfem3D/model_crustmaps.f90 | 2 +-
src/meshfem3D/model_epcrust.f90 | 2 +-
src/meshfem3D/model_gapp2.f90 | 2 +-
src/meshfem3D/model_gll.f90 | 2 +-
src/meshfem3D/model_gll_adios.F90 | 2 +-
src/meshfem3D/model_ppm.f90 | 334 +---
src/meshfem3D/model_s362ani.f90 | 5 +
src/meshfem3D/moho_stretching.f90 | 8 +-
src/meshfem3D/rules.mk | 6 +-
src/meshfem3D/save_arrays_solver.f90 | 8 +-
src/meshfem3D/save_arrays_solver_adios.F90 | 14 +-
src/meshfem3D/setup_MPI_interfaces.f90 | 12 +-
src/meshfem3D/setup_color_perm.f90 | 16 +-
src/meshfem3D/setup_inner_outer.f90 | 4 +-
src/meshfem3D/test_MPI_interfaces.f90 | 27 +-
src/meshfem3D/write_AVS_DX_global_chunks_data.f90 | 2 +-
.../write_AVS_DX_global_chunks_data_adios.f90 | 2 +-
src/meshfem3D/write_AVS_DX_global_data.f90 | 4 +-
src/meshfem3D/write_AVS_DX_global_faces_data.f90 | 2 +-
src/meshfem3D/write_AVS_DX_surface_data.f90 | 2 +-
src/shared/adios_method_stubs.c | 8 +-
src/shared/asdf_helpers.f90 | 90 -
src/shared/asdf_helpers_definitions.f90 | 1391 ---------------
src/shared/asdf_helpers_writers.f90 | 290 ---
src/shared/binary_c_io.c | 16 +-
src/shared/broadcast_computed_parameters.f90 | 6 +-
src/shared/calendar.f90 | 6 +-
src/shared/count_number_of_sources.f90 | 2 +-
src/shared/create_name_database.f90 | 8 +-
src/shared/create_serial_name_database.f90 | 2 +-
src/shared/define_all_layers.f90 | 9 +
src/shared/exit_mpi.f90 | 26 -
src/shared/{exit_mpi.f90 => flush_system.f90} | 90 +-
src/shared/get_all_eight_slices.f90 | 251 +++
src/shared/get_global.f90 | 4 +-
src/shared/get_model_parameters.F90 | 12 +-
src/shared/memory_eval.f90 | 3 +-
src/shared/model_topo_bathy.f90 | 10 +-
src/shared/parallel.f90 | 97 +
src/shared/param_reader.c | 6 +-
src/shared/read_compute_parameters.f90 | 20 +-
src/shared/read_value_parameters.f90 | 2 +-
src/shared/rthetaphi_xyz.f90 | 11 +-
src/shared/rules.mk | 15 +-
src/shared/save_header_file.F90 | 45 +-
src/shared/shared_par.f90 | 4 +-
src/shared/smooth_weights_vec.f90 | 141 ++
src/shared/write_VTK_file.f90 | 12 +-
src/specfem3D/asdf_data.f90 | 36 +-
src/specfem3D/check_stability.f90 | 4 +-
src/specfem3D/comp_source_time_function.f90 | 18 +-
src/specfem3D/compute_arrays_source.f90 | 4 +-
src/specfem3D/compute_element_strain.F90 | 38 +-
.../compute_forces_acoustic_calling_routine.F90 | 24 +-
...compute_forces_viscoelastic_calling_routine.F90 | 6 +-
src/specfem3D/compute_kernels.F90 | 80 +-
src/specfem3D/compute_seismograms.f90 | 20 +-
src/specfem3D/compute_stacey_crust_mantle.f90 | 30 +-
src/specfem3D/compute_stacey_outer_core.f90 | 14 +-
src/specfem3D/finalize_simulation.f90 | 12 +-
src/{shared => specfem3D}/force_ftz.c | 0
src/specfem3D/get_attenuation.f90 | 2 +-
src/specfem3D/get_backazimuth.f90 | 3 +-
src/specfem3D/get_cmt.f90 | 361 +++-
src/specfem3D/get_event_info.f90 | 2 +-
src/specfem3D/initialize_simulation.f90 | 39 +-
src/specfem3D/iterate_time.F90 | 11 +-
src/specfem3D/iterate_time_undoatt.F90 | 86 +-
src/specfem3D/locate_receivers.f90 | 201 ++-
src/specfem3D/locate_sources.f90 | 33 +-
src/{shared => specfem3D}/make_gravity.f90 | 6 +-
src/specfem3D/noise_tomography.f90 | 10 +-
src/specfem3D/prepare_timerun.f90 | 13 +
src/specfem3D/read_adjoint_sources.f90 | 6 +-
src/specfem3D/read_arrays_solver.f90 | 2 +-
src/specfem3D/read_arrays_solver_adios.F90 | 2 +-
src/specfem3D/read_attenuation_adios.f90 | 2 +-
src/specfem3D/read_forward_arrays.f90 | 6 +-
src/specfem3D/read_forward_arrays_adios.F90 | 9 +-
src/specfem3D/read_mesh_databases_adios.f90 | 23 +-
src/specfem3D/read_write_netcdf.f90 | 192 ++
src/specfem3D/rules.mk | 22 +-
src/specfem3D/save_forward_arrays.f90 | 4 +-
src/specfem3D/save_forward_arrays_adios.F90 | 8 +-
.../{save_kernels.f90 => save_kernels.F90} | 28 +-
src/specfem3D/save_kernels_adios.F90 | 14 +-
src/specfem3D/save_regular_kernels.f90 | 7 +-
src/specfem3D/setup_sources_receivers.f90 | 35 +-
src/specfem3D/specfem3D_gpu_method_stubs.c | 19 +-
src/specfem3D/specfem3D_par.F90 | 4 +-
src/specfem3D/update_displacement_LDDRK.f90 | 8 +-
src/specfem3D/update_displacement_Newmark.f90 | 8 +-
src/specfem3D/write_movie_output.f90 | 16 +-
src/specfem3D/write_movie_surface.f90 | 7 +-
src/specfem3D/write_movie_volume.f90 | 24 +-
src/specfem3D/write_output_ASCII.f90 | 6 +-
src/specfem3D/write_output_SAC.f90 | 6 +-
src/specfem3D/write_seismograms.f90 | 29 +-
src/specfem3D/write_specfem_adios_header.F90 | 4 +-
src/tomography/add_model_iso.f90 | 229 +++
src/tomography/add_model_tiso.f90 | 281 +++
src/tomography/add_model_tiso_cg.f90 | 298 ++++
src/tomography/add_model_tiso_iso.f90 | 259 +++
src/tomography/compute_kernel_integral.f90 | 767 ++++++++
src/tomography/convert_model_file_adios.f90 | 538 ++++++
src/tomography/difference_sem.f90 | 229 +++
src/tomography/get_gradient_cg.f90 | 480 +++++
src/tomography/get_gradient_steepest.f90 | 436 +++++
src/tomography/interpolate_model.F90 | 1862 ++++++++++++++++++++
src/tomography/interpolate_model_kdtree.f90 | 693 ++++++++
src/tomography/read_kernels.f90 | 269 +++
src/tomography/read_kernels_cg.f90 | 291 +++
src/tomography/read_model.f90 | 340 ++++
src/tomography/read_parameters_tomo.f90 | 122 ++
src/tomography/rules.mk | 317 ++++
src/tomography/smooth_sem.f90 | 608 +++++++
src/tomography/sum_kernels.f90 | 270 +++
src/tomography/sum_preconditioned_kernels.f90 | 402 +++++
src/tomography/tomography_par.f90 | 174 ++
src/tomography/write_gradients.f90 | 122 ++
src/tomography/write_new_model.f90 | 212 +++
src/tomography/write_new_model_perturbations.f90 | 231 +++
.../gpuTrace/gpu_helper_py.c | 0
.../gpuTrace/instr-cuda.c | 4 +-
.../gpuTrace/instr-ocl.c | 0
.../gpuTrace/ldChecker.c | 0
.../gpuTrace/ldChecker.h | 0
.../gpuTrace/ldPreloader.c | 0
utils/Roland_Sylvain_gravity/constants.h.in | 4 +-
.../VTK_ParaView/create_slice_VTK.f90 | 19 +-
.../opendx_AVS/convert_palette_GMT_OpenDX.f90 | 10 +-
.../amplitude/create_adjsrc_amplitude.f90 | 0
.../traveltime/create_adjsrc_traveltime.f90 | 0
utils/attenuation/attenuation_output.f90 | 2 +-
utils/check_cuda_device.cu | 0
utils/check_opencl_device.c | 0
.../create_superbrick_duplicates.f90 | 8 +-
utils/doubling_brick/extract_unique_points.f90 | 8 +-
utils/extract_database/extract_database.f90 | 42 +-
.../routines_SEM_Bernhard_diff_lagrange.f90 | 10 +-
utils/lib/GMT_PLOT.pm | 2 +-
utils/lib/GMT_PLOT_SC.pm | 6 +-
utils/lib/SAC_TOOLS.pm | 2 +-
utils/lib/convolve_stf.c | 2 +-
utils/lib/rw_ascfile_c.c | 8 +-
utils/lib/rw_fortran_wrapper.c | 0
utils/oldstuff/check_buffers_1D.f90 | 2 +-
utils/oldstuff/check_buffers_2D.f90 | 2 +-
utils/oldstuff/check_buffers_corners_chunks.f90 | 2 +-
utils/oldstuff/check_buffers_faces_chunks.f90 | 2 +-
347 files changed, 17939 insertions(+), 9422 deletions(-)
More information about the CIG-COMMITS
mailing list