guilhem_lavaux/cosmotool
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed default arguments in healpix_transform. Fixed fftw detection in CMake

Browse Source
This commit is contained in:
Guilhem Lavaux 2014-02-27 15:30:21 +01:00
parent 083cad3c77
commit 86dc4bd249
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -61,6 +61,10 @@ pkg_check_modules(FFTW3 fftw3>=3.3)
pkg_check_modules(FFTW3F fftw3f>=3.3) pkg_check_modules(FFTW3F fftw3f>=3.3)
pkg_check_modules(EIGEN3 eigen3) pkg_check_modules(EIGEN3 eigen3)
find_library(FFTW3F_LIBRARY_FULL fftw3f PATHS ${FFTW3F_LIBDIR} NO_DEFAULT_PATH)
find_library(FFTW3_LIBRARY_FULL fftw3 PATHS ${FFTW3_LIBDIR} NO_DEFAULT_PATH)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
set(NETCDF_FIND_REQUIRED TRUE) set(NETCDF_FIND_REQUIRED TRUE)
set(GSL_FIND_REQUIRED TRUE) set(GSL_FIND_REQUIRED TRUE)

8
sample/CMakeLists.txt
View File

@ -48,8 +48,14 @@ add_executable(testBSP testBSP.cpp)
target_link_libraries(testBSP ${tolink}) target_link_libraries(testBSP ${tolink})
if (FFTW3_FOUND AND FFTW3F_FOUND AND EIGEN3_FOUND) if (FFTW3_FOUND AND FFTW3F_FOUND AND EIGEN3_FOUND)
IF (FFTW3F_LIBRARY_FULL)
SET(FFTW3_LIB ${FFTW3F_LIBRARY_FULL})
ENDIF (FFTW3F_LIBRARY_FULL)
IF (FFTW3_LIBRARY_FULL)
SET(FFTW3_LIB ${FFTW3_LIB} ${FFTW3_LIBRARY_FULL})
ENDIF (FFTW3_LIBRARY_FULL)
add_executable(test_fft_calls test_fft_calls.cpp) add_executable(test_fft_calls test_fft_calls.cpp)
target_link_libraries(test_fft_calls ${tolink} ${FFTW3_LIBRARIES} ${FFTW3F_LIBRARIES}) target_link_libraries(test_fft_calls ${tolink} ${FFTW3_LIB})
endif (FFTW3_FOUND AND FFTW3F_FOUND AND EIGEN3_FOUND) endif (FFTW3_FOUND AND FFTW3F_FOUND AND EIGEN3_FOUND)
if (ENABLE_SHARP AND SHARP_LIBRARY AND SHARP_INCLUDE_PATH AND EIGEN3_FOUND) if (ENABLE_SHARP AND SHARP_LIBRARY AND SHARP_INCLUDE_PATH AND EIGEN3_FOUND)

2
src/fourier/details/healpix_transform.hpp
View File

@ -67,7 +67,7 @@ namespace CosmoTool
sharp_make_triangular_alm_info (Lmax, Mmax, 1, &ainfo); sharp_make_triangular_alm_info (Lmax, Mmax, 1, &ainfo);
} }
HealpixFourierTransform(long nSide, long Lmax, long Mmax, int iterate = 0, const std::valarray<double>& weights ) HealpixFourierTransform(long nSide, long Lmax, long Mmax, int iterate, const std::valarray<double>& weights )
: realMap(nSide), fourierMap(Lmax, Mmax), ainfo(0), ginfo(0), m_iterate(iterate) : realMap(nSide), fourierMap(Lmax, Mmax), ainfo(0), ginfo(0), m_iterate(iterate)
{ {
sharp_make_weighted_healpix_geom_info (nSide, 1, &weights[0], &ginfo); sharp_make_weighted_healpix_geom_info (nSide, 1, &weights[0], &ginfo);