From c2c1127aa96d5f707a557e28b45e97437436b173 Mon Sep 17 00:00:00 2001
From: Chichi Lalescu <clalesc1@jhu.edu>
Date: Fri, 4 Dec 2015 21:38:00 +0100
Subject: [PATCH] update NDEBUG definitions
---
bfps/cpp/fftw_tools.cpp | 4 +---
bfps/cpp/field_descriptor.cpp | 7 +++----
bfps/cpp/fluid_solver.cpp | 7 +++----
bfps/cpp/fluid_solver_base.cpp | 7 +++----
bfps/cpp/slab_field_particles.cpp | 7 +++----
bfps/cpp/tracers.cpp | 7 +++----
tox_convergence.ini | 3 ++-
7 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/bfps/cpp/fftw_tools.cpp b/bfps/cpp/fftw_tools.cpp
index c9e68526..f6eacbf1 100644
--- a/bfps/cpp/fftw_tools.cpp
+++ b/bfps/cpp/fftw_tools.cpp
@@ -28,9 +28,7 @@
#include "base.hpp"
#include "fftw_tools.hpp"
-//#ifdef NDEBUG
-//#undef NDEBUG
-//#endif//NDEBUG
+#define NDEBUG
template <class rnumber>
int clip_zero_padding(
diff --git a/bfps/cpp/field_descriptor.cpp b/bfps/cpp/field_descriptor.cpp
index 87f25a16..b5025835 100644
--- a/bfps/cpp/field_descriptor.cpp
+++ b/bfps/cpp/field_descriptor.cpp
@@ -22,10 +22,9 @@
* *
**********************************************************************/
-// code is generally compiled via setuptools, therefore NDEBUG is present
-//#ifdef NDEBUG
-//#undef NDEBUG
-//#endif//NDEBUG
+
+
+#define NDEBUG
#include <stdlib.h>
#include <algorithm>
diff --git a/bfps/cpp/fluid_solver.cpp b/bfps/cpp/fluid_solver.cpp
index 04b4aa5a..880d4f69 100644
--- a/bfps/cpp/fluid_solver.cpp
+++ b/bfps/cpp/fluid_solver.cpp
@@ -22,10 +22,9 @@
* *
**********************************************************************/
-// code is generally compiled via setuptools, therefore NDEBUG is present
-//#ifdef NDEBUG
-//#undef NDEBUG
-//#endif//NDEBUG
+
+
+#define NDEBUG
#include <cassert>
#include <cmath>
diff --git a/bfps/cpp/fluid_solver_base.cpp b/bfps/cpp/fluid_solver_base.cpp
index d570f80f..7f191f88 100644
--- a/bfps/cpp/fluid_solver_base.cpp
+++ b/bfps/cpp/fluid_solver_base.cpp
@@ -22,10 +22,9 @@
* *
**********************************************************************/
-// code is generally compiled via setuptools, therefore NDEBUG is present
-//#ifdef NDEBUG
-//#undef NDEBUG
-//#endif//NDEBUG
+
+
+#define NDEBUG
#include <cassert>
#include <cmath>
diff --git a/bfps/cpp/slab_field_particles.cpp b/bfps/cpp/slab_field_particles.cpp
index 3988659a..15fa363f 100644
--- a/bfps/cpp/slab_field_particles.cpp
+++ b/bfps/cpp/slab_field_particles.cpp
@@ -22,10 +22,9 @@
* *
**********************************************************************/
-// code is generally compiled via setuptools, therefore NDEBUG is present
-//#ifdef NDEBUG
-//#undef NDEBUG
-//#endif//NDEBUG
+
+
+#define NDEBUG
#include <cmath>
diff --git a/bfps/cpp/tracers.cpp b/bfps/cpp/tracers.cpp
index 5e0e106e..3d9fbfb6 100644
--- a/bfps/cpp/tracers.cpp
+++ b/bfps/cpp/tracers.cpp
@@ -22,10 +22,9 @@
* *
**********************************************************************/
-// code is generally compiled via setuptools, therefore NDEBUG is present
-//#ifdef NDEBUG
-//#undef NDEBUG
-//#endif//NDEBUG
+
+
+#define NDEBUG
#include <cmath>
diff --git a/tox_convergence.ini b/tox_convergence.ini
index 447e32fe..39a368ff 100644
--- a/tox_convergence.ini
+++ b/tox_convergence.ini
@@ -1,6 +1,7 @@
[tox]
-envlist = py27
+envlist = py34
[testenv]
+deps = matplotlib
whitelist_externals =
echo
cp
--
GitLab