Move models folder to project root

.gitignore

@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2024 Tobias Hienzsch
 
 /.vscode
-/data/sim_data
+sim_data
 /build
 /cmake-build-*
 .DS_Store

README.md

@@ -109,7 +109,7 @@ See (TODO:) for some performance benchmark results using single-node Nvidia GPUs
 
 ## License
 
-This software is released under the MIT license. See the LICENSE file for details. The Sketchup models found in the data/models folder are released under different licenses; see the README files in their corresponding folders.
+This software is released under the MIT license. See the LICENSE file for details. The Sketchup models found in the `models` folder are released under different licenses; see the README files in their corresponding folders.
 
 ## Credits
 

REUSE.toml

@@ -4,25 +4,20 @@
 version = 1
 
 [[annotations]]
-path = [
-    "benchmarks/pffdtd_benchmarks.csv",
-    "doc/screenshot.png",
-    "src/model_viewer/doc/screenshot.png",
-    "src/ruby_SU/RoomExporter.rbz",
-]
+path = ["benchmarks/pffdtd_benchmarks.csv", "doc/screenshot.png"]
 SPDX-FileCopyrightText = "2021 Brian Hamilton"
 SPDX-License-Identifier = "MIT"
 
 [[annotations]]
 path = [
-    "data/models/CTK_Church/CTK_Church_SU2017.skp",
-    "data/models/CTK_Church/model_export.json",
-    "data/models/CTK_Church/receivers.csv",
-    "data/models/CTK_Church/sources.csv",
-    "data/models/Musikverein_ConcertHall/Musikverein_SU2017.skp",
-    "data/models/Musikverein_ConcertHall/model_export.json",
-    "data/models/Musikverein_ConcertHall/receivers.csv",
-    "data/models/Musikverein_ConcertHall/sources.csv",
+    "models/CTK_Church/CTK_Church_SU2017.skp",
+    "models/CTK_Church/model_export.json",
+    "models/CTK_Church/receivers.csv",
+    "models/CTK_Church/sources.csv",
+    "models/Musikverein_ConcertHall/Musikverein_SU2017.skp",
+    "models/Musikverein_ConcertHall/model_export.json",
+    "models/Musikverein_ConcertHall/receivers.csv",
+    "models/Musikverein_ConcertHall/sources.csv",
 ]
 SPDX-FileCopyrightText = "2021 Brian Hamilton"
 SPDX-License-Identifier = "CC-BY-SA-4.0"
@@ -31,14 +26,13 @@ SPDX-License-Identifier = "CC-BY-SA-4.0"
 path = [
     "cmake/profile/linux_sycl",
     "cmake/profile/windows_sycl",
-    "data/materials/*.h5",
-    "data/models/**/*.obj",
-    "data/models/InfiniteBaffle/model.json",
-    "data/models/LivingRoom/model.json",
-    "data/models/Localization/model.json",
-    "data/models/Modes/model.json",
-    "data/models/ProStudio/model.json",
-    "data/models/Studio/model.json",
+    "models/InfiniteBaffle/model.json",
+    "models/LivingRoom/model.json",
+    "models/Localization/model.json",
+    "models/Modes/model.json",
+    "models/ProStudio/model.json",
+    "models/Studio/model.json",
+    "models/**/*.obj",
 ]
 SPDX-FileCopyrightText = "2024 Tobias Hienzsch"
 SPDX-License-Identifier = "MIT"

data/models/InfiniteBaffle/InfiniteBaffle.py → models/InfiniteBaffle/InfiniteBaffle.py

@@ -8,8 +8,8 @@
 class InfiniteBaffle(Setup3D):
     """Point source on infinite baffle in an anechoic chamber
     """
-    fmax = 2000
-    ppw = 10.5
+    fmax = 4000
+    ppw = 7.7
     fcc = False
     model_file = 'model.json'
     mat_folder = '../../sim_data/InfiniteBaffle/materials'

models/InfiniteBaffle/model.json

@@ -0,0 +1 @@
+{"mats_hash": {"_RIGID": {"tris": [[0, 2, 1], [0, 3, 2], [1, 5, 4], [1, 3, 5]], "pts": [[0.0, 2.0, 0.0], [8.575, 2.0, 0.0], [8.575, 2.0, 17.15], [0.0, 2.0, 17.15], [17.15, 2.0, 0.0], [17.15, 2.0, 17.15]], "color": [255, 255, 255], "sides": [0, 0, 0, 0]}}, "sources": [{"name": "S1", "xyz": [8.575, 1.9777142857142858, 8.575]}], "receivers": [{"name": "R1", "xyz": [8.575, 0.022285714285714284, 7.824999999999999]}, {"name": "R2", "xyz": [8.575, 0.022285714285714284, 8.325]}, {"name": "R3", "xyz": [8.575, 0.022285714285714284, 8.575]}, {"name": "R4", "xyz": [8.575, 0.022285714285714284, 8.825]}, {"name": "R5", "xyz": [8.575, 0.022285714285714284, 9.325]}]}

run_2d.sh

@@ -15,9 +15,9 @@ python_dir="$root_dir/src/python"
 engine_exe="$root_dir/$build_dir/src/cpp/main_2d/pffdtd_2d"
 
 sim_name="Modes2D"
-sim_dir="$root_dir/data/sim_data/$sim_name/cpu"
+sim_dir="$root_dir/sim_data/$sim_name/cpu"
 sim_setup="${sim_name}.py"
-model_dir="$root_dir/data/models/$sim_name"
+model_dir="$root_dir/models/$sim_name"
 
 jobs=16
 

run_3d.sh

@@ -9,12 +9,12 @@ root_dir="$(cd "$(dirname "$0")" && pwd)"
 engine_exe="$root_dir/build/src/cpp/main_3d/pffdtd_3d"
 engine_exe="$root_dir/cmake-build-cuda/src/cpp/main_3d/pffdtd_3d"
 
-sim_name="ProStudio"
+sim_name="InfiniteBaffle"
 sim_setup="${sim_name}.py"
-sim_dir="$root_dir/data/sim_data/$sim_name/gpu"
+sim_dir="$root_dir/sim_data/$sim_name/gpu"
 
-model_dir="$root_dir/data/models/$sim_name"
-materials_dir="$root_dir/data/materials"
+model_dir="$root_dir/models/$sim_name"
+materials_dir="$root_dir/materials"
 
 fmin=20
 fmax=4000

src/cpp/CMakeLists.txt

@@ -6,7 +6,7 @@ project(pffdtd)
 add_library(pffdtd)
 add_library(pffdtd::pffdtd ALIAS pffdtd)
 target_include_directories(pffdtd PUBLIC ${PROJECT_SOURCE_DIR})
-target_compile_definitions(pffdtd PUBLIC PFFDTD_PRECISION=2)
+target_compile_definitions(pffdtd PUBLIC PFFDTD_PRECISION=1)
 
 target_link_libraries(pffdtd
     PUBLIC