@@ -785,13 +785,12 @@ def test_model_step_nonsmooth_events(self):
785785 var1 = pybamm .Variable ("var1" )
786786 var2 = pybamm .Variable ("var2" )
787787
788- # make this an input parameter so the timescale isn't optimised out
789- # (covering Modulo -> Event code in base_solver.py)
790- model .timescale_eval = pybamm .InputParameter ("timescale" )
788+ # if this is 1 it gets simplified out
789+ model .timescale = pybamm .Scalar (1.000001 )
791790 a = 0.6
792791 discontinuities = (np .arange (3 ) + 1 ) * a
793792
794- model .rhs = {var1 : pybamm .Modulo (pybamm .t * model .timescale_eval , a )}
793+ model .rhs = {var1 : pybamm .Modulo (pybamm .t * model .timescale , a )}
795794 model .algebraic = {var2 : 2 * var1 - var2 }
796795 model .initial_conditions = {var1 : 0 , var2 : 0 }
797796 model .events = [
@@ -813,8 +812,7 @@ def test_model_step_nonsmooth_events(self):
813812 step_solution = None
814813 while time < end_time :
815814 step_solution = step_solver .step (
816- step_solution , model , dt = dt , npts = 10 ,
817- inputs = {"timescale" : 1 }
815+ step_solution , model , dt = dt , npts = 10
818816 )
819817 time += dt
820818 np .testing .assert_array_less (step_solution .y [0 , :- 1 ], 0.55 )
0 commit comments