[cig-commits] [commit] devel: Merge pull request #192 from komatits/devel (84afeb0)

[cig_noreply at geodynamics.org]

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

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/c955f015c0c0d76b76353673452e1eef9301c610...84afeb0839da6b1202fc18205727351c96f25299

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

commit 84afeb0839da6b1202fc18205727351c96f25299
Merge: c955f01 bd417fb
Author: Dimitri Komatitsch <komatits at users.noreply.github.com>
Date:   Tue Jul 8 22:03:04 2014 +0200

    Merge pull request #192 from komatits/devel
    
    moved the DSM_FOR_SPECFEM3D/examples to EXAMPLES/DSM_FOR_SPECFEM3D in order to maintain them in the same directory as all other examples



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

84afeb0839da6b1202fc18205727351c96f25299
 .../DSM_FOR_SPECFEM3D/example_bigger_PYROPE}/DATA/CMTSOLUTION           | 0
 .../DSM_FOR_SPECFEM3D/example_bigger_PYROPE}/DATA/Par_file              | 0
 .../DSM_FOR_SPECFEM3D/example_bigger_PYROPE}/DATA/STATIONS              | 0
 .../DSM_FOR_SPECFEM3D/example_bigger_PYROPE}/DATA/coeff_poly_deg12      | 0
 .../DSM_FOR_SPECFEM3D/example_bigger_PYROPE}/DATA/model_1D.in           | 0
 .../DSM_FOR_SPECFEM3D/example_bigger_PYROPE}/README                     | 0
 .../example_bigger_PYROPE}/idris_ada_compute_tract_ev5.sh               | 0
 .../DSM_FOR_SPECFEM3D/example_bigger_PYROPE}/input_dsm/Double_para.txt  | 0
 .../DSM_FOR_SPECFEM3D/example_bigger_PYROPE}/input_dsm/FrqsMpi.txt      | 0
 .../DSM_FOR_SPECFEM3D/example_bigger_PYROPE}/input_dsm/ak135            | 0
 .../DSM_FOR_SPECFEM3D/example_bigger_PYROPE/input_dsm}/st               | 0
 .../DSM_FOR_SPECFEM3D/example_bigger_PYROPE}/parfile_for_benchmark      | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/DATA/CMTSOLUTION            | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/DATA/Par_file               | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/DATA/STATIONS               | 0
 .../example_simple_small}/DATA/STATIONS_suface_latitude_0               | 0
 .../example_simple_small}/DATA/STATIONS_suface_logitude_60              | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/DATA/STATIONS_vertical_55   | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/DATA/STATIONS_vertical_65   | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/DATA/coeff_poly_deg12       | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/DATA/model_1D.in            | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/DSM_tractions/FrqsMpi.txt   | 0
 .../example_simple_small}/DSM_tractions/TmpWrkFile00000                 | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/DSM_tractions/iasp91_dsm    | 0
 .../example_simple_small}/DSM_tractions/inputIASP.infTra                | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/DSM_tractions/recdepth      | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions}/st            | 0
 .../example_simple_small}/DSM_tractions/timer_part2.txt                 | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/MESH3VTU.sh                 | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/ParFileInterface            | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/ParFileMeshChunk            | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/README_NEW_CHANGE           | 0
 .../example_simple_small}/batch_run_benchmark_all_process.sh            | 0
 .../batch_run_benchmark_all_process.sh_Traction_preparation             | 0
 .../batch_run_benchmark_all_process_only_SPECFEM3D.sh                   | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/batch_run_movie.sh          | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/input_dsm/Double_para.txt   | 0
 .../example_simple_small}/input_dsm/Double_para.txt_12                  | 0
 .../example_simple_small}/input_dsm/Double_para.txt_18                  | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/input_dsm/FrqsMpi.txt       | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/input_dsm/FrqsMpi.txt_12    | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/input_dsm/FrqsMpi.txt_18    | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/input_dsm/iasp91            | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/input_dsm/iasp91_dsm        | 0
 .../example_simple_small}/input_dsm/inputIASP.infTra_for_coef           | 0
 .../example_simple_small}/input_dsm/inputIASP.infTra_stxmax             | 0
 .../example_simple_small}/input_dsm/inputIASP.infTra_stxmin             | 0
 .../example_simple_small}/input_dsm/inputIASP.infTra_stymax             | 0
 .../example_simple_small}/input_dsm/inputIASP.infTra_stymin             | 0
 .../example_simple_small}/input_dsm/inputIASP.infTra_stzmin             | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/input_dsm/st                | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/load_data.m                 | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/log.benchmark               | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/mesh2vtu.pl                 | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/params.in                   | 0
 .../DSM_FOR_SPECFEM3D/example_simple_small}/parfile_for_benchmark       | 0
 EXAMPLES/view_all_parameter_files_to_modify_them.csh                    | 2 +-
 utils/DSM_FOR_SPECFEM3D/EXAMPLES                                        | 1 +
 58 files changed, 2 insertions(+), 1 deletion(-)