diff --git a/gsl.spec b/gsl.spec index 0295609..0b385fa 100644 --- a/gsl.spec +++ b/gsl.spec @@ -38,7 +38,7 @@ developing programs using the GSL (GNU Scientific Library). %patch0 -p1 -b .lib64 %patch1 -p1 -b .libs %patch2 -p1 -b .atlas -#%patch3 -p1 -b .wrk +%patch3 -p1 -b .wrk iconv -f windows-1252 -t utf-8 THANKS > THANKS.aux touch -r THANKS THANKS.aux mv THANKS.aux THANKS diff --git a/wrk.patch b/wrk.patch index b2d250e..b401b5f 100644 --- a/wrk.patch +++ b/wrk.patch @@ -1,6 +1,6 @@ diff -up wrk/ode-initval2/cstd.c.wrk wrk/ode-initval2/cstd.c --- wrk/ode-initval2/cstd.c.wrk 2013-01-18 16:02:19.566833381 +0100 -+++ wrk/ode-initval2/cstd.c 2013-01-21 13:19:57.939546891 +0100 ++++ wrk/ode-initval2/cstd.c 2013-01-22 10:52:34.432627630 +0100 @@ -80,11 +80,14 @@ std_control_init (void *vstate, return GSL_SUCCESS; } @@ -20,17 +20,17 @@ diff -up wrk/ode-initval2/cstd.c.wrk wrk/ode-initval2/cstd.c if (rmax > 1.1) { -+ printf("skracujem\n"); ++// printf("skracujem\n"); /* decrease step, no more than factor of 5, but a fraction S more than scaling suggests (for better accuracy) */ - double r = S / pow (rmax, 1.0 / ord); + double pom = pow (rmax, 1.0 / ord); + double r = S / pom; -+ printf("ord %d", ord); -+printf ("S\n"); -+PD(S); -+printf("rmax\n"); -+PD(rmax); ++// printf("ord %d", ord); ++//printf ("S\n"); ++//PD(S); ++//printf("rmax\n"); ++//PD(rmax); +printf("pom\n"); +PD(pom); @@ -40,7 +40,7 @@ diff -up wrk/ode-initval2/cstd.c.wrk wrk/ode-initval2/cstd.c } else if (rmax < 0.5) { -+ printf("predlzujem\n"); ++// printf("predlzujem\n"); /* increase step, no more than factor of 5 */ double r = S / pow (rmax, 1.0 / (ord + 1.0)); @@ -48,13 +48,13 @@ diff -up wrk/ode-initval2/cstd.c.wrk wrk/ode-initval2/cstd.c } else { -+ printf("nemenim\n"); ++// printf("nemenim\n"); /* no change */ return GSL_ODEIV_HADJ_NIL; } diff -up wrk/ode-initval2/evolve.c.wrk wrk/ode-initval2/evolve.c --- wrk/ode-initval2/evolve.c.wrk 2013-01-17 18:48:06.473062671 +0100 -+++ wrk/ode-initval2/evolve.c 2013-01-17 20:00:18.350164952 +0100 ++++ wrk/ode-initval2/evolve.c 2013-01-22 10:52:40.895672072 +0100 @@ -28,6 +28,8 @@ #include "odeiv_util.h" @@ -68,8 +68,8 @@ diff -up wrk/ode-initval2/evolve.c.wrk wrk/ode-initval2/evolve.c const gsl_odeiv2_system * dydt, double *t, double t1, double *h, double y[]) { -+ printf("vstup do apply\n"); -+ PD(*h); ++// printf("vstup do apply\n"); ++// PD(*h); const double t0 = *t; double h0 = *h; int step_status; @@ -78,8 +78,8 @@ diff -up wrk/ode-initval2/evolve.c.wrk wrk/ode-initval2/evolve.c try_step: - -+printf("po navasti\n"); -+PD(h0); ++//printf("po navasti\n"); ++//PD(h0); if ((dt >= 0.0 && h0 > dt) || (dt < 0.0 && h0 < dt)) { h0 = dt; @@ -87,7 +87,7 @@ diff -up wrk/ode-initval2/evolve.c.wrk wrk/ode-initval2/evolve.c DBL_MEMCPY (y, e->y0, dydt->dimension); e->failed_steps++; -+ printf("skacem prvy\n"); ++// printf("skacem prvy\n"); goto try_step; } else @@ -96,8 +96,8 @@ diff -up wrk/ode-initval2/evolve.c.wrk wrk/ode-initval2/evolve.c *t = t0 + h0; } - -+printf("pred con\n"); -+PD(h0); ++//printf("pred con\n"); ++//PD(h0); if (con != NULL) { /* Check error and attempt to adjust the step. */ @@ -105,8 +105,8 @@ diff -up wrk/ode-initval2/evolve.c.wrk wrk/ode-initval2/evolve.c const int hadjust_status = gsl_odeiv2_control_hadjust (con, step, y, e->yerr, e->dydt_out, &h0); -+printf("po hadjust\n"); -+PD(h0); ++//printf("po hadjust\n"); ++//PD(h0); if (hadjust_status == GSL_ODEIV_HADJ_DEC) { @@ -114,8 +114,8 @@ diff -up wrk/ode-initval2/evolve.c.wrk wrk/ode-initval2/evolve.c DBL_MEMCPY (y, e->y0, dydt->dimension); e->failed_steps++; -+printf("skacem druhy\n"); -+PD(h0); ++//printf("skacem druhy\n"); ++//PD(h0); goto try_step; } else @@ -123,15 +123,15 @@ diff -up wrk/ode-initval2/evolve.c.wrk wrk/ode-initval2/evolve.c *h = h0; } -+ printf("vystup z apply\n"); -+ PD(*h); ++// printf("vystup z apply\n"); ++// PD(*h); + return step_status; } 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 18:49:59.200781741 +0100 ++++ wrk/ode-initval2/msbdf.c 2013-01-22 10:54:04.377231938 +0100 @@ -43,6 +43,8 @@ framework. */ @@ -170,8 +170,8 @@ diff -up wrk/ode-initval2/msbdf.c.wrk wrk/ode-initval2/msbdf.c { /* Carries out a step by BDF linear multistep methods. */ - -+printf("zaciatok msbdf\n"); -+PD(h); ++//printf("zaciatok msbdf\n"); ++//PD(h); msbdf_state_t *state = (msbdf_state_t *) vstate; double *const z = state->z; @@ -192,8 +192,8 @@ diff -up wrk/ode-initval2/msbdf.c.wrk wrk/ode-initval2/msbdf.c #endif } - -+printf("koniec msbdf\n"); -+PD(h); ++//printf("koniec msbdf\n"); ++//PD(h); return GSL_SUCCESS; }