[cig-commits] [commit] devel,master: fixes a bug in NGNOD-related developments; moves parameters MOVIE_SURFACE, CREATE_SHAKEMAP, OLSEN_ATTENUATION_RATIO from constants.h.in to Par_file; gets rid of previous EXTERNAL_MESH_* flags and introduces instead a new parameter MOVIE_TYPE in Par_file. (beware: the activation of movie flags still needs to be tested!) (3a0dd55)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Wed Jun 18 16:50:22 PDT 2014


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

On branches: devel,master
Link       : https://github.com/geodynamics/specfem3d/compare/6026e367984905ab133865f62fa6293b343759b9...47f703851338234f96397e7da9fbff63d8178b8a

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

commit 3a0dd55ba0b2ab44de0abb3063ef9b528710bb34
Author: Joseph Charles <jcharles at lma.cnrs-mrs.fr>
Date:   Fri Oct 26 19:06:43 2012 +0000

    fixes a bug in NGNOD-related developments; moves parameters MOVIE_SURFACE, CREATE_SHAKEMAP, OLSEN_ATTENUATION_RATIO from constants.h.in to Par_file; gets rid of previous EXTERNAL_MESH_* flags and introduces instead a new parameter MOVIE_TYPE in Par_file. (beware: the activation of movie flags still needs to be tested!)


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

3a0dd55ba0b2ab44de0abb3063ef9b528710bb34
 BENCHMARK_CLAERBOUT_ADJOINT/ACOUSTIC/DATA/Par_file | 12 +++++++++---
 BENCHMARK_CLAERBOUT_ADJOINT/ELASTIC/DATA/Par_file  | 12 +++++++++---
 Mount_StHelens/DATA/Par_file                       | 10 ++++++++--
 homogeneous_halfspace_HEX27/DATA/Par_file          | 14 ++++++++++----
 homogeneous_halfspace_HEX8/DATA/Par_file           | 10 ++++++++--
 homogeneous_poroelastic/DATA/Par_file              | 10 ++++++++--
 layered_halfspace/DATA/Par_file                    | 10 ++++++++--
 meshfem3D_examples/many_interfaces/DATA/Par_file   | 12 +++++++++---
 meshfem3D_examples/simple_model/DATA/Par_file      | 10 ++++++++--
 meshfem3D_examples/socal1D/DATA/Par_file           | 10 ++++++++--
 tomographic_model/DATA/Par_file                    | 10 ++++++++--
 waterlayered_halfspace/DATA/Par_file               | 10 ++++++++--
 12 files changed, 101 insertions(+), 29 deletions(-)

diff --git a/BENCHMARK_CLAERBOUT_ADJOINT/ACOUSTIC/DATA/Par_file b/BENCHMARK_CLAERBOUT_ADJOINT/ACOUSTIC/DATA/Par_file
index 9bd8a54..8bc4acf 100644
--- a/BENCHMARK_CLAERBOUT_ADJOINT/ACOUSTIC/DATA/Par_file
+++ b/BENCHMARK_CLAERBOUT_ADJOINT/ACOUSTIC/DATA/Par_file
@@ -47,13 +47,19 @@ ABSORBING_CONDITIONS            = .true.
 # absorbing top surface (defined in mesh as 'free_surface_file')
 ABSORB_INSTEAD_OF_FREE_SURFACE  = .false.
 
+# Olsen's constant for Q_mu = constant * v_s attenuation rule
+OLSEN_ATTENUATION_RATIO         = 0.05
+
 # save AVS or OpenDX movies
+# MOVIE_TYPE = 1 to show the top surface
+# MOVIE_TYPE = 2 to show all the external faces of the mesh
+MOVIE_TYPE                      = 1
+CREATE_SHAKEMAP                 = .false.
 MOVIE_SURFACE                   = .false.
 MOVIE_VOLUME                    = .false.
-NTSTEP_BETWEEN_FRAMES           = 100
-CREATE_SHAKEMAP                 = .false.
-SAVE_DISPLACEMENT               = .true.
+SAVE_DISPLACEMENT               = .false.
 USE_HIGHRES_FOR_MOVIES          = .false.
+NTSTEP_BETWEEN_FRAMES           = 200
 HDUR_MOVIE                      = 0.0
 
 # save AVS or OpenDX mesh files to check the mesh
