[cig-commits] [commit] release_1.1: Merge branch 'master' into release_1.1 (edd15e0)

[cig_noreply at geodynamics.org]

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

On branch  : release_1.1
Link       : https://github.com/geodynamics/axisem/compare/cbc40eada7db5b1734bf2bd0408d391a9d6fad71...edd15e002007437675fc73480aa1a1bc9d018410

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

commit edd15e002007437675fc73480aa1a1bc9d018410
Merge: cbc40ea c73403f
Author: Simon Stähler <staehler at geophysik.uni-muenchen.de>
Date:   Wed Aug 27 16:12:16 2014 +0200

    Merge branch 'master' into release_1.1
    
    Pull intermediate updates of master branch into release branch. In case that should ever be released, it might be useful to have the latest version.
    
    Conflicts:
    	MANUAL/manual_axisem1.1.tex



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

edd15e002007437675fc73480aa1a1bc9d018410
 SOLVER/UTILS/field_transform.F90 |  51 ++++++-----
 SOLVER/UTILS/post_processing.F90 |   2 +-
 SOLVER/data_io.f90               |   9 +-
 SOLVER/meshes_io.F90             | 131 ++++++++++++++-------------
 SOLVER/nc_routines.F90           |  95 +++++++++++++++-----
 SOLVER/parameters.F90            |  49 ++++------
 SOLVER/seismograms.f90           |  72 ++++++++-------
 SOLVER/submit.csh                |  44 +++++----
 SOLVER/time_evol_wave.F90        |  79 ++++++++--------
 SOLVER/wavefields_io.f90         | 188 +++------------------------------------
 10 files changed, 298 insertions(+), 422 deletions(-)