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

[cig_noreply at geodynamics.org]

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

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

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

commit 80c11355aa306e725f4be28b0aee6d40e48527ef
Merge: 8263787 45885c7
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date:   Sat Nov 1 14:29:28 2014 +0100

    Merge remote-tracking branch 'origin/devel'
    
    Conflicts:
    	src/meshfem2D/scotch_5.1.12b/src/libscotch/common.c



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

80c11355aa306e725f4be28b0aee6d40e48527ef
 EXAMPLES/anisotropic_zinc_crystal/DATA/Par_file    |  1 -
 ...ate_mesh_AK135F_2D_with_central_cube_no_PML.F90 |  8 +--
 .../read_parameter_file_Ra_Cleave.F90              |  2 +-
 .../save_databases_Ra_Cleave.f90                   |  2 +-
 .../meshfem2D_non_struct_2.f90                     |  2 +-
 .../meshfem2D_non_struct_3.f90                     |  2 +-
 doc/USER_MANUAL/manual_SPECFEM2D.tex               |  4 +-
 flags.guess                                        |  5 +-
 ...st_of_things_to_do_in_the_SPECFEM3D_package.txt |  3 +
 src/meshfem2D/meshfem2D.F90                        |  6 +-
 src/meshfem2D/part_unstruct.F90                    | 84 +++++++++++++---------
 src/meshfem2D/save_databases.f90                   | 10 +--
 .../scotch_5.1.12b/src/libscotch/common.c          |  8 +--
 src/specfem2D/compute_coupling_acoustic_el.f90     |  0
 src/specfem2D/compute_coupling_viscoelastic_ac.f90 |  0
 src/specfem2D/compute_energy.f90                   | 63 ++++++++--------
 src/specfem2D/libjpeg/jerror.h                     | 72 +++++++++----------
 src/specfem2D/libjpeg/jmorecfg.h                   | 72 +++++++++----------
 src/specfem2D/specfem2D.F90                        |  4 +-
 19 files changed, 188 insertions(+), 160 deletions(-)