Cleanup module names

Author: tobiashienzsch

run_2d.sh

@@ -10,15 +10,15 @@ engine_exe="$root_dir/$build_dir/src/cpp/main_2d/pffdtd_2d"
 sim_name="Diffusor"
 sim_dir="$root_dir/data/sim_data/$sim_name/cpu"
 
-fmax=1000
+fmax=1600
 duration=0.06
 
 # Delete old sim
 rm -rf "$sim_dir"
 
 # Generate model
 cd "$python_dir"
-python -m fdtd2.fdtd --save --video --data_dir="$sim_dir" --duration="$duration" --fmax="$fmax"
+python -m sim2d.fdtd --save --video --data_dir="$sim_dir" --duration="$duration" --fmax="$fmax"
 
 # Run sim
-DPCPP_CPU_PLACES=cores DPCPP_CPU_CU_AFFINITY=spread DPCPP_CPU_NUM_CUS=16 "$engine_exe" "$sim_dir/diffusor.h5"
+# DPCPP_CPU_PLACES=cores DPCPP_CPU_CU_AFFINITY=spread DPCPP_CPU_NUM_CUS=16 "$engine_exe" "$sim_dir/diffusor.h5"

run_3d.sh

@@ -34,6 +34,6 @@ $engine_exe
 
 # Post-process
 cd "$python_dir"
-python -m fdtd.process_outputs --data_dir="$sim_dir" --fcut_lowpass "$fmax" --N_order_lowpass=8 --symmetric --fcut_lowcut 20.0 --N_order_lowcut=4 --air_abs_filter="stokes" --save_wav --plot
+python -m sim3d.process_outputs --data_dir="$sim_dir" --fcut_lowpass "$fmax" --N_order_lowpass=8 --symmetric --fcut_lowcut 20.0 --N_order_lowcut=4 --air_abs_filter="stokes" --save_wav --plot
 python -m analysis.t60 --data_dir="$sim_dir" --fmin=20 --fmax="$fmax"
 python -m analysis.room_modes --data_dir="$sim_dir"

src/cpp/main_2d/README.md

@@ -14,7 +14,7 @@ WARNINGS=-Wall -Wno-deprecated-declarations
 # 	source /opt/intel/oneapi/setvars.sh
 
 all:
-	${CXX} ${FLAGS} ${LIBS} ${WARNINGS} fdtd.cpp
+	${CXX} ${FLAGS} ${LIBS} ${WARNINGS} main.cpp
 ```
 
 ```sh

src/python/CTK_gpu.py

@@ -40,8 +40,3 @@
     save_folder_gpu='../../data/sim_data/ctk_cart/gpu',
     compress=0,
 )
-# then from '../../data/sim_data/ctk_cart/gpu' folder, run (relative path for default folder structure):
-#   ../../../../src/fdtd_main_gpu_single.x
-
-# then post-process with something like:
-# python -m fdtd.process_outputs --data_dir='../../data/sim_data/ctk_cart/gpu/' --fcut_lowpass 1400.0 --N_order_lowpass=8 --symmetric --fcut_lowcut 10.0 --N_order_lowcut=4 --save_wav --plot

src/python/CTK_viz.py

@@ -43,4 +43,4 @@
 )
 
 # then run with python and 3D visualization:
-#   python3 -m fdtd.sim_fdtd --data_dir='../../data/sim_data/ctk_cart/viz' --plot --draw_backend='mayavi' --json_model='../../data/models/CTK_Church/model_export.json'
+#   python3 -m sim3d.sim_fdtd --data_dir='../../data/sim_data/ctk_cart/viz' --plot --draw_backend='mayavi' --json_model='../../data/models/CTK_Church/model_export.json'

src/python/LivingRoom_viz.py

@@ -28,4 +28,4 @@
 )
 
 # then run with python and 3D visualization:
-#   python3 -m fdtd.sim_fdtd --data_dir='../../data/sim_data/LivingRoom/viz' --plot --draw_backend='mayavi' --json_model='../../data/models/LivingRoom/model.json'
+#   python3 -m sim3d.sim_fdtd --data_dir='../../data/sim_data/LivingRoom/viz' --plot --draw_backend='mayavi' --json_model='../../data/models/LivingRoom/model.json'

src/python/MV_gpu.py

@@ -37,9 +37,3 @@
     save_folder_gpu='../../data/sim_data/mv_fcc/gpu',
     compress=3,  # apply level-3 GZIP compression to larger h5 files
 )
-
-# then from '../../data/sim_data/mv_fcc/gpu' folder, run (relative path for default folder structure):
-#   ../../../../src/fdtd_main_gpu_single.x
-
-# then post-process with something like:
-#   python -m fdtd.process_outputs --data_dir='../../data/sim_data/mv_fcc/gpu/' --fcut_lowpass 2500.0 --N_order_lowpass=8 --symmetric --fcut_lowcut 10.0 --N_order_lowcut=4 --air_abs_filter='stokes' --save_wav --plot

src/python/MV_viz.py

@@ -40,4 +40,4 @@
 )
 
 # then run with python and 3D visualization:
-#   python3 -m fdtd.sim_fdtd --data_dir='../../data/sim_data/mv_fcc/viz' --plot --draw_backend='mayavi' --json_model='../../data/models/Musikverein_ConcertHall/model_export.json'
+#   python3 -m sim3d.sim_fdtd --data_dir='../../data/sim_data/mv_fcc/viz' --plot --draw_backend='mayavi' --json_model='../../data/models/Musikverein_ConcertHall/model_export.json'

src/python/Studio_viz.py

@@ -29,4 +29,4 @@
 )
 
 # then run with python and 3D visualization:
-#   python3 -m fdtd.sim_fdtd --data_dir='../../data/sim_data/Studio/viz' --plot --draw_backend='mayavi' --json_model='../../data/models/Studio/model.json'
+#   python3 -m sim3d.sim_fdtd --data_dir='../../data/sim_data/Studio/viz' --plot --draw_backend='mayavi' --json_model='../../data/models/Studio/model.json'

src/python/fdtd/__init__.py src/python/sim2d/__init__.py

@@ -159,7 +159,7 @@ def main():
     if add_dome:
         in_mask[(X - 0.5 * Bx)**2 + (Y - By)**2 < R_dome**2] = True
 
-    in_mask = add_diffusor(dx*5, 0.4, in_mask, X, Y)
+    in_mask = add_diffusor(dx*2, 0.8, in_mask, X, Y)
 
     angles = np.linspace(0.0, 180.0, 180, endpoint=True)
     out_ixy = []

src/python/fdtd2/fdtd.py src/python/sim2d/fdtd.py

@@ -20,10 +20,10 @@
 from voxelizer.cart_grid import CartGrid
 from voxelizer.vox_grid import VoxGrid
 from voxelizer.vox_scene import VoxScene
-from fdtd.sim_comms import SimComms
-from fdtd.sim_consts import SimConsts
-from fdtd.sim_mats import SimMats
-from fdtd.rotate_sim_data import rotate_sim_data,sort_sim_data,copy_sim_data,fold_fcc_sim_data
+from sim3d.sim_comms import SimComms
+from sim3d.sim_consts import SimConsts
+from sim3d.sim_mats import SimMats
+from sim3d.rotate_sim_data import rotate_sim_data,sort_sim_data,copy_sim_data,fold_fcc_sim_data
 from air_abs.get_air_absorption import get_air_absorption
 
 def sim_setup(