diff --git a/wrk.patch b/wrk.patch index 43bad46..0484dc7 100644 --- a/wrk.patch +++ b/wrk.patch @@ -1,6 +1,6 @@ diff -up wrk/ode-initval2/msbdf.c.wrk wrk/ode-initval2/msbdf.c --- wrk/ode-initval2/msbdf.c.wrk 2013-01-09 10:35:45.259960403 +0100 -+++ wrk/ode-initval2/msbdf.c 2013-01-17 16:52:13.135771518 +0100 ++++ wrk/ode-initval2/msbdf.c 2013-01-17 17:00:39.904038985 +0100 @@ -43,6 +43,8 @@ framework. */ @@ -39,7 +39,7 @@ diff -up wrk/ode-initval2/msbdf.c.wrk wrk/ode-initval2/msbdf.c { /* Carries out a step by BDF linear multistep methods. */ - -+PD(h); ++//PD(h); msbdf_state_t *state = (msbdf_state_t *) vstate; double *const z = state->z; @@ -57,7 +57,7 @@ diff -up wrk/ode-initval2/msbdf.c.wrk wrk/ode-initval2/msbdf.c diff -up wrk/ode-initval2/test.c.wrk wrk/ode-initval2/test.c --- wrk/ode-initval2/test.c.wrk 2013-01-09 10:48:22.051415928 +0100 -+++ wrk/ode-initval2/test.c 2013-01-17 15:18:46.759826995 +0100 ++++ wrk/ode-initval2/test.c 2013-01-17 17:12:50.880664280 +0100 @@ -923,6 +923,18 @@ rhs_ringmod (double t, const double y[], f[13] = (-y[0] + uin1 - (ri + rg1) * y[13]) / ls1; f[14] = (-y[1] - (rc + rg1) * y[14]) / ls1; @@ -77,16 +77,29 @@ diff -up wrk/ode-initval2/test.c.wrk wrk/ode-initval2/test.c return GSL_SUCCESS; } -@@ -1264,10 +1276,19 @@ sys_driver (const gsl_odeiv2_step_type * +@@ -1239,6 +1251,8 @@ test_evolve_system (const gsl_odeiv2_ste + gsl_odeiv2_driver_free (d); + } + ++#define PD(fl) printf("%lu\n", *((unsigned long *)&(fl))) ++ + int + sys_driver (const gsl_odeiv2_step_type * T, + const gsl_odeiv2_system * sys, +@@ -1264,10 +1278,23 @@ sys_driver (const gsl_odeiv2_step_type * nfe = 0; nje = 0; + int poc=0; while (t < t1) { ++ printf("pred\n"); ++ PD(h); s = gsl_odeiv2_evolve_apply (d->e, d->c, d->s, sys, &t, t1, &h, y); + printf("\nkrok %d\n", ++poc); ++printf("po\n"); ++PD(h); +/* int k; + for (k=0; k<15; ++k) { + printf(" %lu\n",(*(unsigned long int *)(&(y[k])))); @@ -97,7 +110,7 @@ diff -up wrk/ode-initval2/test.c.wrk wrk/ode-initval2/test.c #ifdef DEBUG printf ("%.5e %.5e %.5e %d\n", t, y[0], y[1], gsl_odeiv2_step_order (d->s)); -@@ -1959,7 +1980,7 @@ test_extreme_problems (void) +@@ -1959,7 +1986,7 @@ test_extreme_problems (void) /* Loop over problems */ @@ -106,7 +119,7 @@ diff -up wrk/ode-initval2/test.c.wrk wrk/ode-initval2/test.c { /* Initialize */ -@@ -2001,12 +2022,13 @@ test_extreme_problems (void) +@@ -2001,12 +2028,13 @@ test_extreme_problems (void) /* Call each solver for the problem */ @@ -122,7 +135,7 @@ diff -up wrk/ode-initval2/test.c.wrk wrk/ode-initval2/test.c if (s != GSL_SUCCESS) { printf ("start=%.5e, initstepsize=%.5e\n", start[p], -@@ -2450,7 +2472,7 @@ main (void) +@@ -2450,7 +2478,7 @@ main (void) /* Basic tests for all steppers */ @@ -131,7 +144,7 @@ diff -up wrk/ode-initval2/test.c.wrk wrk/ode-initval2/test.c { test_stepper (p[i].type); } -@@ -2469,9 +2491,9 @@ main (void) +@@ -2469,9 +2497,9 @@ main (void) test_stepsize_fail (p[i].type, p[i].h); test_user_break (p[i].type, p[i].h); } @@ -143,7 +156,7 @@ diff -up wrk/ode-initval2/test.c.wrk wrk/ode-initval2/test.c explicit_stepper[0].type = gsl_odeiv2_step_rk4; explicit_stepper[0].h = 1.0e-3; explicit_stepper[1].type = gsl_odeiv2_step_rk2; -@@ -2491,16 +2513,16 @@ main (void) +@@ -2491,16 +2519,16 @@ main (void) test_stepfn (explicit_stepper[i].type); test_stepfn2 (explicit_stepper[i].type); }