diff --git a/cpp/field.cpp b/cpp/field.cpp
index f900140b785d0992faa8f7f37f95a15b5d83ffcd..077427ce1c00594cb94d75f5d3dde3fe9d3cebea 100644
--- a/cpp/field.cpp
+++ b/cpp/field.cpp
@@ -24,8 +24,6 @@
 
 
 
-#define NDEBUG
-
 #include <sys/stat.h>
 #include <cmath>
 #include <cstdlib>
@@ -35,7 +33,7 @@
 #include "scope_timer.hpp"
 #include "shared_array.hpp"
 
-
+#define NDEBUG
 
 template <typename rnumber,
           field_backend be,
diff --git a/cpp/full_code/NSVEcomplex_particles.cpp b/cpp/full_code/NSVEcomplex_particles.cpp
index 0c4cae9161c66799e705042e6ad6423b30f71844..701892f93dafaaf06ecdbd0c58bf3963c5b1c8e9 100644
--- a/cpp/full_code/NSVEcomplex_particles.cpp
+++ b/cpp/full_code/NSVEcomplex_particles.cpp
@@ -24,8 +24,6 @@
 
 
 
-//#define NDEBUG
-
 #include <string>
 #include <cmath>
 #include "NSVEcomplex_particles.hpp"
@@ -34,6 +32,8 @@
 #include "particles/p2p_computer.hpp"
 #include "particles/particles_inner_computer.hpp"
 
+#define NDEBUG
+
 template <typename rnumber>
 int NSVEcomplex_particles<rnumber>::initialize(void)
 {
diff --git a/cpp/full_code/NSVEparticles.cpp b/cpp/full_code/NSVEparticles.cpp
index 674b4f7762a6ae8f67b1033cff2d7f1b726993bd..1952bcfccb6255bb357a8d603a74efea086db3c2 100644
--- a/cpp/full_code/NSVEparticles.cpp
+++ b/cpp/full_code/NSVEparticles.cpp
@@ -24,13 +24,13 @@
 
 
 
-//#define NDEBUG
-
 #include <string>
 #include <cmath>
 #include "NSVEparticles.hpp"
 #include "scope_timer.hpp"
 
+#define NDEBUG
+
 template <typename rnumber>
 int NSVEparticles<rnumber>::initialize(void)
 {
diff --git a/cpp/full_code/code_base.cpp b/cpp/full_code/code_base.cpp
index 210f2c963089751920788f8f2004c0331a565f6c..f412a792b642e70fdf36d88d0f327501a4d6ce0a 100644
--- a/cpp/full_code/code_base.cpp
+++ b/cpp/full_code/code_base.cpp
@@ -24,11 +24,10 @@
 
 
 
-//#define NDEBUG
-
 #include "code_base.hpp"
 #include "scope_timer.hpp"
 
+#define NDEBUG
 
 code_base::code_base(
         const MPI_Comm COMMUNICATOR,
diff --git a/cpp/full_code/direct_numerical_simulation.cpp b/cpp/full_code/direct_numerical_simulation.cpp
index f269045ac53fd27631dfee3c6d77be41650d609a..955c1f2e6bcb75bd1a7538da5edd2ac2d9520ccc 100644
--- a/cpp/full_code/direct_numerical_simulation.cpp
+++ b/cpp/full_code/direct_numerical_simulation.cpp
@@ -23,8 +23,6 @@
 
 
 
-//#define NDEBUG
-
 #include <cstdlib>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -32,6 +30,7 @@
 #include "scope_timer.hpp"
 #include "hdf5_tools.hpp"
 
+#define NDEBUG
 
 int direct_numerical_simulation::grow_file_datasets()
 {
diff --git a/cpp/kspace.cpp b/cpp/kspace.cpp
index 5accb969cd93735b0cfb4d5deecfbb8ccd914910..452ca305dcf6730824d27aca23b25ffa567de8ff 100644
--- a/cpp/kspace.cpp
+++ b/cpp/kspace.cpp
@@ -24,8 +24,6 @@
 
 
 
-#define NDEBUG
-
 #include <cmath>
 #include <cstdlib>
 #include <algorithm>
@@ -34,7 +32,7 @@
 #include "scope_timer.hpp"
 #include "shared_array.hpp"
 
-
+#define NDEBUG
 
 template <field_backend be,
           kspace_dealias_type dt>
diff --git a/cpp/particles/particles_distr_mpi.hpp b/cpp/particles/particles_distr_mpi.hpp
index c88bedac8c3c6b03f1a0367124c86d49b381423e..57d8067059a1408afb90c53e32c83c0731030bd2 100644
--- a/cpp/particles/particles_distr_mpi.hpp
+++ b/cpp/particles/particles_distr_mpi.hpp
@@ -336,7 +336,7 @@ public:
 
         const bool more_than_one_thread = (omp_get_max_threads() > 1);
         MPI_Barrier(MPI_COMM_WORLD);
-        DEBUG_MSG_WAIT(MPI_COMM_WORLD, "line 338 of particles_distr_mpi.hpp\n");
+        //DEBUG_MSG_WAIT(MPI_COMM_WORLD, "line 338 of particles_distr_mpi.hpp\n");
 
         TIMEZONE_OMP_INIT_PREPARALLEL(omp_get_max_threads())
         #pragma omp parallel default(shared)
diff --git a/cpp/vorticity_equation.cpp b/cpp/vorticity_equation.cpp
index ead9345af5a2f0555e7fa6e2b6ee45cecd9f3624..38ca8f6dc55b77e8ab66b91693076dc074a3affc 100644
--- a/cpp/vorticity_equation.cpp
+++ b/cpp/vorticity_equation.cpp
@@ -24,8 +24,6 @@
 
 
 
-#define NDEBUG
-
 #include <limits>
 #include <cassert>
 #include <cmath>
@@ -35,6 +33,8 @@
 #include "scope_timer.hpp"
 #include "shared_array.hpp"
 
+#define NDEBUG
+
 
 
 template <class rnumber,