diff --git a/BENCHMARK_CLAERBOUT_ADJOINT/ELASTIC/DATA/Par_file b/BENCHMARK_CLAERBOUT_ADJOINT/ELASTIC/DATA/Par_file
index d9f6ee8..4fe92ef 100644
--- a/BENCHMARK_CLAERBOUT_ADJOINT/ELASTIC/DATA/Par_file
+++ b/BENCHMARK_CLAERBOUT_ADJOINT/ELASTIC/DATA/Par_file
@@ -47,13 +47,19 @@ ABSORBING_CONDITIONS            = .true.
 # absorbing top surface (defined in mesh as 'free_surface_file')
 ABSORB_INSTEAD_OF_FREE_SURFACE  = .false.
 
+# Olsen's constant for Q_mu = constant * v_s attenuation rule
+OLSEN_ATTENUATION_RATIO         = 0.05
+
 # save AVS or OpenDX movies
+# MOVIE_TYPE = 1 to show the top surface
+# MOVIE_TYPE = 2 to show all the external faces of the mesh
+MOVIE_TYPE                      = 1
+CREATE_SHAKEMAP                 = .false.
 MOVIE_SURFACE                   = .false.
 MOVIE_VOLUME                    = .false.
-NTSTEP_BETWEEN_FRAMES           = 100
-CREATE_SHAKEMAP                 = .false.
-SAVE_DISPLACEMENT               = .true.
+SAVE_DISPLACEMENT               = .false.
 USE_HIGHRES_FOR_MOVIES          = .false.
+NTSTEP_BETWEEN_FRAMES           = 200
 HDUR_MOVIE                      = 0.0
 
 # save AVS or OpenDX mesh files to check the mesh
diff --git a/Mount_StHelens/DATA/Par_file b/Mount_StHelens/DATA/Par_file
index 0ecdceb..3fb324d 100644
--- a/Mount_StHelens/DATA/Par_file
+++ b/Mount_StHelens/DATA/Par_file
@@ -47,13 +47,19 @@ ABSORBING_CONDITIONS            = .true.
 # absorbing top surface (defined in mesh as 'free_surface_file')
 ABSORB_INSTEAD_OF_FREE_SURFACE  = .false.
 
+# Olsen's constant for Q_mu = constant * v_s attenuation rule
+OLSEN_ATTENUATION_RATIO         = 0.05
+
 # save AVS or OpenDX movies
+# MOVIE_TYPE = 1 to show the top surface
+# MOVIE_TYPE = 2 to show all the external faces of the mesh
+MOVIE_TYPE                      = 1
+CREATE_SHAKEMAP                 = .false.
 MOVIE_SURFACE                   = .false.
 MOVIE_VOLUME                    = .false.
-NTSTEP_BETWEEN_FRAMES           = 200
-CREATE_SHAKEMAP                 = .false.
 SAVE_DISPLACEMENT               = .false.
 USE_HIGHRES_FOR_MOVIES          = .false.
+NTSTEP_BETWEEN_FRAMES           = 200
 HDUR_MOVIE                      = 0.0
 
 # save AVS or OpenDX mesh files to check the mesh
diff --git a/homogeneous_halfspace_HEX27/DATA/Par_file b/homogeneous_halfspace_HEX27/DATA/Par_file
index 6bc5b42..548577f 100644
--- a/homogeneous_halfspace_HEX27/DATA/Par_file
+++ b/homogeneous_halfspace_HEX27/DATA/Par_file
@@ -12,7 +12,7 @@ UTM_PROJECTION_ZONE             = 11
 SUPPRESS_UTM_PROJECTION         = .true.
 
 # number of MPI processors
-NPROC                           = 4
+NPROC                           = 2
 
 # time step parameters
 NSTEP                           = 1000
@@ -23,7 +23,7 @@ DT                              = 0.05
 # If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
 # CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
 # To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD 	      	    	     	= 8
+NGNOD 	      	    	     	= 27
 
 # models:
 # available options are:
@@ -48,13 +48,19 @@ ABSORBING_CONDITIONS            = .false.
 # absorbing top surface (defined in mesh as 'free_surface_file')
 ABSORB_INSTEAD_OF_FREE_SURFACE  = .false.
 
