[cig-commits] [commit] QA: Merge remote-tracking branch 'upstream/devel' into devel (353252b)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Feb 3 11:30:05 PST 2014
Repository : ssh://geoshell/specfem3d
On branch : QA
Link : https://github.com/geodynamics/specfem3d/compare/10e3bb919590b2040fe0bb30a8cd814d2ceb6b4a...56deeb214ac966cde7e955473d9e61288b16d98f
>---------------------------------------------------------------
commit 353252bf2d5267ed014661fd09934f70b88e6903
Merge: dd29b92 10e3bb9
Author: Matthieu Lefebvre <ml15 at princeton.edu>
Date: Mon Feb 3 10:27:17 2014 -0500
Merge remote-tracking branch 'upstream/devel' into devel
Conflicts:
src/shared/read_value_parameters.f90
>---------------------------------------------------------------
353252bf2d5267ed014661fd09934f70b88e6903
Makefile.in | 343 ++++++--
configure | 888 +++++++++++++++------
configure.ac | 178 ++++-
obj/che/.keep | 0
obj/dec/.keep | 0
obj/gen/.keep | 0
obj/mesh/.keep | 0
obj/spec/.keep | 0
config.h.in => setup/config.h.in | 2 +-
{src/shared => setup}/constants.h.in | 0
{src/shared => setup}/precision.h.in | 0
src/{shared => auxiliaries}/combine_surf_data.f90 | 0
src/{shared => auxiliaries}/combine_vol_data.f90 | 47 +-
.../combine_vol_data_adios_impl.f90 | 22 +-
.../combine_vol_data_adios_stubs.f90 | 0
.../combine_vol_data_impl.f90 | 0
.../convolve_source_timefunction.f90 | 0
.../create_movie_shakemap_AVS_DX_GMT.f90 | 93 ++-
src/{specfem3D => auxiliaries}/model_update.f90 | 145 ++--
src/auxiliaries/rules.mk | 303 +++++++
.../save_external_bin_m_up.f90 | 4 +-
src/{shared => auxiliaries}/smooth_vol_data.f90 | 25 +-
src/{shared => auxiliaries}/sum_kernels.f90 | 39 +-
.../{Makefile.in => rules.mk} | 79 +-
src/cuda/check_fields_cuda.cu | 32 +-
src/cuda/initialize_cuda.cu | 163 +++-
src/cuda/mesh_constants_cuda.h | 2 +-
src/cuda/rules.mk | 108 +++
src/cuda/specfem3D_gpu_cuda_method_stubs.c | 84 +-
...acement_cuda.cu => update_displacement_cuda.cu} | 8 +-
src/decompose_mesh/Makefile.in | 142 ----
src/decompose_mesh/fault_scotch.f90 | 2 +-
src/decompose_mesh/part_decompose_mesh.f90 | 2 +-
src/decompose_mesh/rules.mk | 113 +++
src/generate_databases/Makefile.in | 318 --------
src/generate_databases/generate_databases.f90 | 4 +
.../generate_databases_adios_stubs.f90 | 71 +-
src/generate_databases/get_model.f90 | 2 +
src/generate_databases/model_gll_adios.F90 | 11 +-
src/generate_databases/model_ipati_adios.F90 | 18 +-
.../pml_set_local_dampingcoeff.f90 | 0
.../read_partition_files_adios.F90 | 41 +-
src/generate_databases/rules.mk | 245 ++++++
.../save_arrays_solver_adios.F90 | 28 +-
src/generate_databases/save_moho_adios.F90 | 16 +-
src/meshfem3D/Makefile.in | 335 --------
src/meshfem3D/read_value_mesh_parameters.f90 | 11 +-
src/meshfem3D/rules.mk | 168 ++++
src/meshfem3D/save_databases_adios.F90 | 19 +-
src/shared/adios_helpers_definitions.f90 | 2 +-
src/shared/adios_manager.F90 | 17 +-
src/shared/adios_manager_stubs.f90 | 2 +-
src/shared/parallel.f90 | 88 ++
src/shared/read_parameter_file.f90 | 1 +
src/shared/read_value_parameters.f90 | 6 +-
src/shared/rules.mk | 153 ++++
src/shared/serial.f90 | 66 +-
src/specfem3D/Makefile.in | 625 ---------------
src/specfem3D/assemble_MPI_vector.f90 | 123 +--
src/specfem3D/comp_source_time_function.f90 | 12 +-
src/specfem3D/compute_add_sources_acoustic.f90 | 9 +-
src/specfem3D/compute_add_sources_poroelastic.f90 | 3 +-
src/specfem3D/compute_add_sources_viscoelastic.f90 | 10 +-
src/specfem3D/compute_adj_source_frechet.f90 | 4 +-
src/specfem3D/compute_arrays_source.f90 | 12 +-
src/specfem3D/compute_boundary_kernel.f90 | 3 +-
src/specfem3D/compute_coupling_acoustic_el.f90 | 4 +-
src/specfem3D/compute_coupling_acoustic_po.f90 | 3 +-
src/specfem3D/compute_coupling_poroelastic_ac.f90 | 3 +-
src/specfem3D/compute_coupling_poroelastic_el.f90 | 3 +-
src/specfem3D/compute_coupling_viscoelastic_ac.f90 | 10 +-
src/specfem3D/compute_coupling_viscoelastic_po.f90 | 3 +-
.../compute_forces_acoustic_calling_routine.f90 | 4 +-
.../compute_forces_poroelastic_calling_routine.f90 | 3 +-
src/specfem3D/compute_forces_viscoelastic_Dev.F90 | 2 +-
...compute_forces_viscoelastic_calling_routine.F90 | 2 +-
.../compute_forces_viscoelastic_noDev.f90 | 2 +-
src/specfem3D/compute_gradient.f90 | 3 +-
src/specfem3D/compute_interpolated_dva.f90 | 6 +-
src/specfem3D/compute_kernels.f90 | 3 +-
src/specfem3D/compute_stacey_acoustic.f90 | 12 +-
src/specfem3D/compute_stacey_poroelastic.f90 | 4 +-
src/specfem3D/compute_stacey_viscoelastic.f90 | 69 +-
src/specfem3D/create_color_image.f90 | 4 +-
src/specfem3D/fault_solver_dynamic.f90 | 4 +-
src/specfem3D/fault_solver_kinematic.f90 | 2 +-
src/specfem3D/finalize_simulation.f90 | 0
src/specfem3D/gravity_perturbation.f90 | 9 +-
src/specfem3D/initialize_simulation.f90 | 9 +-
src/specfem3D/locate_receivers.f90 | 8 +-
src/specfem3D/locate_source.f90 | 4 +-
src/specfem3D/make_gravity.f90 | 12 +-
src/specfem3D/multiply_arrays_source.f90 | 4 +-
src/specfem3D/noise_tomography.f90 | 59 +-
src/specfem3D/pml_allocate_arrays.f90 | 0
src/specfem3D/pml_compute_memory_variables.f90 | 6 +-
src/specfem3D/read_forward_arrays_adios.F90 | 14 +-
src/specfem3D/read_mesh_databases_adios.F90 | 117 +--
src/specfem3D/rules.mk | 406 ++++++++++
src/specfem3D/save_forward_arrays_adios.F90 | 17 +-
src/specfem3D/save_kernels_adios.F90 | 13 +-
src/specfem3D/setup_movie_meshes.f90 | 2 +-
src/specfem3D/update_displacement_scheme.f90 | 2 +-
src/specfem3D/write_movie_output.f90 | 3 +-
src/specfem3D/write_output_ASCII.f90 | 4 +-
src/specfem3D/write_output_SU.f90 | 5 +-
src/specfem3D/write_seismograms.f90 | 13 +-
107 files changed, 3678 insertions(+), 2422 deletions(-)
More information about the CIG-COMMITS
mailing list