[cig-commits] [commit] devel, master: fixed the last broken examples, and renamed Gmsh_example_MPI_Stacey to Gmsh_example_Stacey_MPI and Gmsh_example_serial_Stacey to Gmsh_example_Stacey_serial (f4027ab)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Jun 18 15:24:07 PDT 2014
Repository : https://github.com/geodynamics/specfem2d
On branches: devel,master
Link : https://github.com/geodynamics/specfem2d/compare/fc67e6fd7ad890705b2b72b4b3c509accb22249e...e9ca46c40131588d89d7b0883250bc6584ce6b4c
>---------------------------------------------------------------
commit f4027abe46af31e07588c73cfaa413a717fda628
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date: Tue Mar 18 14:41:20 2014 +0100
fixed the last broken examples, and renamed Gmsh_example_MPI_Stacey to Gmsh_example_Stacey_MPI and Gmsh_example_serial_Stacey to Gmsh_example_Stacey_serial
>---------------------------------------------------------------
f4027abe46af31e07588c73cfaa413a717fda628
.../Material_SqrCirc | 0
.../Mesh_SqrCirc | 0
.../Nodes_SqrCirc | 0
.../Par_file_Gmsh_SqrCircles.in | 0
.../SOURCE.SqrCirc | 0
.../SqrCirc.geo | 0
.../SqrCirc.msh | 0
.../Surf_abs_SqrCirc | 0
.../Surf_free_SqrCirc | 0
.../mesh_quality_histogram.txt | 0
.../plot_mesh_quality_histogram.gnu | 0
.../process_the_Gmsh_file_once_and_for_all.sh | 0
.../run_this_example.sh | 0
.../Material_SqrCirc | 0
.../Mesh_SqrCirc | 0
.../Nodes_SqrCirc | 0
.../Par_file_Gmsh_SqrCircles.in | 0
.../SOURCE.SqrCirc | 0
.../SqrCirc.geo | 0
.../SqrCirc.msh | 0
.../Surf_abs_SqrCirc | 0
.../Surf_free_SqrCirc | 0
.../mesh_quality_histogram.txt | 0
.../plot_mesh_quality_histogram.gnu | 0
.../process_the_Gmsh_file_once_and_for_all.sh | 0
.../run_this_example.sh | 0
anisotropic_zinc_crystal/DATA/Par_file | 6 +-----
global_Earth_ak135f/DATA/Par_file | 18 +++++++-----------
28 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/Gmsh_example_MPI_Stacey/Material_SqrCirc b/Gmsh_example_Stacey_MPI/Material_SqrCirc
similarity index 100%
rename from Gmsh_example_MPI_Stacey/Material_SqrCirc
rename to Gmsh_example_Stacey_MPI/Material_SqrCirc
diff --git a/Gmsh_example_MPI_Stacey/Mesh_SqrCirc b/Gmsh_example_Stacey_MPI/Mesh_SqrCirc
similarity index 100%
rename from Gmsh_example_MPI_Stacey/Mesh_SqrCirc
rename to Gmsh_example_Stacey_MPI/Mesh_SqrCirc
diff --git a/Gmsh_example_MPI_Stacey/Nodes_SqrCirc b/Gmsh_example_Stacey_MPI/Nodes_SqrCirc
similarity index 100%
rename from Gmsh_example_MPI_Stacey/Nodes_SqrCirc
rename to Gmsh_example_Stacey_MPI/Nodes_SqrCirc
diff --git a/Gmsh_example_MPI_Stacey/Par_file_Gmsh_SqrCircles.in b/Gmsh_example_Stacey_MPI/Par_file_Gmsh_SqrCircles.in
similarity index 100%
rename from Gmsh_example_MPI_Stacey/Par_file_Gmsh_SqrCircles.in
rename to Gmsh_example_Stacey_MPI/Par_file_Gmsh_SqrCircles.in
diff --git a/Gmsh_example_MPI_Stacey/SOURCE.SqrCirc b/Gmsh_example_Stacey_MPI/SOURCE.SqrCirc
similarity index 100%
rename from Gmsh_example_MPI_Stacey/SOURCE.SqrCirc
rename to Gmsh_example_Stacey_MPI/SOURCE.SqrCirc
diff --git a/Gmsh_example_MPI_Stacey/SqrCirc.geo b/Gmsh_example_Stacey_MPI/SqrCirc.geo
similarity index 100%
rename from Gmsh_example_MPI_Stacey/SqrCirc.geo
rename to Gmsh_example_Stacey_MPI/SqrCirc.geo
diff --git a/Gmsh_example_MPI_Stacey/SqrCirc.msh b/Gmsh_example_Stacey_MPI/SqrCirc.msh
similarity index 100%
rename from Gmsh_example_MPI_Stacey/SqrCirc.msh
rename to Gmsh_example_Stacey_MPI/SqrCirc.msh
diff --git a/Gmsh_example_MPI_Stacey/Surf_abs_SqrCirc b/Gmsh_example_Stacey_MPI/Surf_abs_SqrCirc
similarity index 100%
rename from Gmsh_example_MPI_Stacey/Surf_abs_SqrCirc
rename to Gmsh_example_Stacey_MPI/Surf_abs_SqrCirc
diff --git a/Gmsh_example_MPI_Stacey/Surf_free_SqrCirc b/Gmsh_example_Stacey_MPI/Surf_free_SqrCirc
similarity index 100%
rename from Gmsh_example_MPI_Stacey/Surf_free_SqrCirc
rename to Gmsh_example_Stacey_MPI/Surf_free_SqrCirc
diff --git a/Gmsh_example_MPI_Stacey/mesh_quality_histogram.txt b/Gmsh_example_Stacey_MPI/mesh_quality_histogram.txt
similarity index 100%
rename from Gmsh_example_MPI_Stacey/mesh_quality_histogram.txt
rename to Gmsh_example_Stacey_MPI/mesh_quality_histogram.txt
diff --git a/Gmsh_example_MPI_Stacey/plot_mesh_quality_histogram.gnu b/Gmsh_example_Stacey_MPI/plot_mesh_quality_histogram.gnu
similarity index 100%
rename from Gmsh_example_MPI_Stacey/plot_mesh_quality_histogram.gnu
rename to Gmsh_example_Stacey_MPI/plot_mesh_quality_histogram.gnu
diff --git a/Gmsh_example_MPI_Stacey/process_the_Gmsh_file_once_and_for_all.sh b/Gmsh_example_Stacey_MPI/process_the_Gmsh_file_once_and_for_all.sh
similarity index 100%
rename from Gmsh_example_MPI_Stacey/process_the_Gmsh_file_once_and_for_all.sh
rename to Gmsh_example_Stacey_MPI/process_the_Gmsh_file_once_and_for_all.sh
diff --git a/Gmsh_example_MPI_Stacey/run_this_example.sh b/Gmsh_example_Stacey_MPI/run_this_example.sh
similarity index 100%
rename from Gmsh_example_MPI_Stacey/run_this_example.sh
rename to Gmsh_example_Stacey_MPI/run_this_example.sh
diff --git a/Gmsh_example_serial_Stacey/Material_SqrCirc b/Gmsh_example_Stacey_serial/Material_SqrCirc
similarity index 100%
rename from Gmsh_example_serial_Stacey/Material_SqrCirc
rename to Gmsh_example_Stacey_serial/Material_SqrCirc
diff --git a/Gmsh_example_serial_Stacey/Mesh_SqrCirc b/Gmsh_example_Stacey_serial/Mesh_SqrCirc
similarity index 100%
rename from Gmsh_example_serial_Stacey/Mesh_SqrCirc
rename to Gmsh_example_Stacey_serial/Mesh_SqrCirc
diff --git a/Gmsh_example_serial_Stacey/Nodes_SqrCirc b/Gmsh_example_Stacey_serial/Nodes_SqrCirc
similarity index 100%
rename from Gmsh_example_serial_Stacey/Nodes_SqrCirc
rename to Gmsh_example_Stacey_serial/Nodes_SqrCirc
diff --git a/Gmsh_example_serial_Stacey/Par_file_Gmsh_SqrCircles.in b/Gmsh_example_Stacey_serial/Par_file_Gmsh_SqrCircles.in
similarity index 100%
rename from Gmsh_example_serial_Stacey/Par_file_Gmsh_SqrCircles.in
rename to Gmsh_example_Stacey_serial/Par_file_Gmsh_SqrCircles.in
diff --git a/Gmsh_example_serial_Stacey/SOURCE.SqrCirc b/Gmsh_example_Stacey_serial/SOURCE.SqrCirc
similarity index 100%
rename from Gmsh_example_serial_Stacey/SOURCE.SqrCirc
rename to Gmsh_example_Stacey_serial/SOURCE.SqrCirc
diff --git a/Gmsh_example_serial_Stacey/SqrCirc.geo b/Gmsh_example_Stacey_serial/SqrCirc.geo
similarity index 100%
rename from Gmsh_example_serial_Stacey/SqrCirc.geo
rename to Gmsh_example_Stacey_serial/SqrCirc.geo
diff --git a/Gmsh_example_serial_Stacey/SqrCirc.msh b/Gmsh_example_Stacey_serial/SqrCirc.msh
similarity index 100%
rename from Gmsh_example_serial_Stacey/SqrCirc.msh
rename to Gmsh_example_Stacey_serial/SqrCirc.msh
diff --git a/Gmsh_example_serial_Stacey/Surf_abs_SqrCirc b/Gmsh_example_Stacey_serial/Surf_abs_SqrCirc
similarity index 100%
rename from Gmsh_example_serial_Stacey/Surf_abs_SqrCirc
rename to Gmsh_example_Stacey_serial/Surf_abs_SqrCirc
diff --git a/Gmsh_example_serial_Stacey/Surf_free_SqrCirc b/Gmsh_example_Stacey_serial/Surf_free_SqrCirc
similarity index 100%
rename from Gmsh_example_serial_Stacey/Surf_free_SqrCirc
rename to Gmsh_example_Stacey_serial/Surf_free_SqrCirc
diff --git a/Gmsh_example_serial_Stacey/mesh_quality_histogram.txt b/Gmsh_example_Stacey_serial/mesh_quality_histogram.txt
similarity index 100%
rename from Gmsh_example_serial_Stacey/mesh_quality_histogram.txt
rename to Gmsh_example_Stacey_serial/mesh_quality_histogram.txt
diff --git a/Gmsh_example_serial_Stacey/plot_mesh_quality_histogram.gnu b/Gmsh_example_Stacey_serial/plot_mesh_quality_histogram.gnu
similarity index 100%
rename from Gmsh_example_serial_Stacey/plot_mesh_quality_histogram.gnu
rename to Gmsh_example_Stacey_serial/plot_mesh_quality_histogram.gnu
diff --git a/Gmsh_example_serial_Stacey/process_the_Gmsh_file_once_and_for_all.sh b/Gmsh_example_Stacey_serial/process_the_Gmsh_file_once_and_for_all.sh
similarity index 100%
rename from Gmsh_example_serial_Stacey/process_the_Gmsh_file_once_and_for_all.sh
rename to Gmsh_example_Stacey_serial/process_the_Gmsh_file_once_and_for_all.sh
diff --git a/Gmsh_example_serial_Stacey/run_this_example.sh b/Gmsh_example_Stacey_serial/run_this_example.sh
similarity index 100%
rename from Gmsh_example_serial_Stacey/run_this_example.sh
rename to Gmsh_example_Stacey_serial/run_this_example.sh
diff --git a/anisotropic_zinc_crystal/DATA/Par_file b/anisotropic_zinc_crystal/DATA/Par_file
index 5aa73ba..df7e5e9 100644
--- a/anisotropic_zinc_crystal/DATA/Par_file
+++ b/anisotropic_zinc_crystal/DATA/Par_file
@@ -10,7 +10,6 @@ SAVE_FORWARD = .false. # save the last frame, needed for adjo
# parameters concerning partitioning
nproc = 1 # number of processes
partitioning_method = 3 # SCOTCH = 3, ascending order (very bad idea) = 1
-PERFORM_CUTHILL_MCKEE = .false. # perform inverse Cuthill-McKee (1969) optimization/permutation for mesh numbering (can be very costly and not very useful)
ngnod = 4 # number of control nodes per element (4 or 9)
initialfield = .false. # use a plane wave as source or not
@@ -136,10 +135,7 @@ ADD_SPRING_TO_STACEY = .false.
ADD_PERIODIC_CONDITIONS = .false.
# horizontal periodicity distance for periodic conditions
-PERIODIC_horiz_dist = 0.3597d0
-
-# grid point detection tolerance for periodic conditions
-PERIODIC_DETECT_TOL = 3.3334d-6
+PERIODIC_HORIZ_DIST = 0.3597d0
#-----------------------------------------------------------------------------
# PARAMETERS FOR EXTERNAL MESHING
diff --git a/global_Earth_ak135f/DATA/Par_file b/global_Earth_ak135f/DATA/Par_file
index c799ef6..890a6cc 100644
--- a/global_Earth_ak135f/DATA/Par_file
+++ b/global_Earth_ak135f/DATA/Par_file
@@ -2,14 +2,13 @@
title = AK135F for half a disk for axisymmetric runs
# forward or adjoint simulation
-SIMULATION_TYPE = 1 # 1 = forward, 3 = adjoint + kernels
-NOISE_TOMOGRAPHY = 0 # 0 = earthquake simulation, 1/2/3 = noise simulation
-SAVE_FORWARD = .false. # save the last frame, needed for adjoint simulation
+SIMULATION_TYPE = 1 # 1 = forward, 3 = adjoint + kernels; 2 is purposely UNUSED (for compatibility with the numbering of our 3D codes)
+NOISE_TOMOGRAPHY = 0 # 0 = earthquake simulation, 1/2/3 = noise simulation
+SAVE_FORWARD = .false. # save the last frame, needed for adjoint simulation
# parameters concerning partitioning
-nproc = 4 # number of processes
-partitioning_method = 3 # ascending order = 1, Scotch = 3
-PERFORM_CUTHILL_MCKEE = .false. # perform inverse Cuthill-McKee (1969) optimization/permutation for mesh numbering (can be very costly and not very useful)
+nproc = 1 # number of processes
+partitioning_method = 3 # SCOTCH = 3, ascending order (very bad idea) = 1
ngnod = 9 # number of control nodes per element (4 or 9)
initialfield = .false. # use a plane wave as source or not
@@ -44,7 +43,7 @@ save_binary_seismograms_single = .false. # save seismograms in single pr
save_binary_seismograms_double = .false. # save seismograms in double precision binary format or not (can be used jointly with both flags above to save all)
SU_FORMAT = .false. # output single precision binary seismograms in Seismic Unix format (adjoint traces will be read in the same format)
subsamp_seismos = 1 # subsampling of the seismograms to create smaller files (but less accurately sampled in time)
-generate_STATIONS = .true. # creates a new STATION file in ./DATA from this file or use the existing one
+use_existing_STATIONS = .false. # use an existing STATION file found in ./DATA or create a new one from the receiver positions below in this Par_file
nreceiversets = 1 # number of receiver sets
anglerec = 0.d0 # angle to rotate components at receivers
rec_normal_to_surface = .false. # replace anglerec with the normal to the surface (external mesh and curve file needed, anglerec above ignored)
@@ -125,10 +124,7 @@ ADD_SPRING_TO_STACEY = .false.
ADD_PERIODIC_CONDITIONS = .false.
# horizontal periodicity distance for periodic conditions
-PERIODIC_horiz_dist = 0.3597d0
-
-# grid point detection tolerance for periodic conditions
-PERIODIC_DETECT_TOL = 3.3334d-6
+PERIODIC_HORIZ_DIST = 0.3597d0
#-----------------------------------------------------------------------------
# PARAMETERS FOR EXTERNAL MESHING
More information about the CIG-COMMITS
mailing list