[cig-commits] [commit] devel, master: Merge branch 'devel' into opencl (677d61e)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Nov 6 08:21:08 PST 2014
Repository : https://github.com/geodynamics/specfem3d_globe
On branches: devel,master
Link : https://github.com/geodynamics/specfem3d_globe/compare/bc58e579b3b0838a0968725a076f5904845437ca...be63f20cbb6f462104e949894dbe205d2398cd7f
>---------------------------------------------------------------
commit 677d61e9cd8c291b3378e2e82012a637d6940a2a
Merge: a35d9a3 35fef95
Author: Kevin Pouget <kevin.pouget at imag.fr>
Date: Wed Jun 4 15:23:10 2014 +0200
Merge branch 'devel' into opencl
>---------------------------------------------------------------
677d61e9cd8c291b3378e2e82012a637d6940a2a
Makefile.in | 11 +-
configure | 4 +-
configure.ac | 4 +-
flags.guess | 2 +-
setup/constants.h.in | 14 +-
src/auxiliaries/Makefile | 8 +-
src/auxiliaries/combine_AVS_DX.f90 | 4 +-
src/auxiliaries/create_movie_AVS_DX.f90 | 230 +---------
src/auxiliaries/create_movie_GMT_global.f90 | 5 +-
src/auxiliaries/rules.mk | 9 +-
src/compute_optimized_dumping_undo_att/Makefile | 8 +-
src/compute_optimized_dumping_undo_att/rules.mk | 1 -
src/create_header_file/Makefile | 8 +-
src/create_header_file/create_header_file.f90 | 4 +-
src/create_header_file/rules.mk | 1 -
src/gpu/assemble_MPI_scalar_gpu.c | 52 +--
src/gpu/assemble_MPI_vector_gpu.c | 52 +--
src/gpu/check_fields_gpu.c | 52 +--
src/gpu/compute_add_sources_elastic_gpu.c | 52 +--
src/gpu/compute_coupling_gpu.c | 52 +--
src/gpu/compute_forces_crust_mantle_gpu.c | 52 +--
src/gpu/compute_forces_inner_core_gpu.c | 52 +--
src/gpu/compute_forces_outer_core_gpu.c | 52 +--
src/gpu/compute_kernels_gpu.c | 52 +--
src/gpu/compute_stacey_acoustic_gpu.c | 52 +--
src/gpu/compute_stacey_elastic_gpu.c | 52 +--
src/gpu/gpu_buffer_list.c | 52 +--
src/gpu/initialize_gpu.c | 52 +--
src/gpu/mesh_constants_cuda.h | 52 +--
src/gpu/mesh_constants_gpu.h | 52 +--
src/gpu/mesh_constants_ocl.h | 52 +--
src/gpu/noise_tomography_gpu.c | 52 +--
src/gpu/prepare_mesh_constants_gpu.c | 52 +--
src/gpu/rules.mk | 1 +
src/gpu/save_and_compare_cpu_vs_gpu.c | 52 +--
src/gpu/transfer_fields_gpu.c | 52 +--
src/gpu/update_displacement_gpu.c | 52 +--
src/gpu/write_seismograms_gpu.c | 52 +--
src/meshfem3D/Makefile | 8 +-
src/meshfem3D/assemble_MPI_central_cube_mesh.f90 | 45 +-
src/meshfem3D/calc_jacobian.f90 | 45 +-
src/meshfem3D/compute_coordinates_grid.f90 | 4 +-
src/meshfem3D/compute_volumes_and_areas.F90 | 6 +-
src/meshfem3D/create_MPI_interfaces.f90 | 12 +-
src/meshfem3D/create_chunk_buffers.f90 | 21 +-
src/meshfem3D/create_mass_matrices.f90 | 187 ++------
src/meshfem3D/create_regions_mesh.F90 | 2 +-
src/meshfem3D/define_superbrick.f90 | 12 +-
src/meshfem3D/get_MPI_interfaces.f90 | 25 +-
src/meshfem3D/get_global.f90 | 306 -------------
src/meshfem3D/get_jacobian_boundaries.f90 | 15 +-
src/meshfem3D/get_model.f90 | 197 +++-----
src/meshfem3D/initialize_mesher.f90 | 4 +-
src/meshfem3D/meshfem3D_models.f90 | 42 +-
src/meshfem3D/model_aniso_mantle.f90 | 8 +-
src/meshfem3D/model_attenuation.f90 | 121 +++--
src/meshfem3D/model_crust_2_0.f90 | 5 +-
src/meshfem3D/model_crustmaps.f90 | 7 +-
src/meshfem3D/model_epcrust.f90 | 7 +-
src/meshfem3D/model_eucrust.f90 | 3 +-
src/meshfem3D/model_gapp2.f90 | 3 +-
src/meshfem3D/model_heterogen_mantle.f90 | 16 +-
src/meshfem3D/model_ppm.f90 | 30 +-
src/meshfem3D/model_s20rts.f90 | 6 +-
src/meshfem3D/model_s40rts.f90 | 6 +-
src/meshfem3D/moho_stretching.f90 | 4 +-
src/meshfem3D/rules.mk | 5 +-
src/meshfem3D/save_arrays_solver.f90 | 18 +-
src/meshfem3D/save_arrays_solver_adios.F90 | 18 +-
src/meshfem3D/sort_array_coordinates.f90 | 241 ----------
src/shared/Makefile | 8 +-
src/shared/adios_method_stubs.c | 85 ++--
src/shared/asdf_helpers.f90 | 10 +-
src/shared/asdf_helpers_definitions.f90 | 23 +-
src/shared/asdf_helpers_writers.f90 | 10 +-
src/shared/auto_ner.f90 | 4 +-
src/shared/count_number_of_sources.f90 | 8 +-
src/shared/exit_mpi.f90 | 4 +-
src/shared/force_ftz.c | 54 +--
src/shared/get_global.f90 | 128 ++++++
src/shared/get_model_parameters.f90 | 4 +-
src/shared/get_value_parameters.f90 | 101 -----
src/shared/model_topo_bathy.f90 | 7 +-
src/shared/parallel.f90 | 39 +-
src/shared/param_reader.c | 30 +-
src/shared/read_parameter_file.f90 | 193 ++++----
src/shared/read_value_parameters.f90 | 71 ---
src/shared/rthetaphi_xyz.f90 | 60 +--
src/shared/rules.mk | 3 +-
src/shared/save_header_file.F90 | 12 +-
src/shared/sort_array_coordinates.f90 | 223 +++++++++
src/shared/write_VTK_file.f90 | 2 -
src/shared/write_c_binary.c | 171 ++-----
src/specfem3D/Makefile | 8 +-
src/specfem3D/compute_add_sources.f90 | 12 +-
src/specfem3D/compute_arrays_source.f90 | 44 +-
src/specfem3D/compute_element.F90 | 500 +++++++++------------
.../compute_forces_acoustic_calling_routine.F90 | 31 +-
.../compute_forces_crust_mantle_noDev.f90 | 80 +---
src/specfem3D/compute_forces_inner_core_Dev.F90 | 79 +---
src/specfem3D/compute_forces_inner_core_noDev.f90 | 80 +---
src/specfem3D/compute_forces_outer_core_Dev.F90 | 28 +-
src/specfem3D/compute_forces_outer_core_noDev.f90 | 17 +-
src/specfem3D/compute_kernels.F90 | 4 +-
src/specfem3D/compute_seismograms.f90 | 41 +-
src/specfem3D/define_derivation_matrices.f90 | 75 +---
src/specfem3D/file_io_threads.c | 55 ++-
src/specfem3D/get_attenuation.f90 | 21 +-
src/specfem3D/get_cmt.f90 | 6 +-
src/specfem3D/get_event_info.f90 | 8 +-
src/specfem3D/initialize_simulation.f90 | 14 +-
src/specfem3D/locate_receivers.f90 | 14 +-
src/specfem3D/locate_sources.f90 | 25 +-
src/specfem3D/noise_tomography.f90 | 34 +-
src/specfem3D/prepare_timerun.f90 | 96 +---
src/specfem3D/rules.mk | 1 -
src/specfem3D/save_kernels.f90 | 9 +-
src/specfem3D/setup_sources_receivers.f90 | 4 +-
src/specfem3D/specfem3D_gpu_method_stubs.c | 335 +++++++-------
src/specfem3D/visual_vtk_stubs.c | 16 +-
src/specfem3D/write_movie_volume.f90 | 18 +-
src/specfem3D/write_output_ASCII.f90 | 12 +-
src/specfem3D/write_output_ASDF.F90 | 27 ++
src/specfem3D/write_output_SAC.f90 | 57 ++-
src/specfem3D/write_seismograms.f90 | 26 +-
src/specfem3D/write_specfem_adios_header.F90 | 12 +-
utils/Cluster/IDRIS/script_IDRIS_MPI.ll | 0
utils/Cluster/IDRIS/script_IDRIS_OpenMP.ll | 0
.../generate_trace_marenostrum.sh | 0
utils/Cluster/lsf/remap_database/remap.bash | 0
utils/Cluster/test_cache_size.f90 | 0
...components_SPECFEM3D_GLOBE_with_GMT_absolute.sh | 120 +++++
...onents_SPECFEM3D_GLOBE_with_GMT_differences.sh} | 0
...components_SPECFEM3D_GLOBE_with_GMT_absolute.sh | 69 +++
...onents_SPECFEM3D_GLOBE_with_GMT_differences.sh} | 0
...ector_norm_SPECFEM3D_GLOBE_with_GMT_absolute.sh | 33 ++
...r_norm_SPECFEM3D_GLOBE_with_GMT_differences.sh} | 0
.../Visualization/GMT/plot_gmt_movie_file_qinya.pl | 0
.../Visualization/GMT/plot_movie_GMT_ascii_PNG.pl | 0
.../opendx_AVS/add_logo_to_images.csh | 0
.../opendx_AVS/assemble_final_MPEG_movie.csh | 0
.../opendx_AVS/create_mpeg_OpenDX_sequences.csh | 0
.../opendx_AVS/create_mpeg_title_sequences.csh | 0
.../opendx_AVS/shrink_elements_OpenDX_mesh.pl | 0
utils/adjoint_sources/amplitude/compile_cut | 12 -
utils/adjoint_sources/traveltime/compile_cut | 12 -
utils/attenuation/{makefile => build.csh} | 0
utils/clean_sac_headers_after_crash.sh | 0
.../doubling_brick/shrink_elements_OpenDX_mesh.pl | 0
149 files changed, 2444 insertions(+), 3728 deletions(-)
More information about the CIG-COMMITS
mailing list