Browse Source

testing of IRONS filter coeffs

master
Trevor Irons 5 years ago
parent
commit
2993b1af4d

+ 2
- 2
CMake/SuperBuild.cmake View File

6
 else()
6
 else()
7
     message( STATUS "Eigen WAS NOT FOUND ${eigen_DIR}" )
7
     message( STATUS "Eigen WAS NOT FOUND ${eigen_DIR}" )
8
         ExternalProject_Add(EIGEN
8
         ExternalProject_Add(EIGEN
9
-	    GIT_REPOSITORY "https://github.com/eigenteam/eigen-git-mirror.git"
10
-	    UPDATE_COMMAND "" 
9
+	    GIT_REPOSITORY "https://gitlab.com/libeigen/eigen.git"
10
+        UPDATE_COMMAND "" 
11
 	    GIT_TAG "3.3.7" #"default"
11
 	    GIT_TAG "3.3.7" #"default"
12
    	    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/eigen
12
    	    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/eigen
13
    	    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
13
    	    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}

+ 3
- 0
Modules/FDEM1D/include/FHT.h View File

185
     const Eigen::Matrix<Real, Eigen::Dynamic, 3>  FHT<FHTKONG241>::WT;
185
     const Eigen::Matrix<Real, Eigen::Dynamic, 3>  FHT<FHTKONG241>::WT;
186
     template<>
186
     template<>
187
     const Eigen::Matrix<Real, Eigen::Dynamic, 3>  FHT<IRONS>::WT;
187
     const Eigen::Matrix<Real, Eigen::Dynamic, 3>  FHT<IRONS>::WT;
188
+    // Clang wants generic declaration
189
+    template < HANKELTRANSFORMTYPE Type >
190
+    const Eigen::Matrix<Real, Eigen::Dynamic, 3>  FHT< Type >::WT;
188
 #endif
191
 #endif
189
 
192
 
190
     template < HANKELTRANSFORMTYPE Type >
193
     template < HANKELTRANSFORMTYPE Type >

+ 4
- 2
Modules/FDEM1D/python/CMakeLists.txt View File

3
 add_library(pyFDEM1D MODULE pyFDEM1D.cpp)
3
 add_library(pyFDEM1D MODULE pyFDEM1D.cpp)
4
 target_link_libraries(pyFDEM1D PRIVATE pybind11::module lemmacore fdem1d )
4
 target_link_libraries(pyFDEM1D PRIVATE pybind11::module lemmacore fdem1d )
5
 set_target_properties(pyFDEM1D PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}"
5
 set_target_properties(pyFDEM1D PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}"
6
-                                       SUFFIX "${PYTHON_MODULE_EXTENSION}"
7
-                                                      OUTPUT_NAME "FDEM1D"
6
+	SUFFIX "${PYTHON_MODULE_EXTENSION}"
7
+    OUTPUT_NAME "FDEM1D"
8
+	CXX_STANDARD 14 
9
+	CXX_STANDARD_REQUIRED ON
8
 )
10
 )
9
 
11
 
10
 install(TARGETS pyFDEM1D
12
 install(TARGETS pyFDEM1D

+ 964
- 803
Modules/FDEM1D/src/FHT.cpp
File diff suppressed because it is too large
View File


Loading…
Cancel
Save