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

Fixed internal boost

Browse Source
This commit is contained in:
Guilhem Lavaux 2015-04-29 10:32:25 +02:00
parent c50679c31d
commit 38e3e61237
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
external/external_build.cmake vendored
View File

@ -142,6 +142,7 @@ if (INTERNAL_BOOST)
) )
set(Boost_INCLUDE_DIRS ${BOOST_SOURCE_DIR} CACHE STRING "Boost path" FORCE) 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_LIBRARIES ${BOOST_SOURCE_DIR}/stage/lib/libboost_python.a CACHE STRING "Boost libraries" FORCE)
set(Boost_FOUND YES)
ELSE (INTERNAL_BOOST) ELSE (INTERNAL_BOOST)
find_package(Boost 1.53) find_package(Boost 1.53)

2
python_sample/icgen/borgicgen.py
View File

@ -185,7 +185,7 @@ def whitify(density, L, cosmo, supergenerate=1, zero_fill=False, func='HU_WIGGLE
def build_Pk(): def build_Pk():
ik = np.fft.fftfreq(N, d=L/N)*2*np.pi 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) 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 = build_Pk()
Pk[0,0,0]=1 Pk[0,0,0]=1