+# Olsen's constant for Q_mu = constant * v_s attenuation rule
+OLSEN_ATTENUATION_RATIO         = 0.05
+
 # save AVS or OpenDX movies
+# MOVIE_TYPE = 1 to show the top surface
+# MOVIE_TYPE = 2 to show all the external faces of the mesh
+MOVIE_TYPE                      = 1
+CREATE_SHAKEMAP                 = .false.
 MOVIE_SURFACE                   = .false.
 MOVIE_VOLUME                    = .false.
-NTSTEP_BETWEEN_FRAMES           = 200
-CREATE_SHAKEMAP                 = .false.
 SAVE_DISPLACEMENT               = .false.
 USE_HIGHRES_FOR_MOVIES          = .false.
+NTSTEP_BETWEEN_FRAMES           = 200
 HDUR_MOVIE                      = 0.0
 
 # save AVS or OpenDX mesh files to check the mesh
diff --git a/homogeneous_halfspace_HEX8/DATA/Par_file b/homogeneous_halfspace_HEX8/DATA/Par_file
index 6bc5b42..c7610b9 100644
--- a/homogeneous_halfspace_HEX8/DATA/Par_file
+++ b/homogeneous_halfspace_HEX8/DATA/Par_file
@@ -48,13 +48,19 @@ ABSORBING_CONDITIONS            = .false.
 # absorbing top surface (defined in mesh as 'free_surface_file')
 ABSORB_INSTEAD_OF_FREE_SURFACE  = .false.
 
+# Olsen's constant for Q_mu = constant * v_s attenuation rule
+OLSEN_ATTENUATION_RATIO         = 0.05
+
 # save AVS or OpenDX movies
+# MOVIE_TYPE = 1 to show the top surface
+# MOVIE_TYPE = 2 to show all the external faces of the mesh
+MOVIE_TYPE                      = 1
+CREATE_SHAKEMAP                 = .false.
 MOVIE_SURFACE                   = .false.
 MOVIE_VOLUME                    = .false.
-NTSTEP_BETWEEN_FRAMES           = 200
-CREATE_SHAKEMAP                 = .false.
 SAVE_DISPLACEMENT               = .false.
 USE_HIGHRES_FOR_MOVIES          = .false.
+NTSTEP_BETWEEN_FRAMES           = 200
 HDUR_MOVIE                      = 0.0
 
 # save AVS or OpenDX mesh files to check the mesh
diff --git a/homogeneous_poroelastic/DATA/Par_file b/homogeneous_poroelastic/DATA/Par_file
index 2e9c886..e55e068 100644
--- a/homogeneous_poroelastic/DATA/Par_file
+++ b/homogeneous_poroelastic/DATA/Par_file
@@ -48,13 +48,19 @@ ABSORBING_CONDITIONS            = .false.
 # absorbing top surface (defined in mesh as 'free_surface_file')
 ABSORB_INSTEAD_OF_FREE_SURFACE  = .false.
 
+# Olsen's constant for Q_mu = constant * v_s attenuation rule
+OLSEN_ATTENUATION_RATIO         = 0.05
+
 # save AVS or OpenDX movies
+# MOVIE_TYPE = 1 to show the top surface
+# MOVIE_TYPE = 2 to show all the external faces of the mesh
+MOVIE_TYPE                      = 1
+CREATE_SHAKEMAP                 = .false.
 MOVIE_SURFACE                   = .false.
 MOVIE_VOLUME                    = .false.
-NTSTEP_BETWEEN_FRAMES           = 100
-CREATE_SHAKEMAP                 = .false.
 SAVE_DISPLACEMENT               = .false.
 USE_HIGHRES_FOR_MOVIES          = .false.
+NTSTEP_BETWEEN_FRAMES           = 200
 HDUR_MOVIE                      = 0.0
 
 # save AVS or OpenDX mesh files to check the mesh
diff --git a/layered_halfspace/DATA/Par_file b/layered_halfspace/DATA/Par_file
index 1182b7c..427ab41 100644
--- a/layered_halfspace/DATA/Par_file
+++ b/layered_halfspace/DATA/Par_file
@@ -48,13 +48,19 @@ ABSORBING_CONDITIONS            = .true.
 # absorbing top surface (defined in mesh as 'free_surface_file')
 ABSORB_INSTEAD_OF_FREE_SURFACE  = .false.
 
