[cig-commits] [commit] devel, master: Merge pull request #155 from komatits/devel (c75d818)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/specfem3d_globe

On branches: devel,master
Link       : https://github.com/geodynamics/specfem3d_globe/compare/bc58e579b3b0838a0968725a076f5904845437ca...be63f20cbb6f462104e949894dbe205d2398cd7f

>---------------------------------------------------------------

commit c75d8182e54f18602f8b7689181fb54ded8f7f29
Merge: c285e06 10a92ce
Author: Dimitri Komatitsch <komatits at users.noreply.github.com>
Date:   Tue Jun 24 10:34:38 2014 +0200

    Merge pull request #155 from komatits/devel
    
    moved ATTENUATION_1D_WITH_3D_STORAGE from the Par_file to setup/constant...



>---------------------------------------------------------------

c75d8182e54f18602f8b7689181fb54ded8f7f29
 DATA/Par_file                                      |  1 -
 .../Par_file                                       |  1 -
 .../SEMD/DATA/Par_file                             |  1 -
 .../SEMD/DATA/Par_file                             |  1 -
 .../SEMD/DATA/Par_file                             |  1 -
 .../global_PREM_kernels/amplitude/DATA/Par_file    |  1 -
 .../global_PREM_kernels/traveltime/DATA/Par_file   |  1 -
 EXAMPLES/global_s362ani_shakemovie/DATA/Par_file   |  1 -
 .../global_long/Par_file_NOISE_1_attenuation       |  1 -
 .../global_long/Par_file_NOISE_1_noattenuation     |  1 -
 .../global_long/Par_file_NOISE_2_attenuation       |  1 -
 .../global_long/Par_file_NOISE_2_noattenuation     |  1 -
 .../global_long/Par_file_NOISE_3_noattenuation     |  1 -
 .../global_short/Par_file_NOISE_1_attenuation      |  1 -
 .../global_short/Par_file_NOISE_1_noattenuation    |  1 -
 .../global_short/Par_file_NOISE_2_attenuation      |  1 -
 .../global_short/Par_file_NOISE_2_noattenuation    |  1 -
 .../global_short/Par_file_NOISE_3_noattenuation    |  1 -
 .../regional/Par_file_NOISE_1_attenuation          |  1 -
 .../regional/Par_file_NOISE_1_noattenuation        |  1 -
 .../regional/Par_file_NOISE_2_attenuation          |  1 -
 .../regional/Par_file_NOISE_2_noattenuation        |  1 -
 .../regional/Par_file_NOISE_3_noattenuation        |  1 -
 EXAMPLES/regional_Greece_noise_small/DATA/Par_file |  1 -
 EXAMPLES/regional_Greece_small/DATA/Par_file       |  1 -
 EXAMPLES/regional_MiddleEast/DATA/Par_file         |  1 -
 .../Par_file                                       |  1 -
 m4                                                 |  2 +-
 setup/constants.h.in                               | 66 +++++++++++++---------
 src/gpu/prepare_mesh_constants_gpu.c               |  0
 src/meshfem3D/meshfem3D_par.f90                    |  3 +-
 src/shared/broadcast_computed_parameters.f90       | 23 ++++----
 src/shared/read_compute_parameters.f90             |  3 +-
 src/shared/read_parameter_file.f90                 |  8 +--
 src/shared/save_header_file.F90                    |  2 +-
 src/shared/shared_par.f90                          |  2 +-
 src/specfem3D/prepare_timerun.f90                  |  0
 37 files changed, 57 insertions(+), 79 deletions(-)