[cig-commits] [commit] master: Merge remote-tracking branch 'origin/devel' (b01e61f)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Tue Dec 9 17:44:12 PST 2014


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

On branch  : master
Link       : https://github.com/geodynamics/specfem2d/compare/80c11355aa306e725f4be28b0aee6d40e48527ef...b01e61f34153205fa9f7b39257a5c155b904258c

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

commit b01e61f34153205fa9f7b39257a5c155b904258c
Merge: 80c1135 a5ff68e
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date:   Wed Dec 10 02:43:39 2014 +0100

    Merge remote-tracking branch 'origin/devel'



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

b01e61f34153205fa9f7b39257a5c155b904258c
 .gitignore                                         |    5 +
 .../Par_file_Gmsh_SqrCircles.in                    |   97 +-
 .../Gmsh_example_Stacey_MPI/run_this_example.sh    |    3 -
 .../Par_file_Gmsh_SqrCircles.in                    |   99 +-
 .../Gmsh_example_Stacey_serial/run_this_example.sh |    3 -
 EXAMPLES/LuoYang_fluid_solid_kernel/Par_file       |   39 +-
 .../LuoYang_fluid_solid_kernel/run_this_example.sh |    3 -
 .../Rayleigh_wave_no_crack/Par_file_Rayleigh_2D    |   72 +-
 .../Rayleigh_wave_no_crack/run_this_example.sh     |    3 -
 .../Rayleigh_wave_with_crack/Par_file_Rayleigh_2D  |   72 +-
 .../Rayleigh_wave_with_crack/run_this_example.sh   |    3 -
 EXAMPLES/Tape2007/Par_file_Tape2007_132rec_checker |   72 +-
 EXAMPLES/Tape2007/Par_file_Tape2007_onerec         |   71 +-
 EXAMPLES/Tape2007/run_this_example.sh              |    3 -
 EXAMPLES/Tape2007_kernel/Par_file_Tape2007_onerec  |   73 +-
 EXAMPLES/Tape2007_kernel/run_this_example.sh       |    3 -
 EXAMPLES/Tromp2005/Par_file_Tromp2005              |   74 +-
 EXAMPLES/Tromp2005/Par_file_Tromp2005_s100         |   74 +-
 EXAMPLES/Tromp2005/run_this_example.sh             |    3 -
 EXAMPLES/Tromp2005_kernel/Par_file_Tromp2005       |   72 +-
 EXAMPLES/Tromp2005_kernel/run_this_example.sh      |    3 -
 .../INDUSTRIAL_FORMAT/Par_file                     |   76 +-
 .../noise_layered/model_0/Par_file_fair            |   81 +-
 .../noise_layered/model_0/Par_file_good            |   80 +-
 .../noise_layered/model_1/Par_file_best            |   80 +-
 .../noise_layered/model_1/Par_file_fair            |   80 +-
 .../noise_layered/model_1/Par_file_good            |   80 +-
 .../noise_layered/model_2/Par_file_fair            |   78 +-
 .../noise_layered/model_2/Par_file_good            |   78 +-
 .../noise_uniform/Par_file_noise_1                 |   78 +-
 .../noise_uniform/Par_file_noise_2                 |   78 +-
 .../noise_uniform/Par_file_noise_3                 |   79 +-
 .../Par_file_attenuation_2D                        |   80 +-
 .../run_this_example.sh                            |    3 -
 .../Par_file_acoustic_poroelastic                  |   74 +-
 EXAMPLES/acoustic_poroelastic/run_this_example.sh  |    3 -
 EXAMPLES/anisotropic_zinc_crystal/DATA/Par_file    |   10 +-
 EXAMPLES/attenuation/Par_file_attenuation_2D       |   72 +-
 EXAMPLES/attenuation/run_this_example.sh           |    3 -
 .../Par_file_axisym                                |   82 +-
 EXAMPLES/axisymmetric_case_AXISYM_option/README    |   25 +
 .../REFERENCE_SEISMOS/AA.S0001.BXX.semv            | 4500 ++++++++++++++++++++
 .../REFERENCE_SEISMOS/AA.S0001.BXZ.semv            | 4500 ++++++++++++++++++++
 .../REFERENCE_SEISMOS/AA.S0002.BXX.semv            | 4500 ++++++++++++++++++++
 .../REFERENCE_SEISMOS/AA.S0002.BXZ.semv            | 4500 ++++++++++++++++++++
 .../REFERENCE_SEISMOS/AA.S0003.BXX.semv            | 4500 ++++++++++++++++++++
 .../REFERENCE_SEISMOS/AA.S0003.BXZ.semv            | 4500 ++++++++++++++++++++
 .../REFERENCE_SEISMOS/Ux_file_single.bin           |  Bin 0 -> 54000 bytes
 .../REFERENCE_SEISMOS/Uz_file_single.bin           |  Bin 0 -> 54000 bytes
 .../SOURCE_axisym}                                 |    4 +-
 .../interfaces_axisym.dat                          |   36 +
 .../run_this_example.sh                            |   70 +
 EXAMPLES/canyon/Par_file_canyon                    |   74 +-
 EXAMPLES/canyon/run_this_example.sh                |    3 -
 .../fluid_solid_external_mesh/Par_file_fluid_solid |   74 +-
 .../fluid_solid_external_mesh/run_this_example.sh  |    3 -
 .../Par_file_fluid_solid                           |   72 +-
 .../run_this_example.sh                            |    3 -
 .../Par_file_fluid_solid                           |   73 +-
 .../run_this_example.sh                            |    3 -
 EXAMPLES/global_Earth_ak135f/DATA/Par_file         |   87 +-
 EXAMPLES/initial_plane_wave/Par_file_Slave         |   84 +-
 EXAMPLES/initial_plane_wave/Par_file_Slave_for     |   85 +-
 EXAMPLES/initial_plane_wave/Par_file_Slave_kernel  |   84 +-
 EXAMPLES/initial_plane_wave/run_this_example.sh    |    3 -
 .../salt_dome_CUBIT_mesh/CPML_homogeneous/Par_file |   47 +-
 .../CPML_homogeneous/run_this_example.sh           |    3 -
 .../CPML_normal_fluid_solid/Par_file               |   41 +-
 .../CPML_normal_fluid_solid/run_this_example.sh    |    3 -
 .../CPML_normal_solid_only/Par_file                |   43 +-
 .../CPML_normal_solid_only/run_this_example.sh     |    3 -
 .../Stacey_homogeneous/Par_file                    |   43 +-
 .../Stacey_homogeneous/run_this_example.sh         |    3 -
 .../Stacey_normal_fluid_solid/Par_file             |   43 +-
 .../Stacey_normal_fluid_solid/run_this_example.sh  |    3 -
 EXAMPLES/semi_infinite_homo/Par_file_elastic_2D    |   76 +-
 EXAMPLES/semi_infinite_homo/run_this_example.sh    |    5 +-
 .../Par_file_simple_topo                           |   76 +-
 .../run_this_example.sh                            |    5 +-
 .../Par_file_Abel_Balanche_bathy_source_solid      |   82 +-
 .../thermocline/extract_thermocline.f90            |    0
 ...rated_by_the_Python_script_of_Paul_Cristini.png |  Bin 0 -> 50098 bytes
 ...hallow_water_profile_script_by_Paul_Cristini.py |   46 +
 .../thermocline/plot_thermocline.gnu               |    0
 EXAMPLES/thermocline/run_this_example.sh           |    3 -
 {UTILS => EXAMPLES}/thermocline/ssp_example1.png   |  Bin
 {UTILS => EXAMPLES}/thermocline/thermocline.dat    |    0
 .../thermocline/thermocline_final.gif              |  Bin
 .../thermocline/thermocline_original.gif           |  Bin
 EXAMPLES/vi_all_2D_Par_files.csh                   |    2 +-
 ...{cubit2specfem2d_abs4.py => cubit2specfem2d.py} |   12 +-
 UTILS/cubit2specfem2d/cubit2specfem2d_original.py  |  434 --
 ...ix_negative_Jacobians_from_Ronan_Madec_2009.py} |    0
 flags.guess                                        |    6 +-
 ...in_directory_utils_in_the_SPECFEM3D_package.txt |    0
 ...st_of_things_to_do_in_the_SPECFEM3D_package.txt |    3 -
 setup/constants.h.in                               |    4 +-
 src/specfem2D/Makefile.in                          |   63 +
 src/specfem2D/acoustic_forcing_boundary.f90        |   57 +-
 src/specfem2D/assemble_MPI.F90                     |  133 +-
 src/specfem2D/attenuation_model.f90                |   87 +-
 src/specfem2D/axisymmetric_routines.f90            |   30 +-
 src/specfem2D/check_stability.F90                  |   37 +-
 src/specfem2D/checkgrid.F90                        |   79 +-
 src/specfem2D/compute_arrays_source.f90            |   39 +-
 src/specfem2D/compute_coupling_acoustic_el.f90     |   56 +-
 src/specfem2D/compute_coupling_viscoelastic_ac.f90 |   58 +-
 src/specfem2D/compute_curl_one_element.f90         |   34 +-
 src/specfem2D/compute_energy.f90                   |  112 +-
 src/specfem2D/compute_forces_acoustic.f90          |  117 +-
 src/specfem2D/compute_forces_gravitoacoustic.f90   |   70 +-
 src/specfem2D/compute_forces_poro_fluid.f90        |  131 +-
 src/specfem2D/compute_forces_poro_solid.f90        |  129 +-
 src/specfem2D/compute_forces_viscoelastic.F90      |  193 +-
 src/specfem2D/compute_pressure.f90                 |  140 +-
 src/specfem2D/compute_vector_field.f90             |   99 +-
 src/specfem2D/construct_acoustic_surface.f90       |   11 +-
 src/specfem2D/create_color_image.f90               |  109 +-
 src/specfem2D/createnum_fast.f90                   |   14 +-
 src/specfem2D/createnum_slow.f90                   |    8 +-
 src/specfem2D/define_derivation_matrices.f90       |   27 +-
 src/specfem2D/define_external_model.f90            |   11 +-
 src/specfem2D/enforce_acoustic_free_surface.f90    |   16 +-
 src/specfem2D/get_MPI.F90                          |   62 +-
 src/specfem2D/get_global.f90                       |    9 +-
 src/specfem2D/gmat01.f90                           |  109 +-
 src/specfem2D/initialize_simulation.F90            |   31 +-
 src/specfem2D/invert_mass_matrix.F90               |  103 +-
 src/specfem2D/locate_receivers.F90                 |    2 +-
 src/specfem2D/noise_tomography.f90                 |   94 +-
 src/specfem2D/paco_beyond_critical.f90             |   39 +-
 src/specfem2D/plotgll.f90                          |    9 +-
 src/specfem2D/plotpost.F90                         |  248 +-
 src/specfem2D/pml_init.F90                         |   70 +-
 src/specfem2D/prepare_absorb.f90                   |   74 +-
 src/specfem2D/prepare_assemble_MPI.F90             |   36 +-
 src/specfem2D/prepare_color_image.F90              |   91 +-
 src/specfem2D/prepare_initialfield.F90             |   67 +-
 src/specfem2D/prepare_source_time_function.f90     |   49 +-
 src/specfem2D/read_databases.F90                   |  287 +-
 src/specfem2D/read_external_model.f90              |   62 +-
 src/specfem2D/set_sources.f90                      |   23 +-
 src/specfem2D/setup_sources_receivers.F90          |   59 +-
 src/specfem2D/specfem2D.F90                        | 1724 +-------
 src/specfem2D/specfem2D_par.f90                    |  786 ++++
 src/specfem2D/update_displacement_scheme.F90       |   61 +-
 src/specfem2D/write_seismograms.F90                |   51 +-
 147 files changed, 31056 insertions(+), 5761 deletions(-)



More information about the CIG-COMMITS mailing list