+# Olsen's constant for Q_mu = constant * v_s attenuation rule
+OLSEN_ATTENUATION_RATIO         = 0.05
+
 # save AVS or OpenDX movies
+# MOVIE_TYPE = 1 to show the top surface
+# MOVIE_TYPE = 2 to show all the external faces of the mesh
+MOVIE_TYPE                      = 1
+CREATE_SHAKEMAP                 = .false.
 MOVIE_SURFACE                   = .false.
 MOVIE_VOLUME                    = .false.
-NTSTEP_BETWEEN_FRAMES           = 200
-CREATE_SHAKEMAP                 = .false.
 SAVE_DISPLACEMENT               = .false.
 USE_HIGHRES_FOR_MOVIES          = .false.
+NTSTEP_BETWEEN_FRAMES           = 200
 HDUR_MOVIE                      = 0.0
 
 # save AVS or OpenDX mesh files to check the mesh
diff --git a/meshfem3D_examples/many_interfaces/DATA/Par_file b/meshfem3D_examples/many_interfaces/DATA/Par_file
index 74e744f..a2d8ed6 100644
--- a/meshfem3D_examples/many_interfaces/DATA/Par_file
+++ b/meshfem3D_examples/many_interfaces/DATA/Par_file
@@ -48,13 +48,19 @@ ABSORBING_CONDITIONS            = .true.
 # absorbing top surface (defined in mesh as 'free_surface_file')
 ABSORB_INSTEAD_OF_FREE_SURFACE  = .false.
 
+# Olsen's constant for Q_mu = constant * v_s attenuation rule
+OLSEN_ATTENUATION_RATIO         = 0.05
+
 # save AVS or OpenDX movies
-MOVIE_SURFACE                   = .true.
-MOVIE_VOLUME                    = .false.
-NTSTEP_BETWEEN_FRAMES           = 200
+# MOVIE_TYPE = 1 to show the top surface
+# MOVIE_TYPE = 2 to show all the external faces of the mesh
+MOVIE_TYPE                      = 1
 CREATE_SHAKEMAP                 = .false.
+MOVIE_SURFACE                   = .false.
+MOVIE_VOLUME                    = .false.
 SAVE_DISPLACEMENT               = .false.
 USE_HIGHRES_FOR_MOVIES          = .false.
+NTSTEP_BETWEEN_FRAMES           = 200
 HDUR_MOVIE                      = 0.0
 
 # save AVS or OpenDX mesh files to check the mesh
diff --git a/meshfem3D_examples/simple_model/DATA/Par_file b/meshfem3D_examples/simple_model/DATA/Par_file
index 743a5da..ee12585 100644
--- a/meshfem3D_examples/simple_model/DATA/Par_file
+++ b/meshfem3D_examples/simple_model/DATA/Par_file
@@ -48,13 +48,19 @@ ABSORBING_CONDITIONS            = .false.
 # absorbing top surface (defined in mesh as 'free_surface_file')
 ABSORB_INSTEAD_OF_FREE_SURFACE  = .false.
 
+# Olsen's constant for Q_mu = constant * v_s attenuation rule
+OLSEN_ATTENUATION_RATIO         = 0.05
+
 # save AVS or OpenDX movies
+# MOVIE_TYPE = 1 to show the top surface
+# MOVIE_TYPE = 2 to show all the external faces of the mesh
+MOVIE_TYPE                      = 1
+CREATE_SHAKEMAP                 = .false.
 MOVIE_SURFACE                   = .false.
 MOVIE_VOLUME                    = .false.
-NTSTEP_BETWEEN_FRAMES           = 200
-CREATE_SHAKEMAP                 = .false.
 SAVE_DISPLACEMENT               = .false.
 USE_HIGHRES_FOR_MOVIES          = .false.
+NTSTEP_BETWEEN_FRAMES           = 200
 HDUR_MOVIE                      = 0.0
 
 # save AVS or OpenDX mesh files to check the mesh
