Merge pull request #46 from equinor/refactor/improve-imports

Remove commented out includes
equinor · Jan 23, 2024 · 081a556 · 081a556
2 parents 3e4c3c6 + 2ead650
commit 081a556
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,6 +14,12 @@ include(cmake/project-is-top-level.cmake)
 include(cmake/variables.cmake)
 include(cmake/utilities.cmake)
 
+option(FFTW_DEBUG "Flag to add methods for writing the FFT grid to file. Requires Boost" OFF)
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(FFTW_DEBUG ON)
+    # TODO: Move this logic into CMakePresets.json
+endif ()
+
 # Which versions of dependencies to use
 option(BOOST_VERSION "Configure the specific version of Boost gaussianfft wil be statically linked against")
 if (NOT BOOST_VERSION)
@@ -32,6 +38,9 @@ include_directories(SYSTEM ${Python3_INCLUDE_DIRS})
 
 include(cmake/mkl-fftw.cmake)
 
+if (FFTW_DEBUG)
+    add_compile_definitions(FFTW_DEBUG)
+endif ()
 include(cmake/boost.cmake)
 
 # ---- Copy source files ----

diff --git a/src/gaussfft.cpp b/src/gaussfft.cpp
@@ -2,7 +2,6 @@
 
 #include <boost/python/numpy.hpp>
 
-//#include <chrono>
 #include <iostream>
 
 #include "nrlib/iotools/stringtools.hpp"

diff --git a/src/nrlib/geometry/unittests/line_test.cpp b/src/nrlib/geometry/unittests/line_test.cpp
@@ -3,8 +3,6 @@
 #include <nrlib/geometry/line.hpp>
 
 #include <boost/test/unit_test.hpp>
-//#include <math.h>
-//#include <algorithm>
 
 using namespace NRLib;
 

diff --git a/src/nrlib/iotools/fileio.hpp b/src/nrlib/iotools/fileio.hpp
@@ -22,7 +22,6 @@
 #ifndef NRLIB_FILEIO_HPP
 #define NRLIB_FILEIO_HPP
 
-// #include <algorithm>
 #include <cassert>
 #include <cstdio>
 #include <cstdlib>

diff --git a/src/nrlib/iotools/stringtools.hpp b/src/nrlib/iotools/stringtools.hpp
@@ -22,7 +22,7 @@
 #ifndef NRLIB_STRINGTOOLS_HPP
 #define NRLIB_STRINGTOOLS_HPP
 
-#include <stdlib.h> // For atoi and atof
+#include <cstdlib> // For atoi and atof
 
 #include <string>
 #include <iomanip>

diff --git a/src/nrlib/random/fractal.cpp b/src/nrlib/random/fractal.cpp
@@ -22,9 +22,6 @@
 
 #include "fractal.hpp"
 
-//#include "../iotools/stringtools.hpp"
-//#include "../math/mathutility.hpp"
-
 namespace NRLib {
 
 Fractal::Fractal(double min, double max, double dim)

diff --git a/src/nrlib/statistics/kriging.cpp b/src/nrlib/statistics/kriging.cpp
@@ -37,10 +37,6 @@
 #include <omp.h>
 #endif
 
-////for debug print
-//#include <nrlib/surface/regularsurface.hpp>
-//#include <nrlib/surface/surfaceio.hpp>
-
 #ifdef PARALLEL
 #include <omp.h>
 #endif

diff --git a/src/nrlib/statistics/nodalkrigingdata2d.cpp b/src/nrlib/statistics/nodalkrigingdata2d.cpp
@@ -23,7 +23,6 @@
 #include <ostream>
 #include <fstream>
 
-//#include "nrlib/iotools/logkit.hpp"
 #include "nrlib/iotools/fileio.hpp"
 
 #include "nodalkrigingdata2d.hpp"

diff --git a/src/nrlib/well/norsarwell.cpp b/src/nrlib/well/norsarwell.cpp
@@ -28,7 +28,6 @@
 #include "norsarwell.hpp"
 #include "../iotools/stringtools.hpp"
 #include "../iotools/fileio.hpp"
-//#include "src/definitions.h"
 
 using namespace NRLib;