[cig-commits] [commit] devel: Change for DSM (5ab8d7a)

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


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

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

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

commit 5ab8d7acbae3ddaa92759edde0739c164259d7c6
Author: Clément Durochat <c.durochat at gmail.com>
Date:   Wed Jul 9 16:27:56 2014 +0200

    Change for DSM


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

5ab8d7acbae3ddaa92759edde0739c164259d7c6
 .../example_simple_small/ParFileMeshChunk          |  2 +-
 .../UTILS/create_all_input_files_for_Hybrid.f90    |  2 +-
 .../UTILS/create_inputs_files.f90                  |  2 +-
 .../UTILS/create_inputs_files_for_benchmark.f90    |  2 +-
 .../DSM_FOR_SPECFEM3D/shells/scrpits_specfem3D.sh  |  4 ++--
 .../shells_for_FWI/create_link_for_tractions.sh    |  4 ++--
 ...ward_sources_time_reversal_Yingzi_Ying_Matlab.m | 24 +++++++++++-----------
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/ParFileMeshChunk b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/ParFileMeshChunk
index 3e61038..cbb332f 100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/ParFileMeshChunk
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/ParFileMeshChunk
@@ -1,5 +1,5 @@
  ../Tract/
  ../MESH/
  ../OUTPUT_FILES/DATABASES_MPI/
- ../in_out_files/Tractions/
+ ../OUTPUT_FILES/Tractions/
  1
diff --git a/utils/DSM_FOR_SPECFEM3D/UTILS/create_all_input_files_for_Hybrid.f90 b/utils/DSM_FOR_SPECFEM3D/UTILS/create_all_input_files_for_Hybrid.f90
index 966adf7..e6177f5 100755
--- a/utils/DSM_FOR_SPECFEM3D/UTILS/create_all_input_files_for_Hybrid.f90
+++ b/utils/DSM_FOR_SPECFEM3D/UTILS/create_all_input_files_for_Hybrid.f90
@@ -51,7 +51,7 @@ program create_input_files
   write(10,*) '../Tract/'
   write(10,*) '../MESH/'
   write(10,*) '../OUTPUT_FILES/DATABASES_MPI/'
-  write(10,*) '../in_out_files/Tractions/'
+  write(10,*) '../OUTPUT_FILES/Tractions/'
   write(10,*) '1'
   close(10)
 
diff --git a/utils/DSM_FOR_SPECFEM3D/UTILS/create_inputs_files.f90 b/utils/DSM_FOR_SPECFEM3D/UTILS/create_inputs_files.f90
index eb9c89f..45056a3 100755
--- a/utils/DSM_FOR_SPECFEM3D/UTILS/create_inputs_files.f90
+++ b/utils/DSM_FOR_SPECFEM3D/UTILS/create_inputs_files.f90
@@ -33,7 +33,7 @@ program create_input_files
   write(10,*) '../Tract/'
   write(10,*) '../MESH/'
   write(10,*) '../OUTPUT_FILES/DATABASES_MPI/'
-  write(10,*) '../in_out_files/Tractions/'
+  write(10,*) '../OUTPUT_FILES/Tractions/'
   write(10,*) '1'
   close(10)
 
diff --git a/utils/DSM_FOR_SPECFEM3D/UTILS/create_inputs_files_for_benchmark.f90 b/utils/DSM_FOR_SPECFEM3D/UTILS/create_inputs_files_for_benchmark.f90
index b163619..e3cff82 100755
--- a/utils/DSM_FOR_SPECFEM3D/UTILS/create_inputs_files_for_benchmark.f90
+++ b/utils/DSM_FOR_SPECFEM3D/UTILS/create_inputs_files_for_benchmark.f90
@@ -30,7 +30,7 @@ program create_input_files_for_benchmark
   write(10,*) '../Tract/'
   write(10,*) '../MESH/'
   write(10,*) '../OUTPUT_FILES/DATABASES_MPI/'
-  write(10,*) '../in_out_files/Tractions/'
+  write(10,*) '../OUTPUT_FILES/Tractions/'
   close(10)
 
  ! input file for DSM write coef --------------------------------------------------------
diff --git a/utils/DSM_FOR_SPECFEM3D/shells/scrpits_specfem3D.sh b/utils/DSM_FOR_SPECFEM3D/shells/scrpits_specfem3D.sh
index fa3ce4f..6f48917 100755
--- a/utils/DSM_FOR_SPECFEM3D/shells/scrpits_specfem3D.sh
+++ b/utils/DSM_FOR_SPECFEM3D/shells/scrpits_specfem3D.sh
@@ -13,13 +13,13 @@ function clean_and_make_dir ()
 delete_directory_if_exist $MESH
 delete_directory_if_exist OUTPUT_FILES
 delete_directory_if_exist OUTPUT_FILES/DATABASES_MPI
-delete_directory_if_exist in_out_files/Tractions
+delete_directory_if_exist OUTPUT_FILES/Tractions
 delete_directory_if_exist bin
 
 mkdir -p $MESH
 mkdir -p OUTPUT_FILES
 mkdir -p OUTPUT_FILES/DATABASES_MPI
-mkdir -p in_out_files/Tractions
+mkdir -p OUTPUT_FILES/Tractions
 mkdir bin
 }
 
diff --git a/utils/DSM_FOR_SPECFEM3D/shells/shells_for_FWI/create_link_for_tractions.sh b/utils/DSM_FOR_SPECFEM3D/shells/shells_for_FWI/create_link_for_tractions.sh
index eaced7e..f24ffd2 100755
--- a/utils/DSM_FOR_SPECFEM3D/shells/shells_for_FWI/create_link_for_tractions.sh
+++ b/utils/DSM_FOR_SPECFEM3D/shells/shells_for_FWI/create_link_for_tractions.sh
@@ -1,5 +1,5 @@
 source ./global_parameters.in
 source $SHELL_SCRIPTS/functions_set_up.sh
 
