🐛 2DDWave Distance Fix #1608

Job	Run time
macos-11 with g++-11 (Debug mode)	11m 30s
macos-11 with g++-11 (Release mode)	11m 31s
macos-11 with g++-12 (Debug mode)	8m 7s
macos-11 with g++-12 (Release mode)	10m 19s
macos-11 with clang++ (Debug mode)	15m 29s
macos-11 with clang++ (Release mode)	10m 16s
macos-12 with g++-11 (Debug mode)	10m 52s
macos-12 with g++-11 (Release mode)	11m 39s
macos-12 with g++-12 (Debug mode)	9m 36s
macos-12 with g++-12 (Release mode)	10m 39s
macos-12 with clang++ (Debug mode)	9m 29s
macos-12 with clang++ (Release mode)	12m 9s
macos-11 with g++-10 (Debug mode)	7m 59s
macos-11 with g++-10 (Release mode)	9m 42s
	2h 29m 17s

Provide feedback