12 files changed, 18 insertions, 57 deletions
diff --git a/libs/numeric/odeint/examples/Jamfile.v2 b/libs/numeric/odeint/examples/Jamfile.v2
index c0f80e5ad..04556879f 100644
--- a/libs/numeric/odeint/examples/Jamfile.v2
+++ b/libs/numeric/odeint/examples/Jamfile.v2
@@ -8,7 +8,6 @@
 
 project
     : requirements 
-      <include>../../../..
       <define>BOOST_ALL_NO_LIB=1
     : 
     ;
diff --git a/libs/numeric/odeint/examples/molecular_dynamics_cells.cpp b/libs/numeric/odeint/examples/molecular_dynamics_cells.cpp
index 699b13970..d746ca8bf 100644
--- a/libs/numeric/odeint/examples/molecular_dynamics_cells.cpp
+++ b/libs/numeric/odeint/examples/molecular_dynamics_cells.cpp
@@ -22,6 +22,7 @@
 #include <algorithm>
 #include <tuple>
 #include <iostream>
+#include <random>
 
 #include <boost/range/algorithm/for_each.hpp>
 #include <boost/range/algorithm/sort.hpp>
diff --git a/libs/numeric/odeint/examples/mpi/Jamfile.v2 b/libs/numeric/odeint/examples/mpi/Jamfile.v2
index 6aaeb0e8a..d3f18eb2c 100644
--- a/libs/numeric/odeint/examples/mpi/Jamfile.v2
+++ b/libs/numeric/odeint/examples/mpi/Jamfile.v2
@@ -7,7 +7,6 @@
 
 project
     : requirements
-      <include>../../../../..
       <define>BOOST_ALL_NO_LIB=1
       <library>/boost//mpi
       <library>/boost//timer
diff --git a/libs/numeric/odeint/examples/mtl/Jamfile.v2 b/libs/numeric/odeint/examples/mtl/Jamfile.v2
index bd2ec3cae..9f4ffb0f3 100644
--- a/libs/numeric/odeint/examples/mtl/Jamfile.v2
+++ b/libs/numeric/odeint/examples/mtl/Jamfile.v2
@@ -9,7 +9,6 @@ MTL4_INCLUDE = /home/mario/MTL4 ;
 
 project
     : requirements 
-      <include>../../../../..
       <include>$(MTL4_INCLUDE)
       <define>BOOST_ALL_NO_LIB=1
     ;
diff --git a/libs/numeric/odeint/examples/multiprecision/Jamfile b/libs/numeric/odeint/examples/multiprecision/Jamfile
index dc6fee895..9708d4340 100644
--- a/libs/numeric/odeint/examples/multiprecision/Jamfile
+++ b/libs/numeric/odeint/examples/multiprecision/Jamfile
@@ -7,7 +7,6 @@
 
 project
     : requirements 
-      <include>../../../../..
       <define>BOOST_ALL_NO_LIB=1
     : 
     ;
diff --git a/libs/numeric/odeint/examples/nt2/Jamfile.v2 b/libs/numeric/odeint/examples/nt2/Jamfile.v2
index 539ed1b73..05847cd17 100644
--- a/libs/numeric/odeint/examples/nt2/Jamfile.v2
+++ b/libs/numeric/odeint/examples/nt2/Jamfile.v2
@@ -24,7 +24,6 @@ local NT2_SIMD_FLAGS = [ os.environ NT2_SIMD_FLAGS ] ;
 project
   : requirements
     <define>BOOST_ALL_NO_LIB=1
-    <include>../../../../..
     <include>$(NT2_ROOT_PATH)/include/
     <link>static
     <toolset>gcc:<cxxflags>-DBOOST_SIMD_NO_STRICT_ALIASING
diff --git a/libs/numeric/odeint/examples/openmp/Jamfile.v2 b/libs/numeric/odeint/examples/openmp/Jamfile.v2
index c80aaa1b0..cef4f670c 100644
--- a/libs/numeric/odeint/examples/openmp/Jamfile.v2
+++ b/libs/numeric/odeint/examples/openmp/Jamfile.v2
@@ -10,7 +10,6 @@ import openmp : * ;
 
 project
     : requirements
