[cig-commits] [commit] devel, master: merges with upstream version (753122f)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Nov 6 08:31:24 PST 2014
Repository : https://github.com/geodynamics/specfem3d_globe
On branches: devel,master
Link : https://github.com/geodynamics/specfem3d_globe/compare/bc58e579b3b0838a0968725a076f5904845437ca...be63f20cbb6f462104e949894dbe205d2398cd7f
>---------------------------------------------------------------
commit 753122f036cd0bd80e65389eeb06a507ccd14ed8
Merge: d2dff12 0aa2df0
Author: daniel peter <peterda at ethz.ch>
Date: Tue Sep 16 15:23:23 2014 +0200
merges with upstream version
>---------------------------------------------------------------
753122f036cd0bd80e65389eeb06a507ccd14ed8
DATA/Par_file | 2 +-
DATA/cemRequest/readme.txt | 10 +
Makefile.in | 7 +-
configure | 99 ++--
configure.ac | 46 +-
...omatitsch_and_Jean_Pierre_Vilotte_04apr1995.pdf | Bin 0 -> 1860437 bytes
doc/USER_MANUAL/manual_SPECFEM3D_GLOBE.pdf | Bin 24370999 -> 24378184 bytes
doc/USER_MANUAL/manual_SPECFEM3D_GLOBE.tex | 2 +-
flags.guess | 67 ++-
src/auxiliaries/combine_vol_data.F90 | 8 +-
src/auxiliaries/combine_vol_data_shared.f90 | 569 ---------------------
src/auxiliaries/rules.mk | 257 ++++++++--
src/gpu/boast/FUNCTIONS.rb | 12 +
src/gpu/boast/assemble_boundary_accel_on_device.rb | 4 +-
src/gpu/boast/compute_acoustic_kernel.rb | 4 +-
.../boast/compute_add_sources_adjoint_kernel.rb | 4 +-
src/gpu/boast/compute_add_sources_kernel.rb | 4 +-
src/gpu/boast/compute_ani_kernel.rb | 4 +-
src/gpu/boast/compute_ani_undo_att_kernel.rb | 4 +-
src/gpu/boast/compute_coupling_fluid_CMB_kernel.rb | 4 +-
src/gpu/boast/compute_coupling_ocean_kernel.rb | 4 +-
src/gpu/boast/compute_hess_kernel.rb | 4 +-
src/gpu/boast/compute_iso_kernel.rb | 4 +-
src/gpu/boast/compute_rho_kernel.rb | 4 +-
src/gpu/boast/compute_stacey_acoustic_kernel.rb | 4 +-
src/gpu/boast/compute_stacey_elastic_kernel.rb | 4 +-
src/gpu/boast/compute_strain_kernel.rb | 4 +-
src/gpu/boast/compute_strength_noise_kernel.rb | 4 +-
src/gpu/boast/get_maximum_scalar_kernel.rb | 4 +-
src/gpu/boast/inner_core_impl_kernel_forward.rb | 84 +--
src/gpu/boast/kernels.rb | 9 +-
.../boast/noise_add_source_master_rec_kernel.rb | 4 +-
src/gpu/boast/noise_add_surface_movie_kernel.rb | 4 +-
.../boast/noise_transfer_surface_to_host_kernel.rb | 4 +-
src/gpu/boast/outer_core_impl_kernel_forward.rb | 78 +--
src/gpu/boast/prepare_boundary_accel_on_device.rb | 4 +-
src/gpu/boast/update_disp_veloc_kernel.rb | 4 +-
...rite_seismograms_transfer_from_device_kernel.rb | 4 +-
.../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 +-
src/meshfem3D/compute_coordinates_grid.f90 | 2 +-
src/meshfem3D/create_meshes.f90 | 4 +
src/meshfem3D/create_regions_mesh.F90 | 21 +-
src/meshfem3D/{get_model.f90 => get_model.F90} | 9 +-
.../{meshfem3D_models.f90 => meshfem3D_models.F90} | 25 +-
src/meshfem3D/meshfem3D_par.f90 | 3 +-
src/meshfem3D/model_cem.f90 | 19 +-
src/meshfem3D/model_ppm.f90 | 2 +-
src/meshfem3D/moho_stretching.f90 | 4 +-
src/meshfem3D/rules.mk | 2 -
src/meshfem3D/write_AVS_DX_global_chunks_data.f90 | 3 +
.../write_AVS_DX_global_chunks_data_adios.f90 | 8 +-
src/meshfem3D/write_AVS_DX_global_faces_data.f90 | 3 +
.../write_AVS_DX_global_faces_data_adios.f90 | 3 +
src/meshfem3D/write_AVS_DX_surface_data.f90 | 3 +
src/meshfem3D/write_AVS_DX_surface_data_adios.f90 | 3 +
src/shared/asdf_helpers_definitions.f90 | 2 +-
src/shared/broadcast_computed_parameters.f90 | 7 +-
...del_parameters.f90 => get_model_parameters.F90} | 28 +-
src/shared/make_ellipticity.f90 | 45 ++
src/shared/read_compute_parameters.f90 | 3 +-
src/shared/shared_par.f90 | 3 +-
src/specfem3D/comp_source_time_function.f90 | 8 +-
src/specfem3D/compute_add_sources.f90 | 2 +
src/specfem3D/get_cmt.f90 | 2 +-
src/specfem3D/locate_receivers.f90 | 3 +
src/specfem3D/locate_sources.f90 | 3 +
src/specfem3D/setup_sources_receivers.f90 | 4 +-
src/specfem3D/write_output_SAC.f90 | 2 +-
153 files changed, 1315 insertions(+), 1469 deletions(-)
diff --cc src/meshfem3D/model_cem.f90
index 4994e6a,7724e51..062815b
--- a/src/meshfem3D/model_cem.f90
+++ b/src/meshfem3D/model_cem.f90
@@@ -67,9 -66,8 +66,7 @@@ subroutine model_cem_broadcast ( myran
call return_populated_arrays (reg3Bc, "vpp", 3)
call synchronize_all ()
- if (myrank == 0 ) print *, "Finished reading in netcdf."
--
- end if
+ endif
end subroutine model_cem_broadcast
diff --cc src/specfem3D/get_cmt.f90
index 7e12553,176a1d3..57ea19b
--- a/src/specfem3D/get_cmt.f90
+++ b/src/specfem3D/get_cmt.f90
@@@ -315,9 -148,9 +315,9 @@@
! If we're using external stf, don't worry about hdur.
if (EXTERNAL_SOURCE_TIME_FUNCTION) then
hdur(:) = 0.d0
- end if
+ endif
- close(1)
+ close(IIN)
! Sets tshift_cmt to zero to initiate the simulation!
if (NSOURCES == 1) then
More information about the CIG-COMMITS
mailing list