Merge pull request #1202 from danielpeter/devel

updates reading of external models (adds nummaterial_velocity_file); updates Par_files and examples (in particular Marmousi_mesh_of_the_model/ and MODEL = marmousi)
SPECFEM · Feb 15, 2024 · 620b7a5 · 620b7a5
2 parents 9343a0a + 5d6c127
commit 620b7a5
Show file tree

Hide file tree

Showing 126 changed files with 373,597 additions and 3,234 deletions.
diff --git a/DATA/Par_file b/DATA/Par_file
@@ -68,6 +68,9 @@ MODEL                           = default
 # (available output formats: ascii,binary,gll,legacy)
 SAVE_MODEL                      = default
 
+# external tomography file
+# (used for tomography materials with negative material ids and/or MODEL==tomo settings)
+TOMOGRAPHY_FILE                 = dummy
 
 #-----------------------------------------------------------
 #
@@ -239,10 +242,39 @@ PERIODIC_HORIZ_DIST             = 4000.d0
 
 #-----------------------------------------------------------
 #
-# Velocity and density models
+# MESHING - Velocity and density models
+#
+#-----------------------------------------------------------
+
+# use an external mesh created by an external meshing tool or use the internal mesher
+read_external_mesh              = .false.
+
+#-----------------------------------------------------------
+#
+# PARAMETERS FOR EXTERNAL MESHING
+#
+#-----------------------------------------------------------
+
+# data concerning mesh, when generated using third-party app (more info in README)
+# (see also absorbing_conditions above)
+mesh_file                       = dummy                                   # file containing the mesh
+nodes_coords_file               = dummy                                   # file containing the nodes coordinates
+materials_file                  = dummy                                   # file containing the material number for each element
+nummaterial_velocity_file       = dummy                                   # file containing the material properties for each material
+free_surface_file               = dummy                                   # file containing the free surface
+axial_elements_file             = dummy                                   # file containing the axial elements if AXISYM is true
+absorbing_surface_file          = dummy                                   # file containing the absorbing surface
+acoustic_forcing_surface_file   = dummy                                   # file containing the acoustic forcing surface
+absorbing_cpml_file             = dummy                                   # file containing the CPML element numbers
+tangential_detection_curve_file = dummy                                   # file containing the curve delimiting the velocity model
+
+#-----------------------------------------------------------
+#
+# PARAMETERS FOR INTERNAL MESHING
 #
 #-----------------------------------------------------------
 
+# material properties
 # number of model materials
 nbmodels                        = 4
 # available material types (see user manual for more information)
@@ -265,37 +297,6 @@ nbmodels                        = 4
 3 1 2200.d0 2500.d0 1443.375d0 0 0 9999 9999 0 0 0 0 0 0
 4 1 2200.d0 2200.d0 1343.375d0 0 0 9999 9999 0 0 0 0 0 0
 
-# external tomography file
-TOMOGRAPHY_FILE                 = ./DATA/tomo_file.xyz
-
-# use an external mesh created by an external meshing tool or use the internal mesher
-read_external_mesh              = .false.
-
-#-----------------------------------------------------------
-#
-# PARAMETERS FOR EXTERNAL MESHING
-#
-#-----------------------------------------------------------
-
-# data concerning mesh, when generated using third-party app (more info in README)
-# (see also absorbing_conditions above)
-mesh_file                       = dummy                     # file containing the mesh
-nodes_coords_file               = dummy                     # file containing the nodes coordinates
-materials_file                  = dummy                     # file containing the material number for each element
-nummaterial_velocity_file       = dummy                     # file containing the material properties for each material
-free_surface_file               = dummy                     # file containing the free surface
-axial_elements_file             = dummy                     # file containing the axial elements if AXISYM is true
-absorbing_surface_file          = dummy                     # file containing the absorbing surface
-acoustic_forcing_surface_file   = dummy                     # file containing the acoustic forcing surface
-absorbing_cpml_file             = dummy                     # file containing the CPML element numbers
-tangential_detection_curve_file = dummy                     # file containing the curve delimiting the velocity model
-
-#-----------------------------------------------------------
-#
-# PARAMETERS FOR INTERNAL MESHING
-#
-#-----------------------------------------------------------
-
 # file containing interfaces for internal mesh
 interfacesfile                  = ../EXAMPLES/simple_topography_and_also_a_simple_fluid_layer/DATA/interfaces_simple_topo_curved.dat
 

