boost_mirror/odeint
1
0
Fork 0
mirror of https://github.com/boostorg/odeint.git synced 2025-05-09 23:24:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

added max_dt to bs dense out

Browse Source
This commit is contained in:
Mario Mulansky 2015-11-01 13:38:10 -06:00
parent 80da40f6b5
commit 936af851bb
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/boost/numeric/odeint/stepper/bulirsch_stoer_dense_out.hpp
View File

@ -97,8 +97,10 @@ public:
bulirsch_stoer_dense_out(
value_type eps_abs = 1E-6 , value_type eps_rel = 1E-6 ,
value_type factor_x = 1.0 , value_type factor_dxdt = 1.0 ,
time_type max_dt = static_cast<time_type>(0) ,
bool control_interpolation = false )
: m_error_checker( eps_abs , eps_rel , factor_x, factor_dxdt ) ,
: m_error_checker( eps_abs , eps_rel , factor_x, factor_dxdt ) ,
m_max_dt(max_dt) ,
m_control_interpolation( control_interpolation) ,
m_last_step_rejected( false ) , m_first( true ) ,
m_current_state_x1( true ) ,
@ -149,6 +151,14 @@ public:
template< class System , class StateIn , class DerivIn , class StateOut , class DerivOut >
controlled_step_result try_step( System system , const StateIn &in , const DerivIn &dxdt , time_type &t , StateOut &out , DerivOut &dxdt_new , time_type &dt )
{
if( m_max_dt != static_cast<time_type>(0) && detail::less_with_sign(m_max_dt, dt, dt) )
{
// given step size is bigger then max_dt
// set limit and return fail
dt = m_max_dt;
return fail;
}
BOOST_USING_STD_MIN();
BOOST_USING_STD_MAX();
using std::pow;
@ -275,7 +285,14 @@ public:
}
//set next stepsize
if( !m_last_step_rejected || (new_h < dt) )
{
// limit step size
if( m_max_dt != static_cast<time_type>(0) )
{
new_h = detail::min_abs(m_max_dt, new_h);
}
dt = new_h;
}
m_last_step_rejected = reject;
if( reject )
@ -646,6 +663,8 @@ private:
default_error_checker< value_type, algebra_type , operations_type > m_error_checker;
modified_midpoint_dense_out< state_type , value_type , deriv_type , time_type , algebra_type , operations_type , resizer_type > m_midpoint;
time_type m_max_dt;
bool m_control_interpolation;
bool m_last_step_rejected;