Minor changes

Author: mikaem

demo/demo.py

@@ -13,9 +13,9 @@
 #sigma = 0.16674922174125 * fmean * (1 - fmean)
 
 #fmean = 4.653900989e-03
-fmean = 0.02
+fmean = 0.5
 #sigma = 8.9500083540e-01 * fmean * (1 - fmean)
-sigma = 0.999* fmean * (1 - fmean)
+sigma = 0.9* fmean * (1 - fmean)
 
 pmf = PMF(fmean, sigma, 1, 1, 0, 1)
 
@@ -26,10 +26,11 @@
 pmf.DT = 1.         # Turbulent diffusivity
 
 # The simulations are run using integer moments
-pmf.central = False
+pmf.central = True
 
 #pmf.reallocate_solver(pmf.froot, 1)
 pmf.compute(0, True)
+#pmf.tau = 2e-7
 
 from scipy.special import erf, erfinv
 def integrand(x, tau, alfa):
@@ -122,6 +123,7 @@ def lower2(x, tau, alfa):
 figure("dfdtau original")
 plot(xx[1:-1], dintegrand(xx[1:-1], tau, alfa))
 
+
 show()
 
 

multiprecision/CMakeLists.txt

@@ -1,12 +1,28 @@
 cmake_minimum_required(VERSION 2.6)
 
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules")
 find_package(Boost COMPONENTS system filesystem timer REQUIRED)
 include_directories(${Boost_INCLUDE_DIR})
 link_directories(${Boost_LIBRARY_DIR})
+
+find_package(OpenMP)
+if (OPENMP_FOUND)
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+endif()
+
+# find_package(FFTW)
+# if (FFTW_FOUND)
+#     include_directories(${FFTW_INCLUDE_DIR})
+# endif()
+
 #------------------------------------------------------------------------------
 
 list(APPEND CXX_DEFINITIONS "-O1 -std=c++11 -Wno-narrowing")
 
 add_definitions(${CXX_DEFINITIONS})
 add_executable(demo test_multiprecision.cpp)
 target_link_libraries(demo ${Boost_LIBRARIES} )
+# if (FFTW_FOUND)
+#     target_link_libraries(demo ${FFTW_LIBRARY} ${FFTW_THREADS_LIBRARY})
+# endif()