[cig-commits] [commit] devel: solves merge conflict in serioal.f90 (63b33a6)

[cig_noreply at geodynamics.org]

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

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/69d1a6fe5d756c2d8d122dd4521d96ddd99b5671...63b33a6cfd79d58ef4ebcf2ca10eb8317b416a7d

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

commit 63b33a6cfd79d58ef4ebcf2ca10eb8317b416a7d
Merge: fdd2ff1 69d1a6f
Author: daniel peter <peterda at ethz.ch>
Date:   Thu Sep 25 12:32:57 2014 +0200

    solves merge conflict in serioal.f90



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

63b33a6cfd79d58ef4ebcf2ca10eb8317b416a7d
 setup/constants.h.in                        |   3 +
 src/decompose_mesh/decompose_mesh.F90       |   5 +-
 src/generate_databases/model_tomography.f90 |   3 +-
 src/shared/constants_mod.f90                |   6 +-
 src/shared/parallel.f90                     |  81 ++++++------
 src/shared/serial.f90                       | 141 ++++++++++++++++-----
 src/specfem3D/fault_solver_dynamic.f90      |   2 +-
 src/specfem3D/fault_solver_kinematic.f90    |   2 +-
 src/specfem3D/read_mesh_databases.F90       | 183 +++++++++++++++++++++++++++-
 src/specfem3D/specfem3D_par.f90             |   1 -
 10 files changed, 344 insertions(+), 83 deletions(-)

diff --cc src/shared/serial.f90
index 58b0fe4,1a5a22a..e2fc797
--- a/src/shared/serial.f90
+++ b/src/shared/serial.f90
@@@ -126,23 -111,7 +111,23 @@@
  !----
  !
  
 +  subroutine bcast_all_singledp(buffer)
 +
 +  use unused_mod
 +
 +  implicit none
 +
 +  double precision :: buffer
 +
 +  unused_dp = buffer
 +
 +  end subroutine bcast_all_singledp
 +
 +!
 +!----
 +!
 +
-   subroutine bcast_all_r(buffer, count)
+   subroutine bcast_all_r(buffer, countval)
  
    use unused_mod
    implicit none