diff --git a/EXAMPLES/BENCHIE_water_PVC/DATA/Par_file b/EXAMPLES/BENCHIE_water_PVC/DATA/Par_file
@@ -68,6 +68,9 @@ MODEL                           = default
 # (available output formats: ascii,binary,gll,legacy)
 SAVE_MODEL                      = default
 
+# external tomography file
+# (used for tomography materials with negative material ids and/or MODEL==tomo settings)
+TOMOGRAPHY_FILE                 = ./DATA/tomo_file.xyz
 
 #-----------------------------------------------------------
 #
@@ -231,10 +234,39 @@ PERIODIC_HORIZ_DIST             = 4000.d0
 
 #-----------------------------------------------------------
 #
-# Velocity and density models
+# MESHING - Velocity and density models
+#
+#-----------------------------------------------------------
+
+# use an external mesh created by an external meshing tool or use the internal mesher
+read_external_mesh              = .true.
+
+#-----------------------------------------------------------
+#
+# PARAMETERS FOR EXTERNAL MESHING
 #
 #-----------------------------------------------------------
 
+# data concerning mesh, when generated using third-party app (more info in README)
+# (see also absorbing_conditions above)
+mesh_file                       = ./MESH/mesh_file                        # file containing the mesh
+nodes_coords_file               = ./MESH/nodes_coords_file                # file containing the nodes coordinates
+materials_file                  = ./MESH/materials_file                   # file containing the material number for each element
+nummaterial_velocity_file       = ./MESH/nummaterial_velocity_file        # file containing the material properties for each material
+free_surface_file               = ./MESH/free_surface_file                # file containing the free surface
+axial_elements_file             = ./MESH/axial_elements_file              # file containing the axial elements if AXISYM is true
+absorbing_surface_file          = ./MESH/absorbing_surface_file           # file containing the absorbing surface
+acoustic_forcing_surface_file   = ./MESH/Surf_acforcing_Bottom_enforcing_mesh   # file containing the acoustic forcing surface
+absorbing_cpml_file             = ./MESH/absorbing_cpml_file              # file containing the CPML element numbers
+tangential_detection_curve_file = ./MESH/courbe_eros_nodes                # file containing the curve delimiting the velocity model
+
+#-----------------------------------------------------------
+#
+# PARAMETERS FOR INTERNAL MESHING
+#
+#-----------------------------------------------------------
+
+# material properties
 # number of model materials
 nbmodels                        = 2
 # available material types (see user manual for more information)
@@ -264,37 +296,6 @@ nbmodels                        = 2
 1 1 1412.d0 2260.d0 1050.d0 0 0 9999 9999 0 0 0 0 0 0
 2 1 1000.d0 1477.d0 0.d0 0 0 9999 9999 0 0 0 0 0 0
 
-# external tomography file
-TOMOGRAPHY_FILE                 = ./DATA/tomo_file.xyz
-
-# use an external mesh created by an external meshing tool or use the internal mesher
-read_external_mesh              = .true.
-
-#-----------------------------------------------------------
-#
-# PARAMETERS FOR EXTERNAL MESHING
-#
-#-----------------------------------------------------------
-
-# data concerning mesh, when generated using third-party app (more info in README)
-# (see also absorbing_conditions above)
-mesh_file                       = ./MESH/mesh_file                             # file containing the mesh
-nodes_coords_file               = ./MESH/nodes_coords_file                     # file containing the nodes coordinates
-materials_file                  = ./MESH/materials_file                        # file containing the material number for each element
-nummaterial_velocity_file       = ./MESH/nummaterial_velocity_file             # file containing the material properties for each material
-free_surface_file               = ./MESH/free_surface_file                     # file containing the free surface
-axial_elements_file             = ./MESH/axial_elements_file                   # file containing the axial elements if AXISYM is true
-absorbing_surface_file          = ./MESH/absorbing_surface_file                # file containing the absorbing surface
-acoustic_forcing_surface_file   = ./MESH/Surf_acforcing_Bottom_enforcing_mesh  # file containing the acoustic forcing surface
-absorbing_cpml_file             = ./MESH/absorbing_cpml_file                   # file containing the CPML element numbers
-tangential_detection_curve_file = ./MESH/courbe_eros_nodes                     # file containing the curve delimiting the velocity model
-
-#-----------------------------------------------------------
-#
-# PARAMETERS FOR INTERNAL MESHING
-#
-#-----------------------------------------------------------
-
 # file containing interfaces for internal mesh
 interfacesfile                  = interfaces_model5.dat
 

