[Boost-commit] svn:boost r72204 - in sandbox/odeint/branches/karsten/boost/numeric/odeint: algebra stepper

Subject: [Boost-commit] svn:boost r72204 - in sandbox/odeint/branches/karsten/boost/numeric/odeint: algebra stepper
From: karsten.ahnert_at_[hidden]
Date: 2011-05-27 03:25:05

Author: karsten
Date: 2011-05-27 03:25:04 EDT (Fri, 27 May 2011)
New Revision: 72204
URL: http://svn.boost.org/trac/boost/changeset/72204

Log:
small fix in generic_algebra and pp check for msvc
Text files modified: 
   sandbox/odeint/branches/karsten/boost/numeric/odeint/algebra/generic_algebra.hpp     |     6 +++---                                  
   sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/explicit_generic_rk.hpp |     8 +++++++-                                
   2 files changed, 10 insertions(+), 4 deletions(-)

Modified: sandbox/odeint/branches/karsten/boost/numeric/odeint/algebra/generic_algebra.hpp
==============================================================================
--- sandbox/odeint/branches/karsten/boost/numeric/odeint/algebra/generic_algebra.hpp	(original)
+++ sandbox/odeint/branches/karsten/boost/numeric/odeint/algebra/generic_algebra.hpp	2011-05-27 03:25:04 EDT (Fri, 27 May 2011)
@@ -21,7 +21,7 @@
             const boost::array< T , n > &a ,
                         const DerivIn &dxdt , const StateIn2 k_vector[n] , const T dt )
     {
-        for( size_t i=0 ; i<x.size() ; ++i )
+        for( size_t i=0 ; i<x_tmp.size() ; ++i )
         {
             x_tmp[i] = x[i] + a[0]*dt*dxdt[i];
             for( size_t j = 1 ; j<n ; ++j )
@@ -34,7 +34,7 @@
                 const boost::array< T , n > &a ,
                                 const DerivIn &dxdt , const StateIn k_vector[n] , const T dt )
     {
-        for( size_t i=0 ; i<x.size() ; ++i )
+        for( size_t i=0 ; i<x_tmp.size() ; ++i )
         {
             x_tmp[i] = a[0]*dt*dxdt[i];
             for( size_t j = 1 ; j<n ; ++j )
@@ -47,4 +47,4 @@
 }
 }
 
-#endif /* GENERIC_ALGEBRA */
\ No newline at end of file
+#endif /* GENERIC_ALGEBRA */

Modified: sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/explicit_generic_rk.hpp
==============================================================================
--- sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/explicit_generic_rk.hpp	(original)
+++ sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/explicit_generic_rk.hpp	2011-05-27 03:25:04 EDT (Fri, 27 May 2011)
@@ -184,9 +184,15 @@
         //typename stage_fusion_wrapper< T , mpl::size_t< stage_number > , intermediate_stage >::type const &stage ) const
         {
             if( stage_number > 1 )
+            {
+				#ifdef BOOST_MSVC
                                 #pragma warning( disable : 4307 34 )
+				#endif
                 system( x_tmp , F[stage_number-2] , t + stage.c * dt );
+				#ifdef BOOST_MSVC
                                 #pragma warning( default : 4307 34 )
+				#endif
+            }
                         //std::cout << stage_number-2 << ", t': " << t + stage.c * dt << std::endl;
 
                         if( stage_number < StageCount )
@@ -228,4 +234,4 @@
 }
 }
 
-#endif /* EXPLICIT_GENERIC_RK_HPP_ */
\ No newline at end of file
+#endif /* EXPLICIT_GENERIC_RK_HPP_ */