-create_link /ccc/scratch/cont003/gen6351/vmont/synth_1d/in_out_files/Tractions  1
-create_link /ccc/scratch/cont003/gen6351/vmont/synth_saut_moho_source_nord/in_out_files/Tractions 2
+create_link /ccc/scratch/cont003/gen6351/vmont/synth_1d/OUTPUT_FILES/Tractions  1
+create_link /ccc/scratch/cont003/gen6351/vmont/synth_saut_moho_source_nord/OUTPUT_FILES/Tractions 2
diff --git a/utils/generate_SOURCE_file_forward_and_backward_sources_time_reversal_Yingzi_Ying_Matlab.m b/utils/generate_SOURCE_file_forward_and_backward_sources_time_reversal_Yingzi_Ying_Matlab.m
index 111be8a..6bac417 100644
--- a/utils/generate_SOURCE_file_forward_and_backward_sources_time_reversal_Yingzi_Ying_Matlab.m
+++ b/utils/generate_SOURCE_file_forward_and_backward_sources_time_reversal_Yingzi_Ying_Matlab.m
@@ -10,9 +10,9 @@ backwardSourceComponent=[1 1 1];
 
 switch sourceType
 case 'FORWARD'
-[nt_status nt] = system('grep NSTEP ../in_data_files/Par_file | cut -d = -f 2');
-[dt_status dt] = system('grep DT ../in_data_files/Par_file | cut -d = -f 2');
-[f_status f] = system('grep half\ duration ../in_data_files/backup/CMTSOLUTION_FORWARD | cut -d : -f 2');
+[nt_status nt] = system('grep NSTEP ../DATAs/Par_file | cut -d = -f 2');
+[dt_status dt] = system('grep DT ../DATAs/Par_file | cut -d = -f 2');
+[f_status f] = system('grep half\ duration ../DATAs/backup/CMTSOLUTION_FORWARD | cut -d : -f 2');
 
 nt=str2num(nt);
 dt=str2num(dt);
@@ -40,10 +40,10 @@ end
 
 
 case 'BACKWARD'
-[nt_status nt] = system('grep NSTEP ../in_data_files/Par_file | cut -d = -f 2');
+[nt_status nt] = system('grep NSTEP ../DATAs/Par_file | cut -d = -f 2');
 nt=str2num(nt);
 
-fid=fopen('../in_data_files/backup/STATIONS_FORWARD');
+fid=fopen('../DATAs/backup/STATIONS_FORWARD');
   c=textscan(fid,'%s %s %f %f %f %f');
 fclose(fid);
 
@@ -63,13 +63,13 @@ cutShift = 0;
 totalCutTrace=zeros(cutLength,stationNumber);
 
 benchStation=floor((1+stationNumber)/2);
-bench=load(['../in_out_files/OUTPUT_FILES/' c{1,1}{benchStation} '.' c{1,2}{benchStation} '.' band 'Z' '.' variable]);
+bench=load(['../OUTPUT_FILES/' c{1,1}{benchStation} '.' c{1,2}{benchStation} '.' band 'Z' '.' variable]);
 [benchMax benchMaxIndex] = max(bench(:,2));
 
 for nStation = 1:stationNumber
-trace_x = load(['../in_out_files/OUTPUT_FILES/' c{1,1}{nStation} '.' c{1,2}{nStation} '.' band 'X' '.' variable]);
-trace_y = load(['../in_out_files/OUTPUT_FILES/' c{1,1}{nStation} '.' c{1,2}{nStation} '.' band 'Y' '.' variable]);
-trace_z = load(['../in_out_files/OUTPUT_FILES/' c{1,1}{nStation} '.' c{1,2}{nStation} '.' band 'Z' '.' variable]);
+trace_x = load(['../OUTPUT_FILES/' c{1,1}{nStation} '.' c{1,2}{nStation} '.' band 'X' '.' variable]);
+trace_y = load(['../OUTPUT_FILES/' c{1,1}{nStation} '.' c{1,2}{nStation} '.' band 'Y' '.' variable]);
+trace_z = load(['../OUTPUT_FILES/' c{1,1}{nStation} '.' c{1,2}{nStation} '.' band 'Z' '.' variable]);
 cutTrace_x = trace_x(benchMaxIndex - cutLength/2+cutShift:benchMaxIndex + cutLength/2 -1+cutShift,2);
 cutTrace_y = trace_y(benchMaxIndex - cutLength/2+cutShift:benchMaxIndex + cutLength/2 -1+cutShift,2);
 cutTrace_z = trace_z(benchMaxIndex - cutLength/2+cutShift:benchMaxIndex + cutLength/2 -1+cutShift,2);
@@ -102,6 +102,6 @@ end
 otherwise
 error('Wrong SOURCE type.')
 end
-save("-ascii",['../in_data_files/backup/SOURCE_X_' sourceType],'s_x')
-save("-ascii",['../in_data_files/backup/SOURCE_Y_' sourceType],'s_y')
-save("-ascii",['../in_data_files/backup/SOURCE_Z_' sourceType],'s_z')
+save("-ascii",['../DATAs/backup/SOURCE_X_' sourceType],'s_x')
+save("-ascii",['../DATAs/backup/SOURCE_Y_' sourceType],'s_y')
+save("-ascii",['../DATAs/backup/SOURCE_Z_' sourceType],'s_z')



More information about the CIG-COMMITS mailing list