[cig-commits] [commit] devel: Merge remote-tracking branch 'upstream/devel' into devel (16bd156)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/specfem2d

On branch  : devel
Link       : https://github.com/geodynamics/specfem2d/compare/e4fa9d03bf2b0fc1837c42aa51eeb63f360575fe...fc67e6fd7ad890705b2b72b4b3c509accb22249e

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

commit 16bd15649c8ccd6c6c0121bb678e426b5eb7f552
Merge: 9662ffc 22eda3d
Author: Alexis Bottero <alexis.bottero at gmail.com>
Date:   Thu Mar 27 18:38:50 2014 +0100

    Merge remote-tracking branch 'upstream/devel' into devel
    
    Conflicts:
    	src/specfem2D/pml_init.F90



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

16bd15649c8ccd6c6c0121bb678e426b5eb7f552
 DATA/Par_file                                    |    6 +-
 src/meshfem2D/meshfem2D.F90                      |   13 +
 src/meshfem2D/part_unstruct.F90                  |  246 +++++
 src/meshfem2D/read_parameter_file.F90            |   17 +-
 src/meshfem2D/save_databases.f90                 |   21 +-
 src/specfem2D/Makefile.in                        |    8 +
 src/specfem2D/acoustic_forcing_boundary.f90      |  169 +++
 src/specfem2D/compute_forces_acoustic.f90        |   13 +-
 src/specfem2D/compute_forces_gravitoacoustic.f90 |  555 ++++++++++
 src/specfem2D/compute_pressure.f90               |   54 +-
 src/specfem2D/compute_vector_field.f90           |   96 +-
 src/specfem2D/define_external_model.f90          |  143 ++-
 src/specfem2D/initialize_simulation.F90          |   21 +-
 src/specfem2D/invert_mass_matrix.F90             |   58 +-
 src/specfem2D/read_databases.F90                 |  171 ++-
 src/specfem2D/read_external_model.f90            |   27 +-
 src/specfem2D/specfem2D.F90                      | 1199 ++++++++++++++++++++--
 17 files changed, 2611 insertions(+), 206 deletions(-)