[cig-commits] [commit] devel: Modif conflict (62d217d)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue Oct 7 03:03:55 PDT 2014
Repository : https://github.com/geodynamics/specfem3d
On branch : devel
Link : https://github.com/geodynamics/specfem3d/compare/acc6906b149198b82f5e2b2fe7923a89990a7932...3d4c7ccbd84fea019e2ac6a62e759e3c61a473fb
>---------------------------------------------------------------
commit 62d217d4eb7ba6bf4a9155a2cb04661075b3c62b
Merge: 69581f6 758dcb5
Author: Clément Durochat <c.durochat at gmail.com>
Date: Mon Oct 6 17:17:57 2014 +0200
Modif conflict
>---------------------------------------------------------------
62d217d4eb7ba6bf4a9155a2cb04661075b3c62b
.../ACOUSTIC/DATA/Par_file | 9 +-
.../ELASTIC/DATA/Par_file | 9 +-
.../DATA/Par_file | 3 +
.../run_this_example.sh | 2 +-
.../DATA/Par_file | 3 +
.../run_this_example.sh | 2 +-
.../DATA/Par_file | 3 +
.../run_this_example.sh | 2 +-
.../DATA/Par_file | 3 +
.../run_this_example.sh | 2 +-
.../DATA/Par_file | 3 +
.../run_this_example.sh | 2 +-
.../DATA/Par_file | 3 +
.../run_this_example.sh | 2 +-
.../example_bigger_PYROPE/DATA/Par_file | 5 +-
.../example_simple_small/DATA/CMTSOLUTION | 0
.../example_simple_small/DATA/Par_file | 6 +-
.../example_simple_small/DATA/Par_file~ | 133 ---------------------
.../example_simple_small/DATA/STATIONS | 0
.../example_simple_small/DATA/STATIONS_FILTERED | 0
.../DATA/STATIONS_suface_latitude_0 | 0
.../DATA/STATIONS_suface_logitude_60 | 0
.../example_simple_small/DATA/STATIONS_test | 0
.../example_simple_small/DATA/STATIONS_vertical_55 | 0
.../example_simple_small/DATA/STATIONS_vertical_65 | 0
.../example_simple_small/DATA/coeff_poly_deg12 | 0
.../example_simple_small/DATA/model_1D.in | 0
.../example_simple_small/MESH/IgXmax | 0
.../example_simple_small/MESH/IgXmin | 0
.../example_simple_small/MESH/IgYmax | 0
.../example_simple_small/MESH/IgYmin | 0
.../example_simple_small/MESH/IgZmin | 0
.../example_simple_small/MESH/Nb_ielm_faces.txt | 0
.../example_simple_small/MESH/OrigRepSpecfm | 0
.../example_simple_small/MESH/ParFileMeshChunk | 0
.../MESH/absorbing_surface_file_bottom | 0
.../MESH/absorbing_surface_file_xmax | 0
.../MESH/absorbing_surface_file_xmin | 0
.../MESH/absorbing_surface_file_ymax | 0
.../MESH/absorbing_surface_file_ymin | 0
.../example_simple_small/MESH/flags_boundary.txt | 0
.../example_simple_small/MESH/free_surface | 0
.../example_simple_small/MESH/iasp91 | 0
.../example_simple_small/MESH/iasp91_dsm | 0
.../example_simple_small/MESH/materials_file | 0
.../example_simple_small/MESH/mesh_file | 0
.../example_simple_small/MESH/model_1D.in | 0
.../example_simple_small/MESH/nodes_coords_file | 0
.../MESH/nummaterial_velocity_file | 0
.../MESH/output_mesher_chunk.txt | 0
.../example_simple_small/MESH/recdepth | 0
.../example_simple_small/MESH/stxmax | 0
.../example_simple_small/MESH/stxmin | 0
.../example_simple_small/MESH/stymax | 0
.../example_simple_small/MESH/stymin | 0
.../example_simple_small/MESH/stzmin | 0
.../batch_run_benchmark_all_process_wangyi.sh | 2 +-
..._run_benchmark_all_process_OLD_SAVE1-22-7-14.sh | 2 +-
..._run_benchmark_all_process_OLD_SAVE2-22-7-14.sh | 2 +-
.../example_simple_small/ParFileInterface | 0
.../example_simple_small/ParFileMeshChunk | 0
.../README_BEFORE_RUN_THIS_BENCHMARK | 0
.../example_simple_small/README_NEW_CHANGE | 0
.../batch_run_benchmark_all_process.sh | 2 +-
...n_benchmark_all_process.sh_Traction_preparation | 2 +-
...tch_run_benchmark_all_process_only_SPECFEM3D.sh | 2 +-
.../example_simple_small/batch_run_movie.sh | 2 +-
.../example_simple_small/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/log.benchmark | 0
.../example_simple_small/out_read.txt | 0
.../example_simple_small/params.in | 0
.../example_simple_small/parfile_for_benchmark | 0
.../station_for_simulation.txt | 0
.../example_simple_small/tmp_sem.out | 0
EXAMPLES/Mount_StHelens/DATA/Par_file | 9 +-
EXAMPLES/Mount_StHelens/run_this_example.sh | 2 +-
EXAMPLES/fault_examples/splay_faults/DATA/Par_file | 9 +-
EXAMPLES/fault_examples/tpv102/DATA/Par_file | 9 +-
EXAMPLES/fault_examples/tpv103/DATA/Par_file | 9 +-
EXAMPLES/fault_examples/tpv15/DATA/Par_file | 9 +-
EXAMPLES/fault_examples/tpv16/DATA/Par_file | 9 +-
EXAMPLES/fault_examples/tpv5/DATA/Par_file | 9 +-
EXAMPLES/homogeneous_acoustic/DATA/Par_file | 3 +
.../DATA/Par_file | 3 +
.../run_this_example.sh | 2 +-
.../DATA/Par_file | 3 +
.../run_this_example.sh | 2 +-
EXAMPLES/homogeneous_poroelastic/DATA/Par_file | 9 +-
EXAMPLES/layered_halfspace/DATA/Par_file | 9 +-
EXAMPLES/layered_halfspace/run_this_example.sh | 2 +-
.../many_interfaces/DATA/Par_file | 9 +-
.../many_interfaces/go_process_pbs.bash | 2 +-
.../many_interfaces/run_this_example.sh | 2 +-
.../sep_bathymetry/DATA/Par_file | 18 ++-
.../sep_bathymetry/run_this_example.sh | 2 +-
.../meshfem3D_examples/simple_model/DATA/Par_file | 9 +-
.../simple_model/run_this_example.sh | 2 +-
EXAMPLES/meshfem3D_examples/socal1D/DATA/Par_file | 9 +-
.../socal1D/example_utm/Par_file_utm | 8 +-
.../meshfem3D_examples/socal1D/run_this_example.sh | 2 +-
EXAMPLES/noise_tomography/DATA/Par_file_step1 | 10 +-
EXAMPLES/noise_tomography/DATA/Par_file_step2 | 10 +-
EXAMPLES/noise_tomography/DATA/Par_file_step3 | 10 +-
EXAMPLES/tomographic_model/DATA/Par_file | 9 +-
EXAMPLES/tomographic_model/run_this_example.sh | 2 +-
.../view_all_parameter_files_to_modify_them.csh | 2 +-
EXAMPLES/waterlayered_halfspace/DATA/Par_file | 9 +-
.../waterlayered_halfspace/run_this_example.sh | 2 +-
run_this_example.sh | 2 +-
.../create_movie_shakemap_AVS_DX_GMT.f90 | 26 ++--
src/auxiliaries/smooth_vol_data.f90 | 26 ++--
src/auxiliaries/sum_kernels.f90 | 26 ++--
src/decompose_mesh/program_decompose_mesh.f90 | 2 +-
src/generate_databases/create_regions_mesh.f90 | 16 ++-
src/generate_databases/generate_databases.f90 | 26 ++--
src/generate_databases/get_model.f90 | 7 +-
src/generate_databases/model_gll.f90 | 7 +-
src/generate_databases/model_gll_adios.F90 | 7 +-
src/generate_databases/model_ipati.f90 | 12 +-
src/generate_databases/model_ipati_adios.F90 | 12 +-
src/generate_databases/model_sep.f90 | 7 +-
src/generate_databases/parse_sep.c | 9 +-
src/meshfem3D/check_mesh_quality.f90 | 26 ++--
src/specfem3D/initialize_simulation.f90 | 26 ++--
tests/decompose_mesh/test_read.f90 | 24 ++--
139 files changed, 338 insertions(+), 344 deletions(-)
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_bigger_PYROPE/DATA/Par_file
index 24a31a7,01ea67e..667c029
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_bigger_PYROPE/DATA/Par_file
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_bigger_PYROPE/DATA/Par_file
@@@ -120,9 -123,9 +123,9 @@@ USE_RICKER_TIME_FUNCTION = .fals
PRINT_SOURCE_TIME_FUNCTION = .false.
# to couple with an external code (such as DSM, AxiSEM, or FK)
--COUPLE_WITH_EXTERNAL_CODE = .false.
++COUPLE_WITH_EXTERNAL_CODE = .true.
EXTERNAL_CODE_TYPE = 1 # 1 = DSM, 2 = AxiSEM, 3 = FK
-TRACTION_PATH = ./DATA/DSM_traction_files/
+TRACTION_PATH = ./OUTPUT_FILES/Tractions/
MESH_A_CHUNK_OF_THE_EARTH = .true.
# set to true to use GPUs
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DATA/Par_file
index 340e643,6c78465..7b3187a
mode 100755,100644..100644
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DATA/Par_file
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/DATA/Par_file
@@@ -121,9 -123,9 +123,9 @@@ USE_RICKER_TIME_FUNCTION = .fals
PRINT_SOURCE_TIME_FUNCTION = .false.
# to couple with an external code (such as DSM, AxiSEM, or FK)
--COUPLE_WITH_EXTERNAL_CODE = .false.
++COUPLE_WITH_EXTERNAL_CODE = .true.
EXTERNAL_CODE_TYPE = 1 # 1 = DSM, 2 = AxiSEM, 3 = FK
-TRACTION_PATH = ./DATA/DSM_traction_files/
+TRACTION_PATH = ./OUTPUT_FILES/Tractions/
MESH_A_CHUNK_OF_THE_EARTH = .true.
# set to true to use GPUs
diff --cc EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/parfile_for_benchmark
index b7277cf,a0083f3..b7277cf
mode 100755,100644..100644
--- 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