Skip to content

Fix error estimation #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 27, 2016
Merged

Fix error estimation #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/boussinesq_2d_imex/plotgmrescounter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
uref = np.load('uref.npy')

print("Estimated discretisation error of DIRK: %5.3e" % ( np.linalg.norm(udirk.flatten() - uref.flatten(), np.inf)/np.linalg.norm(uref.flatten(),np.inf) ))
print("Estimated discretisation error of SDC: %5.3e" % ( np.linalg.norm(uend.flatten() - uref.flatten(), np.inf)/np.linalg.norm(uref.flatten(),np.inf) ))
print("Estimated discretisation error of RK-IMEX: %5.3e" % ( np.linalg.norm(uimex.flatten() - uref.flatten(), np.inf)/np.linalg.norm(uref.flatten(),np.inf) ))
print("Estimated discretisation error of SDC: %5.3e" % ( np.linalg.norm(uend.flatten() - uref.flatten(), np.inf)/np.linalg.norm(uref.flatten(),np.inf) ))

fs = 8
rcParams['figure.figsize'] = 5.0, 2.5
Expand Down
39 changes: 21 additions & 18 deletions examples/boussinesq_2d_imex/rungmrescounter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,18 @@
swparams['do_LU'] = False

sparams = {}
sparams['maxiter'] = 4
sparams['maxiter'] = 3

dirk_order = 4
dirk_order = 3

# setup parameters "in time"
t0 = 0
Tend = 3000
Tend = 3000
Nsteps = 100
dt = Tend/float(Nsteps)

# This comes as read-in for the problem class
pparams = {}
# pparams['nvars'] = [(4,450,30)]
pparams['nvars'] = [(4,300,30)]
pparams['u_adv'] = 0.02
pparams['c_s'] = 0.3
Expand All @@ -63,8 +62,8 @@
pparams['order_upw'] = [5]
pparams['gmres_maxiter'] = [500]
pparams['gmres_restart'] = [10]
pparams['gmres_tol_limit'] = [1e-3]
pparams['gmres_tol_factor'] = [0.01]
pparams['gmres_tol_limit'] = [1e-5]
pparams['gmres_tol_factor'] = [0.05]

# This comes as read-in for the transfer operations
tparams = {}
Expand Down Expand Up @@ -99,27 +98,31 @@

dirkp = dirk(P, dirk_order)
u0 = uinit.values.flatten()
udirk = u0
udirk = np.copy(u0)
print "Running DIRK ...."
for i in range(0,Nsteps):
udirk = dirkp.timestep(udirk, dt)

Pref = P
# For reference solution, increase GMRES tolerance
Pref.gmes_tol = 1e-6
dirkref = dirk(P, 4)
uref = u0
dt_ref = dt/10.0
for i in range(0,10*Nsteps):
uref = dirkref.timestep(uref, dt_ref)

rkimex = rk_imex(P, dirk_order)
uimex = u0
uimex = np.copy(u0)
dt_imex = dt
print "Running RK-IMEX ...."
for i in range(0,Nsteps):
uimex = rkimex.timestep(uimex, dt_imex)

# call main function to get things done...
print "Running SDC..."
uend,stats = mp.run_pfasst(MS,u0=uinit,t0=t0,dt=dt,Tend=Tend)

# For reference solution, increase GMRES tolerance
P.gmres_tol_limit = 1e-10
rkimexref = rk_imex(P, 4)
uref = np.copy(u0)
dt_ref = dt/10.0
print "Running RK-IMEX reference...."
for i in range(0,10*Nsteps):
uref = rkimexref.timestep(uref, dt_ref)

udirk = unflatten(udirk, 4, P.N[0], P.N[1])
uimex = unflatten(uimex, 4, P.N[0], P.N[1])
uref = unflatten(uref, 4, P.N[0], P.N[1])
Expand Down