Update data.

PrincetonUniversity · Feb 3, 2025 · da14a72 · da14a72
1 parent 2aa729b
commit da14a72
Show file tree

Hide file tree

Showing 22 changed files with 52 additions and 673 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -642,20 +642,16 @@ add_executable(
         benchmarks/main.cpp
 )
 
-add_subdirectory(benchmarks/data)
-add_subdirectory(benchmarks/data_iso)
-add_subdirectory(benchmarks/data_aniso)
-
 target_link_libraries(
         specfem2d-benchmark
         execute
 )
 
 target_compile_definitions(
         specfem2d-benchmark
-        PRIVATE __benchmark_acoustic__="${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/data/specfem_config.yaml"
         PRIVATE __benchmark_iso__="${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/data_iso/specfem_config.yaml"
-        PRIVATE __benchmark_aniso__="${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/data_aniso/specfem_config.yaml"
+        PRIVATE __benchmark_eiso__="${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/data_eiso/specfem_config.yaml"
+        PRIVATE __benchmark_eani__="${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/data_eani/specfem_config.yaml"
 )
 
 # Include tests

diff --git a/benchmarks/.gitignore b/benchmarks/.gitignore
@@ -0,0 +1,3 @@
+data_iso
+data_eiso
+data_eani
diff --git a/benchmarks/data/.gitignore b/benchmarks/data/.gitignore
diff --git a/benchmarks/data/CMakeFiles/Par_File.in b/benchmarks/data/CMakeFiles/Par_File.in
diff --git a/benchmarks/data/CMakeLists.txt b/benchmarks/data/CMakeLists.txt
diff --git a/...ks/data/CMakeFiles/specfem_config.yaml.in → benchmarks/data/specfem_config.yaml b/...ks/data/CMakeFiles/specfem_config.yaml.in → benchmarks/data/specfem_config.yaml
@@ -2,10 +2,10 @@ parameters:
 
   header:
     ## Header information is used for logging. It is good practice to give your simulations explicit names
-    title: Isotropic Elastic simulation # name for your simulation
+    title: ${title} # name for your simulation
     # A detailed description for your simulation
     description: |
-      Material systems : Elastic domain (1)
+      Material systems : ${title}
       Interfaces : None
       Sources : Force source (1)
       Boundary conditions : Neumann BCs on all edges
@@ -28,10 +28,10 @@ parameters:
         writer:
           seismogram:
             format: "ascii"
-            directory: "@CMAKE_SOURCE_DIR@/benchmarks/data/OUTPUT_FILES/results"
+            directory: "${cwd}/OUTPUT_FILES"
 
   receivers:
-    stations: "@CMAKE_SOURCE_DIR@/benchmarks/data/OUTPUT_FILES/STATIONS"
+    stations: "${cwd}/OUTPUT_FILES/STATIONS"
     angle: 0.0
     seismogram-type:
       - velocity
@@ -44,7 +44,7 @@ parameters:
 
   ## databases
   databases:
-    mesh-database: "@CMAKE_SOURCE_DIR@/benchmarks/data/OUTPUT_FILES/database.bin"
+    mesh-database: "${cwd}/OUTPUT_FILES/database.bin"
 
   ## sources
-  sources: "@CMAKE_SOURCE_DIR@/benchmarks/data/source.yaml"
+  sources: "${cwd}/source.yaml"
diff --git a/benchmarks/data/topography.dat b/benchmarks/data/topography.dat
@@ -22,4 +22,4 @@
 #
 # layer number 1 (bottom layer)
 #
-    600
+    ${nz}
diff --git a/benchmarks/data_aniso/.gitignore b/benchmarks/data_aniso/.gitignore
diff --git a/benchmarks/data_aniso/CMakeFiles/Par_File.in b/benchmarks/data_aniso/CMakeFiles/Par_File.in
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,4 +22,4 @@ @@
     #
     # layer number 1 (bottom layer)
     #
+        ${nz}