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

[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 bc5868821b7ff670b9cb41e8b53f73aec8d836b7
Merge: e70ef6f d6f39eb
Author: Dimitri Komatitsch <komatits at users.noreply.github.com>
Date:   Thu Jun 26 23:53:49 2014 +0200

    Merge pull request #161 from komatits/devel
    
    put Matthieu Lefebvre's support for ADIOS_FOR_UNDO_ATTENUATION back (the...



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

bc5868821b7ff670b9cb41e8b53f73aec8d836b7
 DATA/Par_file                                      |   2 +-
 .../Par_file                                       |   6 +
 .../SEMD/DATA/Par_file                             |   6 +
 .../SEMD/DATA/Par_file                             |   6 +
 .../SEMD/DATA/Par_file                             |   6 +
 .../global_PREM_kernels/amplitude/DATA/Par_file    |   6 +
 .../global_PREM_kernels/traveltime/DATA/Par_file   |   6 +
 EXAMPLES/global_s362ani_shakemovie/DATA/Par_file   |   6 +
 .../global_long/Par_file_NOISE_1_attenuation       |   6 +
 .../global_long/Par_file_NOISE_1_noattenuation     |   6 +
 .../global_long/Par_file_NOISE_2_attenuation       |   6 +
 .../global_long/Par_file_NOISE_2_noattenuation     |   6 +
 .../global_long/Par_file_NOISE_3_noattenuation     |   6 +
 .../global_short/Par_file_NOISE_1_attenuation      |   6 +
 .../global_short/Par_file_NOISE_1_noattenuation    |   6 +
 .../global_short/Par_file_NOISE_2_attenuation      |   6 +
 .../global_short/Par_file_NOISE_2_noattenuation    |   6 +
 .../global_short/Par_file_NOISE_3_noattenuation    |   6 +
 .../regional/Par_file_NOISE_1_attenuation          |   6 +
 .../regional/Par_file_NOISE_1_noattenuation        |   6 +
 .../regional/Par_file_NOISE_2_attenuation          |   6 +
 .../regional/Par_file_NOISE_2_noattenuation        |   6 +
 .../regional/Par_file_NOISE_3_noattenuation        |   6 +
 .../test_global/Par_file_NOISE_1_attenuation       |   6 +
 .../test_global/Par_file_NOISE_1_noattenuation     |   6 +
 .../test_global/Par_file_NOISE_2_attenuation       |   6 +
 .../test_global/Par_file_NOISE_2_noattenuation     |   6 +
 .../test_global/Par_file_NOISE_3_noattenuation     |   6 +
 .../test_regional/Par_file_NOISE_1_attenuation     |   6 +
 .../test_regional/Par_file_NOISE_1_noattenuation   |   6 +
 .../test_regional/Par_file_NOISE_2_attenuation     |   6 +
 .../test_regional/Par_file_NOISE_2_noattenuation   |   6 +
 .../test_regional/Par_file_NOISE_3_noattenuation   |   6 +
 EXAMPLES/regional_Greece_noise_small/DATA/Par_file |   6 +
 EXAMPLES/regional_Greece_small/DATA/Par_file       |   6 +
 EXAMPLES/regional_MiddleEast/DATA/Par_file         |   6 +
 .../Par_file                                       |   6 +
 src/shared/adios_method_stubs.c                    |   4 +
 src/shared/broadcast_computed_parameters.f90       |   5 +-
 src/shared/read_parameter_file.f90                 |   2 +
 src/shared/shared_par.f90                          |   2 +-
 src/specfem3D/read_forward_arrays.f90              |  74 +++++-----
 src/specfem3D/read_forward_arrays_adios.F90        | 163 +++++++++++++++++++++
 src/specfem3D/save_forward_arrays.f90              |  75 +++++-----
 src/specfem3D/save_forward_arrays_adios.F90        | 161 +++++++++++++++++++-
 45 files changed, 628 insertions(+), 76 deletions(-)