Add AuroraDefs.h

CMakeLists.txt

@@ -14,7 +14,7 @@ endif()
 
 set(MKL_INTERFACE_FULL intel_lp64)
 find_package(MKL CONFIG REQUIRED)
-include_directories(./ /usr/local/include/eigen3 ./thirdparty/include)
+include_directories(./ ./src /usr/local/include/eigen3 ./thirdparty/include)
 file(GLOB_RECURSE  cpp_files ./src/*.cpp)
 file(GLOB_RECURSE  cxx_files ./src/*.cxx)
 add_executable(Aurora ${cpp_files} ${cxx_files} )
@@ -26,7 +26,7 @@ target_link_libraries(Aurora PUBLIC $<LINK_ONLY:MKL::MKL>)
 target_link_libraries(Aurora PUBLIC OpenMP::OpenMP_CXX)
 find_package(GTest  REQUIRED)
 INCLUDE_DIRECTORIES(${GTEST_INCLUDE_DIRS})
-include_directories(./src ./src/util)
+include_directories(./src/util)
 
 file(GLOB_RECURSE  test_cpp ./test/*.cpp)
 

src/AuroraDefs.h

@@ -0,0 +1,7 @@
+#ifndef AURORA_AURORADEFS_H
+#define AURORA_AURORADEFS_H
+#include <complex>
+//必须在mkl.h和Eigen的头之前，<complex>之后
+#define MKL_Complex16 std::complex<double>
+#include "mkl.h"
+#endif //AURORA_AURORADEFS_H

src/Function1D.cpp

@@ -1,11 +1,11 @@
 #include "Function1D.h"
 #include "Function.h"
-#include <complex>
+
+//必须在Eigen之前
+#include "AuroraDefs.h"
+
 #include <cstring>
 #include <iostream>
-//必须在mkl.h和Eigen的头之前，<complex>之后
-#define MKL_Complex16 std::complex<double>
-#include "mkl.h"
 
 #include <Eigen/Core>
 #include <Eigen/Eigen>

src/Function2D.cpp

@@ -2,7 +2,12 @@
 #include "Function.h"
 #include "Function2D.h"
 #include "Function1D.h"
-#include "mkl.h"
+//必须在Eigen之前
+#include "AuroraDefs.h"
+
+#include <Eigen/Core>
+#include <Eigen/Eigen>
+#include <Eigen/Dense>
 
 using namespace Aurora;
 

src/Function3D.cpp

@@ -3,7 +3,8 @@
 #include "Function2D.h"
 #include "Function.h"
 
-#include "mkl.h"
+//必须在Eigen之前
+#include "AuroraDefs.h"
 
 using namespace Aurora;
 

test/Function1D_Test.cpp

@@ -144,9 +144,6 @@ TEST_F(Function1D_Test, complexAndEtc){
         EXPECT_DOUBLE_EQ(2, matrixDN.getData()[0]);
         EXPECT_DOUBLE_EQ(13, matrixDN.getData()[3]);
     }
-
-
-
 }
 
 TEST_F(Function1D_Test, ceilAndRound) {