[cig-commits] [commit] devel: Merge branch 'devel' of https://github.com/geodynamics/specfem3d into devel (beeb92a)

[cig_noreply at geodynamics.org]

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

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/0479069f470e39347345ab3d4aff453320ac453e...57f2934cebe2e3d82d758afd2da6bf77d96c901d

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

commit beeb92aaa127bcdcbf9cce82a3d63d5dd09b9072
Merge: 99d8198 0479069
Author: Clément Durochat <c.durochat at gmail.com>
Date:   Mon Oct 20 09:54:35 2014 +0200

    Merge branch 'devel' of https://github.com/geodynamics/specfem3d into devel



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

beeb92aaa127bcdcbf9cce82a3d63d5dd09b9072
 configure                                          |    5 +-
 doc/USER_MANUAL/manual_SPECFEM3D_Cartesian.tex     |    4 -
 m4                                                 |    2 +-
 setup/constants_tomography.h.in                    |   24 +-
 .../scotch_5.1.12b/src/libscotch/common.c          |    8 +-
 src/shared/parallel.f90                            |   22 +
 src/shared/serial.f90                              |   17 +
 src/tomography/add_model_iso.f90                   |  277 ++++
 src/tomography/compute_kernel_integral.f90         |  734 +++++++++
 src/tomography/get_gradient_cg.f90                 |  479 ++++++
 src/tomography/get_gradient_steepest.f90           |  435 ++++++
 src/tomography/model_update.f90                    | 1642 +++++++++-----------
 src/tomography/read_kernels.f90                    |  269 ++++
 src/tomography/read_kernels_cg.f90                 |  291 ++++
 src/tomography/read_model.f90                      |  330 ++++
 src/tomography/read_parameters_tomo.f90            |  122 ++
 src/tomography/rules.mk                            |   66 +-
 src/tomography/save_external_bin_m_up.f90          |   14 +-
 src/tomography/smooth_sem.f90                      |   12 +-
 src/tomography/sum_kernels.f90                     |   21 +-
 src/tomography/sum_preconditioned_kernels.f90      |   32 +-
 src/tomography/tomography_par.f90                  |  126 +-
 src/tomography/write_gradients.f90                 |  122 ++
 src/tomography/write_new_model.f90                 |  212 +++
 src/tomography/write_new_model_perturbations.f90   |  231 +++
 25 files changed, 4556 insertions(+), 941 deletions(-)