Skip to content

U
uva
Commit 3f68304d authored by Sander Mathijs van Veen's avatar Sander Mathijs van Veen
Browse files
Options

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

parents efd03369 7c1173db
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modsim/ass3/compare_osc.sh
View file @ 3f68304d
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
cat report/osc_euler | ./plot.py report/osc_euler.pdf cat report/osc_euler | ./plot.py report/osc_euler.pdf
cat report/osc_rk2 | ./plot.py report/osc_rk2.pdf cat report/osc_rk2 | ./plot.py report/osc_rk2.pdf
cat report/osc_rk4 | ./plot.py report/osc_rk4.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
modsim/ass3/main.c
View file @ 3f68304d
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include "logger.h" #include "logger.h"
#define DEFAULT_DT .001 #define DEFAULT_DT .001
#define COMPARE_DT .5 #define COMPARE_DT 1.0
#define INTEGRATE(method, t0, t1, dt, N, FN) { \ #define INTEGRATE(method, t0, t1, dt, N, FN) { \
if( method(t0, t1, dt, y0, y1, N, &f_ ## FN, (void *)args_ ## FN) ) \ if( method(t0, t1, dt, y0, y1, N, &f_ ## FN, (void *)args_ ## FN) ) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment