From 38e3e61237b76ffd6bb985c2b915ba9ee43cf100 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Wed, 29 Apr 2015 10:32:25 +0200 Subject: [PATCH] Fixed internal boost --- external/external_build.cmake | 1 + python_sample/icgen/borgicgen.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/external/external_build.cmake b/external/external_build.cmake index 170cf8f..f414b74 100644 --- a/external/external_build.cmake +++ b/external/external_build.cmake @@ -142,6 +142,7 @@ if (INTERNAL_BOOST) ) set(Boost_INCLUDE_DIRS ${BOOST_SOURCE_DIR} CACHE STRING "Boost path" FORCE) set(Boost_LIBRARIES ${BOOST_SOURCE_DIR}/stage/lib/libboost_python.a CACHE STRING "Boost libraries" FORCE) + set(Boost_FOUND YES) ELSE (INTERNAL_BOOST) find_package(Boost 1.53) diff --git a/python_sample/icgen/borgicgen.py b/python_sample/icgen/borgicgen.py index f5653b3..28f597e 100644 --- a/python_sample/icgen/borgicgen.py +++ b/python_sample/icgen/borgicgen.py @@ -185,7 +185,7 @@ def whitify(density, L, cosmo, supergenerate=1, zero_fill=False, func='HU_WIGGLE def build_Pk(): ik = np.fft.fftfreq(N, d=L/N)*2*np.pi k = np.sqrt(ik[:,None,None]**2 + ik[None,:,None]**2 + ik[None,None,:(N/2+1)]**2) - return p.compute(k)*cosmo['h']**3*L**3 + return p.compute(k)*L**3 Pk = build_Pk() Pk[0,0,0]=1