diff --git a/EXAMPLES/BENCHMARK_CLAERBOUT_ADJOINT/ACOUSTIC/DATA/Par_file b/EXAMPLES/BENCHMARK_CLAERBOUT_ADJOINT/ACOUSTIC/DATA/Par_file
@@ -68,6 +68,9 @@ MODEL                           = default
 # (available output formats: ascii,binary,gll,legacy)
 SAVE_MODEL                      = gll
 
+# external tomography file
+# (used for tomography materials with negative material ids and/or MODEL==tomo settings)
+TOMOGRAPHY_FILE                 = dummy
 
 #-----------------------------------------------------------
 #
@@ -223,10 +226,39 @@ PERIODIC_HORIZ_DIST             = 0.3597d0
 
 #-----------------------------------------------------------
 #
-# Velocity and density models
+# MESHING - Velocity and density models
+#
+#-----------------------------------------------------------
+
+# use an external mesh created by an external meshing tool or use the internal mesher
+read_external_mesh              = .false.
+
+#-----------------------------------------------------------
+#
+# PARAMETERS FOR EXTERNAL MESHING
 #
 #-----------------------------------------------------------
 
+# data concerning mesh, when generated using third-party app (more info in README)
+# (see also absorbing_conditions above)
+mesh_file                       = dummy                                   # file containing the mesh
+nodes_coords_file               = dummy                                   # file containing the nodes coordinates
+materials_file                  = dummy                                   # file containing the material number for each element
+nummaterial_velocity_file       = dummy                                   # file containing the material properties for each material
+free_surface_file               = dummy                                   # file containing the free surface
+axial_elements_file             = dummy                                   # file containing the axial elements if AXISYM is true
+absorbing_surface_file          = dummy                                   # file containing the absorbing surface
+acoustic_forcing_surface_file   = dummy                                   # file containing the acoustic forcing surface
+absorbing_cpml_file             = dummy                                   # file containing the CPML element numbers
+tangential_detection_curve_file = dummy                                   # file containing the curve delimiting the velocity model
+
+#-----------------------------------------------------------
+#
+# PARAMETERS FOR INTERNAL MESHING
+#
+#-----------------------------------------------------------
+
+# material properties
 # number of model materials
 nbmodels                        = 1
 # available material types (see user manual for more information)
@@ -246,37 +278,6 @@ nbmodels                        = 1
 #       utils/attenuation/conversion_from_Qkappa_Qmu_to_Qp_Qs_from_Dahlen_Tromp_959_960.f90.
 1 1 2500.d0 2700.d0 0.d0   0 0 9999 9999 0 0 0 0 0 0
 
-# external tomography file
-TOMOGRAPHY_FILE                 = dummy
-
-# use an external mesh created by an external meshing tool or use the internal mesher
-read_external_mesh              = .false.
-
-#-----------------------------------------------------------
-#
-# PARAMETERS FOR EXTERNAL MESHING
-#
-#-----------------------------------------------------------
-
-# data concerning mesh, when generated using third-party app (more info in README)
-# (see also absorbing_conditions above)
-mesh_file                       = dummy                     # file containing the mesh
-nodes_coords_file               = dummy                     # file containing the nodes coordinates
-materials_file                  = dummy                     # file containing the material number for each element
-nummaterial_velocity_file       = dummy                     # file containing the material properties for each material
-free_surface_file               = dummy                     # file containing the free surface
-axial_elements_file             = dummy                     # file containing the axial elements if AXISYM is true
-absorbing_surface_file          = dummy                     # file containing the absorbing surface
-acoustic_forcing_surface_file   = dummy                     # file containing the acoustic forcing surface
-absorbing_cpml_file             = dummy                     # file containing the CPML element numbers
-tangential_detection_curve_file = dummy                     # file containing the curve delimiting the velocity model
-
-#-----------------------------------------------------------
-#
-# PARAMETERS FOR INTERNAL MESHING
-#
-#-----------------------------------------------------------
-
 # file containing interfaces for internal mesh
 interfacesfile                  = ./interfaces.dat
 

