90 lines
2.4 KiB
Diff
90 lines
2.4 KiB
Diff
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-09 14:46:43.224385347 +0100
|
|
@@ -1264,10 +1264,17 @@ sys_driver (const gsl_odeiv2_step_type *
|
|
nfe = 0;
|
|
nje = 0;
|
|
|
|
+ int poc=0;
|
|
while (t < t1)
|
|
{
|
|
s = gsl_odeiv2_evolve_apply (d->e, d->c, d->s, sys, &t, t1, &h, y);
|
|
|
|
+ printf("krok %d:", ++poc);
|
|
+ int k;
|
|
+ for (k=0; k<15; ++k) {
|
|
+ printf(" %ld",(*(long int *)(&(y[k]))));
|
|
+ }
|
|
+ printf("\n");
|
|
#ifdef DEBUG
|
|
printf ("%.5e %.5e %.5e %d\n", t, y[0], y[1],
|
|
gsl_odeiv2_step_order (d->s));
|
|
@@ -1959,7 +1966,7 @@ test_extreme_problems (void)
|
|
|
|
/* Loop over problems */
|
|
|
|
- for (p = 0; p < CONST_EXTREME_NPROB; p++)
|
|
+ for (p = 2; p < CONST_EXTREME_NPROB; p++)
|
|
{
|
|
/* Initialize */
|
|
|
|
@@ -2001,12 +2008,13 @@ test_extreme_problems (void)
|
|
|
|
/* Call each solver for the problem */
|
|
|
|
- for (i = 0; steppers[i] != 0; i++)
|
|
+ for (i = 1; steppers[i] != 0; i++)
|
|
{
|
|
+ printf("spustam driver p=%ld i=%ld\n", p, i);
|
|
int s = sys_driver (steppers[i], prob[p], start[p], end[p],
|
|
initstepsize[p], &y[sd[p] * i],
|
|
epsabs[p], epsrel[p], probname[p]);
|
|
-
|
|
+ printf("koniec drivera\n");
|
|
if (s != GSL_SUCCESS)
|
|
{
|
|
printf ("start=%.5e, initstepsize=%.5e\n", start[p],
|
|
@@ -2450,7 +2458,7 @@ main (void)
|
|
|
|
/* Basic tests for all steppers */
|
|
|
|
- for (i = 0; p[i].type != 0; i++)
|
|
+ /*for (i = 0; p[i].type != 0; i++)
|
|
{
|
|
test_stepper (p[i].type);
|
|
}
|
|
@@ -2469,9 +2477,9 @@ main (void)
|
|
test_stepsize_fail (p[i].type, p[i].h);
|
|
test_user_break (p[i].type, p[i].h);
|
|
}
|
|
-
|
|
+*/
|
|
/* Derivative test for explicit steppers */
|
|
-
|
|
+/*
|
|
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 +2499,16 @@ main (void)
|
|
test_stepfn (explicit_stepper[i].type);
|
|
test_stepfn2 (explicit_stepper[i].type);
|
|
}
|
|
-
|
|
+*/
|
|
/* Special tests */
|
|
|
|
- test_nonstiff_problems ();
|
|
+ // test_nonstiff_problems ();
|
|
|
|
- test_stiff_problems ();
|
|
+ // test_stiff_problems ();
|
|
|
|
test_extreme_problems ();
|
|
|
|
- test_driver ();
|
|
+ //test_driver ();
|
|
|
|
exit (gsl_test_summary ());
|
|
}
|