-      <include>../../../../..
       <include>..
       <define>BOOST_ALL_NO_LIB=1
       <library>/boost//timer
diff --git a/libs/numeric/odeint/examples/quadmath/Jamfile.v2 b/libs/numeric/odeint/examples/quadmath/Jamfile.v2
index 9b994b780..88a046325 100644
--- a/libs/numeric/odeint/examples/quadmath/Jamfile.v2
+++ b/libs/numeric/odeint/examples/quadmath/Jamfile.v2
@@ -7,7 +7,6 @@
 
 project
     : requirements 
-      <include>../../../..
       <define>BOOST_ALL_NO_LIB=1
     : 
     ;
diff --git a/libs/numeric/odeint/examples/stochastic_euler.cpp b/libs/numeric/odeint/examples/stochastic_euler.cpp
index 23474255b..c98d27b09 100644
--- a/libs/numeric/odeint/examples/stochastic_euler.cpp
+++ b/libs/numeric/odeint/examples/stochastic_euler.cpp
@@ -109,10 +109,10 @@ struct ornstein_det
 
 struct ornstein_stoch
 {
-    boost::mt19937 m_rng;
+    boost::mt19937 &m_rng;
     boost::normal_distribution<> m_dist;
 
-    ornstein_stoch( double sigma ) : m_rng() , m_dist( 0.0 , sigma ) { }
+  ornstein_stoch( boost::mt19937 &rng , double sigma ) : m_rng( rng ) , m_dist( 0.0 , sigma ) { }
 
     void operator()( const state_type &x , state_type &dxdt )
     {
@@ -137,9 +137,10 @@ int main( int argc , char **argv )
     using namespace boost::numeric::odeint;
 
     //[ ornstein_uhlenbeck_main
+    boost::mt19937 rng;
     double dt = 0.1;
     state_type x = {{ 1.0 }};
-    integrate_const( stochastic_euler< N >() , make_pair( ornstein_det() , ornstein_stoch( 1.0 ) ) ,
+    integrate_const( stochastic_euler< N >() , make_pair( ornstein_det() , ornstein_stoch( rng , 1.0 ) ),
             x , 0.0 , 10.0 , dt , streaming_observer() );
     //]
     return 0;
diff --git a/libs/numeric/odeint/examples/thrust/Makefile b/libs/numeric/odeint/examples/thrust/Makefile
index 570a06673..5a33bdb32 100644
--- a/libs/numeric/odeint/examples/thrust/Makefile
+++ b/libs/numeric/odeint/examples/thrust/Makefile
@@ -1,66 +1,34 @@
-# Copyright 2011-2013 Mario Mulansky
+# Copyright 2011-2014 Mario Mulansky
 # Copyright 2011-2012 Karsten Ahnert
 #
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or
 # copy at http://www.boost.org/LICENSE_1_0.txt)
 
+# make sure BOOST_ROOT is pointing to your boost directory
+# otherwise, set it here:
+# BOOST_ROOT = /path/to/boost
 
-
-# CUDA_ROOT = /home/karsten/boost/cuda4.1/cuda/
+# path to the cuda installation
 CUDA_ROOT = /usr/local/cuda
+# target architecture
 ARCH = sm_13
 
-CC = gcc
-CXX = g++
 NVCC = $(CUDA_ROOT)/bin/nvcc
-# NVCC = g++
-
-INCLUDES += -I$(BOOST_ROOT) -I$(THRUST_ROOT) -I$(CUDA_ROOT)/include -I../../../../..
-
-NVCCFLAGS = -O3 $(INCLUDES) -arch $(ARCH) --compiler-bindir=/opt/gcc4.6.2/bin/  -Xcompiler -fopenmp -DTHRUST_DEVICE_BACKEND=THRUST_DEVICE_BACKEND_OMP
-# NVCCFLAGS = -O3 $(INCLUDES) -arch $(ARCH) --compiler-bindir=/usr/bin/g++-4.3 -Xcompiler -fopenmp -DTHRUST_DEVICE_BACKEND=THRUST_DEVICE_BACKEND_OMP 
-
-# NVCCFLAGS = -O3 $(INCLUDES) -arch $(ARCH) --compiler-bindir=/usr/bin/g++-4.3
-
-#--compiler-bindir=/usr/bin/g++-4.4 
-#-Xcompiler -fopenmp -DTHRUST_DEVICE_BACKEND=THRUST_DEVICE_BACKEND_OMP 
-# NVCCFLAGS = -O3 $(INCLUDES) -arch $(ARCH) --compiler-bindir=/usr/bin/g++-4.3 
-#-Xcompiler -fopenmp -DTHRUST_DEVICE_BACKEND=THRUST_DEVICE_BACKEND_OMP 
 
+INCLUDES += -I../../include/ -I$(BOOST_ROOT)
 
-LDLIBS = -lstdc++ -lm -lcudart -lgomp
-LDFLAGS = -L$(CUDA_ROOT)/lib64
+NVCCFLAGS = -O3 $(INCLUDES) -arch $(ARCH)
 
-%.co : %.cu
+%.o : %.cu
 	$(NVCC) $(NVCCFLAGS) -c $< -o $@
 
-
-all : phase_oscillator_chain phase_oscillator_ensemble lorenz_parameters relaxation
-
-
-phase_oscillator_chain.co : phase_oscillator_chain.cu
-phase_oscillator_chain : phase_oscillator_chain.co
-	$(CC) -o phase_oscillator_chain $(LDFLAGS) $(LDLIBS) phase_oscillator_chain.co
+% : %.o
+	$(NVCC) $(NVCCFLAGS) -o $@ $<
 
 
-
-phase_oscillator_ensemble.co : phase_oscillator_ensemble.cu
-phase_oscillator_ensemble : phase_oscillator_ensemble.co
-	$(CC) -o phase_oscillator_ensemble $(LDFLAGS) $(LDLIBS) phase_oscillator_ensemble.co
-
-
-
-lorenz_parameters : lorenz_parameters.co
-	$(CC) -o lorenz_parameters $(LDFLAGS) $(LDLIBS) lorenz_parameters.co
-lorenz_parameters.co : lorenz_parameters.cu
-
-
-relaxation : relaxation.co
-	$(CC) -o relaxation $(LDFLAGS) $(LDLIBS) relaxation.co
-relaxation.co : relaxation.cu
-
+all : phase_oscillator_chain phase_oscillator_ensemble lorenz_parameters relaxation
 
 
 clean :
-	-rm *~ *.o *.co phase_oscillator_chain phase_oscillator_ensemble lorenz_parameters relaxation 
+	-rm *~ *.o phase_oscillator_chain phase_oscillator_ensemble lorenz_parameters relaxation 
diff --git a/libs/numeric/odeint/examples/ublas/Jamfile.v2 b/libs/numeric/odeint/examples/ublas/Jamfile.v2
index 41f8f66fa..7abff98ef 100644
--- a/libs/numeric/odeint/examples/ublas/Jamfile.v2
+++ b/libs/numeric/odeint/examples/ublas/Jamfile.v2
@@ -7,7 +7,6 @@
 
 project
     : requirements 
-      <include>../../../../..
       <define>BOOST_ALL_NO_LIB=1
     ;
     
diff --git a/libs/numeric/odeint/examples/vexcl/Jamfile.v2 b/libs/numeric/odeint/examples/vexcl/Jamfile.v2
index 191fbef7b..73dc8dae0 100644
--- a/libs/numeric/odeint/examples/vexcl/Jamfile.v2
+++ b/libs/numeric/odeint/examples/vexcl/Jamfile.v2
@@ -23,7 +23,6 @@ lib opencl : : <name>OpenCL ;
 
 project : requirements
         <implicit-dependency>/boost//headers
-        <include>../../../../..
         <include>$(VEXCL_INCLUDE)
         <include>$(OPENCL_INCLUDE)
         <toolset>gcc:<cxxflags>-std=c++0x