diff --git a/EXAMPLES/BENCHMARK_CLAERBOUT_ADJOINT/ACOUSTIC_ELASTIC/DATA/Par_file b/EXAMPLES/BENCHMARK_CLAERBOUT_ADJOINT/ACOUSTIC_ELASTIC/DATA/Par_file
@@ -68,6 +68,9 @@ MODEL                           = default
 # (available output formats: ascii,binary,gll,legacy)
 SAVE_MODEL                      = gll
 
+# external tomography file
+# (used for tomography materials with negative material ids and/or MODEL==tomo settings)
+TOMOGRAPHY_FILE                 = dummy
 
 #-----------------------------------------------------------
 #
@@ -223,10 +226,39 @@ PERIODIC_HORIZ_DIST             = 0.3597d0
 
 #-----------------------------------------------------------
 #
-# Velocity and density models
+# MESHING - Velocity and density models
+#
+#-----------------------------------------------------------
+
+# use an external mesh created by an external meshing tool or use the internal mesher
+read_external_mesh              = .false.
+
+#-----------------------------------------------------------
+#
+# PARAMETERS FOR EXTERNAL MESHING
 #
 #-----------------------------------------------------------
 
+# data concerning mesh, when generated using third-party app (more info in README)
+# (see also absorbing_conditions above)
+mesh_file                       = dummy                                   # file containing the mesh
+nodes_coords_file               = dummy                                   # file containing the nodes coordinates
+materials_file                  = dummy                                   # file containing the material number for each element
+nummaterial_velocity_file       = dummy                                   # file containing the material properties for each material
+free_surface_file               = dummy                                   # file containing the free surface
+axial_elements_file             = dummy                                   # file containing the axial elements if AXISYM is true
+absorbing_surface_file          = dummy                                   # file containing the absorbing surface
+acoustic_forcing_surface_file   = dummy                                   # file containing the acoustic forcing surface
+absorbing_cpml_file             = dummy                                   # file containing the CPML element numbers
+tangential_detection_curve_file = dummy                                   # file containing the curve delimiting the velocity model
+
+#-----------------------------------------------------------
+#
+# PARAMETERS FOR INTERNAL MESHING
+#
+#-----------------------------------------------------------
+
+# material properties
 # number of model materials
 nbmodels                        = 2
 # available material types (see user manual for more information)
@@ -247,37 +279,6 @@ nbmodels                        = 2
 1 1 2700.d0 3000.d0 1700.d0  0 0 9999 9999 0 0 0 0 0 0
 2 1 2500.d0 2700.d0 0.d0     0 0 9999 9999 0 0 0 0 0 0
 
-# external tomography file
-TOMOGRAPHY_FILE                 = dummy
-
-# use an external mesh created by an external meshing tool or use the internal mesher
-read_external_mesh              = .false.
-
-#-----------------------------------------------------------
-#
-# PARAMETERS FOR EXTERNAL MESHING
-#
-#-----------------------------------------------------------
-
-# data concerning mesh, when generated using third-party app (more info in README)
-# (see also absorbing_conditions above)
-mesh_file                       = dummy                     # file containing the mesh
-nodes_coords_file               = dummy                     # file containing the nodes coordinates
-materials_file                  = dummy                     # file containing the material number for each element
-nummaterial_velocity_file       = dummy                     # file containing the material properties for each material
-free_surface_file               = dummy                     # file containing the free surface
-axial_elements_file             = dummy                     # file containing the axial elements if AXISYM is true
-absorbing_surface_file          = dummy                     # file containing the absorbing surface
-acoustic_forcing_surface_file   = dummy                     # file containing the acoustic forcing surface
-absorbing_cpml_file             = dummy                     # file containing the CPML element numbers
-tangential_detection_curve_file = dummy                     # file containing the curve delimiting the velocity model
-
-#-----------------------------------------------------------
-#
-# PARAMETERS FOR INTERNAL MESHING
-#
-#-----------------------------------------------------------
-
 # file containing interfaces for internal mesh
 interfacesfile                  = ./interfaces.dat