From 169fd74cecdbc1531c966cbf60296f4bf8bb91f6 Mon Sep 17 00:00:00 2001 From: PeterMeisrimelModelon <92585725+PeterMeisrimelModelon@users.noreply.github.com> Date: Tue, 23 Jan 2024 10:44:39 +0100 Subject: [PATCH] Cleanup --- src/solvers/odepack.py | 2 -- src/solvers/radar5.py | 6 ------ tests/solvers/test_odepack.py | 1 - 3 files changed, 9 deletions(-) diff --git a/src/solvers/odepack.py b/src/solvers/odepack.py index 9eb571f8..44aad118 100644 --- a/src/solvers/odepack.py +++ b/src/solvers/odepack.py @@ -186,7 +186,6 @@ def integrate_start(self, t, y): """ Helper program for the initialization of LSODAR """ - #print('We have rkstarter {} and rkstarter_active {}'.format(self.rkstarter, self._rkstarter_active)) if not(self.rkstarter>1 and self._rkstarter_active): # first call or classical restart after a discontinuity ISTATE=1 @@ -409,7 +408,6 @@ def state_events(t,y): opts["output_index"] = output_index # deciding on restarting options self._rkstarter_active = True if ISTATE == 3 and self.rkstarter > 1 else False - #print('rkstarter_active set to {} and ISTATE={}'.format(self._rkstarter_active, ISTATE)) #Retrieving statistics self.statistics["nstatefcns"] += IWORK[9] diff --git a/src/solvers/radar5.py b/src/solvers/radar5.py index b0ce5119..e12b393c 100644 --- a/src/solvers/radar5.py +++ b/src/solvers/radar5.py @@ -207,8 +207,6 @@ def compute_ydelay(self, t, y, past, ipast): return ydelay def F(self, t, y, past, ipast): - #print('F:', t, y, past, ipast) - # First find the correct place in the past vector for each time-lag # then evaluate all required solution components at that point ydelay = self.compute_ydelay(t,y, past, ipast) @@ -277,8 +275,6 @@ def integrate(self, t, y, tf, opts): #Store the opts self._opts = opts - #print("INIT", t,y,tf,self.inith, self.problem.ipast) - #print("GRID", self.problem.grid, self.problem.ngrid) #t, y, h, iwork, flag, past = radar5.assimulo_radar5(self.F, \ a = radar5.assimulo_radar5(self.F, \ self.problem.phi, \ @@ -316,8 +312,6 @@ def integrate(self, t, y, tf, opts): #len(past) \ #) t, y, h, iwork, flag, past = a[0] - #print a[0] - #print len(a[0]) #self.past = copy.deepcopy(past) self.past = past self.tk = N.trim_zeros(self.past[::self.idif], 'b') diff --git a/tests/solvers/test_odepack.py b/tests/solvers/test_odepack.py index 68b2659a..50e8718f 100644 --- a/tests/solvers/test_odepack.py +++ b/tests/solvers/test_odepack.py @@ -275,7 +275,6 @@ def test_interpol(self): self.sim.reset() t_sol1,y_sol1=self.sim.simulate(0.5) ind05=N.nonzero(N.array(t_sol)==0.5)[0][0] - #print y_sol[ind05],y_sol1[-1] nose.tools.assert_almost_equal(y_sol[ind05,0],y_sol1[-1,0],6) @testattr(stddist = True)