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

[cig_noreply at geodynamics.org]

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

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/b43c63c4cea034e3e6f647cebc591fb4c2ab3894...fb5ff57e01f82037a9b22ebd3c3c184e9e4f14f6

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

commit f6c764ce4e6615738ea63aba16642b5f8422bab3
Merge: 3677217 c7475fd
Author: Clément Durochat <c.durochat at gmail.com>
Date:   Mon Nov 3 11:24:01 2014 +0100

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



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

f6c764ce4e6615738ea63aba16642b5f8422bab3
 README_inversion_package_list_of_things_to_do.txt  | 112 +++++++++++++++++++++
 src/decompose_mesh/scotch_5.1.12b/src/Makefile     |  27 +----
 .../scotch_5.1.12b/src/libscotch/library_version.c |  11 +-
 .../scotch_5.1.12b/src/scotch/Makefile             |   1 +
 src/meshfem3D/meshfem3D.f90                        |   2 +-
 utils/convolve_source_timefunction.csh             |  32 +++---
 6 files changed, 140 insertions(+), 45 deletions(-)

diff --cc src/meshfem3D/meshfem3D.f90
index 7c4c5dd,22ead68..b7c8c28
--- a/src/meshfem3D/meshfem3D.f90
+++ b/src/meshfem3D/meshfem3D.f90
@@@ -418,12 -418,12 +418,12 @@@
        ! done with mesher
        stop 'Done creating a chunk of the earth Mesh (HEX8 elements), see directory MESH/'
  
-     elseif (NGNOD == 27) then
+     else if (NGNOD == 27) then
        ! creates mesh in MESH/
 -!! to uncomment when finished ==> call earth_chunk_HEX27_Mesher()
 +! to uncomment when finished ==> ! call earth_chunk_HEX27_Mesher(NGNOD)
        ! done with mesher
        stop 'Creating a chunk of the earth Mesh not implmented yet with HEX27 elements'
 -!! to uncomment when finished ==> stop 'Done creating a chunk of the earth Mesh (HEX27 elements), see directory MESH/'
 +! to uncomment when finished ==> ! stop 'Done creating a chunk of the earth Mesh (HEX27 elements), see directory MESH/'
  
      else
        stop 'Bad number of nodes per hexahedron : NGNOD must be equal to 8 or 27'