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

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Fri Aug 1 10:07:01 PDT 2014 

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

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/8a3f14d7d473f70feb7f073639045daa35c587bc...d759e09dd946c593868753fbb4253d77378fb276

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

commit f39919c1e455b002ae75bd80cfb1f24505066165
Merge: f838c33 84afeb0
Author: Clément Durochat <c.durochat at gmail.com>
Date:   Wed Jul 9 13:07:14 2014 +0200

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



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

f39919c1e455b002ae75bd80cfb1f24505066165
 .../example_bigger_PYROPE}/DATA/CMTSOLUTION        |    0
 .../example_bigger_PYROPE}/DATA/Par_file           |   20 +-
 .../example_bigger_PYROPE/DATA/STATIONS            |    1 +
 .../example_bigger_PYROPE}/DATA/coeff_poly_deg12   |    0
 .../example_bigger_PYROPE}/DATA/model_1D.in        |    2 +-
 .../example_bigger_PYROPE}/README                  |    0
 .../idris_ada_compute_tract_ev5.sh                 |    0
 .../input_dsm/Double_para.txt                      |  491 ++
 .../example_bigger_PYROPE/input_dsm/FrqsMpi.txt    | 2001 ++++++++
 .../example_bigger_PYROPE/input_dsm/ak135          |   67 +
 .../example_bigger_PYROPE/input_dsm}/st            |    0
 .../example_bigger_PYROPE}/parfile_for_benchmark   |    0
 .../example_simple_small}/DATA/CMTSOLUTION         |    0
 .../example_simple_small}/DATA/Par_file            |   24 +-
 .../example_simple_small}/DATA/STATIONS            |    0
 .../DATA/STATIONS_suface_latitude_0                |    0
 .../DATA/STATIONS_suface_logitude_60               |    0
 .../DATA/STATIONS_vertical_55                      |    0
 .../DATA/STATIONS_vertical_65                      |    0
 .../example_simple_small}/DATA/coeff_poly_deg12    |    0
 .../example_simple_small}/DATA/model_1D.in         |    0
 .../DSM_tractions/FrqsMpi.txt                      |    0
 .../DSM_tractions/TmpWrkFile00000                  |    0
 .../example_simple_small}/DSM_tractions/iasp91_dsm |    0
 .../DSM_tractions/inputIASP.infTra                 |    0
 .../example_simple_small}/DSM_tractions/recdepth   |    0
 .../example_simple_small/DSM_tractions}/st         |    0
 .../DSM_tractions/timer_part2.txt                  |    0
 .../example_simple_small}/MESH3VTU.sh              |    0
 .../example_simple_small/ParFileInterface          |    5 +
 .../example_simple_small}/ParFileMeshChunk         |    0
 .../example_simple_small}/README_NEW_CHANGE        |    0
 .../batch_run_benchmark_all_process.sh             |    4 +-
 ...n_benchmark_all_process.sh_Traction_preparation |    4 +-
 ...tch_run_benchmark_all_process_only_SPECFEM3D.sh |    4 +-
 .../example_simple_small}/batch_run_movie.sh       |    4 +-
 .../input_dsm/Double_para.txt                      |    0
 .../input_dsm/Double_para.txt_12                   |    0
 .../input_dsm/Double_para.txt_18                   |    0
 .../example_simple_small}/input_dsm/FrqsMpi.txt    |    0
 .../example_simple_small}/input_dsm/FrqsMpi.txt_12 |    0
 .../example_simple_small}/input_dsm/FrqsMpi.txt_18 |    0
 .../example_simple_small}/input_dsm/iasp91         |    0
 .../example_simple_small}/input_dsm/iasp91_dsm     |    0
 .../input_dsm/inputIASP.infTra_for_coef            |    0
 .../input_dsm/inputIASP.infTra_stxmax              |    0
 .../input_dsm/inputIASP.infTra_stxmin              |    0
 .../input_dsm/inputIASP.infTra_stymax              |    0
 .../input_dsm/inputIASP.infTra_stymin              |    0
 .../input_dsm/inputIASP.infTra_stzmin              |    0
 .../example_simple_small/input_dsm}/st             |    0
 .../example_simple_small}/load_data.m              |    0
 .../example_simple_small}/log.benchmark            |    0
 .../example_simple_small}/mesh2vtu.pl              |    0
 .../example_simple_small}/params.in                |    0
 .../example_simple_small}/parfile_for_benchmark    |    0
 .../view_all_parameter_files_to_modify_them.csh    |    2 +-
 OUTPUT_FILES/DATABASES_MPI/.gitignore              |    4 +
 utils/DSM_FOR_SPECFEM3D/EXAMPLES                   |    1 +
 utils/DSM_FOR_SPECFEM3D/example/DATA/Par_file      |   57 -
 .../example/DATA/STATIONS_FILTERED                 |   17 -
 utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS_old  |   21 -
 utils/DSM_FOR_SPECFEM3D/example/ParFileInterface   |    5 -
 utils/DSM_FOR_SPECFEM3D/example/tmp_sem.out        | 5352 --------------------
 .../example_pyrope/input.data.tar.bz2              |  Bin 12593 -> 0 bytes
 65 files changed, 2602 insertions(+), 5484 deletions(-)

diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_bigger_PYROPE/DATA/CMTSOLUTION
index 3e6b2b6,3e6b2b6..3e6b2b6
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_bigger_PYROPE/DATA/CMTSOLUTION
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_bigger_PYROPE/DATA/CMTSOLUTION
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_bigger_PYROPE/DATA/coeff_poly_deg12
index e5985c5,e5985c5..e5985c5
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_bigger_PYROPE/DATA/coeff_poly_deg12
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_bigger_PYROPE/DATA/coeff_poly_deg12
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_bigger_PYROPE/README
index 958e3a8,958e3a8..958e3a8
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_bigger_PYROPE/README
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_bigger_PYROPE/README
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_bigger_PYROPE/idris_ada_compute_tract_ev5.sh
index 5764ba1,5764ba1..5764ba1
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_bigger_PYROPE/idris_ada_compute_tract_ev5.sh
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_bigger_PYROPE/idris_ada_compute_tract_ev5.sh
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_bigger_PYROPE/input_dsm/st
index 48b7fbf,48b7fbf..48b7fbf
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_bigger_PYROPE/input_dsm/st
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_bigger_PYROPE/input_dsm/st
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_bigger_PYROPE/parfile_for_benchmark
index de75f01,de75f01..de75f01
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_bigger_PYROPE/parfile_for_benchmark
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_bigger_PYROPE/parfile_for_benchmark
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DATA/STATIONS
index 872bb9f,872bb9f..872bb9f
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DATA/STATIONS
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DATA/STATIONS
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DATA/STATIONS_suface_latitude_0
index e263d5f,e263d5f..e263d5f
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DATA/STATIONS_suface_latitude_0
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DATA/STATIONS_suface_latitude_0
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DATA/STATIONS_suface_logitude_60
index 74ee077,74ee077..74ee077
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DATA/STATIONS_suface_logitude_60
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DATA/STATIONS_suface_logitude_60
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DATA/STATIONS_vertical_55
index 6940539,6940539..6940539
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DATA/STATIONS_vertical_55
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DATA/STATIONS_vertical_55
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DATA/STATIONS_vertical_65
index 8593f67,8593f67..8593f67
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DATA/STATIONS_vertical_65
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DATA/STATIONS_vertical_65
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DATA/model_1D.in
index 8fe8369,8fe8369..8fe8369
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DATA/model_1D.in
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DATA/model_1D.in
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions/FrqsMpi.txt
index a1d0d09,a1d0d09..a1d0d09
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions/FrqsMpi.txt
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions/FrqsMpi.txt
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions/TmpWrkFile00000
index bc14fb3,bc14fb3..bc14fb3
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions/TmpWrkFile00000
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions/TmpWrkFile00000
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions/iasp91_dsm
index b4f10d8,b4f10d8..b4f10d8
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions/iasp91_dsm
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions/iasp91_dsm
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions/inputIASP.infTra
index 883a6c6,883a6c6..883a6c6
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions/inputIASP.infTra
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions/inputIASP.infTra
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions/recdepth
index f35871f,f35871f..f35871f
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions/recdepth
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions/recdepth
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions/st
index 48b7fbf,48b7fbf..48b7fbf
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions/st
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions/st
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions/timer_part2.txt
index 20b43c9,20b43c9..20b43c9
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions/timer_part2.txt
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DSM_tractions/timer_part2.txt
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/ParFileMeshChunk
index 105ab4e,3c5c109..105ab4e
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/ParFileMeshChunk
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/ParFileMeshChunk
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/README_NEW_CHANGE
index bbdb76c,bbdb76c..bbdb76c
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/README_NEW_CHANGE
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/README_NEW_CHANGE
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/Double_para.txt
index 643b549,643b549..643b549
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/Double_para.txt
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/Double_para.txt
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/Double_para.txt_12
index 7b7bfaa,7b7bfaa..7b7bfaa
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/Double_para.txt_12
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/Double_para.txt_12
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/Double_para.txt_18
index 0c1d1cd,0c1d1cd..0c1d1cd
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/Double_para.txt_18
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/Double_para.txt_18
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/FrqsMpi.txt
index a1d0d09,a1d0d09..a1d0d09
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/FrqsMpi.txt
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/FrqsMpi.txt
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/FrqsMpi.txt_12
index 31e40a8,31e40a8..31e40a8
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/FrqsMpi.txt_12
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/FrqsMpi.txt_12
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/FrqsMpi.txt_18
index b838fef,b838fef..b838fef
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/FrqsMpi.txt_18
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/FrqsMpi.txt_18
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/iasp91
index 7885ca3,7885ca3..7885ca3
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/iasp91
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/iasp91
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/iasp91_dsm
index b4f10d8,b4f10d8..b4f10d8
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/iasp91_dsm
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/iasp91_dsm
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/inputIASP.infTra_for_coef
index 883a6c6,883a6c6..883a6c6
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/inputIASP.infTra_for_coef
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/inputIASP.infTra_for_coef
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/inputIASP.infTra_stxmax
index 14f5b68,14f5b68..14f5b68
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/inputIASP.infTra_stxmax
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/inputIASP.infTra_stxmax
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/inputIASP.infTra_stxmin
index aa135da,aa135da..aa135da
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/inputIASP.infTra_stxmin
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/inputIASP.infTra_stxmin
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/inputIASP.infTra_stymax
index ed10b5d,ed10b5d..ed10b5d
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/inputIASP.infTra_stymax
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/inputIASP.infTra_stymax
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/inputIASP.infTra_stymin
index 6d174f7,6d174f7..6d174f7
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/inputIASP.infTra_stymin
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/inputIASP.infTra_stymin
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/inputIASP.infTra_stzmin
index 9ea7fd2,9ea7fd2..9ea7fd2
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/inputIASP.infTra_stzmin
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/input_dsm/inputIASP.infTra_stzmin
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/load_data.m
index 069df11,069df11..069df11
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/load_data.m
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/load_data.m
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/log.benchmark
index ddad8c1,ddad8c1..ddad8c1
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/log.benchmark
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/log.benchmark
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/params.in
index 9353566,9353566..9353566
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/params.in
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/params.in
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/parfile_for_benchmark
index 14d1ef1,13f3815..14d1ef1
mode 100755,100644..100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/parfile_for_benchmark
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/parfile_for_benchmark

More information about the CIG-COMMITS mailing list