[Boost-commit] svn:boost r58350 - in sandbox/odeint/branches/karsten/boost: . numeric/odeint numeric/odeint/concepts

Subject: [Boost-commit] svn:boost r58350 - in sandbox/odeint/branches/karsten/boost: . numeric/odeint numeric/odeint/concepts
From: karsten.ahnert_at_[hidden]
Date: 2009-12-13 08:28:48

Author: karsten
Date: 2009-12-13 08:28:47 EST (Sun, 13 Dec 2009)
New Revision: 58350
URL: http://svn.boost.org/trac/boost/changeset/58350

Log:
merging trunk into branch

Properties modified: 
   sandbox/odeint/branches/karsten/boost/   (props changed)
   sandbox/odeint/branches/karsten/boost/numeric/odeint/concepts/   (props changed)
   sandbox/odeint/branches/karsten/boost/numeric/odeint/concepts/state_concept.hpp   (props changed)
   sandbox/odeint/branches/karsten/boost/numeric/odeint/integrator_adaptive_stepsize.hpp   (props changed)
   sandbox/odeint/branches/karsten/boost/numeric/odeint/integrator_constant_stepsize.hpp   (props changed)
   sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper_euler.hpp   (props changed)
   sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper_rk4.hpp   (props changed)
Text files modified: 
   sandbox/odeint/branches/karsten/boost/numeric/odeint/controlled_stepper_bs.hpp  |    10 +++++-----                              
   sandbox/odeint/branches/karsten/boost/numeric/odeint/error_checker_standard.hpp |    14 ++++++++++++++                          
   sandbox/odeint/branches/karsten/boost/numeric/odeint/resizer.hpp                |     1 +                                       
   3 files changed, 20 insertions(+), 5 deletions(-)

Modified: sandbox/odeint/branches/karsten/boost/numeric/odeint/controlled_stepper_bs.hpp
==============================================================================
--- sandbox/odeint/branches/karsten/boost/numeric/odeint/controlled_stepper_bs.hpp	(original)
+++ sandbox/odeint/branches/karsten/boost/numeric/odeint/controlled_stepper_bs.hpp	2009-12-13 08:28:47 EST (Sun, 13 Dec 2009)
@@ -86,9 +86,9 @@
         typedef std::vector< std::vector< time_type > > value_matrix;
         typedef std::vector< unsigned short > us_vector;
 
-        value_vector m_error;
-        value_vector m_a;
-        value_matrix m_alpha;
+        value_vector m_error; // errors of repeated midpoint steps and extrapolations
+        value_vector m_a; // stores the work (number of f calls) required for the orders
+        value_matrix m_alpha; // stores convergence factor for stepsize adjustment
         us_vector m_interval_sequence;
 
         value_vector m_times;
@@ -160,7 +160,7 @@
             unsigned short k_conv = 0;
             
             for( unsigned short k=0; k<=m_current_k_max; k++ )
-            {
+            {  // loop through interval numbers
                 unsigned short stepcount = m_interval_sequence[k];
                 //out-of-place midpoint step
                 m_stepper_mp.set_stepcount(stepcount);
@@ -207,7 +207,7 @@
                     }
                 }
             }
-            if( !converged ) { // dt was too large - no converge up to order k_max
+            if( !converged ) { // dt was too large - no convergence up to order k_max
 
                 // step_scale is always > 1 
                 step_scale = std::max(step_scale, m_min_step_scale); // at least m_min ...

Modified: sandbox/odeint/branches/karsten/boost/numeric/odeint/error_checker_standard.hpp
==============================================================================
--- sandbox/odeint/branches/karsten/boost/numeric/odeint/error_checker_standard.hpp	(original)
+++ sandbox/odeint/branches/karsten/boost/numeric/odeint/error_checker_standard.hpp	2009-12-13 08:28:47 EST (Sun, 13 Dec 2009)
@@ -1,3 +1,17 @@
+/* Boost odeint/error_checker_standard.hpp header file
+ 
+ Copyright 2009 Karsten Ahnert
+ Copyright 2009 Mario Mulansky
+ 
+ This file includes the standard error checker to be used with
+ controlled steppers. It's purpose is to provide a method
+ that calculates the error ration of a given error-estimation
+ with respect to some user defined tolerance.
+
+ 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)
+*/
 
 
 #ifndef BOOST_NUMERIC_ODEINT_ERROR_CHECKER_STANDARD_HPP

Modified: sandbox/odeint/branches/karsten/boost/numeric/odeint/resizer.hpp
==============================================================================
--- sandbox/odeint/branches/karsten/boost/numeric/odeint/resizer.hpp	(original)
+++ sandbox/odeint/branches/karsten/boost/numeric/odeint/resizer.hpp	2009-12-13 08:28:47 EST (Sun, 13 Dec 2009)
@@ -1,3 +1,4 @@
+
 /* Boost odeint/resizer.hpp header file
  
  Copyright 2009 Karsten Ahnert