Merge branch 'master' of ssh://vo20.nl/git/uva

3f68304d · Sander Mathijs van Veen · efd03369 · 7c1173db · 3f68304d · 3f68304d
Commit 3f68304d authored Apr 10, 2011 by Sander Mathijs van Veen
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

modsim/ass3/compare_osc.sh modsim/ass3/compare_osc.sh +1 -1

modsim/ass3/main.c modsim/ass3/main.c +1 -1

No files found.
--- a/modsim/ass3/compare_osc.sh
+++ b/modsim/ass3/compare_osc.sh
@@ -2,4 +2,4 @@
 cat report/osc_euler | ./plot.py report/osc_euler.pdf
 cat report/osc_rk2 | ./plot.py report/osc_rk2.pdf
 cat report/osc_rk4 | ./plot.py report/osc_rk4.pdf
-rm report/osc_euler report/osc_rk2 report/osc_rk4
+#rm report/osc_euler report/osc_rk2 report/osc_rk4
--- a/modsim/ass3/main.c
+++ b/modsim/ass3/main.c
@@ -6,7 +6,7 @@
 #include "logger.h"

 #define DEFAULT_DT .001
-#define COMPARE_DT .5
+#define COMPARE_DT 1.0

 #define INTEGRATE(method, t0, t1, dt, N, FN) { \
    if( method(t0, t1, dt, y0, y1, N, &f_ ## FN, (void *)args_ ## FN) ) \