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

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Sun Sep 14 11:03:14 PDT 2014


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

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/633036a25401037a02ea21bfa5d50d09cb9f6f08...f1bbebf172ce63bdb6fa2a4bcb20c86887966c50

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

commit 5c57f772cad57cb22a7ddaac440e3642c692268e
Merge: 978df47 e84e7ba
Author: Clément Durochat <c.durochat at gmail.com>
Date:   Fri Sep 12 13:22:42 2014 +0200

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



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

5c57f772cad57cb22a7ddaac440e3642c692268e
 CUBIT_GEOCUBIT/geocubitlib/boundary_definition.py  |    64 +-
 CUBIT_GEOCUBIT/geocubitlib/cubit2specfem3d.py      |   106 +-
 EXAMPLES/README                                    |     0
 .../create_mesh.py                                 |    91 +-
 .../MESH-default/absorbing_surface_file_bottom     |     2 +-
 .../MESH-default/absorbing_surface_file_xmax       |     2 +-
 .../MESH-default/absorbing_surface_file_xmin       |     2 +-
 .../MESH-default/absorbing_surface_file_ymax       |     2 +-
 .../MESH-default/absorbing_surface_file_ymin       |     2 +-
 .../free_or_absorbing_surface_file_zmax            |     2 +-
 .../tomographic_model/MESH-default/materials_file  | 20736 +++++++++++++++++
 .../MESH-default/mesh_file                         |  2048 +-
 .../MESH-default/nodes_coords_file                 | 23274 +++++++++++++++++++
 .../MESH-default}/nummaterial_velocity_file        |     2 +-
 .../create_tomography_model_file.sh                |     9 +
 EXAMPLES/tomographic_model/tomoblock_mesh.py       |    71 +-
 Makefile.in                                        |    21 +-
 configure                                          |   106 +-
 configure.ac                                       |     6 +-
 m4                                                 |     2 +-
 src/cuda/assemble_MPI_scalar_cuda.cu               |   262 +
 src/cuda/assemble_MPI_vector_cuda.cu               |   415 +
 src/cuda/check_fields_cuda.cu                      |    17 +
 src/cuda/compute_forces_acoustic_cuda.cu           |   968 +-
 src/cuda/compute_forces_viscoelastic_cuda.cu       |  3303 ++-
 src/cuda/initialize_cuda.cu                        |    17 +-
 src/cuda/mesh_constants_cuda.h                     |    56 +-
 src/cuda/prepare_mesh_constants_cuda.cu            |     6 +-
 src/cuda/rules.mk                                  |     2 +
 src/cuda/specfem3D_gpu_cuda_method_stubs.c         |   102 +-
 src/cuda/update_displacement_cuda.cu               |    76 +-
 src/decompose_mesh/decompose_mesh.F90              |    29 +-
 src/decompose_mesh/fault_scotch.f90                |     4 +-
 src/decompose_mesh/part_decompose_mesh.f90         |    35 +-
 src/generate_databases/calc_jacobian.f90           |     3 +-
 src/generate_databases/create_mass_matrices.f90    |   982 +-
 src/generate_databases/create_regions_mesh.f90     |    51 +-
 .../fault_generate_databases.f90                   |    11 +-
 src/generate_databases/generate_databases.f90      |     1 +
 src/generate_databases/generate_databases_par.f90  |    20 +-
 src/generate_databases/get_MPI.f90                 |     2 +-
 src/generate_databases/get_absorbing_boundary.f90  |     4 +-
 src/generate_databases/get_coupling_surfaces.f90   |     8 +-
 src/generate_databases/get_model.f90               |    21 +-
 src/generate_databases/model_1d_cascadia.f90       |     2 +-
 src/generate_databases/model_1d_prem.f90           |     2 +-
 src/generate_databases/model_default.f90           |     2 +-
 src/generate_databases/model_external_values.f90   |     2 +-
 src/generate_databases/model_gll.f90               |     1 +
 src/generate_databases/model_gll_adios.F90         |     1 +
 src/generate_databases/model_ipati.f90             |     2 +
 src/generate_databases/model_ipati_adios.F90       |     7 +
 src/generate_databases/model_tomography.f90        |   841 +-
 src/generate_databases/rules.mk                    |     3 +-
 src/generate_databases/save_arrays_solver.f90      |    86 +-
 .../save_arrays_solver_adios.F90                   |    49 +-
 src/generate_databases/save_moho_adios.F90         |     2 +-
 src/generate_databases/setup_color_perm.f90        |     5 +
 src/generate_databases/tomography_par.f90          |    67 -
 src/shared/parallel.f90                            |   123 +-
 src/shared/rules.mk                                |     6 +-
 src/shared/serial.f90                              |    32 +-
 src/specfem3D/assemble_MPI_vector.f90              |     5 +-
 src/specfem3D/compute_coupling_viscoelastic_ac.f90 |     4 +-
 src/specfem3D/compute_forces_viscoelastic_Dev.F90  |   108 +
 .../compute_forces_viscoelastic_noDev.f90          |     2 +-
 src/specfem3D/compute_stacey_viscoelastic.f90      |     0
 src/specfem3D/rules.mk                             |     3 +
 src/specfem3D/write_seismograms.f90                |     2 +-
 tests/compilations/0.configure.serial_make.sh      |     1 -
 tests/decompose_mesh/1.test_read.sh                |     4 +-
 tests/decompose_mesh/2.test_valence.sh             |     4 +-
 tests/decompose_mesh/3.test_partitioning.sh        |     4 +-
 tests/decompose_mesh/test_partitioning.f90         |    15 +-
 tests/decompose_mesh/test_partitioning.makefile    |    17 +-
 tests/decompose_mesh/test_read.f90                 |    20 +-
 tests/decompose_mesh/test_read.makefile            |    17 +-
 tests/decompose_mesh/test_valence.makefile         |    17 +-
 tests/run_all_tests.sh                             |     2 +-
 79 files changed, 50743 insertions(+), 3658 deletions(-)



More information about the CIG-COMMITS mailing list