[cig-commits] [commit] devel, master: Merge pull request #222 from komatits/devel (d2ec161)

[cig_noreply at geodynamics.org]

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

On branches: devel,master
Link       : https://github.com/geodynamics/specfem3d_globe/compare/bc58e579b3b0838a0968725a076f5904845437ca...be63f20cbb6f462104e949894dbe205d2398cd7f

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

commit d2ec161d18724ed7efbbdd0c73b0175de565b033
Merge: d635170 b60514e
Author: Dimitri Komatitsch <komatits at users.noreply.github.com>
Date:   Sat Sep 6 14:54:28 2014 +0200

    Merge pull request #222 from komatits/devel
    
    removed src/auxiliaries/combine_vol_data_shared.f90, which contained routines duplicated from other files of the code (that is dangerous, and very uneasy to maintain the same routines twice, in two different files of the code). Thus temporarily had to comment out xcombine_vol_data* from Makefile.in and from src/auxiliaries/rules.mk because I do not know how to fix the Makefile (probably not difficult, but I am not familiar with that). Also removed unused variables introduced by the CEM modification a few days ago. Added comments for ellipticity. Removed useless white spaces using a cleaning script.



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

d2ec161d18724ed7efbbdd0c73b0175de565b033
 Makefile.in                                        |  25 +-
 src/auxiliaries/combine_vol_data.F90               |   8 +-
 src/auxiliaries/combine_vol_data_shared.f90        | 569 ---------------------
 src/auxiliaries/rules.mk                           |  17 +-
 src/meshfem3D/compute_coordinates_grid.f90         |   2 +-
 src/meshfem3D/create_regions_mesh.F90              |   2 +-
 src/meshfem3D/{get_model.f90 => get_model.F90}     |   7 +-
 src/meshfem3D/meshfem3D_models.F90                 |  18 +-
 src/meshfem3D/model_cem.f90                        |  16 +-
 src/meshfem3D/model_ppm.f90                        |   2 +-
 src/meshfem3D/write_AVS_DX_global_chunks_data.f90  |   3 +
 .../write_AVS_DX_global_chunks_data_adios.f90      |   8 +-
 src/meshfem3D/write_AVS_DX_global_faces_data.f90   |   3 +
 .../write_AVS_DX_global_faces_data_adios.f90       |   3 +
 src/meshfem3D/write_AVS_DX_surface_data.f90        |   3 +
 src/meshfem3D/write_AVS_DX_surface_data_adios.f90  |   3 +
 src/shared/asdf_helpers_definitions.f90            |   2 +-
 src/shared/make_ellipticity.f90                    |  45 ++
 src/specfem3D/comp_source_time_function.f90        |   8 +-
 src/specfem3D/compute_add_sources.f90              |   2 +
 src/specfem3D/get_cmt.f90                          |   2 +-
 src/specfem3D/locate_receivers.f90                 |   3 +
 src/specfem3D/locate_sources.f90                   |   3 +
 src/specfem3D/setup_sources_receivers.f90          |   2 +-
 src/specfem3D/write_output_SAC.f90                 |   2 +-
 25 files changed, 134 insertions(+), 624 deletions(-)