diff --git a/meshfem3D_examples/socal1D/DATA/Par_file b/meshfem3D_examples/socal1D/DATA/Par_file
index 8363063..99a4ffd 100644
--- a/meshfem3D_examples/socal1D/DATA/Par_file
+++ b/meshfem3D_examples/socal1D/DATA/Par_file
@@ -48,13 +48,19 @@ ABSORBING_CONDITIONS            = .true.
 # absorbing top surface (defined in mesh as 'free_surface_file')
 ABSORB_INSTEAD_OF_FREE_SURFACE  = .false.
 
+# Olsen's constant for Q_mu = constant * v_s attenuation rule
+OLSEN_ATTENUATION_RATIO         = 0.05
+
 # save AVS or OpenDX movies
+# MOVIE_TYPE = 1 to show the top surface
+# MOVIE_TYPE = 2 to show all the external faces of the mesh
+MOVIE_TYPE                      = 1
+CREATE_SHAKEMAP                 = .false.
 MOVIE_SURFACE                   = .false.
 MOVIE_VOLUME                    = .false.
-NTSTEP_BETWEEN_FRAMES           = 200
-CREATE_SHAKEMAP                 = .false.
 SAVE_DISPLACEMENT               = .false.
 USE_HIGHRES_FOR_MOVIES          = .false.
+NTSTEP_BETWEEN_FRAMES           = 200
 HDUR_MOVIE                      = 0.0
 
 # save AVS or OpenDX mesh files to check the mesh
diff --git a/tomographic_model/DATA/Par_file b/tomographic_model/DATA/Par_file
index e7a10c8..372d1ae 100644
--- a/tomographic_model/DATA/Par_file
+++ b/tomographic_model/DATA/Par_file
@@ -48,13 +48,19 @@ ABSORBING_CONDITIONS            = .true.
 # absorbing top surface (defined in mesh as 'free_surface_file')
 ABSORB_INSTEAD_OF_FREE_SURFACE  = .false.
 
+# Olsen's constant for Q_mu = constant * v_s attenuation rule
+OLSEN_ATTENUATION_RATIO         = 0.05
+
 # save AVS or OpenDX movies
+# MOVIE_TYPE = 1 to show the top surface
+# MOVIE_TYPE = 2 to show all the external faces of the mesh
+MOVIE_TYPE                      = 1
+CREATE_SHAKEMAP                 = .false.
 MOVIE_SURFACE                   = .false.
 MOVIE_VOLUME                    = .false.
-NTSTEP_BETWEEN_FRAMES           = 200
-CREATE_SHAKEMAP                 = .false.
 SAVE_DISPLACEMENT               = .false.
 USE_HIGHRES_FOR_MOVIES          = .false.
+NTSTEP_BETWEEN_FRAMES           = 200
 HDUR_MOVIE                      = 0.0
 
 # save AVS or OpenDX mesh files to check the mesh
diff --git a/waterlayered_halfspace/DATA/Par_file b/waterlayered_halfspace/DATA/Par_file
index 103186e..01f7cfe 100644
--- a/waterlayered_halfspace/DATA/Par_file
+++ b/waterlayered_halfspace/DATA/Par_file
@@ -48,13 +48,19 @@ ABSORBING_CONDITIONS            = .true.
 # absorbing top surface (defined in mesh as 'free_surface_file')
 ABSORB_INSTEAD_OF_FREE_SURFACE  = .false.
 
+# Olsen's constant for Q_mu = constant * v_s attenuation rule
+OLSEN_ATTENUATION_RATIO         = 0.05
+
 # save AVS or OpenDX movies
+# MOVIE_TYPE = 1 to show the top surface
+# MOVIE_TYPE = 2 to show all the external faces of the mesh
+MOVIE_TYPE                      = 1
+CREATE_SHAKEMAP                 = .false.
 MOVIE_SURFACE                   = .false.
 MOVIE_VOLUME                    = .false.
-NTSTEP_BETWEEN_FRAMES           = 100
-CREATE_SHAKEMAP                 = .false.
 SAVE_DISPLACEMENT               = .false.
 USE_HIGHRES_FOR_MOVIES          = .false.
+NTSTEP_BETWEEN_FRAMES           = 200
 HDUR_MOVIE                      = 0.0
 
 # save AVS or OpenDX mesh files to check the mesh



More information about the CIG-COMMITS mailing list