aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknarf <knarf@b2a53a04-0f4f-0410-87ed-f9f25ced00cf>2010-10-31 13:42:46 +0000
committerknarf <knarf@b2a53a04-0f4f-0410-87ed-f9f25ced00cf>2010-10-31 13:42:46 +0000
commitcd366587f618ba186be191c55c5c8d030f389df4 (patch)
tree84a2539f28e489cb1f9f08dbd7eb0bf313a223e7
parentbd068dd63787499a331a8deccd04c97b1426f7b1 (diff)
update testsuite because: originally the conserved variables of GRHydro (which should not be part of this anyway, but let's keep it for now) have been computed by TOVSolver using only the TOV metric. Now GRHydro is doing that, using the full metric. This changes the value primarily close to the BH - not by much, but enough to make the testsuite fail, thus the update
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/TwoPunctures/trunk@115 b2a53a04-0f4f-0410-87ed-f9f25ced00cf
-rw-r--r--test/bhns_eval/alp.d.asc22
-rw-r--r--test/bhns_eval/alp.x.asc2
-rw-r--r--test/bhns_eval/alp.y.asc2
-rw-r--r--test/bhns_eval/alp.z.asc2
-rw-r--r--test/bhns_eval/betax.d.asc22
-rw-r--r--test/bhns_eval/betax.x.asc2
-rw-r--r--test/bhns_eval/betax.y.asc2
-rw-r--r--test/bhns_eval/betax.z.asc2
-rw-r--r--test/bhns_eval/betay.d.asc22
-rw-r--r--test/bhns_eval/betay.x.asc2
-rw-r--r--test/bhns_eval/betay.y.asc2
-rw-r--r--test/bhns_eval/betay.z.asc2
-rw-r--r--test/bhns_eval/betaz.d.asc22
-rw-r--r--test/bhns_eval/betaz.x.asc2
-rw-r--r--test/bhns_eval/betaz.y.asc2
-rw-r--r--test/bhns_eval/betaz.z.asc2
-rw-r--r--test/bhns_eval/dens.d.asc64
-rw-r--r--test/bhns_eval/dens.maximum.asc4
-rw-r--r--test/bhns_eval/dens.minimum.asc4
-rw-r--r--test/bhns_eval/dens.norm1.asc4
-rw-r--r--test/bhns_eval/dens.norm2.asc4
-rw-r--r--test/bhns_eval/dens.x.asc80
-rw-r--r--test/bhns_eval/dens.y.asc44
-rw-r--r--test/bhns_eval/dens.z.asc44
-rw-r--r--test/bhns_eval/eps.d.asc22
-rw-r--r--test/bhns_eval/eps.maximum.asc4
-rw-r--r--test/bhns_eval/eps.minimum.asc2
-rw-r--r--test/bhns_eval/eps.norm1.asc2
-rw-r--r--test/bhns_eval/eps.norm2.asc2
-rw-r--r--test/bhns_eval/eps.x.asc8
-rw-r--r--test/bhns_eval/eps.y.asc2
-rw-r--r--test/bhns_eval/eps.z.asc2
-rw-r--r--test/bhns_eval/gxx.d.asc24
-rw-r--r--test/bhns_eval/gxx.norm1.asc2
-rw-r--r--test/bhns_eval/gxx.norm2.asc2
-rw-r--r--test/bhns_eval/gxx.x.asc2
-rw-r--r--test/bhns_eval/gxx.y.asc6
-rw-r--r--test/bhns_eval/gxx.z.asc6
-rw-r--r--test/bhns_eval/gxy.d.asc22
-rw-r--r--test/bhns_eval/gxy.x.asc2
-rw-r--r--test/bhns_eval/gxy.y.asc2
-rw-r--r--test/bhns_eval/gxy.z.asc2
-rw-r--r--test/bhns_eval/gxz.d.asc22
-rw-r--r--test/bhns_eval/gxz.x.asc2
-rw-r--r--test/bhns_eval/gxz.y.asc2
-rw-r--r--test/bhns_eval/gxz.z.asc2
-rw-r--r--test/bhns_eval/gyy.d.asc24
-rw-r--r--test/bhns_eval/gyy.norm1.asc2
-rw-r--r--test/bhns_eval/gyy.norm2.asc2
-rw-r--r--test/bhns_eval/gyy.x.asc2
-rw-r--r--test/bhns_eval/gyy.y.asc6
-rw-r--r--test/bhns_eval/gyy.z.asc6
-rw-r--r--test/bhns_eval/gyz.d.asc22
-rw-r--r--test/bhns_eval/gyz.x.asc2
-rw-r--r--test/bhns_eval/gyz.y.asc2
-rw-r--r--test/bhns_eval/gyz.z.asc2
-rw-r--r--test/bhns_eval/gzz.d.asc24
-rw-r--r--test/bhns_eval/gzz.norm1.asc2
-rw-r--r--test/bhns_eval/gzz.norm2.asc2
-rw-r--r--test/bhns_eval/gzz.x.asc2
-rw-r--r--test/bhns_eval/gzz.y.asc6
-rw-r--r--test/bhns_eval/gzz.z.asc6
-rw-r--r--test/bhns_eval/kxx.d.asc22
-rw-r--r--test/bhns_eval/kxx.x.asc2
-rw-r--r--test/bhns_eval/kxx.y.asc2
-rw-r--r--test/bhns_eval/kxx.z.asc2
-rw-r--r--test/bhns_eval/kxy.d.asc22
-rw-r--r--test/bhns_eval/kxy.x.asc2
-rw-r--r--test/bhns_eval/kxy.y.asc2
-rw-r--r--test/bhns_eval/kxy.z.asc2
-rw-r--r--test/bhns_eval/kxz.d.asc22
-rw-r--r--test/bhns_eval/kxz.x.asc2
-rw-r--r--test/bhns_eval/kxz.y.asc2
-rw-r--r--test/bhns_eval/kxz.z.asc2
-rw-r--r--test/bhns_eval/kyy.d.asc22
-rw-r--r--test/bhns_eval/kyy.x.asc2
-rw-r--r--test/bhns_eval/kyy.y.asc2
-rw-r--r--test/bhns_eval/kyy.z.asc2
-rw-r--r--test/bhns_eval/kyz.d.asc22
-rw-r--r--test/bhns_eval/kyz.x.asc2
-rw-r--r--test/bhns_eval/kyz.y.asc2
-rw-r--r--test/bhns_eval/kyz.z.asc2
-rw-r--r--test/bhns_eval/kzz.d.asc22
-rw-r--r--test/bhns_eval/kzz.x.asc2
-rw-r--r--test/bhns_eval/kzz.y.asc2
-rw-r--r--test/bhns_eval/kzz.z.asc2
-rw-r--r--test/bhns_eval/press.d.asc22
-rw-r--r--test/bhns_eval/press.maximum.asc4
-rw-r--r--test/bhns_eval/press.minimum.asc2
-rw-r--r--test/bhns_eval/press.norm1.asc2
-rw-r--r--test/bhns_eval/press.norm2.asc2
-rw-r--r--test/bhns_eval/press.x.asc8
-rw-r--r--test/bhns_eval/press.y.asc2
-rw-r--r--test/bhns_eval/press.z.asc2
-rw-r--r--test/bhns_eval/puncture_u.d.asc44
-rw-r--r--test/bhns_eval/puncture_u.minimum.asc2
-rw-r--r--test/bhns_eval/puncture_u.norm1.asc2
-rw-r--r--test/bhns_eval/puncture_u.norm2.asc2
-rw-r--r--test/bhns_eval/puncture_u.x.asc36
-rw-r--r--test/bhns_eval/puncture_u.y.asc22
-rw-r--r--test/bhns_eval/puncture_u.z.asc28
-rw-r--r--test/bhns_eval/rho.d.asc22
-rw-r--r--test/bhns_eval/rho.maximum.asc4
-rw-r--r--test/bhns_eval/rho.minimum.asc2
-rw-r--r--test/bhns_eval/rho.norm1.asc2
-rw-r--r--test/bhns_eval/rho.norm2.asc2
-rw-r--r--test/bhns_eval/rho.x.asc8
-rw-r--r--test/bhns_eval/rho.y.asc2
-rw-r--r--test/bhns_eval/rho.z.asc2
-rw-r--r--test/bhns_eval/scon[0].d.asc22
-rw-r--r--test/bhns_eval/scon[0].maximum.asc2
-rw-r--r--test/bhns_eval/scon[0].minimum.asc2
-rw-r--r--test/bhns_eval/scon[0].norm1.asc2
-rw-r--r--test/bhns_eval/scon[0].norm2.asc2
-rw-r--r--test/bhns_eval/scon[0].x.asc2
-rw-r--r--test/bhns_eval/scon[0].y.asc2
-rw-r--r--test/bhns_eval/scon[0].z.asc2
-rw-r--r--test/bhns_eval/scon[1].d.asc22
-rw-r--r--test/bhns_eval/scon[1].maximum.asc2
-rw-r--r--test/bhns_eval/scon[1].minimum.asc2
-rw-r--r--test/bhns_eval/scon[1].norm1.asc2
-rw-r--r--test/bhns_eval/scon[1].norm2.asc2
-rw-r--r--test/bhns_eval/scon[1].x.asc2
-rw-r--r--test/bhns_eval/scon[1].y.asc2
-rw-r--r--test/bhns_eval/scon[1].z.asc2
-rw-r--r--test/bhns_eval/scon[2].d.asc22
-rw-r--r--test/bhns_eval/scon[2].maximum.asc2
-rw-r--r--test/bhns_eval/scon[2].minimum.asc2
-rw-r--r--test/bhns_eval/scon[2].norm1.asc2
-rw-r--r--test/bhns_eval/scon[2].norm2.asc2
-rw-r--r--test/bhns_eval/scon[2].x.asc2
-rw-r--r--test/bhns_eval/scon[2].y.asc2
-rw-r--r--test/bhns_eval/scon[2].z.asc2
-rw-r--r--test/bhns_eval/tau.d.asc64
-rw-r--r--test/bhns_eval/tau.maximum.asc4
-rw-r--r--test/bhns_eval/tau.minimum.asc4
-rw-r--r--test/bhns_eval/tau.norm1.asc4
-rw-r--r--test/bhns_eval/tau.norm2.asc2
-rw-r--r--test/bhns_eval/tau.x.asc80
-rw-r--r--test/bhns_eval/tau.y.asc44
-rw-r--r--test/bhns_eval/tau.z.asc44
-rw-r--r--test/bhns_eval/vel[0].d.asc22
-rw-r--r--test/bhns_eval/vel[0].maximum.asc2
-rw-r--r--test/bhns_eval/vel[0].minimum.asc2
-rw-r--r--test/bhns_eval/vel[0].norm1.asc2
-rw-r--r--test/bhns_eval/vel[0].norm2.asc2
-rw-r--r--test/bhns_eval/vel[0].x.asc2
-rw-r--r--test/bhns_eval/vel[0].y.asc2
-rw-r--r--test/bhns_eval/vel[0].z.asc2
-rw-r--r--test/bhns_eval/vel[1].d.asc22
-rw-r--r--test/bhns_eval/vel[1].maximum.asc2
-rw-r--r--test/bhns_eval/vel[1].minimum.asc2
-rw-r--r--test/bhns_eval/vel[1].norm1.asc2
-rw-r--r--test/bhns_eval/vel[1].norm2.asc2
-rw-r--r--test/bhns_eval/vel[1].x.asc2
-rw-r--r--test/bhns_eval/vel[1].y.asc2
-rw-r--r--test/bhns_eval/vel[1].z.asc2
-rw-r--r--test/bhns_eval/vel[2].d.asc22
-rw-r--r--test/bhns_eval/vel[2].maximum.asc2
-rw-r--r--test/bhns_eval/vel[2].minimum.asc2
-rw-r--r--test/bhns_eval/vel[2].norm1.asc2
-rw-r--r--test/bhns_eval/vel[2].norm2.asc2
-rw-r--r--test/bhns_eval/vel[2].x.asc2
-rw-r--r--test/bhns_eval/vel[2].y.asc2
-rw-r--r--test/bhns_eval/vel[2].z.asc2
-rw-r--r--test/bhns_eval/w_lorentz.d.asc22
-rw-r--r--test/bhns_eval/w_lorentz.maximum.asc2
-rw-r--r--test/bhns_eval/w_lorentz.minimum.asc2
-rw-r--r--test/bhns_eval/w_lorentz.norm1.asc2
-rw-r--r--test/bhns_eval/w_lorentz.norm2.asc2
-rw-r--r--test/bhns_eval/w_lorentz.x.asc2
-rw-r--r--test/bhns_eval/w_lorentz.y.asc2
-rw-r--r--test/bhns_eval/w_lorentz.z.asc2
-rw-r--r--test/bhns_interp/alp.d.asc22
-rw-r--r--test/bhns_interp/alp.x.asc2
-rw-r--r--test/bhns_interp/alp.y.asc2
-rw-r--r--test/bhns_interp/alp.z.asc2
-rw-r--r--test/bhns_interp/betax.d.asc22
-rw-r--r--test/bhns_interp/betax.x.asc2
-rw-r--r--test/bhns_interp/betax.y.asc2
-rw-r--r--test/bhns_interp/betax.z.asc2
-rw-r--r--test/bhns_interp/betay.d.asc22
-rw-r--r--test/bhns_interp/betay.x.asc2
-rw-r--r--test/bhns_interp/betay.y.asc2
-rw-r--r--test/bhns_interp/betay.z.asc2
-rw-r--r--test/bhns_interp/betaz.d.asc22
-rw-r--r--test/bhns_interp/betaz.x.asc2
-rw-r--r--test/bhns_interp/betaz.y.asc2
-rw-r--r--test/bhns_interp/betaz.z.asc2
-rw-r--r--test/bhns_interp/dens.d.asc64
-rw-r--r--test/bhns_interp/dens.maximum.asc4
-rw-r--r--test/bhns_interp/dens.minimum.asc4
-rw-r--r--test/bhns_interp/dens.norm1.asc4
-rw-r--r--test/bhns_interp/dens.norm2.asc4
-rw-r--r--test/bhns_interp/dens.x.asc80
-rw-r--r--test/bhns_interp/dens.y.asc44
-rw-r--r--test/bhns_interp/dens.z.asc44
-rw-r--r--test/bhns_interp/eps.d.asc22
-rw-r--r--test/bhns_interp/eps.maximum.asc4
-rw-r--r--test/bhns_interp/eps.minimum.asc2
-rw-r--r--test/bhns_interp/eps.norm1.asc2
-rw-r--r--test/bhns_interp/eps.norm2.asc2
-rw-r--r--test/bhns_interp/eps.x.asc8
-rw-r--r--test/bhns_interp/eps.y.asc2
-rw-r--r--test/bhns_interp/eps.z.asc2
-rw-r--r--test/bhns_interp/gxx.d.asc22
-rw-r--r--test/bhns_interp/gxx.norm1.asc2
-rw-r--r--test/bhns_interp/gxx.norm2.asc2
-rw-r--r--test/bhns_interp/gxx.x.asc12
-rw-r--r--test/bhns_interp/gxx.y.asc10
-rw-r--r--test/bhns_interp/gxx.z.asc8
-rw-r--r--test/bhns_interp/gxy.d.asc22
-rw-r--r--test/bhns_interp/gxy.x.asc2
-rw-r--r--test/bhns_interp/gxy.y.asc2
-rw-r--r--test/bhns_interp/gxy.z.asc2
-rw-r--r--test/bhns_interp/gxz.d.asc22
-rw-r--r--test/bhns_interp/gxz.x.asc2
-rw-r--r--test/bhns_interp/gxz.y.asc2
-rw-r--r--test/bhns_interp/gxz.z.asc2
-rw-r--r--test/bhns_interp/gyy.d.asc22
-rw-r--r--test/bhns_interp/gyy.norm1.asc2
-rw-r--r--test/bhns_interp/gyy.norm2.asc2
-rw-r--r--test/bhns_interp/gyy.x.asc12
-rw-r--r--test/bhns_interp/gyy.y.asc10
-rw-r--r--test/bhns_interp/gyy.z.asc8
-rw-r--r--test/bhns_interp/gyz.d.asc22
-rw-r--r--test/bhns_interp/gyz.x.asc2
-rw-r--r--test/bhns_interp/gyz.y.asc2
-rw-r--r--test/bhns_interp/gyz.z.asc2
-rw-r--r--test/bhns_interp/gzz.d.asc22
-rw-r--r--test/bhns_interp/gzz.norm1.asc2
-rw-r--r--test/bhns_interp/gzz.norm2.asc2
-rw-r--r--test/bhns_interp/gzz.x.asc12
-rw-r--r--test/bhns_interp/gzz.y.asc10
-rw-r--r--test/bhns_interp/gzz.z.asc8
-rw-r--r--test/bhns_interp/kxx.d.asc22
-rw-r--r--test/bhns_interp/kxx.x.asc2
-rw-r--r--test/bhns_interp/kxx.y.asc2
-rw-r--r--test/bhns_interp/kxx.z.asc2
-rw-r--r--test/bhns_interp/kxy.d.asc22
-rw-r--r--test/bhns_interp/kxy.x.asc2
-rw-r--r--test/bhns_interp/kxy.y.asc2
-rw-r--r--test/bhns_interp/kxy.z.asc2
-rw-r--r--test/bhns_interp/kxz.d.asc22
-rw-r--r--test/bhns_interp/kxz.x.asc2
-rw-r--r--test/bhns_interp/kxz.y.asc2
-rw-r--r--test/bhns_interp/kxz.z.asc2
-rw-r--r--test/bhns_interp/kyy.d.asc22
-rw-r--r--test/bhns_interp/kyy.x.asc2
-rw-r--r--test/bhns_interp/kyy.y.asc2
-rw-r--r--test/bhns_interp/kyy.z.asc2
-rw-r--r--test/bhns_interp/kyz.d.asc22
-rw-r--r--test/bhns_interp/kyz.x.asc2
-rw-r--r--test/bhns_interp/kyz.y.asc2
-rw-r--r--test/bhns_interp/kyz.z.asc2
-rw-r--r--test/bhns_interp/kzz.d.asc22
-rw-r--r--test/bhns_interp/kzz.x.asc2
-rw-r--r--test/bhns_interp/kzz.y.asc2
-rw-r--r--test/bhns_interp/kzz.z.asc2
-rw-r--r--test/bhns_interp/press.d.asc22
-rw-r--r--test/bhns_interp/press.maximum.asc2
-rw-r--r--test/bhns_interp/press.minimum.asc2
-rw-r--r--test/bhns_interp/press.norm1.asc2
-rw-r--r--test/bhns_interp/press.norm2.asc2
-rw-r--r--test/bhns_interp/press.x.asc8
-rw-r--r--test/bhns_interp/press.y.asc2
-rw-r--r--test/bhns_interp/press.z.asc2
-rw-r--r--test/bhns_interp/puncture_u.d.asc50
-rw-r--r--test/bhns_interp/puncture_u.maximum.asc2
-rw-r--r--test/bhns_interp/puncture_u.minimum.asc2
-rw-r--r--test/bhns_interp/puncture_u.norm1.asc2
-rw-r--r--test/bhns_interp/puncture_u.norm2.asc2
-rw-r--r--test/bhns_interp/puncture_u.x.asc46
-rw-r--r--test/bhns_interp/puncture_u.y.asc16
-rw-r--r--test/bhns_interp/puncture_u.z.asc30
-rw-r--r--test/bhns_interp/rho.d.asc22
-rw-r--r--test/bhns_interp/rho.maximum.asc4
-rw-r--r--test/bhns_interp/rho.minimum.asc2
-rw-r--r--test/bhns_interp/rho.norm1.asc4
-rw-r--r--test/bhns_interp/rho.norm2.asc2
-rw-r--r--test/bhns_interp/rho.x.asc8
-rw-r--r--test/bhns_interp/rho.y.asc2
-rw-r--r--test/bhns_interp/rho.z.asc2
-rw-r--r--test/bhns_interp/scon[0].d.asc22
-rw-r--r--test/bhns_interp/scon[0].maximum.asc2
-rw-r--r--test/bhns_interp/scon[0].minimum.asc2
-rw-r--r--test/bhns_interp/scon[0].norm1.asc2
-rw-r--r--test/bhns_interp/scon[0].norm2.asc2
-rw-r--r--test/bhns_interp/scon[0].x.asc2
-rw-r--r--test/bhns_interp/scon[0].y.asc2
-rw-r--r--test/bhns_interp/scon[0].z.asc2
-rw-r--r--test/bhns_interp/scon[1].d.asc22
-rw-r--r--test/bhns_interp/scon[1].maximum.asc2
-rw-r--r--test/bhns_interp/scon[1].minimum.asc2
-rw-r--r--test/bhns_interp/scon[1].norm1.asc2
-rw-r--r--test/bhns_interp/scon[1].norm2.asc2
-rw-r--r--test/bhns_interp/scon[1].x.asc2
-rw-r--r--test/bhns_interp/scon[1].y.asc2
-rw-r--r--test/bhns_interp/scon[1].z.asc2
-rw-r--r--test/bhns_interp/scon[2].d.asc22
-rw-r--r--test/bhns_interp/scon[2].maximum.asc2
-rw-r--r--test/bhns_interp/scon[2].minimum.asc2
-rw-r--r--test/bhns_interp/scon[2].norm1.asc2
-rw-r--r--test/bhns_interp/scon[2].norm2.asc2
-rw-r--r--test/bhns_interp/scon[2].x.asc2
-rw-r--r--test/bhns_interp/scon[2].y.asc2
-rw-r--r--test/bhns_interp/scon[2].z.asc2
-rw-r--r--test/bhns_interp/tau.d.asc64
-rw-r--r--test/bhns_interp/tau.maximum.asc4
-rw-r--r--test/bhns_interp/tau.minimum.asc4
-rw-r--r--test/bhns_interp/tau.norm1.asc4
-rw-r--r--test/bhns_interp/tau.norm2.asc2
-rw-r--r--test/bhns_interp/tau.x.asc80
-rw-r--r--test/bhns_interp/tau.y.asc44
-rw-r--r--test/bhns_interp/tau.z.asc44
-rw-r--r--test/bhns_interp/vel[0].d.asc22
-rw-r--r--test/bhns_interp/vel[0].maximum.asc2
-rw-r--r--test/bhns_interp/vel[0].minimum.asc2
-rw-r--r--test/bhns_interp/vel[0].norm1.asc2
-rw-r--r--test/bhns_interp/vel[0].norm2.asc2
-rw-r--r--test/bhns_interp/vel[0].x.asc2
-rw-r--r--test/bhns_interp/vel[0].y.asc2
-rw-r--r--test/bhns_interp/vel[0].z.asc2
-rw-r--r--test/bhns_interp/vel[1].d.asc22
-rw-r--r--test/bhns_interp/vel[1].maximum.asc2
-rw-r--r--test/bhns_interp/vel[1].minimum.asc2
-rw-r--r--test/bhns_interp/vel[1].norm1.asc2
-rw-r--r--test/bhns_interp/vel[1].norm2.asc2
-rw-r--r--test/bhns_interp/vel[1].x.asc2
-rw-r--r--test/bhns_interp/vel[1].y.asc2
-rw-r--r--test/bhns_interp/vel[1].z.asc2
-rw-r--r--test/bhns_interp/vel[2].d.asc22
-rw-r--r--test/bhns_interp/vel[2].maximum.asc2
-rw-r--r--test/bhns_interp/vel[2].minimum.asc2
-rw-r--r--test/bhns_interp/vel[2].norm1.asc2
-rw-r--r--test/bhns_interp/vel[2].norm2.asc2
-rw-r--r--test/bhns_interp/vel[2].x.asc2
-rw-r--r--test/bhns_interp/vel[2].y.asc2
-rw-r--r--test/bhns_interp/vel[2].z.asc2
-rw-r--r--test/bhns_interp/w_lorentz.d.asc22
-rw-r--r--test/bhns_interp/w_lorentz.maximum.asc2
-rw-r--r--test/bhns_interp/w_lorentz.minimum.asc2
-rw-r--r--test/bhns_interp/w_lorentz.norm1.asc2
-rw-r--r--test/bhns_interp/w_lorentz.norm2.asc2
-rw-r--r--test/bhns_interp/w_lorentz.x.asc2
-rw-r--r--test/bhns_interp/w_lorentz.y.asc2
-rw-r--r--test/bhns_interp/w_lorentz.z.asc2
347 files changed, 2112 insertions, 952 deletions
diff --git a/test/bhns_eval/alp.d.asc b/test/bhns_eval/alp.d.asc
index aa6bef4..a40679c 100644
--- a/test/bhns_eval/alp.d.asc
+++ b/test/bhns_eval/alp.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::alp d (alp)
+# alp d (alp)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0.989294409117129
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0.989916099066487
0 0 0 0 0 10240 10240 10240 0 0 60 60 0.990472335219736
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/alp.x.asc b/test/bhns_eval/alp.x.asc
index b9133bd..457abf9 100644
--- a/test/bhns_eval/alp.x.asc
+++ b/test/bhns_eval/alp.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::alp x (alp)
+# alp x (alp)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/alp.y.asc b/test/bhns_eval/alp.y.asc
index 93e763e..50d90be 100644
--- a/test/bhns_eval/alp.y.asc
+++ b/test/bhns_eval/alp.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::alp y (alp)
+# alp y (alp)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/alp.z.asc b/test/bhns_eval/alp.z.asc
index 8c3197c..30a1863 100644
--- a/test/bhns_eval/alp.z.asc
+++ b/test/bhns_eval/alp.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::alp z (alp)
+# alp z (alp)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/betax.d.asc b/test/bhns_eval/betax.d.asc
index 751773b..2cb0496 100644
--- a/test/bhns_eval/betax.d.asc
+++ b/test/bhns_eval/betax.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betax d (betax)
+# betax d (betax)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/betax.x.asc b/test/bhns_eval/betax.x.asc
index f1ee303..72d4b13 100644
--- a/test/bhns_eval/betax.x.asc
+++ b/test/bhns_eval/betax.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betax x (betax)
+# betax x (betax)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/betax.y.asc b/test/bhns_eval/betax.y.asc
index 6c865a4..94e9ec8 100644
--- a/test/bhns_eval/betax.y.asc
+++ b/test/bhns_eval/betax.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betax y (betax)
+# betax y (betax)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/betax.z.asc b/test/bhns_eval/betax.z.asc
index d0378f8..5d93306 100644
--- a/test/bhns_eval/betax.z.asc
+++ b/test/bhns_eval/betax.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betax z (betax)
+# betax z (betax)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/betay.d.asc b/test/bhns_eval/betay.d.asc
index 812a381..b9cdd1f 100644
--- a/test/bhns_eval/betay.d.asc
+++ b/test/bhns_eval/betay.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betay d (betay)
+# betay d (betay)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/betay.x.asc b/test/bhns_eval/betay.x.asc
index d8735b5..abedc44 100644
--- a/test/bhns_eval/betay.x.asc
+++ b/test/bhns_eval/betay.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betay x (betay)
+# betay x (betay)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/betay.y.asc b/test/bhns_eval/betay.y.asc
index b98c5a6..66f90e2 100644
--- a/test/bhns_eval/betay.y.asc
+++ b/test/bhns_eval/betay.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betay y (betay)
+# betay y (betay)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/betay.z.asc b/test/bhns_eval/betay.z.asc
index 476998e..289248a 100644
--- a/test/bhns_eval/betay.z.asc
+++ b/test/bhns_eval/betay.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betay z (betay)
+# betay z (betay)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/betaz.d.asc b/test/bhns_eval/betaz.d.asc
index e1f1f65..9b366e2 100644
--- a/test/bhns_eval/betaz.d.asc
+++ b/test/bhns_eval/betaz.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betaz d (betaz)
+# betaz d (betaz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/betaz.x.asc b/test/bhns_eval/betaz.x.asc
index b3b74de..4df8a82 100644
--- a/test/bhns_eval/betaz.x.asc
+++ b/test/bhns_eval/betaz.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betaz x (betaz)
+# betaz x (betaz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/betaz.y.asc b/test/bhns_eval/betaz.y.asc
index 66b840f..3e2f934 100644
--- a/test/bhns_eval/betaz.y.asc
+++ b/test/bhns_eval/betaz.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betaz y (betaz)
+# betaz y (betaz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/betaz.z.asc b/test/bhns_eval/betaz.z.asc
index b256cf5..9019378 100644
--- a/test/bhns_eval/betaz.z.asc
+++ b/test/bhns_eval/betaz.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betaz z (betaz)
+# betaz z (betaz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/dens.d.asc b/test/bhns_eval/dens.d.asc
index 92b44d7..93580c6 100644
--- a/test/bhns_eval/dens.d.asc
+++ b/test/bhns_eval/dens.d.asc
@@ -1,30 +1,50 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::dens d (dens)
+# dens d (dens)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 0 0 0 0 -60 0 0 1.0893123990595e-11
-0 0 0 0 0 512 512 512 0 -57 3 3 1.09837814425253e-11
-0 0 0 0 0 1024 1024 1024 0 -54 6 6 1.10593401613487e-11
-0 0 0 0 0 1536 1536 1536 0 -51 9 9 1.10998648956504e-11
-0 0 0 0 0 2048 2048 2048 0 -48 12 12 1.1091393427902e-11
-0 0 0 0 0 2560 2560 2560 0 -45 15 15 1.10370480030931e-11
-0 0 0 0 0 3072 3072 3072 0 -42 18 18 1.09543372184737e-11
-0 0 0 0 0 3584 3584 3584 0 -39 21 21 1.08623828458719e-11
-0 0 0 0 0 4096 4096 4096 0 -36 24 24 1.07737483806858e-11
-0 0 0 0 0 4608 4608 4608 0 -33 27 27 1.06941158398531e-11
-0 0 0 0 0 5120 5120 5120 0 -30 30 30 1.06249156864766e-11
-0 0 0 0 0 5632 5632 5632 0 -27 33 33 1.05655992605998e-11
-0 0 0 0 0 6144 6144 6144 0 -24 36 36 1.05149221976621e-11
-0 0 0 0 0 6656 6656 6656 0 -21 39 39 1.04715340592872e-11
-0 0 0 0 0 7168 7168 7168 0 -18 42 42 1.04342061308779e-11
-0 0 0 0 0 7680 7680 7680 0 -15 45 45 1.04018958730354e-11
-0 0 0 0 0 8192 8192 8192 0 -12 48 48 1.03737455800405e-11
-0 0 0 0 0 8704 8704 8704 0 -9 51 51 1.03490586906095e-11
-0 0 0 0 0 9216 9216 9216 0 -6 54 54 1.032727166758e-11
-0 0 0 0 0 9728 9728 9728 0 -3 57 57 1.03079280928467e-11
-0 0 0 0 0 10240 10240 10240 0 0 60 60 1.02906569014668e-11
+0 0 0 0 0 0 0 0 0 -60 0 0 1.27121832060342e-11
+0 0 0 0 0 512 512 512 0 -57 3 3 1.28757008812936e-11
+0 0 0 0 0 1024 1024 1024 0 -54 6 6 1.30249446166964e-11
+0 0 0 0 0 1536 1536 1536 0 -51 9 9 1.31351603874041e-11
+0 0 0 0 0 2048 2048 2048 0 -48 12 12 1.31886914323268e-11
+0 0 0 0 0 2560 2560 2560 0 -45 15 15 1.31880971317605e-11
+0 0 0 0 0 3072 3072 3072 0 -42 18 18 1.31502551726162e-11
+0 0 0 0 0 3584 3584 3584 0 -39 21 21 1.30932378462856e-11
+0 0 0 0 0 4096 4096 4096 0 -36 24 24 1.30288129672045e-11
+0 0 0 0 0 4608 4608 4608 0 -33 27 27 1.29620901142148e-11
+0 0 0 0 0 5120 5120 5120 0 -30 30 30 1.28940968103833e-11
+0 0 0 0 0 5632 5632 5632 0 -27 33 33 1.28241675306868e-11
+0 0 0 0 0 6144 6144 6144 0 -24 36 36 1.27513869359961e-11
+0 0 0 0 0 6656 6656 6656 0 -21 39 39 1.26752309729073e-11
+0 0 0 0 0 7168 7168 7168 0 -18 42 42 1.25957199237975e-11
+0 0 0 0 0 7680 7680 7680 0 -15 45 45 1.25133443307603e-11
+0 0 0 0 0 8192 8192 8192 0 -12 48 48 1.24289138810927e-11
+0 0 0 0 0 8704 8704 8704 0 -9 51 51 1.23433988001937e-11
+0 0 0 0 0 9216 9216 9216 0 -6 54 54 1.22577951789875e-11
+0 0 0 0 0 9728 9728 9728 0 -3 57 57 1.21730275412787e-11
+0 0 0 0 0 10240 10240 10240 0 0 60 60 1.20898901205611e-11
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/dens.maximum.asc b/test/bhns_eval/dens.maximum.asc
index ab6476f..f7c7dd2 100644
--- a/test/bhns_eval/dens.maximum.asc
+++ b/test/bhns_eval/dens.maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::dens (dens)
+# GRHYDRO::dens (dens)
# 1:iteration 2:time 3:data
-0 0 0.000791731104557071
+0 0 0.00079173110455707
diff --git a/test/bhns_eval/dens.minimum.asc b/test/bhns_eval/dens.minimum.asc
index 49149af..5ab30b7 100644
--- a/test/bhns_eval/dens.minimum.asc
+++ b/test/bhns_eval/dens.minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::dens (dens)
+# GRHYDRO::dens (dens)
# 1:iteration 2:time 3:data
-0 0 1.02107952609138e-11
+0 0 1.15679363582628e-11
diff --git a/test/bhns_eval/dens.norm1.asc b/test/bhns_eval/dens.norm1.asc
index 3889faa..9996e75 100644
--- a/test/bhns_eval/dens.norm1.asc
+++ b/test/bhns_eval/dens.norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::dens (dens)
+# GRHYDRO::dens (dens)
# 1:iteration 2:time 3:data
-0 0 4.88986070228634e-07
+0 0 4.88992299407734e-07
diff --git a/test/bhns_eval/dens.norm2.asc b/test/bhns_eval/dens.norm2.asc
index 073c427..2e226b0 100644
--- a/test/bhns_eval/dens.norm2.asc
+++ b/test/bhns_eval/dens.norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::dens (dens)
+# GRHYDRO::dens (dens)
# 1:iteration 2:time 3:data
-0 0 1.306390019023e-05
+0 0 1.30639002095719e-05
diff --git a/test/bhns_eval/dens.x.asc b/test/bhns_eval/dens.x.asc
index 160d323..5475d0d 100644
--- a/test/bhns_eval/dens.x.asc
+++ b/test/bhns_eval/dens.x.asc
@@ -1,50 +1,50 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::dens x (dens)
+# dens x (dens)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 0 0 0 0 -60 0 0 1.0893123990595e-11
-0 0 0 0 0 512 0 0 0 -57 0 0 1.0996335642885e-11
-0 0 0 0 0 1024 0 0 0 -54 0 0 1.11264950073542e-11
-0 0 0 0 0 1536 0 0 0 -51 0 0 1.12957269648291e-11
-0 0 0 0 0 2048 0 0 0 -48 0 0 1.15247015265118e-11
-0 0 0 0 0 2560 0 0 0 -45 0 0 1.18517537784799e-11
-0 0 0 0 0 3072 0 0 0 -42 0 0 1.23568109746147e-11
-0 0 0 0 0 3584 0 0 0 -39 0 0 6.97301362654526e-05
-0 0 0 0 0 4096 0 0 0 -36 0 0 0.000326022422972321
+0 0 0 0 0 0 0 0 0 -60 0 0 1.27121832060342e-11
+0 0 0 0 0 512 0 0 0 -57 0 0 1.2891278838151e-11
+0 0 0 0 0 1024 0 0 0 -54 0 0 1.31071198527624e-11
+0 0 0 0 0 1536 0 0 0 -51 0 0 1.33703645396548e-11
+0 0 0 0 0 2048 0 0 0 -48 0 0 1.36969251790645e-11
+0 0 0 0 0 2560 0 0 0 -45 0 0 1.41241948736123e-11
+0 0 0 0 0 3072 0 0 0 -42 0 0 1.47544987866213e-11
+0 0 0 0 0 3584 0 0 0 -39 0 0 6.97301362654527e-05
+0 0 0 0 0 4096 0 0 0 -36 0 0 0.000326022422972322
0 0 0 0 0 4608 0 0 0 -33 0 0 0.000637928519875288
-0 0 0 0 0 5120 0 0 0 -30 0 0 0.000791731104557071
+0 0 0 0 0 5120 0 0 0 -30 0 0 0.00079173110455707
0 0 0 0 0 5632 0 0 0 -27 0 0 0.000633793442757627
-0 0 0 0 0 6144 0 0 0 -24 0 0 0.000321923945878352
-0 0 0 0 0 6656 0 0 0 -21 0 0 6.82288568340819e-05
-0 0 0 0 0 7168 0 0 0 -18 0 0 1.23568109746147e-11
-0 0 0 0 0 7680 0 0 0 -15 0 0 1.18517537784799e-11
-0 0 0 0 0 8192 0 0 0 -12 0 0 1.15247015265118e-11
-0 0 0 0 0 8704 0 0 0 -9 0 0 1.12957269648291e-11
-0 0 0 0 0 9216 0 0 0 -6 0 0 1.11264950073542e-11
-0 0 0 0 0 9728 0 0 0 -3 0 0 1.0996335642885e-11
-0 0 0 0 0 10240 0 0 0 0 0 0 1.0893123990595e-11
-0 0 0 0 0 10752 0 0 0 3 0 0 1.08092797258066e-11
-0 0 0 0 0 11264 0 0 0 6 0 0 1.0739820963017e-11
-0 0 0 0 0 11776 0 0 0 9 0 0 1.06813390509678e-11
-0 0 0 0 0 12288 0 0 0 12 0 0 1.06314231455797e-11
-0 0 0 0 0 12800 0 0 0 15 0 0 1.05883200775389e-11
-0 0 0 0 0 13312 0 0 0 18 0 0 1.05507244474474e-11
-0 0 0 0 0 13824 0 0 0 21 0 0 1.05176442763735e-11
-0 0 0 0 0 14336 0 0 0 24 0 0 1.04883122832038e-11
-0 0 0 0 0 14848 0 0 0 27 0 0 1.04621256815922e-11
-0 0 0 0 0 15360 0 0 0 30 0 0 1.043860434621e-11
-0 0 0 0 0 15872 0 0 0 33 0 0 1.04173611264298e-11
-0 0 0 0 0 16384 0 0 0 36 0 0 1.03980803826442e-11
-0 0 0 0 0 16896 0 0 0 39 0 0 1.03805022055927e-11
-0 0 0 0 0 17408 0 0 0 42 0 0 1.03644106375509e-11
-0 0 0 0 0 17920 0 0 0 45 0 0 1.03496247595068e-11
-0 0 0 0 0 18432 0 0 0 48 0 0 1.03359918625252e-11
-0 0 0 0 0 18944 0 0 0 51 0 0 1.03233821560702e-11
-0 0 0 0 0 19456 0 0 0 54 0 0 1.031168462432e-11
-0 0 0 0 0 19968 0 0 0 57 0 0 1.03008037500714e-11
-0 0 0 0 0 20480 0 0 0 60 0 0 1.02906569014668e-11
+0 0 0 0 0 6144 0 0 0 -24 0 0 0.000321923945878353
+0 0 0 0 0 6656 0 0 0 -21 0 0 6.82288568340821e-05
+0 0 0 0 0 7168 0 0 0 -18 0 0 1.62016605423642e-11
+0 0 0 0 0 7680 0 0 0 -15 0 0 1.59586399828811e-11
+0 0 0 0 0 8192 0 0 0 -12 0 0 1.596562644362e-11
+0 0 0 0 0 8704 0 0 0 -9 0 0 1.61169246258125e-11
+0 0 0 0 0 9216 0 0 0 -6 0 0 1.638425971547e-11
+0 0 0 0 0 9728 0 0 0 -3 0 0 1.67834756286427e-11
+0 0 0 0 0 10240 0 0 0 0 0 0 1.73514316979305e-11
+0 0 0 0 0 10752 0 0 0 3 0 0 1.81389669612598e-11
+0 0 0 0 0 11264 0 0 0 6 0 0 1.92210362963691e-11
+0 0 0 0 0 11776 0 0 0 9 0 0 2.07287708382814e-11
+0 0 0 0 0 12288 0 0 0 12 0 0 2.29214038931364e-11
+0 0 0 0 0 12800 0 0 0 15 0 0 2.63578508046327e-11
+0 0 0 0 0 13312 0 0 0 18 0 0 3.23944944957662e-11
+0 0 0 0 0 13824 0 0 0 21 0 0 4.51237326146756e-11
+0 0 0 0 0 14336 0 0 0 24 0 0 8.33655540108685e-11
+0 0 0 0 0 14848 0 0 0 27 0 0 3.88276677135669e-10
+0 0 0 0 0 15360 0 0 0 30 0 0 1.7982265244635e-07
+0 0 0 0 0 15872 0 0 0 33 0 0 3.875252644611e-10
+0 0 0 0 0 16384 0 0 0 36 0 0 8.28881889936112e-11
+0 0 0 0 0 16896 0 0 0 39 0 0 4.46972629462231e-11
+0 0 0 0 0 17408 0 0 0 42 0 0 3.19763001723179e-11
+0 0 0 0 0 17920 0 0 0 45 0 0 2.59013837261647e-11
+0 0 0 0 0 18432 0 0 0 48 0 0 2.24056012009866e-11
+0 0 0 0 0 18944 0 0 0 51 0 0 2.01526398335726e-11
+0 0 0 0 0 19456 0 0 0 54 0 0 1.85863458816301e-11
+0 0 0 0 0 19968 0 0 0 57 0 0 1.74369410384839e-11
+0 0 0 0 0 20480 0 0 0 60 0 0 1.65586771770162e-11
diff --git a/test/bhns_eval/dens.y.asc b/test/bhns_eval/dens.y.asc
index 0159a62..9c7dd4c 100644
--- a/test/bhns_eval/dens.y.asc
+++ b/test/bhns_eval/dens.y.asc
@@ -1,30 +1,30 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::dens y (dens)
+# dens y (dens)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 10240 0 0 0 0 0 0 1.0893123990595e-11
-0 0 0 0 0 10240 512 0 0 0 3 0 1.08885329138672e-11
-0 0 0 0 0 10240 1024 0 0 0 6 0 1.08751684353299e-11
-0 0 0 0 0 10240 1536 0 0 0 9 0 1.08541605890375e-11
-0 0 0 0 0 10240 2048 0 0 0 12 0 1.08271137137253e-11
-0 0 0 0 0 10240 2560 0 0 0 15 0 1.07958060770773e-11
-0 0 0 0 0 10240 3072 0 0 0 18 0 1.07619313085017e-11
-0 0 0 0 0 10240 3584 0 0 0 21 0 1.07269331546515e-11
-0 0 0 0 0 10240 4096 0 0 0 24 0 1.06919368798162e-11
-0 0 0 0 0 10240 4608 0 0 0 27 0 1.0657752140514e-11
-0 0 0 0 0 10240 5120 0 0 0 30 0 1.06249156864766e-11
-0 0 0 0 0 10240 5632 0 0 0 33 0 1.05937485712017e-11
-0 0 0 0 0 10240 6144 0 0 0 36 0 1.05644123528158e-11
-0 0 0 0 0 10240 6656 0 0 0 39 0 1.05369569707093e-11
-0 0 0 0 0 10240 7168 0 0 0 42 0 1.05113582216973e-11
-0 0 0 0 0 10240 7680 0 0 0 45 0 1.04875454641965e-11
-0 0 0 0 0 10240 8192 0 0 0 48 0 1.04654212416791e-11
-0 0 0 0 0 10240 8704 0 0 0 51 0 1.04448746965375e-11
-0 0 0 0 0 10240 9216 0 0 0 54 0 1.04257904343751e-11
-0 0 0 0 0 10240 9728 0 0 0 57 0 1.04080541659942e-11
-0 0 0 0 0 10240 10240 0 0 0 60 0 1.03915561264326e-11
+0 0 0 0 0 10240 0 0 0 0 0 0 1.73514316979305e-11
+0 0 0 0 0 10240 512 0 0 0 3 0 1.73062607906966e-11
+0 0 0 0 0 10240 1024 0 0 0 6 0 1.7176341903038e-11
+0 0 0 0 0 10240 1536 0 0 0 9 0 1.6974056583766e-11
+0 0 0 0 0 10240 2048 0 0 0 12 0 1.67166954664836e-11
+0 0 0 0 0 10240 2560 0 0 0 15 0 1.64211855023568e-11
+0 0 0 0 0 10240 3072 0 0 0 18 0 1.61032368222269e-11
+0 0 0 0 0 10240 3584 0 0 0 21 0 1.57775670968551e-11
+0 0 0 0 0 10240 4096 0 0 0 24 0 1.54559413574303e-11
+0 0 0 0 0 10240 4608 0 0 0 27 0 1.5146221042842e-11
+0 0 0 0 0 10240 5120 0 0 0 30 0 1.48529420171377e-11
+0 0 0 0 0 10240 5632 0 0 0 33 0 1.45783292329724e-11
+0 0 0 0 0 10240 6144 0 0 0 36 0 1.4323117074101e-11
+0 0 0 0 0 10240 6656 0 0 0 39 0 1.40870986691047e-11
+0 0 0 0 0 10240 7168 0 0 0 42 0 1.38694896779393e-11
+0 0 0 0 0 10240 7680 0 0 0 45 0 1.36691768163536e-11
+0 0 0 0 0 10240 8192 0 0 0 48 0 1.34848880522886e-11
+0 0 0 0 0 10240 8704 0 0 0 51 0 1.33153055718631e-11
+0 0 0 0 0 10240 9216 0 0 0 54 0 1.31591365829313e-11
+0 0 0 0 0 10240 9728 0 0 0 57 0 1.30151544668776e-11
+0 0 0 0 0 10240 10240 0 0 0 60 0 1.28822200286309e-11
diff --git a/test/bhns_eval/dens.z.asc b/test/bhns_eval/dens.z.asc
index 32ef0c5..a7e22c6 100644
--- a/test/bhns_eval/dens.z.asc
+++ b/test/bhns_eval/dens.z.asc
@@ -1,30 +1,30 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::dens z (dens)
+# dens z (dens)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 10240 0 0 0 0 0 0 1.0893123990595e-11
-0 0 0 0 0 10240 0 512 0 0 0 3 1.08885329138672e-11
-0 0 0 0 0 10240 0 1024 0 0 0 6 1.08751684353299e-11
-0 0 0 0 0 10240 0 1536 0 0 0 9 1.08541605890375e-11
-0 0 0 0 0 10240 0 2048 0 0 0 12 1.08271137137253e-11
-0 0 0 0 0 10240 0 2560 0 0 0 15 1.07958060770773e-11
-0 0 0 0 0 10240 0 3072 0 0 0 18 1.07619313085017e-11
-0 0 0 0 0 10240 0 3584 0 0 0 21 1.07269331546515e-11
-0 0 0 0 0 10240 0 4096 0 0 0 24 1.06919368798162e-11
-0 0 0 0 0 10240 0 4608 0 0 0 27 1.0657752140514e-11
-0 0 0 0 0 10240 0 5120 0 0 0 30 1.06249156864766e-11
-0 0 0 0 0 10240 0 5632 0 0 0 33 1.05937485712017e-11
-0 0 0 0 0 10240 0 6144 0 0 0 36 1.05644123528158e-11
-0 0 0 0 0 10240 0 6656 0 0 0 39 1.05369569707093e-11
-0 0 0 0 0 10240 0 7168 0 0 0 42 1.05113582216973e-11
-0 0 0 0 0 10240 0 7680 0 0 0 45 1.04875454641965e-11
-0 0 0 0 0 10240 0 8192 0 0 0 48 1.04654212416791e-11
-0 0 0 0 0 10240 0 8704 0 0 0 51 1.04448746965375e-11
-0 0 0 0 0 10240 0 9216 0 0 0 54 1.04257904343751e-11
-0 0 0 0 0 10240 0 9728 0 0 0 57 1.04080541659942e-11
-0 0 0 0 0 10240 0 10240 0 0 0 60 1.03915561264326e-11
+0 0 0 0 0 10240 0 0 0 0 0 0 1.73514316979305e-11
+0 0 0 0 0 10240 0 512 0 0 0 3 1.73062607906966e-11
+0 0 0 0 0 10240 0 1024 0 0 0 6 1.7176341903038e-11
+0 0 0 0 0 10240 0 1536 0 0 0 9 1.6974056583766e-11
+0 0 0 0 0 10240 0 2048 0 0 0 12 1.67166954664836e-11
+0 0 0 0 0 10240 0 2560 0 0 0 15 1.64211855023568e-11
+0 0 0 0 0 10240 0 3072 0 0 0 18 1.61032368222269e-11
+0 0 0 0 0 10240 0 3584 0 0 0 21 1.57775670968551e-11
+0 0 0 0 0 10240 0 4096 0 0 0 24 1.54559413574303e-11
+0 0 0 0 0 10240 0 4608 0 0 0 27 1.5146221042842e-11
+0 0 0 0 0 10240 0 5120 0 0 0 30 1.48529420171377e-11
+0 0 0 0 0 10240 0 5632 0 0 0 33 1.45783292329724e-11
+0 0 0 0 0 10240 0 6144 0 0 0 36 1.4323117074101e-11
+0 0 0 0 0 10240 0 6656 0 0 0 39 1.40870986691047e-11
+0 0 0 0 0 10240 0 7168 0 0 0 42 1.38694896779393e-11
+0 0 0 0 0 10240 0 7680 0 0 0 45 1.36691768163536e-11
+0 0 0 0 0 10240 0 8192 0 0 0 48 1.34848880522886e-11
+0 0 0 0 0 10240 0 8704 0 0 0 51 1.33153055718631e-11
+0 0 0 0 0 10240 0 9216 0 0 0 54 1.31591365829313e-11
+0 0 0 0 0 10240 0 9728 0 0 0 57 1.30151544668776e-11
+0 0 0 0 0 10240 0 10240 0 0 0 60 1.28822200286309e-11
diff --git a/test/bhns_eval/eps.d.asc b/test/bhns_eval/eps.d.asc
index ec6a617..bcb20f8 100644
--- a/test/bhns_eval/eps.d.asc
+++ b/test/bhns_eval/eps.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::eps d (eps)
+# eps d (eps)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 1e-09
0 0 0 0 0 9728 9728 9728 0 -3 57 57 1e-09
0 0 0 0 0 10240 10240 10240 0 0 60 60 1e-09
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/eps.maximum.asc b/test/bhns_eval/eps.maximum.asc
index cd19140..c67793f 100644
--- a/test/bhns_eval/eps.maximum.asc
+++ b/test/bhns_eval/eps.maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::eps (eps)
+# HYDROBASE::eps (eps)
# 1:iteration 2:time 3:data
-0 0 0.0395816753545256
+0 0 0.0395816753545255
diff --git a/test/bhns_eval/eps.minimum.asc b/test/bhns_eval/eps.minimum.asc
index 227bf23..b261b18 100644
--- a/test/bhns_eval/eps.minimum.asc
+++ b/test/bhns_eval/eps.minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::eps (eps)
+# HYDROBASE::eps (eps)
# 1:iteration 2:time 3:data
0 0 1e-09
diff --git a/test/bhns_eval/eps.norm1.asc b/test/bhns_eval/eps.norm1.asc
index fae3bd3..31f2c44 100644
--- a/test/bhns_eval/eps.norm1.asc
+++ b/test/bhns_eval/eps.norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::eps (eps)
+# HYDROBASE::eps (eps)
# 1:iteration 2:time 3:data
0 0 2.74385381594098e-05
diff --git a/test/bhns_eval/eps.norm2.asc b/test/bhns_eval/eps.norm2.asc
index d0c100c..f62ef14 100644
--- a/test/bhns_eval/eps.norm2.asc
+++ b/test/bhns_eval/eps.norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::eps (eps)
+# HYDROBASE::eps (eps)
# 1:iteration 2:time 3:data
0 0 0.000711156033795025
diff --git a/test/bhns_eval/eps.x.asc b/test/bhns_eval/eps.x.asc
index f08f090..f17dac5 100644
--- a/test/bhns_eval/eps.x.asc
+++ b/test/bhns_eval/eps.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::eps x (eps)
+# eps x (eps)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -12,12 +12,12 @@
0 0 0 0 0 2048 0 0 0 -48 0 0 1e-09
0 0 0 0 0 2560 0 0 0 -45 0 0 1e-09
0 0 0 0 0 3072 0 0 0 -42 0 0 1e-09
-0 0 0 0 0 3584 0 0 0 -39 0 0 0.004411837103657
+0 0 0 0 0 3584 0 0 0 -39 0 0 0.00441183710365701
0 0 0 0 0 4096 0 0 0 -36 0 0 0.0186857612565824
0 0 0 0 0 4608 0 0 0 -33 0 0 0.0333565612244169
-0 0 0 0 0 5120 0 0 0 -30 0 0 0.0395816753545256
+0 0 0 0 0 5120 0 0 0 -30 0 0 0.0395816753545255
0 0 0 0 0 5632 0 0 0 -27 0 0 0.0324109175393354
-0 0 0 0 0 6144 0 0 0 -24 0 0 0.0177128785693351
+0 0 0 0 0 6144 0 0 0 -24 0 0 0.0177128785693352
0 0 0 0 0 6656 0 0 0 -21 0 0 0.00403949161461789
0 0 0 0 0 7168 0 0 0 -18 0 0 1e-09
0 0 0 0 0 7680 0 0 0 -15 0 0 1e-09
diff --git a/test/bhns_eval/eps.y.asc b/test/bhns_eval/eps.y.asc
index 60f5119..52f4fd2 100644
--- a/test/bhns_eval/eps.y.asc
+++ b/test/bhns_eval/eps.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::eps y (eps)
+# eps y (eps)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/eps.z.asc b/test/bhns_eval/eps.z.asc
index ec233cf..e3d5222 100644
--- a/test/bhns_eval/eps.z.asc
+++ b/test/bhns_eval/eps.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::eps z (eps)
+# eps z (eps)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/gxx.d.asc b/test/bhns_eval/gxx.d.asc
index c0d07c0..99e9872 100644
--- a/test/bhns_eval/gxx.d.asc
+++ b/test/bhns_eval/gxx.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxx d (gxx)
+# gxx d (gxx)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -23,8 +23,28 @@
0 0 0 0 0 7680 7680 7680 0 -15 45 45 1.16122291348897
0 0 0 0 0 8192 8192 8192 0 -12 48 48 1.15599366089986
0 0 0 0 0 8704 8704 8704 0 -9 51 51 1.15068514670822
-0 0 0 0 0 9216 9216 9216 0 -6 54 54 1.1453588436867
+0 0 0 0 0 9216 9216 9216 0 -6 54 54 1.14535884368671
0 0 0 0 0 9728 9728 9728 0 -3 57 57 1.1400723241299
0 0 0 0 0 10240 10240 10240 0 0 60 60 1.13487554025373
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/gxx.norm1.asc b/test/bhns_eval/gxx.norm1.asc
index 27c5e4e..97b83f5 100644
--- a/test/bhns_eval/gxx.norm1.asc
+++ b/test/bhns_eval/gxx.norm1.asc
@@ -2,4 +2,4 @@
#
# ADMBASE::gxx (gxx)
# 1:iteration 2:time 3:data
-0 0 1.25144747615653
+0 0 1.25144747615579
diff --git a/test/bhns_eval/gxx.norm2.asc b/test/bhns_eval/gxx.norm2.asc
index 07f1b97..823ffff 100644
--- a/test/bhns_eval/gxx.norm2.asc
+++ b/test/bhns_eval/gxx.norm2.asc
@@ -2,4 +2,4 @@
#
# ADMBASE::gxx (gxx)
# 1:iteration 2:time 3:data
-0 0 2.98987086486639
+0 0 2.98987086486607
diff --git a/test/bhns_eval/gxx.x.asc b/test/bhns_eval/gxx.x.asc
index 00cbd03..7650e92 100644
--- a/test/bhns_eval/gxx.x.asc
+++ b/test/bhns_eval/gxx.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxx x (gxx)
+# gxx x (gxx)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/gxx.y.asc b/test/bhns_eval/gxx.y.asc
index f2bcd86..462a4f0 100644
--- a/test/bhns_eval/gxx.y.asc
+++ b/test/bhns_eval/gxx.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxx y (gxx)
+# gxx y (gxx)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -12,14 +12,14 @@
0 0 0 0 0 10240 2048 0 0 0 12 0 1.40853276496764
0 0 0 0 0 10240 2560 0 0 0 15 0 1.39188387885619
0 0 0 0 0 10240 3072 0 0 0 18 0 1.37385886350972
-0 0 0 0 0 10240 3584 0 0 0 21 0 1.35527270166974
+0 0 0 0 0 10240 3584 0 0 0 21 0 1.35527270101446
0 0 0 0 0 10240 4096 0 0 0 24 0 1.33679139358296
0 0 0 0 0 10240 4608 0 0 0 27 0 1.31887264450081
0 0 0 0 0 10240 5120 0 0 0 30 0 1.3017921762318
0 0 0 0 0 10240 5632 0 0 0 33 0 1.28569662142782
0 0 0 0 0 10240 6144 0 0 0 36 0 1.2706473289087
0 0 0 0 0 10240 6656 0 0 0 39 0 1.25665010251725
-0 0 0 0 0 10240 7168 0 0 0 42 0 1.2436752392466
+0 0 0 0 0 10240 7168 0 0 0 42 0 1.24367523893592
0 0 0 0 0 10240 7680 0 0 0 45 0 1.23167154331119
0 0 0 0 0 10240 8192 0 0 0 48 0 1.22057619871408
0 0 0 0 0 10240 8704 0 0 0 51 0 1.21032152845121
diff --git a/test/bhns_eval/gxx.z.asc b/test/bhns_eval/gxx.z.asc
index 26c96cf..b459f1c 100644
--- a/test/bhns_eval/gxx.z.asc
+++ b/test/bhns_eval/gxx.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxx z (gxx)
+# gxx z (gxx)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -12,14 +12,14 @@
0 0 0 0 0 10240 0 2048 0 0 0 12 1.40853276496764
0 0 0 0 0 10240 0 2560 0 0 0 15 1.39188387885619
0 0 0 0 0 10240 0 3072 0 0 0 18 1.37385886350972
-0 0 0 0 0 10240 0 3584 0 0 0 21 1.35527270166974
+0 0 0 0 0 10240 0 3584 0 0 0 21 1.35527270101446
0 0 0 0 0 10240 0 4096 0 0 0 24 1.33679139358296
0 0 0 0 0 10240 0 4608 0 0 0 27 1.31887264450081
0 0 0 0 0 10240 0 5120 0 0 0 30 1.3017921762318
0 0 0 0 0 10240 0 5632 0 0 0 33 1.28569662142782
0 0 0 0 0 10240 0 6144 0 0 0 36 1.2706473289087
0 0 0 0 0 10240 0 6656 0 0 0 39 1.25665010251725
-0 0 0 0 0 10240 0 7168 0 0 0 42 1.2436752392466
+0 0 0 0 0 10240 0 7168 0 0 0 42 1.24367523893592
0 0 0 0 0 10240 0 7680 0 0 0 45 1.23167154331119
0 0 0 0 0 10240 0 8192 0 0 0 48 1.22057619871408
0 0 0 0 0 10240 0 8704 0 0 0 51 1.21032152845121
diff --git a/test/bhns_eval/gxy.d.asc b/test/bhns_eval/gxy.d.asc
index a2117f5..8523fef 100644
--- a/test/bhns_eval/gxy.d.asc
+++ b/test/bhns_eval/gxy.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxy d (gxy)
+# gxy d (gxy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/gxy.x.asc b/test/bhns_eval/gxy.x.asc
index 4b9eec3..ee288b2 100644
--- a/test/bhns_eval/gxy.x.asc
+++ b/test/bhns_eval/gxy.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxy x (gxy)
+# gxy x (gxy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/gxy.y.asc b/test/bhns_eval/gxy.y.asc
index af35cda..9d3d55a 100644
--- a/test/bhns_eval/gxy.y.asc
+++ b/test/bhns_eval/gxy.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxy y (gxy)
+# gxy y (gxy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/gxy.z.asc b/test/bhns_eval/gxy.z.asc
index 7599ba0..934910c 100644
--- a/test/bhns_eval/gxy.z.asc
+++ b/test/bhns_eval/gxy.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxy z (gxy)
+# gxy z (gxy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/gxz.d.asc b/test/bhns_eval/gxz.d.asc
index f8b0bb2..48ea223 100644
--- a/test/bhns_eval/gxz.d.asc
+++ b/test/bhns_eval/gxz.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxz d (gxz)
+# gxz d (gxz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/gxz.x.asc b/test/bhns_eval/gxz.x.asc
index e0d2ed2..c49589e 100644
--- a/test/bhns_eval/gxz.x.asc
+++ b/test/bhns_eval/gxz.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxz x (gxz)
+# gxz x (gxz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/gxz.y.asc b/test/bhns_eval/gxz.y.asc
index 71a6156..a7d7015 100644
--- a/test/bhns_eval/gxz.y.asc
+++ b/test/bhns_eval/gxz.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxz y (gxz)
+# gxz y (gxz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/gxz.z.asc b/test/bhns_eval/gxz.z.asc
index 00d4b52..3212f29 100644
--- a/test/bhns_eval/gxz.z.asc
+++ b/test/bhns_eval/gxz.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxz z (gxz)
+# gxz z (gxz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/gyy.d.asc b/test/bhns_eval/gyy.d.asc
index 3f03474..4e01488 100644
--- a/test/bhns_eval/gyy.d.asc
+++ b/test/bhns_eval/gyy.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gyy d (gyy)
+# gyy d (gyy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -23,8 +23,28 @@
0 0 0 0 0 7680 7680 7680 0 -15 45 45 1.16122291348897
0 0 0 0 0 8192 8192 8192 0 -12 48 48 1.15599366089986
0 0 0 0 0 8704 8704 8704 0 -9 51 51 1.15068514670822
-0 0 0 0 0 9216 9216 9216 0 -6 54 54 1.1453588436867
+0 0 0 0 0 9216 9216 9216 0 -6 54 54 1.14535884368671
0 0 0 0 0 9728 9728 9728 0 -3 57 57 1.1400723241299
0 0 0 0 0 10240 10240 10240 0 0 60 60 1.13487554025373
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/gyy.norm1.asc b/test/bhns_eval/gyy.norm1.asc
index 646f5d8..1bf0af3 100644
--- a/test/bhns_eval/gyy.norm1.asc
+++ b/test/bhns_eval/gyy.norm1.asc
@@ -2,4 +2,4 @@
#
# ADMBASE::gyy (gyy)
# 1:iteration 2:time 3:data
-0 0 1.25144747615653
+0 0 1.25144747615579
diff --git a/test/bhns_eval/gyy.norm2.asc b/test/bhns_eval/gyy.norm2.asc
index a517e69..407ce34 100644
--- a/test/bhns_eval/gyy.norm2.asc
+++ b/test/bhns_eval/gyy.norm2.asc
@@ -2,4 +2,4 @@
#
# ADMBASE::gyy (gyy)
# 1:iteration 2:time 3:data
-0 0 2.98987086486639
+0 0 2.98987086486607
diff --git a/test/bhns_eval/gyy.x.asc b/test/bhns_eval/gyy.x.asc
index a75a60d..dd78cc0 100644
--- a/test/bhns_eval/gyy.x.asc
+++ b/test/bhns_eval/gyy.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gyy x (gyy)
+# gyy x (gyy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/gyy.y.asc b/test/bhns_eval/gyy.y.asc
index 82768d7..9ae45f3 100644
--- a/test/bhns_eval/gyy.y.asc
+++ b/test/bhns_eval/gyy.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gyy y (gyy)
+# gyy y (gyy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -12,14 +12,14 @@
0 0 0 0 0 10240 2048 0 0 0 12 0 1.40853276496764
0 0 0 0 0 10240 2560 0 0 0 15 0 1.39188387885619
0 0 0 0 0 10240 3072 0 0 0 18 0 1.37385886350972
-0 0 0 0 0 10240 3584 0 0 0 21 0 1.35527270166974
+0 0 0 0 0 10240 3584 0 0 0 21 0 1.35527270101446
0 0 0 0 0 10240 4096 0 0 0 24 0 1.33679139358296
0 0 0 0 0 10240 4608 0 0 0 27 0 1.31887264450081
0 0 0 0 0 10240 5120 0 0 0 30 0 1.3017921762318
0 0 0 0 0 10240 5632 0 0 0 33 0 1.28569662142782
0 0 0 0 0 10240 6144 0 0 0 36 0 1.2706473289087
0 0 0 0 0 10240 6656 0 0 0 39 0 1.25665010251725
-0 0 0 0 0 10240 7168 0 0 0 42 0 1.2436752392466
+0 0 0 0 0 10240 7168 0 0 0 42 0 1.24367523893592
0 0 0 0 0 10240 7680 0 0 0 45 0 1.23167154331119
0 0 0 0 0 10240 8192 0 0 0 48 0 1.22057619871408
0 0 0 0 0 10240 8704 0 0 0 51 0 1.21032152845121
diff --git a/test/bhns_eval/gyy.z.asc b/test/bhns_eval/gyy.z.asc
index 9e345c7..f0a510b 100644
--- a/test/bhns_eval/gyy.z.asc
+++ b/test/bhns_eval/gyy.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gyy z (gyy)
+# gyy z (gyy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -12,14 +12,14 @@
0 0 0 0 0 10240 0 2048 0 0 0 12 1.40853276496764
0 0 0 0 0 10240 0 2560 0 0 0 15 1.39188387885619
0 0 0 0 0 10240 0 3072 0 0 0 18 1.37385886350972
-0 0 0 0 0 10240 0 3584 0 0 0 21 1.35527270166974
+0 0 0 0 0 10240 0 3584 0 0 0 21 1.35527270101446
0 0 0 0 0 10240 0 4096 0 0 0 24 1.33679139358296
0 0 0 0 0 10240 0 4608 0 0 0 27 1.31887264450081
0 0 0 0 0 10240 0 5120 0 0 0 30 1.3017921762318
0 0 0 0 0 10240 0 5632 0 0 0 33 1.28569662142782
0 0 0 0 0 10240 0 6144 0 0 0 36 1.2706473289087
0 0 0 0 0 10240 0 6656 0 0 0 39 1.25665010251725
-0 0 0 0 0 10240 0 7168 0 0 0 42 1.2436752392466
+0 0 0 0 0 10240 0 7168 0 0 0 42 1.24367523893592
0 0 0 0 0 10240 0 7680 0 0 0 45 1.23167154331119
0 0 0 0 0 10240 0 8192 0 0 0 48 1.22057619871408
0 0 0 0 0 10240 0 8704 0 0 0 51 1.21032152845121
diff --git a/test/bhns_eval/gyz.d.asc b/test/bhns_eval/gyz.d.asc
index 8e72dce..8ca89f1 100644
--- a/test/bhns_eval/gyz.d.asc
+++ b/test/bhns_eval/gyz.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gyz d (gyz)
+# gyz d (gyz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/gyz.x.asc b/test/bhns_eval/gyz.x.asc
index 20a425d..c6d1490 100644
--- a/test/bhns_eval/gyz.x.asc
+++ b/test/bhns_eval/gyz.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gyz x (gyz)
+# gyz x (gyz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/gyz.y.asc b/test/bhns_eval/gyz.y.asc
index 205dad6..1bacbe2 100644
--- a/test/bhns_eval/gyz.y.asc
+++ b/test/bhns_eval/gyz.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gyz y (gyz)
+# gyz y (gyz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/gyz.z.asc b/test/bhns_eval/gyz.z.asc
index 7c94cf5..20f8261 100644
--- a/test/bhns_eval/gyz.z.asc
+++ b/test/bhns_eval/gyz.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gyz z (gyz)
+# gyz z (gyz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/gzz.d.asc b/test/bhns_eval/gzz.d.asc
index 1b465b2..6461876 100644
--- a/test/bhns_eval/gzz.d.asc
+++ b/test/bhns_eval/gzz.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gzz d (gzz)
+# gzz d (gzz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -23,8 +23,28 @@
0 0 0 0 0 7680 7680 7680 0 -15 45 45 1.16122291348897
0 0 0 0 0 8192 8192 8192 0 -12 48 48 1.15599366089986
0 0 0 0 0 8704 8704 8704 0 -9 51 51 1.15068514670822
-0 0 0 0 0 9216 9216 9216 0 -6 54 54 1.1453588436867
+0 0 0 0 0 9216 9216 9216 0 -6 54 54 1.14535884368671
0 0 0 0 0 9728 9728 9728 0 -3 57 57 1.1400723241299
0 0 0 0 0 10240 10240 10240 0 0 60 60 1.13487554025373
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/gzz.norm1.asc b/test/bhns_eval/gzz.norm1.asc
index 925d67b..d232a2d 100644
--- a/test/bhns_eval/gzz.norm1.asc
+++ b/test/bhns_eval/gzz.norm1.asc
@@ -2,4 +2,4 @@
#
# ADMBASE::gzz (gzz)
# 1:iteration 2:time 3:data
-0 0 1.25144747615653
+0 0 1.25144747615579
diff --git a/test/bhns_eval/gzz.norm2.asc b/test/bhns_eval/gzz.norm2.asc
index 1c8f3bd..e37eddc 100644
--- a/test/bhns_eval/gzz.norm2.asc
+++ b/test/bhns_eval/gzz.norm2.asc
@@ -2,4 +2,4 @@
#
# ADMBASE::gzz (gzz)
# 1:iteration 2:time 3:data
-0 0 2.98987086486639
+0 0 2.98987086486607
diff --git a/test/bhns_eval/gzz.x.asc b/test/bhns_eval/gzz.x.asc
index 9cc704d..9bfbf5e 100644
--- a/test/bhns_eval/gzz.x.asc
+++ b/test/bhns_eval/gzz.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gzz x (gzz)
+# gzz x (gzz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/gzz.y.asc b/test/bhns_eval/gzz.y.asc
index ff54796..40147d1 100644
--- a/test/bhns_eval/gzz.y.asc
+++ b/test/bhns_eval/gzz.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gzz y (gzz)
+# gzz y (gzz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -12,14 +12,14 @@
0 0 0 0 0 10240 2048 0 0 0 12 0 1.40853276496764
0 0 0 0 0 10240 2560 0 0 0 15 0 1.39188387885619
0 0 0 0 0 10240 3072 0 0 0 18 0 1.37385886350972
-0 0 0 0 0 10240 3584 0 0 0 21 0 1.35527270166974
+0 0 0 0 0 10240 3584 0 0 0 21 0 1.35527270101446
0 0 0 0 0 10240 4096 0 0 0 24 0 1.33679139358296
0 0 0 0 0 10240 4608 0 0 0 27 0 1.31887264450081
0 0 0 0 0 10240 5120 0 0 0 30 0 1.3017921762318
0 0 0 0 0 10240 5632 0 0 0 33 0 1.28569662142782
0 0 0 0 0 10240 6144 0 0 0 36 0 1.2706473289087
0 0 0 0 0 10240 6656 0 0 0 39 0 1.25665010251725
-0 0 0 0 0 10240 7168 0 0 0 42 0 1.2436752392466
+0 0 0 0 0 10240 7168 0 0 0 42 0 1.24367523893592
0 0 0 0 0 10240 7680 0 0 0 45 0 1.23167154331119
0 0 0 0 0 10240 8192 0 0 0 48 0 1.22057619871408
0 0 0 0 0 10240 8704 0 0 0 51 0 1.21032152845121
diff --git a/test/bhns_eval/gzz.z.asc b/test/bhns_eval/gzz.z.asc
index e3ddc60..93d63bd 100644
--- a/test/bhns_eval/gzz.z.asc
+++ b/test/bhns_eval/gzz.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gzz z (gzz)
+# gzz z (gzz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -12,14 +12,14 @@
0 0 0 0 0 10240 0 2048 0 0 0 12 1.40853276496764
0 0 0 0 0 10240 0 2560 0 0 0 15 1.39188387885619
0 0 0 0 0 10240 0 3072 0 0 0 18 1.37385886350972
-0 0 0 0 0 10240 0 3584 0 0 0 21 1.35527270166974
+0 0 0 0 0 10240 0 3584 0 0 0 21 1.35527270101446
0 0 0 0 0 10240 0 4096 0 0 0 24 1.33679139358296
0 0 0 0 0 10240 0 4608 0 0 0 27 1.31887264450081
0 0 0 0 0 10240 0 5120 0 0 0 30 1.3017921762318
0 0 0 0 0 10240 0 5632 0 0 0 33 1.28569662142782
0 0 0 0 0 10240 0 6144 0 0 0 36 1.2706473289087
0 0 0 0 0 10240 0 6656 0 0 0 39 1.25665010251725
-0 0 0 0 0 10240 0 7168 0 0 0 42 1.2436752392466
+0 0 0 0 0 10240 0 7168 0 0 0 42 1.24367523893592
0 0 0 0 0 10240 0 7680 0 0 0 45 1.23167154331119
0 0 0 0 0 10240 0 8192 0 0 0 48 1.22057619871408
0 0 0 0 0 10240 0 8704 0 0 0 51 1.21032152845121
diff --git a/test/bhns_eval/kxx.d.asc b/test/bhns_eval/kxx.d.asc
index 42a2236..5202447 100644
--- a/test/bhns_eval/kxx.d.asc
+++ b/test/bhns_eval/kxx.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxx d (kxx)
+# kxx d (kxx)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/kxx.x.asc b/test/bhns_eval/kxx.x.asc
index a455d76..07204ef 100644
--- a/test/bhns_eval/kxx.x.asc
+++ b/test/bhns_eval/kxx.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxx x (kxx)
+# kxx x (kxx)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/kxx.y.asc b/test/bhns_eval/kxx.y.asc
index 882d947..472815a 100644
--- a/test/bhns_eval/kxx.y.asc
+++ b/test/bhns_eval/kxx.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxx y (kxx)
+# kxx y (kxx)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/kxx.z.asc b/test/bhns_eval/kxx.z.asc
index a81f088..6455fe4 100644
--- a/test/bhns_eval/kxx.z.asc
+++ b/test/bhns_eval/kxx.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxx z (kxx)
+# kxx z (kxx)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/kxy.d.asc b/test/bhns_eval/kxy.d.asc
index 2cc6cc5..c72ce1c 100644
--- a/test/bhns_eval/kxy.d.asc
+++ b/test/bhns_eval/kxy.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxy d (kxy)
+# kxy d (kxy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/kxy.x.asc b/test/bhns_eval/kxy.x.asc
index cdc223d..a5e977e 100644
--- a/test/bhns_eval/kxy.x.asc
+++ b/test/bhns_eval/kxy.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxy x (kxy)
+# kxy x (kxy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/kxy.y.asc b/test/bhns_eval/kxy.y.asc
index b79de62..b561835 100644
--- a/test/bhns_eval/kxy.y.asc
+++ b/test/bhns_eval/kxy.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxy y (kxy)
+# kxy y (kxy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/kxy.z.asc b/test/bhns_eval/kxy.z.asc
index 3c5e876..87d64b0 100644
--- a/test/bhns_eval/kxy.z.asc
+++ b/test/bhns_eval/kxy.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxy z (kxy)
+# kxy z (kxy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/kxz.d.asc b/test/bhns_eval/kxz.d.asc
index 8bfa31e..d123730 100644
--- a/test/bhns_eval/kxz.d.asc
+++ b/test/bhns_eval/kxz.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxz d (kxz)
+# kxz d (kxz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/kxz.x.asc b/test/bhns_eval/kxz.x.asc
index 1711f2f..00e276c 100644
--- a/test/bhns_eval/kxz.x.asc
+++ b/test/bhns_eval/kxz.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxz x (kxz)
+# kxz x (kxz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/kxz.y.asc b/test/bhns_eval/kxz.y.asc
index e82d73a..5ef5dd6 100644
--- a/test/bhns_eval/kxz.y.asc
+++ b/test/bhns_eval/kxz.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxz y (kxz)
+# kxz y (kxz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/kxz.z.asc b/test/bhns_eval/kxz.z.asc
index 4053e0a..8535316 100644
--- a/test/bhns_eval/kxz.z.asc
+++ b/test/bhns_eval/kxz.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxz z (kxz)
+# kxz z (kxz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/kyy.d.asc b/test/bhns_eval/kyy.d.asc
index b0d5413..9c5b930 100644
--- a/test/bhns_eval/kyy.d.asc
+++ b/test/bhns_eval/kyy.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kyy d (kyy)
+# kyy d (kyy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/kyy.x.asc b/test/bhns_eval/kyy.x.asc
index c57c11c..7c3d98e 100644
--- a/test/bhns_eval/kyy.x.asc
+++ b/test/bhns_eval/kyy.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kyy x (kyy)
+# kyy x (kyy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/kyy.y.asc b/test/bhns_eval/kyy.y.asc
index a5c0181..224ad01 100644
--- a/test/bhns_eval/kyy.y.asc
+++ b/test/bhns_eval/kyy.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kyy y (kyy)
+# kyy y (kyy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/kyy.z.asc b/test/bhns_eval/kyy.z.asc
index a6534f8..63b7179 100644
--- a/test/bhns_eval/kyy.z.asc
+++ b/test/bhns_eval/kyy.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kyy z (kyy)
+# kyy z (kyy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/kyz.d.asc b/test/bhns_eval/kyz.d.asc
index b828f84..aae3975 100644
--- a/test/bhns_eval/kyz.d.asc
+++ b/test/bhns_eval/kyz.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kyz d (kyz)
+# kyz d (kyz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/kyz.x.asc b/test/bhns_eval/kyz.x.asc
index eb361ec..040c164 100644
--- a/test/bhns_eval/kyz.x.asc
+++ b/test/bhns_eval/kyz.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kyz x (kyz)
+# kyz x (kyz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/kyz.y.asc b/test/bhns_eval/kyz.y.asc
index 351df75..4ecf42a 100644
--- a/test/bhns_eval/kyz.y.asc
+++ b/test/bhns_eval/kyz.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kyz y (kyz)
+# kyz y (kyz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/kyz.z.asc b/test/bhns_eval/kyz.z.asc
index 42738b2..64a5be1 100644
--- a/test/bhns_eval/kyz.z.asc
+++ b/test/bhns_eval/kyz.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kyz z (kyz)
+# kyz z (kyz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/kzz.d.asc b/test/bhns_eval/kzz.d.asc
index ce67a47..aea020a 100644
--- a/test/bhns_eval/kzz.d.asc
+++ b/test/bhns_eval/kzz.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kzz d (kzz)
+# kzz d (kzz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/kzz.x.asc b/test/bhns_eval/kzz.x.asc
index 1dbb484..441c76c 100644
--- a/test/bhns_eval/kzz.x.asc
+++ b/test/bhns_eval/kzz.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kzz x (kzz)
+# kzz x (kzz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/kzz.y.asc b/test/bhns_eval/kzz.y.asc
index d6e5884..aed41d5 100644
--- a/test/bhns_eval/kzz.y.asc
+++ b/test/bhns_eval/kzz.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kzz y (kzz)
+# kzz y (kzz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/kzz.z.asc b/test/bhns_eval/kzz.z.asc
index f678796..5654ad0 100644
--- a/test/bhns_eval/kzz.z.asc
+++ b/test/bhns_eval/kzz.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kzz z (kzz)
+# kzz z (kzz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/press.d.asc b/test/bhns_eval/press.d.asc
index cb41353..a99588e 100644
--- a/test/bhns_eval/press.d.asc
+++ b/test/bhns_eval/press.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::press d (press)
+# press d (press)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 1e-20
0 0 0 0 0 9728 9728 9728 0 -3 57 57 1e-20
0 0 0 0 0 10240 10240 10240 0 0 60 60 1e-20
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/press.maximum.asc b/test/bhns_eval/press.maximum.asc
index d703056..b09e38e 100644
--- a/test/bhns_eval/press.maximum.asc
+++ b/test/bhns_eval/press.maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::press (press)
+# HYDROBASE::press (press)
# 1:iteration 2:time 3:data
-0 0 1.56670902387106e-05
+0 0 1.56670902387105e-05
diff --git a/test/bhns_eval/press.minimum.asc b/test/bhns_eval/press.minimum.asc
index bfb721f..822c4e2 100644
--- a/test/bhns_eval/press.minimum.asc
+++ b/test/bhns_eval/press.minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::press (press)
+# HYDROBASE::press (press)
# 1:iteration 2:time 3:data
0 0 1e-20
diff --git a/test/bhns_eval/press.norm1.asc b/test/bhns_eval/press.norm1.asc
index 6f34d77..dd8780b 100644
--- a/test/bhns_eval/press.norm1.asc
+++ b/test/bhns_eval/press.norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::press (press)
+# HYDROBASE::press (press)
# 1:iteration 2:time 3:data
0 0 5.05742904402767e-09
diff --git a/test/bhns_eval/press.norm2.asc b/test/bhns_eval/press.norm2.asc
index c11e170..4ffa6d5 100644
--- a/test/bhns_eval/press.norm2.asc
+++ b/test/bhns_eval/press.norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::press (press)
+# HYDROBASE::press (press)
# 1:iteration 2:time 3:data
0 0 1.7803595519852e-07
diff --git a/test/bhns_eval/press.x.asc b/test/bhns_eval/press.x.asc
index ae9d881..09e9b75 100644
--- a/test/bhns_eval/press.x.asc
+++ b/test/bhns_eval/press.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::press x (press)
+# press x (press)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -13,11 +13,11 @@
0 0 0 0 0 2560 0 0 0 -45 0 0 1e-20
0 0 0 0 0 3072 0 0 0 -42 0 0 1e-20
0 0 0 0 0 3584 0 0 0 -39 0 0 1.94643066292046e-07
-0 0 0 0 0 4096 0 0 0 -36 0 0 3.49157673737994e-06
+0 0 0 0 0 4096 0 0 0 -36 0 0 3.49157673737995e-06
0 0 0 0 0 4608 0 0 0 -33 0 0 1.11266017671827e-05
-0 0 0 0 0 5120 0 0 0 -30 0 0 1.56670902387106e-05
+0 0 0 0 0 5120 0 0 0 -30 0 0 1.56670902387105e-05
0 0 0 0 0 5632 0 0 0 -27 0 0 1.0504675757416e-05
-0 0 0 0 0 6144 0 0 0 -24 0 0 3.13746067212012e-06
+0 0 0 0 0 6144 0 0 0 -24 0 0 3.13746067212013e-06
0 0 0 0 0 6656 0 0 0 -21 0 0 1.63174925045682e-07
0 0 0 0 0 7168 0 0 0 -18 0 0 1e-20
0 0 0 0 0 7680 0 0 0 -15 0 0 1e-20
diff --git a/test/bhns_eval/press.y.asc b/test/bhns_eval/press.y.asc
index 22b7252..f62fc4e 100644
--- a/test/bhns_eval/press.y.asc
+++ b/test/bhns_eval/press.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::press y (press)
+# press y (press)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/press.z.asc b/test/bhns_eval/press.z.asc
index b9c2fd8..f5a973f 100644
--- a/test/bhns_eval/press.z.asc
+++ b/test/bhns_eval/press.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::press z (press)
+# press z (press)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/puncture_u.d.asc b/test/bhns_eval/puncture_u.d.asc
index 9dd7e2c..b6e4536 100644
--- a/test/bhns_eval/puncture_u.d.asc
+++ b/test/bhns_eval/puncture_u.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# TWOPUNCTURES::puncture_u d (puncture_u)
+# puncture_u d (puncture_u)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -11,20 +11,40 @@
0 0 0 0 0 1536 1536 1536 0 -51 9 9 0.016009921385605
0 0 0 0 0 2048 2048 2048 0 -48 12 12 0.0158910229161676
0 0 0 0 0 2560 2560 2560 0 -45 15 15 0.0151267275295532
-0 0 0 0 0 3072 3072 3072 0 -42 18 18 0.0139639104004238
+0 0 0 0 0 3072 3072 3072 0 -42 18 18 0.0139639104004239
0 0 0 0 0 3584 3584 3584 0 -39 21 21 0.0126624511563192
-0 0 0 0 0 4096 4096 4096 0 -36 24 24 0.0113975566861352
+0 0 0 0 0 4096 4096 4096 0 -36 24 24 0.0113975566861353
0 0 0 0 0 4608 4608 4608 0 -33 27 27 0.0102531848648781
-0 0 0 0 0 5120 5120 5120 0 -30 30 30 0.0092535578611962
-0 0 0 0 0 5632 5632 5632 0 -27 33 33 0.00839314595765607
-0 0 0 0 0 6144 6144 6144 0 -24 36 36 0.00765534347322332
+0 0 0 0 0 5120 5120 5120 0 -30 30 30 0.00925355786119621
+0 0 0 0 0 5632 5632 5632 0 -27 33 33 0.00839314595765608
+0 0 0 0 0 6144 6144 6144 0 -24 36 36 0.00765534347322333
0 0 0 0 0 6656 6656 6656 0 -21 39 39 0.00702158544948283
-0 0 0 0 0 7168 7168 7168 0 -18 42 42 0.00647480813826606
-0 0 0 0 0 7680 7680 7680 0 -15 45 45 0.00600038462440437
-0 0 0 0 0 8192 8192 8192 0 -12 48 48 0.00558616354224806
-0 0 0 0 0 8704 8704 8704 0 -9 51 51 0.0052222108060764
+0 0 0 0 0 7168 7168 7168 0 -18 42 42 0.00647480813826607
+0 0 0 0 0 7680 7680 7680 0 -15 45 45 0.00600038462440438
+0 0 0 0 0 8192 8192 8192 0 -12 48 48 0.00558616354224807
+0 0 0 0 0 8704 8704 8704 0 -9 51 51 0.00522221080607641
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0.00490045750680095
-0 0 0 0 0 9728 9728 9728 0 -3 57 57 0.00461434847558265
-0 0 0 0 0 10240 10240 10240 0 0 60 60 0.00435853791824789
+0 0 0 0 0 9728 9728 9728 0 -3 57 57 0.00461434847558266
+0 0 0 0 0 10240 10240 10240 0 0 60 60 0.0043585379182479
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/puncture_u.minimum.asc b/test/bhns_eval/puncture_u.minimum.asc
index 0ca6df8..386b0d9 100644
--- a/test/bhns_eval/puncture_u.minimum.asc
+++ b/test/bhns_eval/puncture_u.minimum.asc
@@ -2,4 +2,4 @@
#
# TWOPUNCTURES::puncture_u (puncture_u)
# 1:iteration 2:time 3:data
-0 0 0.00317032302816796
+0 0 0.00317032302816797
diff --git a/test/bhns_eval/puncture_u.norm1.asc b/test/bhns_eval/puncture_u.norm1.asc
index a0545ec..95ac144 100644
--- a/test/bhns_eval/puncture_u.norm1.asc
+++ b/test/bhns_eval/puncture_u.norm1.asc
@@ -2,4 +2,4 @@
#
# TWOPUNCTURES::puncture_u (puncture_u)
# 1:iteration 2:time 3:data
-0 0 0.00731812180578972
+0 0 0.00731812180563583
diff --git a/test/bhns_eval/puncture_u.norm2.asc b/test/bhns_eval/puncture_u.norm2.asc
index fb43923..40b14ce 100644
--- a/test/bhns_eval/puncture_u.norm2.asc
+++ b/test/bhns_eval/puncture_u.norm2.asc
@@ -2,4 +2,4 @@
#
# TWOPUNCTURES::puncture_u (puncture_u)
# 1:iteration 2:time 3:data
-0 0 0.00850277357280945
+0 0 0.00850277357265274
diff --git a/test/bhns_eval/puncture_u.x.asc b/test/bhns_eval/puncture_u.x.asc
index 5a720f2..68c768b 100644
--- a/test/bhns_eval/puncture_u.x.asc
+++ b/test/bhns_eval/puncture_u.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# TWOPUNCTURES::puncture_u x (puncture_u)
+# puncture_u x (puncture_u)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -8,7 +8,7 @@
0 0 0 0 0 0 0 0 0 -60 0 0 0.0130287894990631
0 0 0 0 0 512 0 0 0 -57 0 0 0.0145006122638555
0 0 0 0 0 1024 0 0 0 -54 0 0 0.0163654179094299
-0 0 0 0 0 1536 0 0 0 -51 0 0 0.0187359298199079
+0 0 0 0 0 1536 0 0 0 -51 0 0 0.018735929819908
0 0 0 0 0 2048 0 0 0 -48 0 0 0.0217786115888127
0 0 0 0 0 2560 0 0 0 -45 0 0 0.025905636253964
0 0 0 0 0 3072 0 0 0 -42 0 0 0.0322523678048841
@@ -18,33 +18,33 @@
0 0 0 0 0 5120 0 0 0 -30 0 0 0.0808184444666426
0 0 0 0 0 5632 0 0 0 -27 0 0 0.0744002103774854
0 0 0 0 0 6144 0 0 0 -24 0 0 0.0584028612890786
-0 0 0 0 0 6656 0 0 0 -21 0 0 0.0422705305214642
+0 0 0 0 0 6656 0 0 0 -21 0 0 0.0422705305214643
0 0 0 0 0 7168 0 0 0 -18 0 0 0.0316603722524186
-0 0 0 0 0 7680 0 0 0 -15 0 0 0.0254617494740124
+0 0 0 0 0 7680 0 0 0 -15 0 0 0.0254617494740125
0 0 0 0 0 8192 0 0 0 -12 0 0 0.0215723567337287
-0 0 0 0 0 8704 0 0 0 -9 0 0 0.0186943992430739
+0 0 0 0 0 8704 0 0 0 -9 0 0 0.018694399243074
0 0 0 0 0 9216 0 0 0 -6 0 0 0.0163254707302645
-0 0 0 0 0 9728 0 0 0 -3 0 0 0.0143775087531683
+0 0 0 0 0 9728 0 0 0 -3 0 0 0.0143775087531684
0 0 0 0 0 10240 0 0 0 0 0 0 0.0128652063150754
0 0 0 0 0 10752 0 0 0 3 0 0 0.0117455987251847
0 0 0 0 0 11264 0 0 0 6 0 0 0.0108879319881139
0 0 0 0 0 11776 0 0 0 9 0 0 0.0101299916701006
-0 0 0 0 0 12288 0 0 0 12 0 0 0.00937102122427377
-0 0 0 0 0 12800 0 0 0 15 0 0 0.00864126191954522
-0 0 0 0 0 13312 0 0 0 18 0 0 0.00807261314769976
-0 0 0 0 0 13824 0 0 0 21 0 0 0.00770867115690966
-0 0 0 0 0 14336 0 0 0 24 0 0 0.00729327954459678
-0 0 0 0 0 14848 0 0 0 27 0 0 0.00683216621786224
-0 0 0 0 0 15360 0 0 0 30 0 0 0.00663462500823802
-0 0 0 0 0 15872 0 0 0 33 0 0 0.00623815682244352
+0 0 0 0 0 12288 0 0 0 12 0 0 0.00937102122427378
+0 0 0 0 0 12800 0 0 0 15 0 0 0.00864126191954523
+0 0 0 0 0 13312 0 0 0 18 0 0 0.00807261314769977
+0 0 0 0 0 13824 0 0 0 21 0 0 0.00770867115690967
+0 0 0 0 0 14336 0 0 0 24 0 0 0.00729327954459679
+0 0 0 0 0 14848 0 0 0 27 0 0 0.00683216621786225
+0 0 0 0 0 15360 0 0 0 30 0 0 0.00663462500823804
+0 0 0 0 0 15872 0 0 0 33 0 0 0.00623815682244353
0 0 0 0 0 16384 0 0 0 36 0 0 0.00593105389307235
0 0 0 0 0 16896 0 0 0 39 0 0 0.00567577044862433
-0 0 0 0 0 17408 0 0 0 42 0 0 0.005441239700079
-0 0 0 0 0 17920 0 0 0 45 0 0 0.00522417698441043
+0 0 0 0 0 17408 0 0 0 42 0 0 0.00544123970007901
+0 0 0 0 0 17920 0 0 0 45 0 0 0.00522417698441044
0 0 0 0 0 18432 0 0 0 48 0 0 0.00502350894328257
0 0 0 0 0 18944 0 0 0 51 0 0 0.00483768018842466
-0 0 0 0 0 19456 0 0 0 54 0 0 0.0046651247558375
+0 0 0 0 0 19456 0 0 0 54 0 0 0.00466512475583751
0 0 0 0 0 19968 0 0 0 57 0 0 0.00450446387106632
-0 0 0 0 0 20480 0 0 0 60 0 0 0.00435450651176803
+0 0 0 0 0 20480 0 0 0 60 0 0 0.00435450651176804
diff --git a/test/bhns_eval/puncture_u.y.asc b/test/bhns_eval/puncture_u.y.asc
index c47a7a0..72aafc7 100644
--- a/test/bhns_eval/puncture_u.y.asc
+++ b/test/bhns_eval/puncture_u.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# TWOPUNCTURES::puncture_u y (puncture_u)
+# puncture_u y (puncture_u)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -10,20 +10,20 @@
0 0 0 0 0 10240 1024 0 0 0 6 0 0.0126320974733998
0 0 0 0 0 10240 1536 0 0 0 9 0 0.012369663515628
0 0 0 0 0 10240 2048 0 0 0 12 0 0.0120378981704507
-0 0 0 0 0 10240 2560 0 0 0 15 0 0.011641773157644
+0 0 0 0 0 10240 2560 0 0 0 15 0 0.0116417731576441
0 0 0 0 0 10240 3072 0 0 0 18 0 0.011185898726704
-0 0 0 0 0 10240 3584 0 0 0 21 0 0.0106939730303153
+0 0 0 0 0 10240 3584 0 0 0 21 0 0.0106939728998936
0 0 0 0 0 10240 4096 0 0 0 24 0 0.0101935908472216
-0 0 0 0 0 10240 4608 0 0 0 27 0 0.00970326124827104
-0 0 0 0 0 10240 5120 0 0 0 30 0 0.00923223021347451
-0 0 0 0 0 10240 5632 0 0 0 33 0 0.00878459317321953
+0 0 0 0 0 10240 4608 0 0 0 27 0 0.00970326124827105
+0 0 0 0 0 10240 5120 0 0 0 30 0 0.00923223021347453
+0 0 0 0 0 10240 5632 0 0 0 33 0 0.00878459317321954
0 0 0 0 0 10240 6144 0 0 0 36 0 0.00836215338233114
-0 0 0 0 0 10240 6656 0 0 0 39 0 0.00796556184266644
-0 0 0 0 0 10240 7168 0 0 0 42 0 0.00759467787088
-0 0 0 0 0 10240 7680 0 0 0 45 0 0.007248753947871
+0 0 0 0 0 10240 6656 0 0 0 39 0 0.00796556184266645
+0 0 0 0 0 10240 7168 0 0 0 42 0 0.00759467780492803
+0 0 0 0 0 10240 7680 0 0 0 45 0 0.00724875394787101
0 0 0 0 0 10240 8192 0 0 0 48 0 0.00692661631223329
-0 0 0 0 0 10240 8704 0 0 0 51 0 0.00662683795788797
-0 0 0 0 0 10240 9216 0 0 0 54 0 0.00634787800772024
+0 0 0 0 0 10240 8704 0 0 0 51 0 0.00662683795788798
+0 0 0 0 0 10240 9216 0 0 0 54 0 0.00634787800772025
0 0 0 0 0 10240 9728 0 0 0 57 0 0.00608817889767127
0 0 0 0 0 10240 10240 0 0 0 60 0 0.00584622722660906
diff --git a/test/bhns_eval/puncture_u.z.asc b/test/bhns_eval/puncture_u.z.asc
index 6ee0bb6..3c7db75 100644
--- a/test/bhns_eval/puncture_u.z.asc
+++ b/test/bhns_eval/puncture_u.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# TWOPUNCTURES::puncture_u z (puncture_u)
+# puncture_u z (puncture_u)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -9,22 +9,22 @@
0 0 0 0 0 10240 0 512 0 0 0 3 0.0128026355778901
0 0 0 0 0 10240 0 1024 0 0 0 6 0.0126320974733998
0 0 0 0 0 10240 0 1536 0 0 0 9 0.012369663515628
-0 0 0 0 0 10240 0 2048 0 0 0 12 0.0120378981704506
+0 0 0 0 0 10240 0 2048 0 0 0 12 0.0120378981704507
0 0 0 0 0 10240 0 2560 0 0 0 15 0.011641773157644
0 0 0 0 0 10240 0 3072 0 0 0 18 0.011185898726704
-0 0 0 0 0 10240 0 3584 0 0 0 21 0.0106939730303153
-0 0 0 0 0 10240 0 4096 0 0 0 24 0.0101935908472215
-0 0 0 0 0 10240 0 4608 0 0 0 27 0.00970326124827101
-0 0 0 0 0 10240 0 5120 0 0 0 30 0.00923223021347448
-0 0 0 0 0 10240 0 5632 0 0 0 33 0.0087845931732195
+0 0 0 0 0 10240 0 3584 0 0 0 21 0.0106939728998936
+0 0 0 0 0 10240 0 4096 0 0 0 24 0.0101935908472216
+0 0 0 0 0 10240 0 4608 0 0 0 27 0.00970326124827103
+0 0 0 0 0 10240 0 5120 0 0 0 30 0.0092322302134745
+0 0 0 0 0 10240 0 5632 0 0 0 33 0.00878459317321951
0 0 0 0 0 10240 0 6144 0 0 0 36 0.00836215338233112
-0 0 0 0 0 10240 0 6656 0 0 0 39 0.00796556184266642
-0 0 0 0 0 10240 0 7168 0 0 0 42 0.00759467787087997
-0 0 0 0 0 10240 0 7680 0 0 0 45 0.00724875394787098
-0 0 0 0 0 10240 0 8192 0 0 0 48 0.00692661631223326
-0 0 0 0 0 10240 0 8704 0 0 0 51 0.00662683795788794
+0 0 0 0 0 10240 0 6656 0 0 0 39 0.00796556184266643
+0 0 0 0 0 10240 0 7168 0 0 0 42 0.00759467780492801
+0 0 0 0 0 10240 0 7680 0 0 0 45 0.00724875394787099
+0 0 0 0 0 10240 0 8192 0 0 0 48 0.00692661631223327
+0 0 0 0 0 10240 0 8704 0 0 0 51 0.00662683795788795
0 0 0 0 0 10240 0 9216 0 0 0 54 0.00634787800772022
-0 0 0 0 0 10240 0 9728 0 0 0 57 0.00608817889767124
-0 0 0 0 0 10240 0 10240 0 0 0 60 0.00584622722660903
+0 0 0 0 0 10240 0 9728 0 0 0 57 0.00608817889767125
+0 0 0 0 0 10240 0 10240 0 0 0 60 0.00584622722660904
diff --git a/test/bhns_eval/rho.d.asc b/test/bhns_eval/rho.d.asc
index 48dc076..b14c0e4 100644
--- a/test/bhns_eval/rho.d.asc
+++ b/test/bhns_eval/rho.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::rho d (rho)
+# rho d (rho)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 1e-11
0 0 0 0 0 9728 9728 9728 0 -3 57 57 1e-11
0 0 0 0 0 10240 10240 10240 0 0 60 60 1e-11
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/rho.maximum.asc b/test/bhns_eval/rho.maximum.asc
index b0cfb2c..f31fec0 100644
--- a/test/bhns_eval/rho.maximum.asc
+++ b/test/bhns_eval/rho.maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::rho (rho)
+# HYDROBASE::rho (rho)
# 1:iteration 2:time 3:data
-0 0 0.000395816753545256
+0 0 0.000395816753545255
diff --git a/test/bhns_eval/rho.minimum.asc b/test/bhns_eval/rho.minimum.asc
index c62e5f0..57394ca 100644
--- a/test/bhns_eval/rho.minimum.asc
+++ b/test/bhns_eval/rho.minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::rho (rho)
+# HYDROBASE::rho (rho)
# 1:iteration 2:time 3:data
0 0 1e-11
diff --git a/test/bhns_eval/rho.norm1.asc b/test/bhns_eval/rho.norm1.asc
index d6370d9..d94bf73 100644
--- a/test/bhns_eval/rho.norm1.asc
+++ b/test/bhns_eval/rho.norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::rho (rho)
+# HYDROBASE::rho (rho)
# 1:iteration 2:time 3:data
0 0 2.74385381593915e-07
diff --git a/test/bhns_eval/rho.norm2.asc b/test/bhns_eval/rho.norm2.asc
index c94f2fc..2bc2e8a 100644
--- a/test/bhns_eval/rho.norm2.asc
+++ b/test/bhns_eval/rho.norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::rho (rho)
+# HYDROBASE::rho (rho)
# 1:iteration 2:time 3:data
0 0 7.11156033794633e-06
diff --git a/test/bhns_eval/rho.x.asc b/test/bhns_eval/rho.x.asc
index 3bbbc87..2b8f40e 100644
--- a/test/bhns_eval/rho.x.asc
+++ b/test/bhns_eval/rho.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::rho x (rho)
+# rho x (rho)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -12,12 +12,12 @@
0 0 0 0 0 2048 0 0 0 -48 0 0 1e-11
0 0 0 0 0 2560 0 0 0 -45 0 0 1e-11
0 0 0 0 0 3072 0 0 0 -42 0 0 1e-11
-0 0 0 0 0 3584 0 0 0 -39 0 0 4.411837103657e-05
+0 0 0 0 0 3584 0 0 0 -39 0 0 4.41183710365701e-05
0 0 0 0 0 4096 0 0 0 -36 0 0 0.000186857612565824
0 0 0 0 0 4608 0 0 0 -33 0 0 0.000333565612244169
-0 0 0 0 0 5120 0 0 0 -30 0 0 0.000395816753545256
+0 0 0 0 0 5120 0 0 0 -30 0 0 0.000395816753545255
0 0 0 0 0 5632 0 0 0 -27 0 0 0.000324109175393354
-0 0 0 0 0 6144 0 0 0 -24 0 0 0.000177128785693351
+0 0 0 0 0 6144 0 0 0 -24 0 0 0.000177128785693352
0 0 0 0 0 6656 0 0 0 -21 0 0 4.03949161461789e-05
0 0 0 0 0 7168 0 0 0 -18 0 0 1e-11
0 0 0 0 0 7680 0 0 0 -15 0 0 1e-11
diff --git a/test/bhns_eval/rho.y.asc b/test/bhns_eval/rho.y.asc
index b58b82f..a3d9eca 100644
--- a/test/bhns_eval/rho.y.asc
+++ b/test/bhns_eval/rho.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::rho y (rho)
+# rho y (rho)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/rho.z.asc b/test/bhns_eval/rho.z.asc
index e6ff316..71a2ba6 100644
--- a/test/bhns_eval/rho.z.asc
+++ b/test/bhns_eval/rho.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::rho z (rho)
+# rho z (rho)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/scon[0].d.asc b/test/bhns_eval/scon[0].d.asc
index cd1a513..b124d5a 100644
--- a/test/bhns_eval/scon[0].d.asc
+++ b/test/bhns_eval/scon[0].d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sx d (sx)
+# scon[0] d (scon[0])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/scon[0].maximum.asc b/test/bhns_eval/scon[0].maximum.asc
index b058345..88f0396 100644
--- a/test/bhns_eval/scon[0].maximum.asc
+++ b/test/bhns_eval/scon[0].maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sx (sx)
+# GRHYDRO::scon[0] (scon[0])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/scon[0].minimum.asc b/test/bhns_eval/scon[0].minimum.asc
index b058345..88f0396 100644
--- a/test/bhns_eval/scon[0].minimum.asc
+++ b/test/bhns_eval/scon[0].minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sx (sx)
+# GRHYDRO::scon[0] (scon[0])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/scon[0].norm1.asc b/test/bhns_eval/scon[0].norm1.asc
index b058345..88f0396 100644
--- a/test/bhns_eval/scon[0].norm1.asc
+++ b/test/bhns_eval/scon[0].norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sx (sx)
+# GRHYDRO::scon[0] (scon[0])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/scon[0].norm2.asc b/test/bhns_eval/scon[0].norm2.asc
index b058345..88f0396 100644
--- a/test/bhns_eval/scon[0].norm2.asc
+++ b/test/bhns_eval/scon[0].norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sx (sx)
+# GRHYDRO::scon[0] (scon[0])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/scon[0].x.asc b/test/bhns_eval/scon[0].x.asc
index 316bbec..fc9656d 100644
--- a/test/bhns_eval/scon[0].x.asc
+++ b/test/bhns_eval/scon[0].x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sx x (sx)
+# scon[0] x (scon[0])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/scon[0].y.asc b/test/bhns_eval/scon[0].y.asc
index aa6b088..36a4dd2 100644
--- a/test/bhns_eval/scon[0].y.asc
+++ b/test/bhns_eval/scon[0].y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sx y (sx)
+# scon[0] y (scon[0])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/scon[0].z.asc b/test/bhns_eval/scon[0].z.asc
index 13972a4..d32d699 100644
--- a/test/bhns_eval/scon[0].z.asc
+++ b/test/bhns_eval/scon[0].z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sx z (sx)
+# scon[0] z (scon[0])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/scon[1].d.asc b/test/bhns_eval/scon[1].d.asc
index b2cd07f..2185a8d 100644
--- a/test/bhns_eval/scon[1].d.asc
+++ b/test/bhns_eval/scon[1].d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sy d (sy)
+# scon[1] d (scon[1])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/scon[1].maximum.asc b/test/bhns_eval/scon[1].maximum.asc
index 91f974a..2c88c85 100644
--- a/test/bhns_eval/scon[1].maximum.asc
+++ b/test/bhns_eval/scon[1].maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sy (sy)
+# GRHYDRO::scon[1] (scon[1])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/scon[1].minimum.asc b/test/bhns_eval/scon[1].minimum.asc
index 91f974a..2c88c85 100644
--- a/test/bhns_eval/scon[1].minimum.asc
+++ b/test/bhns_eval/scon[1].minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sy (sy)
+# GRHYDRO::scon[1] (scon[1])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/scon[1].norm1.asc b/test/bhns_eval/scon[1].norm1.asc
index 91f974a..2c88c85 100644
--- a/test/bhns_eval/scon[1].norm1.asc
+++ b/test/bhns_eval/scon[1].norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sy (sy)
+# GRHYDRO::scon[1] (scon[1])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/scon[1].norm2.asc b/test/bhns_eval/scon[1].norm2.asc
index 91f974a..2c88c85 100644
--- a/test/bhns_eval/scon[1].norm2.asc
+++ b/test/bhns_eval/scon[1].norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sy (sy)
+# GRHYDRO::scon[1] (scon[1])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/scon[1].x.asc b/test/bhns_eval/scon[1].x.asc
index 2ecd912..e851b45 100644
--- a/test/bhns_eval/scon[1].x.asc
+++ b/test/bhns_eval/scon[1].x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sy x (sy)
+# scon[1] x (scon[1])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/scon[1].y.asc b/test/bhns_eval/scon[1].y.asc
index d3f0989..f8761ca 100644
--- a/test/bhns_eval/scon[1].y.asc
+++ b/test/bhns_eval/scon[1].y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sy y (sy)
+# scon[1] y (scon[1])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/scon[1].z.asc b/test/bhns_eval/scon[1].z.asc
index d9f9b56..241915a 100644
--- a/test/bhns_eval/scon[1].z.asc
+++ b/test/bhns_eval/scon[1].z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sy z (sy)
+# scon[1] z (scon[1])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/scon[2].d.asc b/test/bhns_eval/scon[2].d.asc
index e907f60..5d4ed0c 100644
--- a/test/bhns_eval/scon[2].d.asc
+++ b/test/bhns_eval/scon[2].d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sz d (sz)
+# scon[2] d (scon[2])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/scon[2].maximum.asc b/test/bhns_eval/scon[2].maximum.asc
index ab1bc22..924fd71 100644
--- a/test/bhns_eval/scon[2].maximum.asc
+++ b/test/bhns_eval/scon[2].maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sz (sz)
+# GRHYDRO::scon[2] (scon[2])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/scon[2].minimum.asc b/test/bhns_eval/scon[2].minimum.asc
index ab1bc22..924fd71 100644
--- a/test/bhns_eval/scon[2].minimum.asc
+++ b/test/bhns_eval/scon[2].minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sz (sz)
+# GRHYDRO::scon[2] (scon[2])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/scon[2].norm1.asc b/test/bhns_eval/scon[2].norm1.asc
index ab1bc22..924fd71 100644
--- a/test/bhns_eval/scon[2].norm1.asc
+++ b/test/bhns_eval/scon[2].norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sz (sz)
+# GRHYDRO::scon[2] (scon[2])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/scon[2].norm2.asc b/test/bhns_eval/scon[2].norm2.asc
index ab1bc22..924fd71 100644
--- a/test/bhns_eval/scon[2].norm2.asc
+++ b/test/bhns_eval/scon[2].norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sz (sz)
+# GRHYDRO::scon[2] (scon[2])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/scon[2].x.asc b/test/bhns_eval/scon[2].x.asc
index 08d6541..aeb00bb 100644
--- a/test/bhns_eval/scon[2].x.asc
+++ b/test/bhns_eval/scon[2].x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sz x (sz)
+# scon[2] x (scon[2])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/scon[2].y.asc b/test/bhns_eval/scon[2].y.asc
index 5c8356a..2306449 100644
--- a/test/bhns_eval/scon[2].y.asc
+++ b/test/bhns_eval/scon[2].y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sz y (sz)
+# scon[2] y (scon[2])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/scon[2].z.asc b/test/bhns_eval/scon[2].z.asc
index 2278789..f7acd05 100644
--- a/test/bhns_eval/scon[2].z.asc
+++ b/test/bhns_eval/scon[2].z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sz z (sz)
+# scon[2] z (scon[2])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/tau.d.asc b/test/bhns_eval/tau.d.asc
index 6f973a8..e097988 100644
--- a/test/bhns_eval/tau.d.asc
+++ b/test/bhns_eval/tau.d.asc
@@ -1,30 +1,50 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::tau d (tau)
+# tau d (tau)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 0 0 0 0 -60 0 0 1.08931237807278e-20
-0 0 0 0 0 512 512 512 0 -57 3 3 1.09837813909394e-20
-0 0 0 0 0 1024 1024 1024 0 -54 6 6 1.1059339404309e-20
-0 0 0 0 0 1536 1536 1536 0 -51 9 9 1.10998643730904e-20
-0 0 0 0 0 2048 2048 2048 0 -48 12 12 1.10913935578689e-20
-0 0 0 0 0 2560 2560 2560 0 -45 15 15 1.10370474494163e-20
-0 0 0 0 0 3072 3072 3072 0 -42 18 18 1.09543368389522e-20
-0 0 0 0 0 3584 3584 3584 0 -39 21 21 1.08623836288334e-20
-0 0 0 0 0 4096 4096 4096 0 -36 24 24 1.07737490113925e-20
-0 0 0 0 0 4608 4608 4608 0 -33 27 27 1.06941154751627e-20
-0 0 0 0 0 5120 5120 5120 0 -30 30 30 1.06249152026395e-20
-0 0 0 0 0 5632 5632 5632 0 -27 33 33 1.05655996089053e-20
-0 0 0 0 0 6144 6144 6144 0 -24 36 36 1.05149223095072e-20
-0 0 0 0 0 6656 6656 6656 0 -21 39 39 1.04715336778211e-20
-0 0 0 0 0 7168 7168 7168 0 -18 42 42 1.04342061445154e-20
-0 0 0 0 0 7680 7680 7680 0 -15 45 45 1.04018965325508e-20
-0 0 0 0 0 8192 8192 8192 0 -12 48 48 1.03737457345363e-20
-0 0 0 0 0 8704 8704 8704 0 -9 51 51 1.03490592467972e-20
-0 0 0 0 0 9216 9216 9216 0 -6 54 54 1.03272713724452e-20
-0 0 0 0 0 9728 9728 9728 0 -3 57 57 1.03079272992475e-20
-0 0 0 0 0 10240 10240 10240 0 0 60 60 1.02906574947792e-20
+0 0 0 0 0 0 0 0 0 -60 0 0 1.2712184355136e-20
+0 0 0 0 0 512 512 512 0 -57 3 3 1.28757027757186e-20
+0 0 0 0 0 1024 1024 1024 0 -54 6 6 1.30249458683862e-20
+0 0 0 0 0 1536 1536 1536 0 -51 9 9 1.31351628382475e-20
+0 0 0 0 0 2048 2048 2048 0 -48 12 12 1.31886920867548e-20
+0 0 0 0 0 2560 2560 2560 0 -45 15 15 1.31880991662766e-20
+0 0 0 0 0 3072 3072 3072 0 -42 18 18 1.31502572688395e-20
+0 0 0 0 0 3584 3584 3584 0 -39 21 21 1.30932399677101e-20
+0 0 0 0 0 4096 4096 4096 0 -36 24 24 1.30288151995719e-20
+0 0 0 0 0 4608 4608 4608 0 -33 27 27 1.29620914509421e-20
+0 0 0 0 0 5120 5120 5120 0 -30 30 30 1.28940978508251e-20
+0 0 0 0 0 5632 5632 5632 0 -27 33 33 1.28241687773217e-20
+0 0 0 0 0 6144 6144 6144 0 -24 36 36 1.27513898081141e-20
+0 0 0 0 0 6656 6656 6656 0 -21 39 39 1.26752326462096e-20
+0 0 0 0 0 7168 7168 7168 0 -18 42 42 1.2595721525415e-20
+0 0 0 0 0 7680 7680 7680 0 -15 45 45 1.25133459686321e-20
+0 0 0 0 0 8192 8192 8192 0 -12 48 48 1.24289153850149e-20
+0 0 0 0 0 8704 8704 8704 0 -9 51 51 1.23433991268437e-20
+0 0 0 0 0 9216 9216 9216 0 -6 54 54 1.22577972425544e-20
+0 0 0 0 0 9728 9728 9728 0 -3 57 57 1.21730290012262e-20
+0 0 0 0 0 10240 10240 10240 0 0 60 60 1.20898925029032e-20
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/tau.maximum.asc b/test/bhns_eval/tau.maximum.asc
index 5d7185a..f2d1c34 100644
--- a/test/bhns_eval/tau.maximum.asc
+++ b/test/bhns_eval/tau.maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::tau (tau)
+# GRHYDRO::tau (tau)
# 1:iteration 2:time 3:data
-0 0 3.1338043548658e-05
+0 0 3.13380435486578e-05
diff --git a/test/bhns_eval/tau.minimum.asc b/test/bhns_eval/tau.minimum.asc
index 571ad3e..8c1e46a 100644
--- a/test/bhns_eval/tau.minimum.asc
+++ b/test/bhns_eval/tau.minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::tau (tau)
+# GRHYDRO::tau (tau)
# 1:iteration 2:time 3:data
-0 0 1.02107951794206e-20
+0 0 1.1567938305208e-20
diff --git a/test/bhns_eval/tau.norm1.asc b/test/bhns_eval/tau.norm1.asc
index 3d64823..0d718ee 100644
--- a/test/bhns_eval/tau.norm1.asc
+++ b/test/bhns_eval/tau.norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::tau (tau)
+# GRHYDRO::tau (tau)
# 1:iteration 2:time 3:data
-0 0 9.27866369664543e-09
+0 0 9.27866369665749e-09
diff --git a/test/bhns_eval/tau.norm2.asc b/test/bhns_eval/tau.norm2.asc
index 418504d..ac13eb0 100644
--- a/test/bhns_eval/tau.norm2.asc
+++ b/test/bhns_eval/tau.norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::tau (tau)
+# GRHYDRO::tau (tau)
# 1:iteration 2:time 3:data
0 0 3.36858371597692e-07
diff --git a/test/bhns_eval/tau.x.asc b/test/bhns_eval/tau.x.asc
index d20b5b3..bccfaec 100644
--- a/test/bhns_eval/tau.x.asc
+++ b/test/bhns_eval/tau.x.asc
@@ -1,50 +1,50 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::tau x (tau)
+# tau x (tau)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 0 0 0 0 -60 0 0 1.08931237807278e-20
-0 0 0 0 0 512 0 0 0 -57 0 0 1.0996334983386e-20
-0 0 0 0 0 1024 0 0 0 -54 0 0 1.11264949556768e-20
-0 0 0 0 0 1536 0 0 0 -51 0 0 1.12957267865625e-20
-0 0 0 0 0 2048 0 0 0 -48 0 0 1.1524701087484e-20
-0 0 0 0 0 2560 0 0 0 -45 0 0 1.18517537531991e-20
-0 0 0 0 0 3072 0 0 0 -42 0 0 1.23568116073781e-20
-0 0 0 0 0 3584 0 0 0 -39 0 0 3.07638002418982e-07
-0 0 0 0 0 4096 0 0 0 -36 0 0 6.0919771599533e-06
+0 0 0 0 0 0 0 0 0 -60 0 0 1.2712184355136e-20
+0 0 0 0 0 512 0 0 0 -57 0 0 1.28912802668636e-20
+0 0 0 0 0 1024 0 0 0 -54 0 0 1.31071210923645e-20
+0 0 0 0 0 1536 0 0 0 -51 0 0 1.33703664755481e-20
+0 0 0 0 0 2048 0 0 0 -48 0 0 1.3696926718509e-20
+0 0 0 0 0 2560 0 0 0 -45 0 0 1.41241978166353e-20
+0 0 0 0 0 3072 0 0 0 -42 0 0 1.4754501365465e-20
+0 0 0 0 0 3584 0 0 0 -39 0 0 3.07638002418985e-07
+0 0 0 0 0 4096 0 0 0 -36 0 0 6.09197715995333e-06
0 0 0 0 0 4608 0 0 0 -33 0 0 2.12791017300217e-05
-0 0 0 0 0 5120 0 0 0 -30 0 0 3.1338043548658e-05
+0 0 0 0 0 5120 0 0 0 -30 0 0 3.13380435486578e-05
0 0 0 0 0 5632 0 0 0 -27 0 0 2.0541827010189e-05
-0 0 0 0 0 6144 0 0 0 -24 0 0 5.70219976190447e-06
-0 0 0 0 0 6656 0 0 0 -21 0 0 2.75609895056238e-07
-0 0 0 0 0 7168 0 0 0 -18 0 0 1.23568116073781e-20
-0 0 0 0 0 7680 0 0 0 -15 0 0 1.18517537531991e-20
-0 0 0 0 0 8192 0 0 0 -12 0 0 1.1524701087484e-20
-0 0 0 0 0 8704 0 0 0 -9 0 0 1.12957267865625e-20
-0 0 0 0 0 9216 0 0 0 -6 0 0 1.11264949556768e-20
-0 0 0 0 0 9728 0 0 0 -3 0 0 1.0996334983386e-20
-0 0 0 0 0 10240 0 0 0 0 0 0 1.08931237807278e-20
-0 0 0 0 0 10752 0 0 0 3 0 0 1.08092789626203e-20
-0 0 0 0 0 11264 0 0 0 6 0 0 1.07398215845509e-20
-0 0 0 0 0 11776 0 0 0 9 0 0 1.06813392740572e-20
-0 0 0 0 0 12288 0 0 0 12 0 0 1.06314237492363e-20
-0 0 0 0 0 12800 0 0 0 15 0 0 1.05883195760594e-20
-0 0 0 0 0 13312 0 0 0 18 0 0 1.05507241968662e-20
-0 0 0 0 0 13824 0 0 0 21 0 0 1.05176436524383e-20
-0 0 0 0 0 14336 0 0 0 24 0 0 1.04883124731738e-20
-0 0 0 0 0 14848 0 0 0 27 0 0 1.04621259845672e-20
-0 0 0 0 0 15360 0 0 0 30 0 0 1.04386037364062e-20
-0 0 0 0 0 15872 0 0 0 33 0 0 1.04173609767727e-20
-0 0 0 0 0 16384 0 0 0 36 0 0 1.03980807090115e-20
-0 0 0 0 0 16896 0 0 0 39 0 0 1.03805027249866e-20
-0 0 0 0 0 17408 0 0 0 42 0 0 1.03644103277627e-20
-0 0 0 0 0 17920 0 0 0 45 0 0 1.03496244632692e-20
-0 0 0 0 0 18432 0 0 0 48 0 0 1.03359921910983e-20
-0 0 0 0 0 18944 0 0 0 51 0 0 1.03233818330097e-20
-0 0 0 0 0 19456 0 0 0 54 0 0 1.03116841538564e-20
-0 0 0 0 0 19968 0 0 0 57 0 0 1.03008039499599e-20
-0 0 0 0 0 20480 0 0 0 60 0 0 1.02906574947792e-20
+0 0 0 0 0 6144 0 0 0 -24 0 0 5.70219976190451e-06
+0 0 0 0 0 6656 0 0 0 -21 0 0 2.75609895056232e-07
+0 0 0 0 0 7168 0 0 0 -18 0 0 1.62016635406494e-20
+0 0 0 0 0 7680 0 0 0 -15 0 0 1.5958643692795e-20
+0 0 0 0 0 8192 0 0 0 -12 0 0 1.59656294915619e-20
+0 0 0 0 0 8704 0 0 0 -9 0 0 1.61169259954767e-20
+0 0 0 0 0 9216 0 0 0 -6 0 0 1.63842604296962e-20
+0 0 0 0 0 9728 0 0 0 -3 0 0 1.67834752416553e-20
+0 0 0 0 0 10240 0 0 0 0 0 0 1.7351431667401e-20
+0 0 0 0 0 10752 0 0 0 3 0 0 1.81389690028626e-20
+0 0 0 0 0 11264 0 0 0 6 0 0 1.92210407975299e-20
+0 0 0 0 0 11776 0 0 0 9 0 0 2.07287745655381e-20
+0 0 0 0 0 12288 0 0 0 12 0 0 2.29214074183917e-20
+0 0 0 0 0 12800 0 0 0 15 0 0 2.63578549562351e-20
+0 0 0 0 0 13312 0 0 0 18 0 0 3.23944995131992e-20
+0 0 0 0 0 13824 0 0 0 21 0 0 4.51237363905334e-20
+0 0 0 0 0 14336 0 0 0 24 0 0 8.33655627291728e-20
+0 0 0 0 0 14848 0 0 0 27 0 0 3.88276718376013e-19
+0 0 0 0 0 15360 0 0 0 30 0 0 1.79822685952144e-16
+0 0 0 0 0 15872 0 0 0 33 0 0 3.87525328187085e-19
+0 0 0 0 0 16384 0 0 0 36 0 0 8.28882019675473e-20
+0 0 0 0 0 16896 0 0 0 39 0 0 4.46972666236254e-20
+0 0 0 0 0 17408 0 0 0 42 0 0 3.19763015524168e-20
+0 0 0 0 0 17920 0 0 0 45 0 0 2.5901386967425e-20
+0 0 0 0 0 18432 0 0 0 48 0 0 2.24056053765023e-20
+0 0 0 0 0 18944 0 0 0 51 0 0 2.01526400377206e-20
+0 0 0 0 0 19456 0 0 0 54 0 0 1.85863476984573e-20
+0 0 0 0 0 19968 0 0 0 57 0 0 1.74369414632237e-20
+0 0 0 0 0 20480 0 0 0 60 0 0 1.65586792166712e-20
diff --git a/test/bhns_eval/tau.y.asc b/test/bhns_eval/tau.y.asc
index c602596..8a86e60 100644
--- a/test/bhns_eval/tau.y.asc
+++ b/test/bhns_eval/tau.y.asc
@@ -1,30 +1,30 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::tau y (tau)
+# tau y (tau)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 10240 0 0 0 0 0 0 1.08931237807278e-20
-0 0 0 0 0 10240 512 0 0 0 3 0 1.0888533265014e-20
-0 0 0 0 0 10240 1024 0 0 0 6 0 1.08751690241128e-20
-0 0 0 0 0 10240 1536 0 0 0 9 0 1.08541608677681e-20
-0 0 0 0 0 10240 2048 0 0 0 12 0 1.08271139669945e-20
-0 0 0 0 0 10240 2560 0 0 0 15 0 1.07958056151562e-20
-0 0 0 0 0 10240 3072 0 0 0 18 0 1.07619305189804e-20
-0 0 0 0 0 10240 3584 0 0 0 21 0 1.07269329250125e-20
-0 0 0 0 0 10240 4096 0 0 0 24 0 1.06919369063997e-20
-0 0 0 0 0 10240 4608 0 0 0 27 0 1.06577526690459e-20
-0 0 0 0 0 10240 5120 0 0 0 30 0 1.06249152026395e-20
-0 0 0 0 0 10240 5632 0 0 0 33 0 1.05937493356467e-20
-0 0 0 0 0 10240 6144 0 0 0 36 0 1.0564412588602e-20
-0 0 0 0 0 10240 6656 0 0 0 39 0 1.05369563636819e-20
-0 0 0 0 0 10240 7168 0 0 0 42 0 1.05113583369116e-20
-0 0 0 0 0 10240 7680 0 0 0 45 0 1.04875460648277e-20
-0 0 0 0 0 10240 8192 0 0 0 48 0 1.04654212529947e-20
-0 0 0 0 0 10240 8704 0 0 0 51 0 1.04448754645927e-20
-0 0 0 0 0 10240 9216 0 0 0 54 0 1.04257902198134e-20
-0 0 0 0 0 10240 9728 0 0 0 57 0 1.04080542908468e-20
-0 0 0 0 0 10240 10240 0 0 0 60 0 1.03915567180959e-20
+0 0 0 0 0 10240 0 0 0 0 0 0 1.7351431667401e-20
+0 0 0 0 0 10240 512 0 0 0 3 0 1.73062630823116e-20
+0 0 0 0 0 10240 1024 0 0 0 6 0 1.71763440273525e-20
+0 0 0 0 0 10240 1536 0 0 0 9 0 1.69740595934921e-20
+0 0 0 0 0 10240 2048 0 0 0 12 0 1.67166997942373e-20
+0 0 0 0 0 10240 2560 0 0 0 15 0 1.64211862892284e-20
+0 0 0 0 0 10240 3072 0 0 0 18 0 1.61032387412784e-20
+0 0 0 0 0 10240 3584 0 0 0 21 0 1.57775686868283e-20
+0 0 0 0 0 10240 4096 0 0 0 24 0 1.54559440625615e-20
+0 0 0 0 0 10240 4608 0 0 0 27 0 1.51462230842972e-20
+0 0 0 0 0 10240 5120 0 0 0 30 0 1.48529455518817e-20
+0 0 0 0 0 10240 5632 0 0 0 33 0 1.45783312820369e-20
+0 0 0 0 0 10240 6144 0 0 0 36 0 1.43231202136701e-20
+0 0 0 0 0 10240 6656 0 0 0 39 0 1.40871007048669e-20
+0 0 0 0 0 10240 7168 0 0 0 42 0 1.38694908114543e-20
+0 0 0 0 0 10240 7680 0 0 0 45 0 1.36691790094844e-20
+0 0 0 0 0 10240 8192 0 0 0 48 0 1.34848906007084e-20
+0 0 0 0 0 10240 8704 0 0 0 51 0 1.33153072660251e-20
+0 0 0 0 0 10240 9216 0 0 0 54 0 1.31591381513145e-20
+0 0 0 0 0 10240 9728 0 0 0 57 0 1.30151554103548e-20
+0 0 0 0 0 10240 10240 0 0 0 60 0 1.28822216698039e-20
diff --git a/test/bhns_eval/tau.z.asc b/test/bhns_eval/tau.z.asc
index 1a1aeab..b4cf7c8 100644
--- a/test/bhns_eval/tau.z.asc
+++ b/test/bhns_eval/tau.z.asc
@@ -1,30 +1,30 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::tau z (tau)
+# tau z (tau)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 10240 0 0 0 0 0 0 1.08931237807278e-20
-0 0 0 0 0 10240 0 512 0 0 0 3 1.0888533265014e-20
-0 0 0 0 0 10240 0 1024 0 0 0 6 1.08751690241128e-20
-0 0 0 0 0 10240 0 1536 0 0 0 9 1.08541608677681e-20
-0 0 0 0 0 10240 0 2048 0 0 0 12 1.08271139669945e-20
-0 0 0 0 0 10240 0 2560 0 0 0 15 1.07958056151562e-20
-0 0 0 0 0 10240 0 3072 0 0 0 18 1.07619305189804e-20
-0 0 0 0 0 10240 0 3584 0 0 0 21 1.07269329250125e-20
-0 0 0 0 0 10240 0 4096 0 0 0 24 1.06919369063997e-20
-0 0 0 0 0 10240 0 4608 0 0 0 27 1.06577526690459e-20
-0 0 0 0 0 10240 0 5120 0 0 0 30 1.06249152026395e-20
-0 0 0 0 0 10240 0 5632 0 0 0 33 1.05937493356467e-20
-0 0 0 0 0 10240 0 6144 0 0 0 36 1.0564412588602e-20
-0 0 0 0 0 10240 0 6656 0 0 0 39 1.05369563636819e-20
-0 0 0 0 0 10240 0 7168 0 0 0 42 1.05113583369116e-20
-0 0 0 0 0 10240 0 7680 0 0 0 45 1.04875460648277e-20
-0 0 0 0 0 10240 0 8192 0 0 0 48 1.04654212529947e-20
-0 0 0 0 0 10240 0 8704 0 0 0 51 1.04448754645927e-20
-0 0 0 0 0 10240 0 9216 0 0 0 54 1.04257902198134e-20
-0 0 0 0 0 10240 0 9728 0 0 0 57 1.04080542908468e-20
-0 0 0 0 0 10240 0 10240 0 0 0 60 1.03915567180959e-20
+0 0 0 0 0 10240 0 0 0 0 0 0 1.7351431667401e-20
+0 0 0 0 0 10240 0 512 0 0 0 3 1.73062630823116e-20
+0 0 0 0 0 10240 0 1024 0 0 0 6 1.71763440273525e-20
+0 0 0 0 0 10240 0 1536 0 0 0 9 1.69740595934921e-20
+0 0 0 0 0 10240 0 2048 0 0 0 12 1.67166997942373e-20
+0 0 0 0 0 10240 0 2560 0 0 0 15 1.64211895204027e-20
+0 0 0 0 0 10240 0 3072 0 0 0 18 1.61032387412784e-20
+0 0 0 0 0 10240 0 3584 0 0 0 21 1.57775686868283e-20
+0 0 0 0 0 10240 0 4096 0 0 0 24 1.54559440625615e-20
+0 0 0 0 0 10240 0 4608 0 0 0 27 1.51462230842972e-20
+0 0 0 0 0 10240 0 5120 0 0 0 30 1.48529455518817e-20
+0 0 0 0 0 10240 0 5632 0 0 0 33 1.45783312820369e-20
+0 0 0 0 0 10240 0 6144 0 0 0 36 1.43231202136701e-20
+0 0 0 0 0 10240 0 6656 0 0 0 39 1.40871007048669e-20
+0 0 0 0 0 10240 0 7168 0 0 0 42 1.38694908114543e-20
+0 0 0 0 0 10240 0 7680 0 0 0 45 1.36691790094844e-20
+0 0 0 0 0 10240 0 8192 0 0 0 48 1.34848906007084e-20
+0 0 0 0 0 10240 0 8704 0 0 0 51 1.33153072660251e-20
+0 0 0 0 0 10240 0 9216 0 0 0 54 1.31591381513145e-20
+0 0 0 0 0 10240 0 9728 0 0 0 57 1.30151554103548e-20
+0 0 0 0 0 10240 0 10240 0 0 0 60 1.28822216698039e-20
diff --git a/test/bhns_eval/vel[0].d.asc b/test/bhns_eval/vel[0].d.asc
index 8af059d..e1c7694 100644
--- a/test/bhns_eval/vel[0].d.asc
+++ b/test/bhns_eval/vel[0].d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::velx d (velx)
+# vel[0] d (vel[0])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/vel[0].maximum.asc b/test/bhns_eval/vel[0].maximum.asc
index 3b6b5e5..f217a8b 100644
--- a/test/bhns_eval/vel[0].maximum.asc
+++ b/test/bhns_eval/vel[0].maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::velx (velx)
+# HYDROBASE::vel[0] (vel[0])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/vel[0].minimum.asc b/test/bhns_eval/vel[0].minimum.asc
index 3b6b5e5..f217a8b 100644
--- a/test/bhns_eval/vel[0].minimum.asc
+++ b/test/bhns_eval/vel[0].minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::velx (velx)
+# HYDROBASE::vel[0] (vel[0])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/vel[0].norm1.asc b/test/bhns_eval/vel[0].norm1.asc
index 3b6b5e5..f217a8b 100644
--- a/test/bhns_eval/vel[0].norm1.asc
+++ b/test/bhns_eval/vel[0].norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::velx (velx)
+# HYDROBASE::vel[0] (vel[0])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/vel[0].norm2.asc b/test/bhns_eval/vel[0].norm2.asc
index 3b6b5e5..f217a8b 100644
--- a/test/bhns_eval/vel[0].norm2.asc
+++ b/test/bhns_eval/vel[0].norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::velx (velx)
+# HYDROBASE::vel[0] (vel[0])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/vel[0].x.asc b/test/bhns_eval/vel[0].x.asc
index 2701e4c..0cf14da 100644
--- a/test/bhns_eval/vel[0].x.asc
+++ b/test/bhns_eval/vel[0].x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::velx x (velx)
+# vel[0] x (vel[0])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/vel[0].y.asc b/test/bhns_eval/vel[0].y.asc
index 8977239..0d9ccb5 100644
--- a/test/bhns_eval/vel[0].y.asc
+++ b/test/bhns_eval/vel[0].y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::velx y (velx)
+# vel[0] y (vel[0])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/vel[0].z.asc b/test/bhns_eval/vel[0].z.asc
index 315fccc..02fb80a 100644
--- a/test/bhns_eval/vel[0].z.asc
+++ b/test/bhns_eval/vel[0].z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::velx z (velx)
+# vel[0] z (vel[0])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/vel[1].d.asc b/test/bhns_eval/vel[1].d.asc
index dcfe4bb..4b46c5a 100644
--- a/test/bhns_eval/vel[1].d.asc
+++ b/test/bhns_eval/vel[1].d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::vely d (vely)
+# vel[1] d (vel[1])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/vel[1].maximum.asc b/test/bhns_eval/vel[1].maximum.asc
index 189b739..3caed43 100644
--- a/test/bhns_eval/vel[1].maximum.asc
+++ b/test/bhns_eval/vel[1].maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::vely (vely)
+# HYDROBASE::vel[1] (vel[1])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/vel[1].minimum.asc b/test/bhns_eval/vel[1].minimum.asc
index 189b739..3caed43 100644
--- a/test/bhns_eval/vel[1].minimum.asc
+++ b/test/bhns_eval/vel[1].minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::vely (vely)
+# HYDROBASE::vel[1] (vel[1])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/vel[1].norm1.asc b/test/bhns_eval/vel[1].norm1.asc
index 189b739..3caed43 100644
--- a/test/bhns_eval/vel[1].norm1.asc
+++ b/test/bhns_eval/vel[1].norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::vely (vely)
+# HYDROBASE::vel[1] (vel[1])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/vel[1].norm2.asc b/test/bhns_eval/vel[1].norm2.asc
index 189b739..3caed43 100644
--- a/test/bhns_eval/vel[1].norm2.asc
+++ b/test/bhns_eval/vel[1].norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::vely (vely)
+# HYDROBASE::vel[1] (vel[1])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/vel[1].x.asc b/test/bhns_eval/vel[1].x.asc
index 3e3a027..f69b76f 100644
--- a/test/bhns_eval/vel[1].x.asc
+++ b/test/bhns_eval/vel[1].x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::vely x (vely)
+# vel[1] x (vel[1])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/vel[1].y.asc b/test/bhns_eval/vel[1].y.asc
index 66c936c..a6c4a04 100644
--- a/test/bhns_eval/vel[1].y.asc
+++ b/test/bhns_eval/vel[1].y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::vely y (vely)
+# vel[1] y (vel[1])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/vel[1].z.asc b/test/bhns_eval/vel[1].z.asc
index e01fcd6..e5e56be 100644
--- a/test/bhns_eval/vel[1].z.asc
+++ b/test/bhns_eval/vel[1].z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::vely z (vely)
+# vel[1] z (vel[1])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/vel[2].d.asc b/test/bhns_eval/vel[2].d.asc
index d239a31..839f588 100644
--- a/test/bhns_eval/vel[2].d.asc
+++ b/test/bhns_eval/vel[2].d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::velz d (velz)
+# vel[2] d (vel[2])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/vel[2].maximum.asc b/test/bhns_eval/vel[2].maximum.asc
index 6217851..6993feb 100644
--- a/test/bhns_eval/vel[2].maximum.asc
+++ b/test/bhns_eval/vel[2].maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::velz (velz)
+# HYDROBASE::vel[2] (vel[2])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/vel[2].minimum.asc b/test/bhns_eval/vel[2].minimum.asc
index 6217851..6993feb 100644
--- a/test/bhns_eval/vel[2].minimum.asc
+++ b/test/bhns_eval/vel[2].minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::velz (velz)
+# HYDROBASE::vel[2] (vel[2])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/vel[2].norm1.asc b/test/bhns_eval/vel[2].norm1.asc
index 6217851..6993feb 100644
--- a/test/bhns_eval/vel[2].norm1.asc
+++ b/test/bhns_eval/vel[2].norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::velz (velz)
+# HYDROBASE::vel[2] (vel[2])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/vel[2].norm2.asc b/test/bhns_eval/vel[2].norm2.asc
index 6217851..6993feb 100644
--- a/test/bhns_eval/vel[2].norm2.asc
+++ b/test/bhns_eval/vel[2].norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::velz (velz)
+# HYDROBASE::vel[2] (vel[2])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_eval/vel[2].x.asc b/test/bhns_eval/vel[2].x.asc
index e0a8e30..d52f5d8 100644
--- a/test/bhns_eval/vel[2].x.asc
+++ b/test/bhns_eval/vel[2].x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::velz x (velz)
+# vel[2] x (vel[2])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/vel[2].y.asc b/test/bhns_eval/vel[2].y.asc
index 879b50f..bb44a40 100644
--- a/test/bhns_eval/vel[2].y.asc
+++ b/test/bhns_eval/vel[2].y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::velz y (velz)
+# vel[2] y (vel[2])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/vel[2].z.asc b/test/bhns_eval/vel[2].z.asc
index 564c594..33a2832 100644
--- a/test/bhns_eval/vel[2].z.asc
+++ b/test/bhns_eval/vel[2].z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::velz z (velz)
+# vel[2] z (vel[2])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/w_lorentz.d.asc b/test/bhns_eval/w_lorentz.d.asc
index ad1bb31..e0a8c4d 100644
--- a/test/bhns_eval/w_lorentz.d.asc
+++ b/test/bhns_eval/w_lorentz.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::w_lorentz d (w_lorentz)
+# w_lorentz d (w_lorentz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 1
0 0 0 0 0 9728 9728 9728 0 -3 57 57 1
0 0 0 0 0 10240 10240 10240 0 0 60 60 1
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_eval/w_lorentz.maximum.asc b/test/bhns_eval/w_lorentz.maximum.asc
index c0cb89c..7ba38a8 100644
--- a/test/bhns_eval/w_lorentz.maximum.asc
+++ b/test/bhns_eval/w_lorentz.maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::w_lorentz (w_lorentz)
+# GRHYDRO::w_lorentz (w_lorentz)
# 1:iteration 2:time 3:data
0 0 1
diff --git a/test/bhns_eval/w_lorentz.minimum.asc b/test/bhns_eval/w_lorentz.minimum.asc
index c0cb89c..7ba38a8 100644
--- a/test/bhns_eval/w_lorentz.minimum.asc
+++ b/test/bhns_eval/w_lorentz.minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::w_lorentz (w_lorentz)
+# GRHYDRO::w_lorentz (w_lorentz)
# 1:iteration 2:time 3:data
0 0 1
diff --git a/test/bhns_eval/w_lorentz.norm1.asc b/test/bhns_eval/w_lorentz.norm1.asc
index c0cb89c..7ba38a8 100644
--- a/test/bhns_eval/w_lorentz.norm1.asc
+++ b/test/bhns_eval/w_lorentz.norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::w_lorentz (w_lorentz)
+# GRHYDRO::w_lorentz (w_lorentz)
# 1:iteration 2:time 3:data
0 0 1
diff --git a/test/bhns_eval/w_lorentz.norm2.asc b/test/bhns_eval/w_lorentz.norm2.asc
index c0cb89c..7ba38a8 100644
--- a/test/bhns_eval/w_lorentz.norm2.asc
+++ b/test/bhns_eval/w_lorentz.norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::w_lorentz (w_lorentz)
+# GRHYDRO::w_lorentz (w_lorentz)
# 1:iteration 2:time 3:data
0 0 1
diff --git a/test/bhns_eval/w_lorentz.x.asc b/test/bhns_eval/w_lorentz.x.asc
index d1eb0cc..78d8520 100644
--- a/test/bhns_eval/w_lorentz.x.asc
+++ b/test/bhns_eval/w_lorentz.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::w_lorentz x (w_lorentz)
+# w_lorentz x (w_lorentz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/w_lorentz.y.asc b/test/bhns_eval/w_lorentz.y.asc
index cefe4b5..802748e 100644
--- a/test/bhns_eval/w_lorentz.y.asc
+++ b/test/bhns_eval/w_lorentz.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::w_lorentz y (w_lorentz)
+# w_lorentz y (w_lorentz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_eval/w_lorentz.z.asc b/test/bhns_eval/w_lorentz.z.asc
index cd13ec8..a0c273b 100644
--- a/test/bhns_eval/w_lorentz.z.asc
+++ b/test/bhns_eval/w_lorentz.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::w_lorentz z (w_lorentz)
+# w_lorentz z (w_lorentz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/alp.d.asc b/test/bhns_interp/alp.d.asc
index aa6bef4..a40679c 100644
--- a/test/bhns_interp/alp.d.asc
+++ b/test/bhns_interp/alp.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::alp d (alp)
+# alp d (alp)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0.989294409117129
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0.989916099066487
0 0 0 0 0 10240 10240 10240 0 0 60 60 0.990472335219736
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/alp.x.asc b/test/bhns_interp/alp.x.asc
index b9133bd..457abf9 100644
--- a/test/bhns_interp/alp.x.asc
+++ b/test/bhns_interp/alp.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::alp x (alp)
+# alp x (alp)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/alp.y.asc b/test/bhns_interp/alp.y.asc
index 93e763e..50d90be 100644
--- a/test/bhns_interp/alp.y.asc
+++ b/test/bhns_interp/alp.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::alp y (alp)
+# alp y (alp)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/alp.z.asc b/test/bhns_interp/alp.z.asc
index 8c3197c..30a1863 100644
--- a/test/bhns_interp/alp.z.asc
+++ b/test/bhns_interp/alp.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::alp z (alp)
+# alp z (alp)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/betax.d.asc b/test/bhns_interp/betax.d.asc
index 751773b..2cb0496 100644
--- a/test/bhns_interp/betax.d.asc
+++ b/test/bhns_interp/betax.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betax d (betax)
+# betax d (betax)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/betax.x.asc b/test/bhns_interp/betax.x.asc
index f1ee303..72d4b13 100644
--- a/test/bhns_interp/betax.x.asc
+++ b/test/bhns_interp/betax.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betax x (betax)
+# betax x (betax)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/betax.y.asc b/test/bhns_interp/betax.y.asc
index 6c865a4..94e9ec8 100644
--- a/test/bhns_interp/betax.y.asc
+++ b/test/bhns_interp/betax.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betax y (betax)
+# betax y (betax)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/betax.z.asc b/test/bhns_interp/betax.z.asc
index d0378f8..5d93306 100644
--- a/test/bhns_interp/betax.z.asc
+++ b/test/bhns_interp/betax.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betax z (betax)
+# betax z (betax)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/betay.d.asc b/test/bhns_interp/betay.d.asc
index 812a381..b9cdd1f 100644
--- a/test/bhns_interp/betay.d.asc
+++ b/test/bhns_interp/betay.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betay d (betay)
+# betay d (betay)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/betay.x.asc b/test/bhns_interp/betay.x.asc
index d8735b5..abedc44 100644
--- a/test/bhns_interp/betay.x.asc
+++ b/test/bhns_interp/betay.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betay x (betay)
+# betay x (betay)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/betay.y.asc b/test/bhns_interp/betay.y.asc
index b98c5a6..66f90e2 100644
--- a/test/bhns_interp/betay.y.asc
+++ b/test/bhns_interp/betay.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betay y (betay)
+# betay y (betay)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/betay.z.asc b/test/bhns_interp/betay.z.asc
index 476998e..289248a 100644
--- a/test/bhns_interp/betay.z.asc
+++ b/test/bhns_interp/betay.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betay z (betay)
+# betay z (betay)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/betaz.d.asc b/test/bhns_interp/betaz.d.asc
index e1f1f65..9b366e2 100644
--- a/test/bhns_interp/betaz.d.asc
+++ b/test/bhns_interp/betaz.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betaz d (betaz)
+# betaz d (betaz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/betaz.x.asc b/test/bhns_interp/betaz.x.asc
index b3b74de..4df8a82 100644
--- a/test/bhns_interp/betaz.x.asc
+++ b/test/bhns_interp/betaz.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betaz x (betaz)
+# betaz x (betaz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/betaz.y.asc b/test/bhns_interp/betaz.y.asc
index 66b840f..3e2f934 100644
--- a/test/bhns_interp/betaz.y.asc
+++ b/test/bhns_interp/betaz.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betaz y (betaz)
+# betaz y (betaz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/betaz.z.asc b/test/bhns_interp/betaz.z.asc
index b256cf5..9019378 100644
--- a/test/bhns_interp/betaz.z.asc
+++ b/test/bhns_interp/betaz.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::betaz z (betaz)
+# betaz z (betaz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/dens.d.asc b/test/bhns_interp/dens.d.asc
index 92b44d7..38d0115 100644
--- a/test/bhns_interp/dens.d.asc
+++ b/test/bhns_interp/dens.d.asc
@@ -1,30 +1,50 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::dens d (dens)
+# dens d (dens)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 0 0 0 0 -60 0 0 1.0893123990595e-11
-0 0 0 0 0 512 512 512 0 -57 3 3 1.09837814425253e-11
-0 0 0 0 0 1024 1024 1024 0 -54 6 6 1.10593401613487e-11
-0 0 0 0 0 1536 1536 1536 0 -51 9 9 1.10998648956504e-11
-0 0 0 0 0 2048 2048 2048 0 -48 12 12 1.1091393427902e-11
-0 0 0 0 0 2560 2560 2560 0 -45 15 15 1.10370480030931e-11
-0 0 0 0 0 3072 3072 3072 0 -42 18 18 1.09543372184737e-11
-0 0 0 0 0 3584 3584 3584 0 -39 21 21 1.08623828458719e-11
-0 0 0 0 0 4096 4096 4096 0 -36 24 24 1.07737483806858e-11
-0 0 0 0 0 4608 4608 4608 0 -33 27 27 1.06941158398531e-11
-0 0 0 0 0 5120 5120 5120 0 -30 30 30 1.06249156864766e-11
-0 0 0 0 0 5632 5632 5632 0 -27 33 33 1.05655992605998e-11
-0 0 0 0 0 6144 6144 6144 0 -24 36 36 1.05149221976621e-11
-0 0 0 0 0 6656 6656 6656 0 -21 39 39 1.04715340592872e-11
-0 0 0 0 0 7168 7168 7168 0 -18 42 42 1.04342061308779e-11
-0 0 0 0 0 7680 7680 7680 0 -15 45 45 1.04018958730354e-11
-0 0 0 0 0 8192 8192 8192 0 -12 48 48 1.03737455800405e-11
-0 0 0 0 0 8704 8704 8704 0 -9 51 51 1.03490586906095e-11
-0 0 0 0 0 9216 9216 9216 0 -6 54 54 1.032727166758e-11
-0 0 0 0 0 9728 9728 9728 0 -3 57 57 1.03079280928467e-11
-0 0 0 0 0 10240 10240 10240 0 0 60 60 1.02906569014668e-11
+0 0 0 0 0 0 0 0 0 -60 0 0 1.27107456228047e-11
+0 0 0 0 0 512 512 512 0 -57 3 3 1.28754817223795e-11
+0 0 0 0 0 1024 1024 1024 0 -54 6 6 1.30249650143851e-11
+0 0 0 0 0 1536 1536 1536 0 -51 9 9 1.31352631641404e-11
+0 0 0 0 0 2048 2048 2048 0 -48 12 12 1.31886353730701e-11
+0 0 0 0 0 2560 2560 2560 0 -45 15 15 1.3187789060958e-11
+0 0 0 0 0 3072 3072 3072 0 -42 18 18 1.31503421199525e-11
+0 0 0 0 0 3584 3584 3584 0 -39 21 21 1.30933169993029e-11
+0 0 0 0 0 4096 4096 4096 0 -36 24 24 1.30288129922775e-11
+0 0 0 0 0 4608 4608 4608 0 -33 27 27 1.29619854304093e-11
+0 0 0 0 0 5120 5120 5120 0 -30 30 30 1.28942604185843e-11
+0 0 0 0 0 5632 5632 5632 0 -27 33 33 1.28241923153087e-11
+0 0 0 0 0 6144 6144 6144 0 -24 36 36 1.27513757541306e-11
+0 0 0 0 0 6656 6656 6656 0 -21 39 39 1.26749607160383e-11
+0 0 0 0 0 7168 7168 7168 0 -18 42 42 1.25958319652938e-11
+0 0 0 0 0 7680 7680 7680 0 -15 45 45 1.25133606204239e-11
+0 0 0 0 0 8192 8192 8192 0 -12 48 48 1.24289345608522e-11
+0 0 0 0 0 8704 8704 8704 0 -9 51 51 1.23434034837824e-11
+0 0 0 0 0 9216 9216 9216 0 -6 54 54 1.22577616057357e-11
+0 0 0 0 0 9728 9728 9728 0 -3 57 57 1.2172993702566e-11
+0 0 0 0 0 10240 10240 10240 0 0 60 60 1.20899207625086e-11
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/dens.maximum.asc b/test/bhns_interp/dens.maximum.asc
index 809b050..2f990a9 100644
--- a/test/bhns_interp/dens.maximum.asc
+++ b/test/bhns_interp/dens.maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::dens (dens)
+# GRHYDRO::dens (dens)
# 1:iteration 2:time 3:data
-0 0 0.000791711746940172
+0 0 0.000791711746940171
diff --git a/test/bhns_interp/dens.minimum.asc b/test/bhns_interp/dens.minimum.asc
index 49149af..d8552ad 100644
--- a/test/bhns_interp/dens.minimum.asc
+++ b/test/bhns_interp/dens.minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::dens (dens)
+# GRHYDRO::dens (dens)
# 1:iteration 2:time 3:data
-0 0 1.02107952609138e-11
+0 0 1.15679807416404e-11
diff --git a/test/bhns_interp/dens.norm1.asc b/test/bhns_interp/dens.norm1.asc
index 3fd10bc..b3505fa 100644
--- a/test/bhns_interp/dens.norm1.asc
+++ b/test/bhns_interp/dens.norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::dens (dens)
+# GRHYDRO::dens (dens)
# 1:iteration 2:time 3:data
-0 0 4.88975439012083e-07
+0 0 4.88981668127992e-07
diff --git a/test/bhns_interp/dens.norm2.asc b/test/bhns_interp/dens.norm2.asc
index 004173a..ef94142 100644
--- a/test/bhns_interp/dens.norm2.asc
+++ b/test/bhns_interp/dens.norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::dens (dens)
+# GRHYDRO::dens (dens)
# 1:iteration 2:time 3:data
-0 0 1.30634484889551e-05
+0 0 1.30634485082968e-05
diff --git a/test/bhns_interp/dens.x.asc b/test/bhns_interp/dens.x.asc
index d17b69d..8ba2006 100644
--- a/test/bhns_interp/dens.x.asc
+++ b/test/bhns_interp/dens.x.asc
@@ -1,50 +1,50 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::dens x (dens)
+# dens x (dens)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 0 0 0 0 -60 0 0 1.0893123990595e-11
-0 0 0 0 0 512 0 0 0 -57 0 0 1.0996335642885e-11
-0 0 0 0 0 1024 0 0 0 -54 0 0 1.11264950073542e-11
-0 0 0 0 0 1536 0 0 0 -51 0 0 1.12957269648291e-11
-0 0 0 0 0 2048 0 0 0 -48 0 0 1.15247015265118e-11
-0 0 0 0 0 2560 0 0 0 -45 0 0 1.18517537784799e-11
-0 0 0 0 0 3072 0 0 0 -42 0 0 1.23568109746147e-11
-0 0 0 0 0 3584 0 0 0 -39 0 0 6.97248339235586e-05
+0 0 0 0 0 0 0 0 0 -60 0 0 1.27107456228047e-11
+0 0 0 0 0 512 0 0 0 -57 0 0 1.28910708067423e-11
+0 0 0 0 0 1024 0 0 0 -54 0 0 1.31071044433575e-11
+0 0 0 0 0 1536 0 0 0 -51 0 0 1.33713864477707e-11
+0 0 0 0 0 2048 0 0 0 -48 0 0 1.36978920212888e-11
+0 0 0 0 0 2560 0 0 0 -45 0 0 1.4123733803579e-11
+0 0 0 0 0 3072 0 0 0 -42 0 0 1.47515151376928e-11
+0 0 0 0 0 3584 0 0 0 -39 0 0 6.97248339235587e-05
0 0 0 0 0 4096 0 0 0 -36 0 0 0.000326024888579985
-0 0 0 0 0 4608 0 0 0 -33 0 0 0.000637986351120658
-0 0 0 0 0 5120 0 0 0 -30 0 0 0.000791711746940172
+0 0 0 0 0 4608 0 0 0 -33 0 0 0.000637986351120657
+0 0 0 0 0 5120 0 0 0 -30 0 0 0.000791711746940171
0 0 0 0 0 5632 0 0 0 -27 0 0 0.000633773164211089
-0 0 0 0 0 6144 0 0 0 -24 0 0 0.000321929688422749
-0 0 0 0 0 6656 0 0 0 -21 0 0 6.82276794749305e-05
-0 0 0 0 0 7168 0 0 0 -18 0 0 1.23568109746147e-11
-0 0 0 0 0 7680 0 0 0 -15 0 0 1.18517537784799e-11
-0 0 0 0 0 8192 0 0 0 -12 0 0 1.15247015265118e-11
-0 0 0 0 0 8704 0 0 0 -9 0 0 1.12957269648291e-11
-0 0 0 0 0 9216 0 0 0 -6 0 0 1.11264950073542e-11
-0 0 0 0 0 9728 0 0 0 -3 0 0 1.0996335642885e-11
-0 0 0 0 0 10240 0 0 0 0 0 0 1.0893123990595e-11
-0 0 0 0 0 10752 0 0 0 3 0 0 1.08092797258066e-11
-0 0 0 0 0 11264 0 0 0 6 0 0 1.0739820963017e-11
-0 0 0 0 0 11776 0 0 0 9 0 0 1.06813390509678e-11
-0 0 0 0 0 12288 0 0 0 12 0 0 1.06314231455797e-11
-0 0 0 0 0 12800 0 0 0 15 0 0 1.05883200775389e-11
-0 0 0 0 0 13312 0 0 0 18 0 0 1.05507244474474e-11
-0 0 0 0 0 13824 0 0 0 21 0 0 1.05176442763735e-11
-0 0 0 0 0 14336 0 0 0 24 0 0 1.04883122832038e-11
-0 0 0 0 0 14848 0 0 0 27 0 0 1.04621256815922e-11
-0 0 0 0 0 15360 0 0 0 30 0 0 1.043860434621e-11
-0 0 0 0 0 15872 0 0 0 33 0 0 1.04173611264298e-11
-0 0 0 0 0 16384 0 0 0 36 0 0 1.03980803826442e-11
-0 0 0 0 0 16896 0 0 0 39 0 0 1.03805022055927e-11
-0 0 0 0 0 17408 0 0 0 42 0 0 1.03644106375509e-11
-0 0 0 0 0 17920 0 0 0 45 0 0 1.03496247595068e-11
-0 0 0 0 0 18432 0 0 0 48 0 0 1.03359918625252e-11
-0 0 0 0 0 18944 0 0 0 51 0 0 1.03233821560702e-11
-0 0 0 0 0 19456 0 0 0 54 0 0 1.031168462432e-11
-0 0 0 0 0 19968 0 0 0 57 0 0 1.03008037500714e-11
-0 0 0 0 0 20480 0 0 0 60 0 0 1.02906569014668e-11
+0 0 0 0 0 6144 0 0 0 -24 0 0 0.00032192968842275
+0 0 0 0 0 6656 0 0 0 -21 0 0 6.82276794749307e-05
+0 0 0 0 0 7168 0 0 0 -18 0 0 1.61968064111999e-11
+0 0 0 0 0 7680 0 0 0 -15 0 0 1.59559522915345e-11
+0 0 0 0 0 8192 0 0 0 -12 0 0 1.59665870600428e-11
+0 0 0 0 0 8704 0 0 0 -9 0 0 1.61211569558139e-11
+0 0 0 0 0 9216 0 0 0 -6 0 0 1.63842658301621e-11
+0 0 0 0 0 9728 0 0 0 -3 0 0 1.67833659154518e-11
+0 0 0 0 0 10240 0 0 0 0 0 0 1.73475893577253e-11
+0 0 0 0 0 10752 0 0 0 3 0 0 1.81383988834837e-11
+0 0 0 0 0 11264 0 0 0 6 0 0 1.92213400753366e-11
+0 0 0 0 0 11776 0 0 0 9 0 0 2.07378309945615e-11
+0 0 0 0 0 12288 0 0 0 12 0 0 2.29215473397935e-11
+0 0 0 0 0 12800 0 0 0 15 0 0 2.63573335530485e-11
+0 0 0 0 0 13312 0 0 0 18 0 0 3.23916286609429e-11
+0 0 0 0 0 13824 0 0 0 21 0 0 4.51243071421949e-11
+0 0 0 0 0 14336 0 0 0 24 0 0 8.33660144463123e-11
+0 0 0 0 0 14848 0 0 0 27 0 0 3.88273909542254e-10
+0 0 0 0 0 15360 0 0 0 30 0 0 1.7981853762077e-07
+0 0 0 0 0 15872 0 0 0 33 0 0 3.87524200541556e-10
+0 0 0 0 0 16384 0 0 0 36 0 0 8.28887081506889e-11
+0 0 0 0 0 16896 0 0 0 39 0 0 4.46973080243828e-11
+0 0 0 0 0 17408 0 0 0 42 0 0 3.19763238291025e-11
+0 0 0 0 0 17920 0 0 0 45 0 0 2.59013859943494e-11
+0 0 0 0 0 18432 0 0 0 48 0 0 2.2405604736311e-11
+0 0 0 0 0 18944 0 0 0 51 0 0 2.01526363331321e-11
+0 0 0 0 0 19456 0 0 0 54 0 0 1.85863484899023e-11
+0 0 0 0 0 19968 0 0 0 57 0 0 1.74369446268745e-11
+0 0 0 0 0 20480 0 0 0 60 0 0 1.65586891296049e-11
diff --git a/test/bhns_interp/dens.y.asc b/test/bhns_interp/dens.y.asc
index 0159a62..b22c1c5 100644
--- a/test/bhns_interp/dens.y.asc
+++ b/test/bhns_interp/dens.y.asc
@@ -1,30 +1,30 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::dens y (dens)
+# dens y (dens)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 10240 0 0 0 0 0 0 1.0893123990595e-11
-0 0 0 0 0 10240 512 0 0 0 3 0 1.08885329138672e-11
-0 0 0 0 0 10240 1024 0 0 0 6 0 1.08751684353299e-11
-0 0 0 0 0 10240 1536 0 0 0 9 0 1.08541605890375e-11
-0 0 0 0 0 10240 2048 0 0 0 12 0 1.08271137137253e-11
-0 0 0 0 0 10240 2560 0 0 0 15 0 1.07958060770773e-11
-0 0 0 0 0 10240 3072 0 0 0 18 0 1.07619313085017e-11
-0 0 0 0 0 10240 3584 0 0 0 21 0 1.07269331546515e-11
-0 0 0 0 0 10240 4096 0 0 0 24 0 1.06919368798162e-11
-0 0 0 0 0 10240 4608 0 0 0 27 0 1.0657752140514e-11
-0 0 0 0 0 10240 5120 0 0 0 30 0 1.06249156864766e-11
-0 0 0 0 0 10240 5632 0 0 0 33 0 1.05937485712017e-11
-0 0 0 0 0 10240 6144 0 0 0 36 0 1.05644123528158e-11
-0 0 0 0 0 10240 6656 0 0 0 39 0 1.05369569707093e-11
-0 0 0 0 0 10240 7168 0 0 0 42 0 1.05113582216973e-11
-0 0 0 0 0 10240 7680 0 0 0 45 0 1.04875454641965e-11
-0 0 0 0 0 10240 8192 0 0 0 48 0 1.04654212416791e-11
-0 0 0 0 0 10240 8704 0 0 0 51 0 1.04448746965375e-11
-0 0 0 0 0 10240 9216 0 0 0 54 0 1.04257904343751e-11
-0 0 0 0 0 10240 9728 0 0 0 57 0 1.04080541659942e-11
-0 0 0 0 0 10240 10240 0 0 0 60 0 1.03915561264326e-11
+0 0 0 0 0 10240 0 0 0 0 0 0 1.73475893577253e-11
+0 0 0 0 0 10240 512 0 0 0 3 0 1.7301619478892e-11
+0 0 0 0 0 10240 1024 0 0 0 6 0 1.71714898960214e-11
+0 0 0 0 0 10240 1536 0 0 0 9 0 1.69686560228695e-11
+0 0 0 0 0 10240 2048 0 0 0 12 0 1.67167134532456e-11
+0 0 0 0 0 10240 2560 0 0 0 15 0 1.64223818660959e-11
+0 0 0 0 0 10240 3072 0 0 0 18 0 1.61033841256897e-11
+0 0 0 0 0 10240 3584 0 0 0 21 0 1.57771601577863e-11
+0 0 0 0 0 10240 4096 0 0 0 24 0 1.54548776435917e-11
+0 0 0 0 0 10240 4608 0 0 0 27 0 1.51469170875248e-11
+0 0 0 0 0 10240 5120 0 0 0 30 0 1.48544563620359e-11
+0 0 0 0 0 10240 5632 0 0 0 33 0 1.45777348281585e-11
+0 0 0 0 0 10240 6144 0 0 0 36 0 1.43235061038592e-11
+0 0 0 0 0 10240 6656 0 0 0 39 0 1.40881770436573e-11
+0 0 0 0 0 10240 7168 0 0 0 42 0 1.38689772555836e-11
+0 0 0 0 0 10240 7680 0 0 0 45 0 1.36689964797527e-11
+0 0 0 0 0 10240 8192 0 0 0 48 0 1.3485155285058e-11
+0 0 0 0 0 10240 8704 0 0 0 51 0 1.33159438517287e-11
+0 0 0 0 0 10240 9216 0 0 0 54 0 1.31586188479561e-11
+0 0 0 0 0 10240 9728 0 0 0 57 0 1.30150055068768e-11
+0 0 0 0 0 10240 10240 0 0 0 60 0 1.28821065002831e-11
diff --git a/test/bhns_interp/dens.z.asc b/test/bhns_interp/dens.z.asc
index 32ef0c5..4359d6a 100644
--- a/test/bhns_interp/dens.z.asc
+++ b/test/bhns_interp/dens.z.asc
@@ -1,30 +1,30 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::dens z (dens)
+# dens z (dens)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 10240 0 0 0 0 0 0 1.0893123990595e-11
-0 0 0 0 0 10240 0 512 0 0 0 3 1.08885329138672e-11
-0 0 0 0 0 10240 0 1024 0 0 0 6 1.08751684353299e-11
-0 0 0 0 0 10240 0 1536 0 0 0 9 1.08541605890375e-11
-0 0 0 0 0 10240 0 2048 0 0 0 12 1.08271137137253e-11
-0 0 0 0 0 10240 0 2560 0 0 0 15 1.07958060770773e-11
-0 0 0 0 0 10240 0 3072 0 0 0 18 1.07619313085017e-11
-0 0 0 0 0 10240 0 3584 0 0 0 21 1.07269331546515e-11
-0 0 0 0 0 10240 0 4096 0 0 0 24 1.06919368798162e-11
-0 0 0 0 0 10240 0 4608 0 0 0 27 1.0657752140514e-11
-0 0 0 0 0 10240 0 5120 0 0 0 30 1.06249156864766e-11
-0 0 0 0 0 10240 0 5632 0 0 0 33 1.05937485712017e-11
-0 0 0 0 0 10240 0 6144 0 0 0 36 1.05644123528158e-11
-0 0 0 0 0 10240 0 6656 0 0 0 39 1.05369569707093e-11
-0 0 0 0 0 10240 0 7168 0 0 0 42 1.05113582216973e-11
-0 0 0 0 0 10240 0 7680 0 0 0 45 1.04875454641965e-11
-0 0 0 0 0 10240 0 8192 0 0 0 48 1.04654212416791e-11
-0 0 0 0 0 10240 0 8704 0 0 0 51 1.04448746965375e-11
-0 0 0 0 0 10240 0 9216 0 0 0 54 1.04257904343751e-11
-0 0 0 0 0 10240 0 9728 0 0 0 57 1.04080541659942e-11
-0 0 0 0 0 10240 0 10240 0 0 0 60 1.03915561264326e-11
+0 0 0 0 0 10240 0 0 0 0 0 0 1.73475893577253e-11
+0 0 0 0 0 10240 0 512 0 0 0 3 1.7301619478892e-11
+0 0 0 0 0 10240 0 1024 0 0 0 6 1.71714898960214e-11
+0 0 0 0 0 10240 0 1536 0 0 0 9 1.69686560228695e-11
+0 0 0 0 0 10240 0 2048 0 0 0 12 1.67167134532456e-11
+0 0 0 0 0 10240 0 2560 0 0 0 15 1.64223818660959e-11
+0 0 0 0 0 10240 0 3072 0 0 0 18 1.61033841256897e-11
+0 0 0 0 0 10240 0 3584 0 0 0 21 1.57771601577863e-11
+0 0 0 0 0 10240 0 4096 0 0 0 24 1.54548776435917e-11
+0 0 0 0 0 10240 0 4608 0 0 0 27 1.51469170875248e-11
+0 0 0 0 0 10240 0 5120 0 0 0 30 1.48544563620359e-11
+0 0 0 0 0 10240 0 5632 0 0 0 33 1.45777348281585e-11
+0 0 0 0 0 10240 0 6144 0 0 0 36 1.43235061038592e-11
+0 0 0 0 0 10240 0 6656 0 0 0 39 1.40881770436573e-11
+0 0 0 0 0 10240 0 7168 0 0 0 42 1.38689772555836e-11
+0 0 0 0 0 10240 0 7680 0 0 0 45 1.36689964797527e-11
+0 0 0 0 0 10240 0 8192 0 0 0 48 1.3485155285058e-11
+0 0 0 0 0 10240 0 8704 0 0 0 51 1.33159438517287e-11
+0 0 0 0 0 10240 0 9216 0 0 0 54 1.31586188479561e-11
+0 0 0 0 0 10240 0 9728 0 0 0 57 1.30150055068768e-11
+0 0 0 0 0 10240 0 10240 0 0 0 60 1.28821065002831e-11
diff --git a/test/bhns_interp/eps.d.asc b/test/bhns_interp/eps.d.asc
index ec6a617..bcb20f8 100644
--- a/test/bhns_interp/eps.d.asc
+++ b/test/bhns_interp/eps.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::eps d (eps)
+# eps d (eps)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 1e-09
0 0 0 0 0 9728 9728 9728 0 -3 57 57 1e-09
0 0 0 0 0 10240 10240 10240 0 0 60 60 1e-09
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/eps.maximum.asc b/test/bhns_interp/eps.maximum.asc
index 8f8ddfd..b93dd58 100644
--- a/test/bhns_interp/eps.maximum.asc
+++ b/test/bhns_interp/eps.maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::eps (eps)
+# HYDROBASE::eps (eps)
# 1:iteration 2:time 3:data
-0 0 0.0395773053415456
+0 0 0.0395773053415455
diff --git a/test/bhns_interp/eps.minimum.asc b/test/bhns_interp/eps.minimum.asc
index 227bf23..b261b18 100644
--- a/test/bhns_interp/eps.minimum.asc
+++ b/test/bhns_interp/eps.minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::eps (eps)
+# HYDROBASE::eps (eps)
# 1:iteration 2:time 3:data
0 0 1e-09
diff --git a/test/bhns_interp/eps.norm1.asc b/test/bhns_interp/eps.norm1.asc
index 8884df8..e877736 100644
--- a/test/bhns_interp/eps.norm1.asc
+++ b/test/bhns_interp/eps.norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::eps (eps)
+# HYDROBASE::eps (eps)
# 1:iteration 2:time 3:data
0 0 2.74360859712519e-05
diff --git a/test/bhns_interp/eps.norm2.asc b/test/bhns_interp/eps.norm2.asc
index 3b5d776..07e4177 100644
--- a/test/bhns_interp/eps.norm2.asc
+++ b/test/bhns_interp/eps.norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::eps (eps)
+# HYDROBASE::eps (eps)
# 1:iteration 2:time 3:data
0 0 0.000711052473402444
diff --git a/test/bhns_interp/eps.x.asc b/test/bhns_interp/eps.x.asc
index 38b5014..afad996 100644
--- a/test/bhns_interp/eps.x.asc
+++ b/test/bhns_interp/eps.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::eps x (eps)
+# eps x (eps)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -14,9 +14,9 @@
0 0 0 0 0 3072 0 0 0 -42 0 0 1e-09
0 0 0 0 0 3584 0 0 0 -39 0 0 0.00441047742504036
0 0 0 0 0 4096 0 0 0 -36 0 0 0.0186863594402134
-0 0 0 0 0 4608 0 0 0 -33 0 0 0.0333699562448278
-0 0 0 0 0 5120 0 0 0 -30 0 0 0.0395773053415456
-0 0 0 0 0 5632 0 0 0 -27 0 0 0.0324063385270625
+0 0 0 0 0 4608 0 0 0 -33 0 0 0.0333699562448277
+0 0 0 0 0 5120 0 0 0 -30 0 0 0.0395773053415455
+0 0 0 0 0 5632 0 0 0 -27 0 0 0.0324063385270626
0 0 0 0 0 6144 0 0 0 -24 0 0 0.0177142121005456
0 0 0 0 0 6656 0 0 0 -21 0 0 0.00403920939339767
0 0 0 0 0 7168 0 0 0 -18 0 0 1e-09
diff --git a/test/bhns_interp/eps.y.asc b/test/bhns_interp/eps.y.asc
index 60f5119..52f4fd2 100644
--- a/test/bhns_interp/eps.y.asc
+++ b/test/bhns_interp/eps.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::eps y (eps)
+# eps y (eps)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/eps.z.asc b/test/bhns_interp/eps.z.asc
index ec233cf..e3d5222 100644
--- a/test/bhns_interp/eps.z.asc
+++ b/test/bhns_interp/eps.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::eps z (eps)
+# eps z (eps)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/gxx.d.asc b/test/bhns_interp/gxx.d.asc
index 64ebb37..204eb01 100644
--- a/test/bhns_interp/gxx.d.asc
+++ b/test/bhns_interp/gxx.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxx d (gxx)
+# gxx d (gxx)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 1.1453567523134
0 0 0 0 0 9728 9728 9728 0 -3 57 57 1.14007021133872
0 0 0 0 0 10240 10240 10240 0 0 60 60 1.13487745782187
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/gxx.norm1.asc b/test/bhns_interp/gxx.norm1.asc
index c40883e..3d4aa99 100644
--- a/test/bhns_interp/gxx.norm1.asc
+++ b/test/bhns_interp/gxx.norm1.asc
@@ -2,4 +2,4 @@
#
# ADMBASE::gxx (gxx)
# 1:iteration 2:time 3:data
-0 0 1.25144738316376
+0 0 1.25144733968352
diff --git a/test/bhns_interp/gxx.norm2.asc b/test/bhns_interp/gxx.norm2.asc
index b458dce..2802e7d 100644
--- a/test/bhns_interp/gxx.norm2.asc
+++ b/test/bhns_interp/gxx.norm2.asc
@@ -2,4 +2,4 @@
#
# ADMBASE::gxx (gxx)
# 1:iteration 2:time 3:data
-0 0 2.98983330714175
+0 0 2.98983328740263
diff --git a/test/bhns_interp/gxx.x.asc b/test/bhns_interp/gxx.x.asc
index 4dd40b6..c9fead3 100644
--- a/test/bhns_interp/gxx.x.asc
+++ b/test/bhns_interp/gxx.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxx x (gxx)
+# gxx x (gxx)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -10,7 +10,7 @@
0 0 0 0 0 1024 0 0 0 -54 0 0 1.19767184453747
0 0 0 0 0 1536 0 0 0 -51 0 0 1.21371753684595
0 0 0 0 0 2048 0 0 0 -48 0 0 1.23339587681581
-0 0 0 0 0 2560 0 0 0 -45 0 0 1.258827868868
+0 0 0 0 0 2560 0 0 0 -45 0 0 1.25882786886801
0 0 0 0 0 3072 0 0 0 -42 0 0 1.29585901049065
0 0 0 0 0 3584 0 0 0 -39 0 0 1.35706689642413
0 0 0 0 0 4096 0 0 0 -36 0 0 1.4492746789576
@@ -25,7 +25,7 @@
0 0 0 0 0 8704 0 0 0 -9 0 0 1.37487792034644
0 0 0 0 0 9216 0 0 0 -6 0 0 1.38979685244917
0 0 0 0 0 9728 0 0 0 -3 0 0 1.41227533882004
-0 0 0 0 0 10240 0 0 0 0 0 0 1.44375252068932
+0 0 0 0 0 10240 0 0 0 0 0 0 1.44375252068931
0 0 0 0 0 10752 0 0 0 3 0 0 1.48730246887666
0 0 0 0 0 11264 0 0 0 6 0 0 1.54592744878001
0 0 0 0 0 11776 0 0 0 9 0 0 1.62620598048945
@@ -38,11 +38,11 @@
0 0 0 0 0 15360 0 0 0 30 0 0 686.366862226809
0 0 0 0 0 15872 0 0 0 33 0 0 11.4515925145962
0 0 0 0 0 16384 0 0 0 36 0 0 4.09571989172296
-0 0 0 0 0 16896 0 0 0 39 0 0 2.71344430482965
+0 0 0 0 0 16896 0 0 0 39 0 0 2.71344430482964
0 0 0 0 0 17408 0 0 0 42 0 0 2.17046284422645
-0 0 0 0 0 17920 0 0 0 45 0 0 1.88603031613217
+0 0 0 0 0 17920 0 0 0 45 0 0 1.88603031613218
0 0 0 0 0 18432 0 0 0 48 0 0 1.7122655283149
-0 0 0 0 0 18944 0 0 0 51 0 0 1.59546731612091
+0 0 0 0 0 18944 0 0 0 51 0 0 1.59546731612092
0 0 0 0 0 19456 0 0 0 54 0 0 1.51168992005407
0 0 0 0 0 19968 0 0 0 57 0 0 1.44870600040929
0 0 0 0 0 20480 0 0 0 60 0 0 1.39964308195822
diff --git a/test/bhns_interp/gxx.y.asc b/test/bhns_interp/gxx.y.asc
index d782b9c..75a3dd7 100644
--- a/test/bhns_interp/gxx.y.asc
+++ b/test/bhns_interp/gxx.y.asc
@@ -1,25 +1,25 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxx y (gxx)
+# gxx y (gxx)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 10240 0 0 0 0 0 0 1.44375252068932
+0 0 0 0 0 10240 0 0 0 0 0 0 1.44375252068931
0 0 0 0 0 10240 512 0 0 0 3 0 1.44120083184873
0 0 0 0 0 10240 1024 0 0 0 6 0 1.43396533403779
0 0 0 0 0 10240 1536 0 0 0 9 0 1.42265075064451
-0 0 0 0 0 10240 2048 0 0 0 12 0 1.40853377533236
+0 0 0 0 0 10240 2048 0 0 0 12 0 1.40853377533237
0 0 0 0 0 10240 2560 0 0 0 15 0 1.39195148173754
0 0 0 0 0 10240 3072 0 0 0 18 0 1.37386724169529
-0 0 0 0 0 10240 3584 0 0 0 21 0 1.35538925771337
+0 0 0 0 0 10240 3584 0 0 0 21 0 1.35524939721954
0 0 0 0 0 10240 4096 0 0 0 24 0 1.33673005881713
0 0 0 0 0 10240 4608 0 0 0 27 0 1.31891305005842
0 0 0 0 0 10240 5120 0 0 0 30 0 1.3018806583135
0 0 0 0 0 10240 5632 0 0 0 33 0 1.28566167323213
0 0 0 0 0 10240 6144 0 0 0 36 0 1.27067033681416
0 0 0 0 0 10240 6656 0 0 0 39 0 1.25671423316781
-0 0 0 0 0 10240 7168 0 0 0 42 0 1.24363371044917
+0 0 0 0 0 10240 7168 0 0 0 42 0 1.24364460618567
0 0 0 0 0 10240 7680 0 0 0 45 0 1.23166071037658
0 0 0 0 0 10240 8192 0 0 0 48 0 1.22059232426535
0 0 0 0 0 10240 8704 0 0 0 51 0 1.21036020663183
diff --git a/test/bhns_interp/gxx.z.asc b/test/bhns_interp/gxx.z.asc
index 5362347..5afd995 100644
--- a/test/bhns_interp/gxx.z.asc
+++ b/test/bhns_interp/gxx.z.asc
@@ -1,25 +1,25 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxx z (gxx)
+# gxx z (gxx)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 10240 0 0 0 0 0 0 1.44375252068932
+0 0 0 0 0 10240 0 0 0 0 0 0 1.44375252068931
0 0 0 0 0 10240 0 512 0 0 0 3 1.44120083184873
0 0 0 0 0 10240 0 1024 0 0 0 6 1.43396533403779
0 0 0 0 0 10240 0 1536 0 0 0 9 1.42265075064451
0 0 0 0 0 10240 0 2048 0 0 0 12 1.40853377533236
0 0 0 0 0 10240 0 2560 0 0 0 15 1.39195148173754
0 0 0 0 0 10240 0 3072 0 0 0 18 1.37386724169529
-0 0 0 0 0 10240 0 3584 0 0 0 21 1.35538925771337
+0 0 0 0 0 10240 0 3584 0 0 0 21 1.35524939721954
0 0 0 0 0 10240 0 4096 0 0 0 24 1.33673005881713
0 0 0 0 0 10240 0 4608 0 0 0 27 1.31891305005842
0 0 0 0 0 10240 0 5120 0 0 0 30 1.3018806583135
0 0 0 0 0 10240 0 5632 0 0 0 33 1.28566167323213
0 0 0 0 0 10240 0 6144 0 0 0 36 1.27067033681416
0 0 0 0 0 10240 0 6656 0 0 0 39 1.25671423316781
-0 0 0 0 0 10240 0 7168 0 0 0 42 1.24363371044917
+0 0 0 0 0 10240 0 7168 0 0 0 42 1.24364460618567
0 0 0 0 0 10240 0 7680 0 0 0 45 1.23166071037658
0 0 0 0 0 10240 0 8192 0 0 0 48 1.22059232426535
0 0 0 0 0 10240 0 8704 0 0 0 51 1.21036020663183
diff --git a/test/bhns_interp/gxy.d.asc b/test/bhns_interp/gxy.d.asc
index a2117f5..8523fef 100644
--- a/test/bhns_interp/gxy.d.asc
+++ b/test/bhns_interp/gxy.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxy d (gxy)
+# gxy d (gxy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/gxy.x.asc b/test/bhns_interp/gxy.x.asc
index 4b9eec3..ee288b2 100644
--- a/test/bhns_interp/gxy.x.asc
+++ b/test/bhns_interp/gxy.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxy x (gxy)
+# gxy x (gxy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/gxy.y.asc b/test/bhns_interp/gxy.y.asc
index af35cda..9d3d55a 100644
--- a/test/bhns_interp/gxy.y.asc
+++ b/test/bhns_interp/gxy.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxy y (gxy)
+# gxy y (gxy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/gxy.z.asc b/test/bhns_interp/gxy.z.asc
index 7599ba0..934910c 100644
--- a/test/bhns_interp/gxy.z.asc
+++ b/test/bhns_interp/gxy.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxy z (gxy)
+# gxy z (gxy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/gxz.d.asc b/test/bhns_interp/gxz.d.asc
index f8b0bb2..48ea223 100644
--- a/test/bhns_interp/gxz.d.asc
+++ b/test/bhns_interp/gxz.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxz d (gxz)
+# gxz d (gxz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/gxz.x.asc b/test/bhns_interp/gxz.x.asc
index e0d2ed2..c49589e 100644
--- a/test/bhns_interp/gxz.x.asc
+++ b/test/bhns_interp/gxz.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxz x (gxz)
+# gxz x (gxz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/gxz.y.asc b/test/bhns_interp/gxz.y.asc
index 71a6156..a7d7015 100644
--- a/test/bhns_interp/gxz.y.asc
+++ b/test/bhns_interp/gxz.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxz y (gxz)
+# gxz y (gxz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/gxz.z.asc b/test/bhns_interp/gxz.z.asc
index 00d4b52..3212f29 100644
--- a/test/bhns_interp/gxz.z.asc
+++ b/test/bhns_interp/gxz.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gxz z (gxz)
+# gxz z (gxz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/gyy.d.asc b/test/bhns_interp/gyy.d.asc
index 6c41a75..09f0e32 100644
--- a/test/bhns_interp/gyy.d.asc
+++ b/test/bhns_interp/gyy.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gyy d (gyy)
+# gyy d (gyy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 1.1453567523134
0 0 0 0 0 9728 9728 9728 0 -3 57 57 1.14007021133872
0 0 0 0 0 10240 10240 10240 0 0 60 60 1.13487745782187
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/gyy.norm1.asc b/test/bhns_interp/gyy.norm1.asc
index cfa2344..5112b54 100644
--- a/test/bhns_interp/gyy.norm1.asc
+++ b/test/bhns_interp/gyy.norm1.asc
@@ -2,4 +2,4 @@
#
# ADMBASE::gyy (gyy)
# 1:iteration 2:time 3:data
-0 0 1.25144738316376
+0 0 1.25144733968352
diff --git a/test/bhns_interp/gyy.norm2.asc b/test/bhns_interp/gyy.norm2.asc
index bd0266c..4245a9f 100644
--- a/test/bhns_interp/gyy.norm2.asc
+++ b/test/bhns_interp/gyy.norm2.asc
@@ -2,4 +2,4 @@
#
# ADMBASE::gyy (gyy)
# 1:iteration 2:time 3:data
-0 0 2.98983330714175
+0 0 2.98983328740263
diff --git a/test/bhns_interp/gyy.x.asc b/test/bhns_interp/gyy.x.asc
index 5ebadcf..8dd24fe 100644
--- a/test/bhns_interp/gyy.x.asc
+++ b/test/bhns_interp/gyy.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gyy x (gyy)
+# gyy x (gyy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -10,7 +10,7 @@
0 0 0 0 0 1024 0 0 0 -54 0 0 1.19767184453747
0 0 0 0 0 1536 0 0 0 -51 0 0 1.21371753684595
0 0 0 0 0 2048 0 0 0 -48 0 0 1.23339587681581
-0 0 0 0 0 2560 0 0 0 -45 0 0 1.258827868868
+0 0 0 0 0 2560 0 0 0 -45 0 0 1.25882786886801
0 0 0 0 0 3072 0 0 0 -42 0 0 1.29585901049065
0 0 0 0 0 3584 0 0 0 -39 0 0 1.35706689642413
0 0 0 0 0 4096 0 0 0 -36 0 0 1.4492746789576
@@ -25,7 +25,7 @@
0 0 0 0 0 8704 0 0 0 -9 0 0 1.37487792034644
0 0 0 0 0 9216 0 0 0 -6 0 0 1.38979685244917
0 0 0 0 0 9728 0 0 0 -3 0 0 1.41227533882004
-0 0 0 0 0 10240 0 0 0 0 0 0 1.44375252068932
+0 0 0 0 0 10240 0 0 0 0 0 0 1.44375252068931
0 0 0 0 0 10752 0 0 0 3 0 0 1.48730246887666
0 0 0 0 0 11264 0 0 0 6 0 0 1.54592744878001
0 0 0 0 0 11776 0 0 0 9 0 0 1.62620598048945
@@ -38,11 +38,11 @@
0 0 0 0 0 15360 0 0 0 30 0 0 686.366862226809
0 0 0 0 0 15872 0 0 0 33 0 0 11.4515925145962
0 0 0 0 0 16384 0 0 0 36 0 0 4.09571989172296
-0 0 0 0 0 16896 0 0 0 39 0 0 2.71344430482965
+0 0 0 0 0 16896 0 0 0 39 0 0 2.71344430482964
0 0 0 0 0 17408 0 0 0 42 0 0 2.17046284422645
-0 0 0 0 0 17920 0 0 0 45 0 0 1.88603031613217
+0 0 0 0 0 17920 0 0 0 45 0 0 1.88603031613218
0 0 0 0 0 18432 0 0 0 48 0 0 1.7122655283149
-0 0 0 0 0 18944 0 0 0 51 0 0 1.59546731612091
+0 0 0 0 0 18944 0 0 0 51 0 0 1.59546731612092
0 0 0 0 0 19456 0 0 0 54 0 0 1.51168992005407
0 0 0 0 0 19968 0 0 0 57 0 0 1.44870600040929
0 0 0 0 0 20480 0 0 0 60 0 0 1.39964308195822
diff --git a/test/bhns_interp/gyy.y.asc b/test/bhns_interp/gyy.y.asc
index 9f360eb..ac921a3 100644
--- a/test/bhns_interp/gyy.y.asc
+++ b/test/bhns_interp/gyy.y.asc
@@ -1,25 +1,25 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gyy y (gyy)
+# gyy y (gyy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 10240 0 0 0 0 0 0 1.44375252068932
+0 0 0 0 0 10240 0 0 0 0 0 0 1.44375252068931
0 0 0 0 0 10240 512 0 0 0 3 0 1.44120083184873
0 0 0 0 0 10240 1024 0 0 0 6 0 1.43396533403779
0 0 0 0 0 10240 1536 0 0 0 9 0 1.42265075064451
-0 0 0 0 0 10240 2048 0 0 0 12 0 1.40853377533236
+0 0 0 0 0 10240 2048 0 0 0 12 0 1.40853377533237
0 0 0 0 0 10240 2560 0 0 0 15 0 1.39195148173754
0 0 0 0 0 10240 3072 0 0 0 18 0 1.37386724169529
-0 0 0 0 0 10240 3584 0 0 0 21 0 1.35538925771337
+0 0 0 0 0 10240 3584 0 0 0 21 0 1.35524939721954
0 0 0 0 0 10240 4096 0 0 0 24 0 1.33673005881713
0 0 0 0 0 10240 4608 0 0 0 27 0 1.31891305005842
0 0 0 0 0 10240 5120 0 0 0 30 0 1.3018806583135
0 0 0 0 0 10240 5632 0 0 0 33 0 1.28566167323213
0 0 0 0 0 10240 6144 0 0 0 36 0 1.27067033681416
0 0 0 0 0 10240 6656 0 0 0 39 0 1.25671423316781
-0 0 0 0 0 10240 7168 0 0 0 42 0 1.24363371044917
+0 0 0 0 0 10240 7168 0 0 0 42 0 1.24364460618567
0 0 0 0 0 10240 7680 0 0 0 45 0 1.23166071037658
0 0 0 0 0 10240 8192 0 0 0 48 0 1.22059232426535
0 0 0 0 0 10240 8704 0 0 0 51 0 1.21036020663183
diff --git a/test/bhns_interp/gyy.z.asc b/test/bhns_interp/gyy.z.asc
index a86a25e..10d7377 100644
--- a/test/bhns_interp/gyy.z.asc
+++ b/test/bhns_interp/gyy.z.asc
@@ -1,25 +1,25 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gyy z (gyy)
+# gyy z (gyy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 10240 0 0 0 0 0 0 1.44375252068932
+0 0 0 0 0 10240 0 0 0 0 0 0 1.44375252068931
0 0 0 0 0 10240 0 512 0 0 0 3 1.44120083184873
0 0 0 0 0 10240 0 1024 0 0 0 6 1.43396533403779
0 0 0 0 0 10240 0 1536 0 0 0 9 1.42265075064451
0 0 0 0 0 10240 0 2048 0 0 0 12 1.40853377533236
0 0 0 0 0 10240 0 2560 0 0 0 15 1.39195148173754
0 0 0 0 0 10240 0 3072 0 0 0 18 1.37386724169529
-0 0 0 0 0 10240 0 3584 0 0 0 21 1.35538925771337
+0 0 0 0 0 10240 0 3584 0 0 0 21 1.35524939721954
0 0 0 0 0 10240 0 4096 0 0 0 24 1.33673005881713
0 0 0 0 0 10240 0 4608 0 0 0 27 1.31891305005842
0 0 0 0 0 10240 0 5120 0 0 0 30 1.3018806583135
0 0 0 0 0 10240 0 5632 0 0 0 33 1.28566167323213
0 0 0 0 0 10240 0 6144 0 0 0 36 1.27067033681416
0 0 0 0 0 10240 0 6656 0 0 0 39 1.25671423316781
-0 0 0 0 0 10240 0 7168 0 0 0 42 1.24363371044917
+0 0 0 0 0 10240 0 7168 0 0 0 42 1.24364460618567
0 0 0 0 0 10240 0 7680 0 0 0 45 1.23166071037658
0 0 0 0 0 10240 0 8192 0 0 0 48 1.22059232426535
0 0 0 0 0 10240 0 8704 0 0 0 51 1.21036020663183
diff --git a/test/bhns_interp/gyz.d.asc b/test/bhns_interp/gyz.d.asc
index 8e72dce..8ca89f1 100644
--- a/test/bhns_interp/gyz.d.asc
+++ b/test/bhns_interp/gyz.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gyz d (gyz)
+# gyz d (gyz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/gyz.x.asc b/test/bhns_interp/gyz.x.asc
index 20a425d..c6d1490 100644
--- a/test/bhns_interp/gyz.x.asc
+++ b/test/bhns_interp/gyz.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gyz x (gyz)
+# gyz x (gyz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/gyz.y.asc b/test/bhns_interp/gyz.y.asc
index 205dad6..1bacbe2 100644
--- a/test/bhns_interp/gyz.y.asc
+++ b/test/bhns_interp/gyz.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gyz y (gyz)
+# gyz y (gyz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/gyz.z.asc b/test/bhns_interp/gyz.z.asc
index 7c94cf5..20f8261 100644
--- a/test/bhns_interp/gyz.z.asc
+++ b/test/bhns_interp/gyz.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gyz z (gyz)
+# gyz z (gyz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/gzz.d.asc b/test/bhns_interp/gzz.d.asc
index cf0ae30..c3aa3cb 100644
--- a/test/bhns_interp/gzz.d.asc
+++ b/test/bhns_interp/gzz.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gzz d (gzz)
+# gzz d (gzz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 1.1453567523134
0 0 0 0 0 9728 9728 9728 0 -3 57 57 1.14007021133872
0 0 0 0 0 10240 10240 10240 0 0 60 60 1.13487745782187
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/gzz.norm1.asc b/test/bhns_interp/gzz.norm1.asc
index 71178f8..e1c5643 100644
--- a/test/bhns_interp/gzz.norm1.asc
+++ b/test/bhns_interp/gzz.norm1.asc
@@ -2,4 +2,4 @@
#
# ADMBASE::gzz (gzz)
# 1:iteration 2:time 3:data
-0 0 1.25144738316376
+0 0 1.25144733968352
diff --git a/test/bhns_interp/gzz.norm2.asc b/test/bhns_interp/gzz.norm2.asc
index 6f88401..f99a222 100644
--- a/test/bhns_interp/gzz.norm2.asc
+++ b/test/bhns_interp/gzz.norm2.asc
@@ -2,4 +2,4 @@
#
# ADMBASE::gzz (gzz)
# 1:iteration 2:time 3:data
-0 0 2.98983330714175
+0 0 2.98983328740263
diff --git a/test/bhns_interp/gzz.x.asc b/test/bhns_interp/gzz.x.asc
index a7fedd3..498a8bc 100644
--- a/test/bhns_interp/gzz.x.asc
+++ b/test/bhns_interp/gzz.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gzz x (gzz)
+# gzz x (gzz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -10,7 +10,7 @@
0 0 0 0 0 1024 0 0 0 -54 0 0 1.19767184453747
0 0 0 0 0 1536 0 0 0 -51 0 0 1.21371753684595
0 0 0 0 0 2048 0 0 0 -48 0 0 1.23339587681581
-0 0 0 0 0 2560 0 0 0 -45 0 0 1.258827868868
+0 0 0 0 0 2560 0 0 0 -45 0 0 1.25882786886801
0 0 0 0 0 3072 0 0 0 -42 0 0 1.29585901049065
0 0 0 0 0 3584 0 0 0 -39 0 0 1.35706689642413
0 0 0 0 0 4096 0 0 0 -36 0 0 1.4492746789576
@@ -25,7 +25,7 @@
0 0 0 0 0 8704 0 0 0 -9 0 0 1.37487792034644
0 0 0 0 0 9216 0 0 0 -6 0 0 1.38979685244917
0 0 0 0 0 9728 0 0 0 -3 0 0 1.41227533882004
-0 0 0 0 0 10240 0 0 0 0 0 0 1.44375252068932
+0 0 0 0 0 10240 0 0 0 0 0 0 1.44375252068931
0 0 0 0 0 10752 0 0 0 3 0 0 1.48730246887666
0 0 0 0 0 11264 0 0 0 6 0 0 1.54592744878001
0 0 0 0 0 11776 0 0 0 9 0 0 1.62620598048945
@@ -38,11 +38,11 @@
0 0 0 0 0 15360 0 0 0 30 0 0 686.366862226809
0 0 0 0 0 15872 0 0 0 33 0 0 11.4515925145962
0 0 0 0 0 16384 0 0 0 36 0 0 4.09571989172296
-0 0 0 0 0 16896 0 0 0 39 0 0 2.71344430482965
+0 0 0 0 0 16896 0 0 0 39 0 0 2.71344430482964
0 0 0 0 0 17408 0 0 0 42 0 0 2.17046284422645
-0 0 0 0 0 17920 0 0 0 45 0 0 1.88603031613217
+0 0 0 0 0 17920 0 0 0 45 0 0 1.88603031613218
0 0 0 0 0 18432 0 0 0 48 0 0 1.7122655283149
-0 0 0 0 0 18944 0 0 0 51 0 0 1.59546731612091
+0 0 0 0 0 18944 0 0 0 51 0 0 1.59546731612092
0 0 0 0 0 19456 0 0 0 54 0 0 1.51168992005407
0 0 0 0 0 19968 0 0 0 57 0 0 1.44870600040929
0 0 0 0 0 20480 0 0 0 60 0 0 1.39964308195822
diff --git a/test/bhns_interp/gzz.y.asc b/test/bhns_interp/gzz.y.asc
index 8cbbe78..074b9a8 100644
--- a/test/bhns_interp/gzz.y.asc
+++ b/test/bhns_interp/gzz.y.asc
@@ -1,25 +1,25 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gzz y (gzz)
+# gzz y (gzz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 10240 0 0 0 0 0 0 1.44375252068932
+0 0 0 0 0 10240 0 0 0 0 0 0 1.44375252068931
0 0 0 0 0 10240 512 0 0 0 3 0 1.44120083184873
0 0 0 0 0 10240 1024 0 0 0 6 0 1.43396533403779
0 0 0 0 0 10240 1536 0 0 0 9 0 1.42265075064451
-0 0 0 0 0 10240 2048 0 0 0 12 0 1.40853377533236
+0 0 0 0 0 10240 2048 0 0 0 12 0 1.40853377533237
0 0 0 0 0 10240 2560 0 0 0 15 0 1.39195148173754
0 0 0 0 0 10240 3072 0 0 0 18 0 1.37386724169529
-0 0 0 0 0 10240 3584 0 0 0 21 0 1.35538925771337
+0 0 0 0 0 10240 3584 0 0 0 21 0 1.35524939721954
0 0 0 0 0 10240 4096 0 0 0 24 0 1.33673005881713
0 0 0 0 0 10240 4608 0 0 0 27 0 1.31891305005842
0 0 0 0 0 10240 5120 0 0 0 30 0 1.3018806583135
0 0 0 0 0 10240 5632 0 0 0 33 0 1.28566167323213
0 0 0 0 0 10240 6144 0 0 0 36 0 1.27067033681416
0 0 0 0 0 10240 6656 0 0 0 39 0 1.25671423316781
-0 0 0 0 0 10240 7168 0 0 0 42 0 1.24363371044917
+0 0 0 0 0 10240 7168 0 0 0 42 0 1.24364460618567
0 0 0 0 0 10240 7680 0 0 0 45 0 1.23166071037658
0 0 0 0 0 10240 8192 0 0 0 48 0 1.22059232426535
0 0 0 0 0 10240 8704 0 0 0 51 0 1.21036020663183
diff --git a/test/bhns_interp/gzz.z.asc b/test/bhns_interp/gzz.z.asc
index 694ddeb..2acca0f 100644
--- a/test/bhns_interp/gzz.z.asc
+++ b/test/bhns_interp/gzz.z.asc
@@ -1,25 +1,25 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::gzz z (gzz)
+# gzz z (gzz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 10240 0 0 0 0 0 0 1.44375252068932
+0 0 0 0 0 10240 0 0 0 0 0 0 1.44375252068931
0 0 0 0 0 10240 0 512 0 0 0 3 1.44120083184873
0 0 0 0 0 10240 0 1024 0 0 0 6 1.43396533403779
0 0 0 0 0 10240 0 1536 0 0 0 9 1.42265075064451
0 0 0 0 0 10240 0 2048 0 0 0 12 1.40853377533236
0 0 0 0 0 10240 0 2560 0 0 0 15 1.39195148173754
0 0 0 0 0 10240 0 3072 0 0 0 18 1.37386724169529
-0 0 0 0 0 10240 0 3584 0 0 0 21 1.35538925771337
+0 0 0 0 0 10240 0 3584 0 0 0 21 1.35524939721954
0 0 0 0 0 10240 0 4096 0 0 0 24 1.33673005881713
0 0 0 0 0 10240 0 4608 0 0 0 27 1.31891305005842
0 0 0 0 0 10240 0 5120 0 0 0 30 1.3018806583135
0 0 0 0 0 10240 0 5632 0 0 0 33 1.28566167323213
0 0 0 0 0 10240 0 6144 0 0 0 36 1.27067033681416
0 0 0 0 0 10240 0 6656 0 0 0 39 1.25671423316781
-0 0 0 0 0 10240 0 7168 0 0 0 42 1.24363371044917
+0 0 0 0 0 10240 0 7168 0 0 0 42 1.24364460618567
0 0 0 0 0 10240 0 7680 0 0 0 45 1.23166071037658
0 0 0 0 0 10240 0 8192 0 0 0 48 1.22059232426535
0 0 0 0 0 10240 0 8704 0 0 0 51 1.21036020663183
diff --git a/test/bhns_interp/kxx.d.asc b/test/bhns_interp/kxx.d.asc
index 42a2236..5202447 100644
--- a/test/bhns_interp/kxx.d.asc
+++ b/test/bhns_interp/kxx.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxx d (kxx)
+# kxx d (kxx)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/kxx.x.asc b/test/bhns_interp/kxx.x.asc
index a455d76..07204ef 100644
--- a/test/bhns_interp/kxx.x.asc
+++ b/test/bhns_interp/kxx.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxx x (kxx)
+# kxx x (kxx)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/kxx.y.asc b/test/bhns_interp/kxx.y.asc
index 882d947..472815a 100644
--- a/test/bhns_interp/kxx.y.asc
+++ b/test/bhns_interp/kxx.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxx y (kxx)
+# kxx y (kxx)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/kxx.z.asc b/test/bhns_interp/kxx.z.asc
index a81f088..6455fe4 100644
--- a/test/bhns_interp/kxx.z.asc
+++ b/test/bhns_interp/kxx.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxx z (kxx)
+# kxx z (kxx)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/kxy.d.asc b/test/bhns_interp/kxy.d.asc
index 2cc6cc5..c72ce1c 100644
--- a/test/bhns_interp/kxy.d.asc
+++ b/test/bhns_interp/kxy.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxy d (kxy)
+# kxy d (kxy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/kxy.x.asc b/test/bhns_interp/kxy.x.asc
index cdc223d..a5e977e 100644
--- a/test/bhns_interp/kxy.x.asc
+++ b/test/bhns_interp/kxy.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxy x (kxy)
+# kxy x (kxy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/kxy.y.asc b/test/bhns_interp/kxy.y.asc
index b79de62..b561835 100644
--- a/test/bhns_interp/kxy.y.asc
+++ b/test/bhns_interp/kxy.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxy y (kxy)
+# kxy y (kxy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/kxy.z.asc b/test/bhns_interp/kxy.z.asc
index 3c5e876..87d64b0 100644
--- a/test/bhns_interp/kxy.z.asc
+++ b/test/bhns_interp/kxy.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxy z (kxy)
+# kxy z (kxy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/kxz.d.asc b/test/bhns_interp/kxz.d.asc
index 8bfa31e..d123730 100644
--- a/test/bhns_interp/kxz.d.asc
+++ b/test/bhns_interp/kxz.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxz d (kxz)
+# kxz d (kxz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/kxz.x.asc b/test/bhns_interp/kxz.x.asc
index 1711f2f..00e276c 100644
--- a/test/bhns_interp/kxz.x.asc
+++ b/test/bhns_interp/kxz.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxz x (kxz)
+# kxz x (kxz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/kxz.y.asc b/test/bhns_interp/kxz.y.asc
index e82d73a..5ef5dd6 100644
--- a/test/bhns_interp/kxz.y.asc
+++ b/test/bhns_interp/kxz.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxz y (kxz)
+# kxz y (kxz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/kxz.z.asc b/test/bhns_interp/kxz.z.asc
index 4053e0a..8535316 100644
--- a/test/bhns_interp/kxz.z.asc
+++ b/test/bhns_interp/kxz.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kxz z (kxz)
+# kxz z (kxz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/kyy.d.asc b/test/bhns_interp/kyy.d.asc
index b0d5413..9c5b930 100644
--- a/test/bhns_interp/kyy.d.asc
+++ b/test/bhns_interp/kyy.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kyy d (kyy)
+# kyy d (kyy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/kyy.x.asc b/test/bhns_interp/kyy.x.asc
index c57c11c..7c3d98e 100644
--- a/test/bhns_interp/kyy.x.asc
+++ b/test/bhns_interp/kyy.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kyy x (kyy)
+# kyy x (kyy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/kyy.y.asc b/test/bhns_interp/kyy.y.asc
index a5c0181..224ad01 100644
--- a/test/bhns_interp/kyy.y.asc
+++ b/test/bhns_interp/kyy.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kyy y (kyy)
+# kyy y (kyy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/kyy.z.asc b/test/bhns_interp/kyy.z.asc
index a6534f8..63b7179 100644
--- a/test/bhns_interp/kyy.z.asc
+++ b/test/bhns_interp/kyy.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kyy z (kyy)
+# kyy z (kyy)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/kyz.d.asc b/test/bhns_interp/kyz.d.asc
index b828f84..aae3975 100644
--- a/test/bhns_interp/kyz.d.asc
+++ b/test/bhns_interp/kyz.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kyz d (kyz)
+# kyz d (kyz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/kyz.x.asc b/test/bhns_interp/kyz.x.asc
index eb361ec..040c164 100644
--- a/test/bhns_interp/kyz.x.asc
+++ b/test/bhns_interp/kyz.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kyz x (kyz)
+# kyz x (kyz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/kyz.y.asc b/test/bhns_interp/kyz.y.asc
index 351df75..4ecf42a 100644
--- a/test/bhns_interp/kyz.y.asc
+++ b/test/bhns_interp/kyz.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kyz y (kyz)
+# kyz y (kyz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/kyz.z.asc b/test/bhns_interp/kyz.z.asc
index 42738b2..64a5be1 100644
--- a/test/bhns_interp/kyz.z.asc
+++ b/test/bhns_interp/kyz.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kyz z (kyz)
+# kyz z (kyz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/kzz.d.asc b/test/bhns_interp/kzz.d.asc
index ce67a47..aea020a 100644
--- a/test/bhns_interp/kzz.d.asc
+++ b/test/bhns_interp/kzz.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kzz d (kzz)
+# kzz d (kzz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/kzz.x.asc b/test/bhns_interp/kzz.x.asc
index 1dbb484..441c76c 100644
--- a/test/bhns_interp/kzz.x.asc
+++ b/test/bhns_interp/kzz.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kzz x (kzz)
+# kzz x (kzz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/kzz.y.asc b/test/bhns_interp/kzz.y.asc
index d6e5884..aed41d5 100644
--- a/test/bhns_interp/kzz.y.asc
+++ b/test/bhns_interp/kzz.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kzz y (kzz)
+# kzz y (kzz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/kzz.z.asc b/test/bhns_interp/kzz.z.asc
index f678796..5654ad0 100644
--- a/test/bhns_interp/kzz.z.asc
+++ b/test/bhns_interp/kzz.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# ADMBASE::kzz z (kzz)
+# kzz z (kzz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/press.d.asc b/test/bhns_interp/press.d.asc
index cb41353..a99588e 100644
--- a/test/bhns_interp/press.d.asc
+++ b/test/bhns_interp/press.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::press d (press)
+# press d (press)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 1e-20
0 0 0 0 0 9728 9728 9728 0 -3 57 57 1e-20
0 0 0 0 0 10240 10240 10240 0 0 60 60 1e-20
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/press.maximum.asc b/test/bhns_interp/press.maximum.asc
index 019599f..bb820a1 100644
--- a/test/bhns_interp/press.maximum.asc
+++ b/test/bhns_interp/press.maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::press (press)
+# HYDROBASE::press (press)
# 1:iteration 2:time 3:data
0 0 1.56636309809793e-05
diff --git a/test/bhns_interp/press.minimum.asc b/test/bhns_interp/press.minimum.asc
index bfb721f..822c4e2 100644
--- a/test/bhns_interp/press.minimum.asc
+++ b/test/bhns_interp/press.minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::press (press)
+# HYDROBASE::press (press)
# 1:iteration 2:time 3:data
0 0 1e-20
diff --git a/test/bhns_interp/press.norm1.asc b/test/bhns_interp/press.norm1.asc
index 9b541e3..1350aac 100644
--- a/test/bhns_interp/press.norm1.asc
+++ b/test/bhns_interp/press.norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::press (press)
+# HYDROBASE::press (press)
# 1:iteration 2:time 3:data
0 0 5.05595619931428e-09
diff --git a/test/bhns_interp/press.norm2.asc b/test/bhns_interp/press.norm2.asc
index c12b95a..fcd3fd5 100644
--- a/test/bhns_interp/press.norm2.asc
+++ b/test/bhns_interp/press.norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::press (press)
+# HYDROBASE::press (press)
# 1:iteration 2:time 3:data
0 0 1.77988083793977e-07
diff --git a/test/bhns_interp/press.x.asc b/test/bhns_interp/press.x.asc
index 741b8be..4ca4e5a 100644
--- a/test/bhns_interp/press.x.asc
+++ b/test/bhns_interp/press.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::press x (press)
+# press x (press)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -12,12 +12,12 @@
0 0 0 0 0 2048 0 0 0 -48 0 0 1e-20
0 0 0 0 0 2560 0 0 0 -45 0 0 1e-20
0 0 0 0 0 3072 0 0 0 -42 0 0 1e-20
-0 0 0 0 0 3584 0 0 0 -39 0 0 1.94523111167906e-07
-0 0 0 0 0 4096 0 0 0 -36 0 0 3.49180029128853e-06
+0 0 0 0 0 3584 0 0 0 -39 0 0 1.94523111167907e-07
+0 0 0 0 0 4096 0 0 0 -36 0 0 3.49180029128854e-06
0 0 0 0 0 4608 0 0 0 -33 0 0 1.11355397978172e-05
0 0 0 0 0 5120 0 0 0 -30 0 0 1.56636309809793e-05
0 0 0 0 0 5632 0 0 0 -27 0 0 1.05017077673058e-05
-0 0 0 0 0 6144 0 0 0 -24 0 0 3.13793310343115e-06
+0 0 0 0 0 6144 0 0 0 -24 0 0 3.13793310343116e-06
0 0 0 0 0 6656 0 0 0 -21 0 0 1.6315212523712e-07
0 0 0 0 0 7168 0 0 0 -18 0 0 1e-20
0 0 0 0 0 7680 0 0 0 -15 0 0 1e-20
diff --git a/test/bhns_interp/press.y.asc b/test/bhns_interp/press.y.asc
index 22b7252..f62fc4e 100644
--- a/test/bhns_interp/press.y.asc
+++ b/test/bhns_interp/press.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::press y (press)
+# press y (press)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/press.z.asc b/test/bhns_interp/press.z.asc
index b9c2fd8..f5a973f 100644
--- a/test/bhns_interp/press.z.asc
+++ b/test/bhns_interp/press.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::press z (press)
+# press z (press)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/puncture_u.d.asc b/test/bhns_interp/puncture_u.d.asc
index 1a482db..967aad4 100644
--- a/test/bhns_interp/puncture_u.d.asc
+++ b/test/bhns_interp/puncture_u.d.asc
@@ -1,30 +1,50 @@
# 1D ASCII output created by CarpetIOASCII
#
-# TWOPUNCTURES::puncture_u d (puncture_u)
+# puncture_u d (puncture_u)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 0 0 0 0 -60 0 0 0.0130091716182024
+0 0 0 0 0 0 0 0 0 -60 0 0 0.0130091716182025
0 0 0 0 0 512 512 512 0 -57 3 3 0.014321545440819
0 0 0 0 0 1024 1024 1024 0 -54 6 6 0.0154204004448552
0 0 0 0 0 1536 1536 1536 0 -51 9 9 0.0160112861133035
0 0 0 0 0 2048 2048 2048 0 -48 12 12 0.0158902810445355
-0 0 0 0 0 2560 2560 2560 0 -45 15 15 0.0151226504260597
+0 0 0 0 0 2560 2560 2560 0 -45 15 15 0.0151226504260598
0 0 0 0 0 3072 3072 3072 0 -42 18 18 0.0139650638324822
0 0 0 0 0 3584 3584 3584 0 -39 21 21 0.0126635049993207
-0 0 0 0 0 4096 4096 4096 0 -36 24 24 0.0113975570213325
+0 0 0 0 0 4096 4096 4096 0 -36 24 24 0.0113975570213326
0 0 0 0 0 4608 4608 4608 0 -33 27 27 0.0102517793551712
-0 0 0 0 0 5120 5120 5120 0 -30 30 30 0.00925576413335203
-0 0 0 0 0 5632 5632 5632 0 -27 33 33 0.00839348170020258
-0 0 0 0 0 6144 6144 6144 0 -24 36 36 0.00765519127883081
-0 0 0 0 0 6656 6656 6656 0 -21 39 39 0.00701788859138488
-0 0 0 0 0 7168 7168 7168 0 -18 42 42 0.006476348798515
-0 0 0 0 0 7680 7680 7680 0 -15 45 45 0.00600060984916484
-0 0 0 0 0 8192 8192 8192 0 -12 48 48 0.00558645108314116
-0 0 0 0 0 8704 8704 8704 0 -9 51 51 0.00522227630464348
-0 0 0 0 0 9216 9216 9216 0 -6 54 54 0.00489998526362964
-0 0 0 0 0 9728 9728 9728 0 -3 57 57 0.00461386973793454
-0 0 0 0 0 10240 10240 10240 0 0 60 60 0.00435897391109112
+0 0 0 0 0 5120 5120 5120 0 -30 30 30 0.00925576413335204
+0 0 0 0 0 5632 5632 5632 0 -27 33 33 0.00839348170020259
+0 0 0 0 0 6144 6144 6144 0 -24 36 36 0.00765519127883082
+0 0 0 0 0 6656 6656 6656 0 -21 39 39 0.00701788859138489
+0 0 0 0 0 7168 7168 7168 0 -18 42 42 0.00647634879851501
+0 0 0 0 0 7680 7680 7680 0 -15 45 45 0.00600060984916485
+0 0 0 0 0 8192 8192 8192 0 -12 48 48 0.00558645108314117
+0 0 0 0 0 8704 8704 8704 0 -9 51 51 0.00522227630464349
+0 0 0 0 0 9216 9216 9216 0 -6 54 54 0.00489998526362965
+0 0 0 0 0 9728 9728 9728 0 -3 57 57 0.00461386973793455
+0 0 0 0 0 10240 10240 10240 0 0 60 60 0.00435897391109113
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/puncture_u.maximum.asc b/test/bhns_interp/puncture_u.maximum.asc
index 48e2e26..8d8cf7e 100644
--- a/test/bhns_interp/puncture_u.maximum.asc
+++ b/test/bhns_interp/puncture_u.maximum.asc
@@ -2,4 +2,4 @@
#
# TWOPUNCTURES::puncture_u (puncture_u)
# 1:iteration 2:time 3:data
-0 0 0.0808345262411887
+0 0 0.0808345262411888
diff --git a/test/bhns_interp/puncture_u.minimum.asc b/test/bhns_interp/puncture_u.minimum.asc
index dfd58d6..0693e46 100644
--- a/test/bhns_interp/puncture_u.minimum.asc
+++ b/test/bhns_interp/puncture_u.minimum.asc
@@ -2,4 +2,4 @@
#
# TWOPUNCTURES::puncture_u (puncture_u)
# 1:iteration 2:time 3:data
-0 0 0.00316994132432473
+0 0 0.00316994132432474
diff --git a/test/bhns_interp/puncture_u.norm1.asc b/test/bhns_interp/puncture_u.norm1.asc
index 1b60ae1..f1d4697 100644
--- a/test/bhns_interp/puncture_u.norm1.asc
+++ b/test/bhns_interp/puncture_u.norm1.asc
@@ -2,4 +2,4 @@
#
# TWOPUNCTURES::puncture_u (puncture_u)
# 1:iteration 2:time 3:data
-0 0 0.00731814489043249
+0 0 0.00731813623838801
diff --git a/test/bhns_interp/puncture_u.norm2.asc b/test/bhns_interp/puncture_u.norm2.asc
index 64fa50b..6d9e280 100644
--- a/test/bhns_interp/puncture_u.norm2.asc
+++ b/test/bhns_interp/puncture_u.norm2.asc
@@ -2,4 +2,4 @@
#
# TWOPUNCTURES::puncture_u (puncture_u)
# 1:iteration 2:time 3:data
-0 0 0.00850245047970137
+0 0 0.00850243965420273
diff --git a/test/bhns_interp/puncture_u.x.asc b/test/bhns_interp/puncture_u.x.asc
index b4aac74..36532bb 100644
--- a/test/bhns_interp/puncture_u.x.asc
+++ b/test/bhns_interp/puncture_u.x.asc
@@ -1,21 +1,21 @@
# 1D ASCII output created by CarpetIOASCII
#
-# TWOPUNCTURES::puncture_u x (puncture_u)
+# puncture_u x (puncture_u)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 0 0 0 0 -60 0 0 0.0130091716182024
+0 0 0 0 0 0 0 0 0 -60 0 0 0.0130091716182025
0 0 0 0 0 512 0 0 0 -57 0 0 0.0144978063958022
-0 0 0 0 0 1024 0 0 0 -54 0 0 0.0163652129291402
+0 0 0 0 0 1024 0 0 0 -54 0 0 0.0163652129291403
0 0 0 0 0 1536 0 0 0 -51 0 0 0.0187492996963606
-0 0 0 0 0 2048 0 0 0 -48 0 0 0.0217910092286604
-0 0 0 0 0 2560 0 0 0 -45 0 0 0.0258998732117247
+0 0 0 0 0 2048 0 0 0 -48 0 0 0.0217910092286605
+0 0 0 0 0 2560 0 0 0 -45 0 0 0.0258998732117248
0 0 0 0 0 3072 0 0 0 -42 0 0 0.0322164042443747
0 0 0 0 0 3584 0 0 0 -39 0 0 0.0430883383096973
0 0 0 0 0 4096 0 0 0 -36 0 0 0.0593259546539905
-0 0 0 0 0 4608 0 0 0 -33 0 0 0.0743792827784681
-0 0 0 0 0 5120 0 0 0 -30 0 0 0.0808345262411887
+0 0 0 0 0 4608 0 0 0 -33 0 0 0.0743792827784682
+0 0 0 0 0 5120 0 0 0 -30 0 0 0.0808345262411888
0 0 0 0 0 5632 0 0 0 -27 0 0 0.07442058039121
0 0 0 0 0 6144 0 0 0 -24 0 0 0.0583922847490564
0 0 0 0 0 6656 0 0 0 -21 0 0 0.0422800996850387
@@ -24,27 +24,27 @@
0 0 0 0 0 8192 0 0 0 -12 0 0 0.0215831976560582
0 0 0 0 0 8704 0 0 0 -9 0 0 0.018741784758895
0 0 0 0 0 9216 0 0 0 -6 0 0 0.0163255382660966
-0 0 0 0 0 9728 0 0 0 -3 0 0 0.0143763210519736
+0 0 0 0 0 9728 0 0 0 -3 0 0 0.0143763210519737
0 0 0 0 0 10240 0 0 0 0 0 0 0.0128247451351201
0 0 0 0 0 10752 0 0 0 3 0 0 0.011739834356394
0 0 0 0 0 11264 0 0 0 6 0 0 0.010890869116467
0 0 0 0 0 11776 0 0 0 9 0 0 0.0102122337467781
-0 0 0 0 0 12288 0 0 0 12 0 0 0.00937221889390501
-0 0 0 0 0 12800 0 0 0 15 0 0 0.00863741780959681
-0 0 0 0 0 13312 0 0 0 18 0 0 0.00805467724490475
-0 0 0 0 0 13824 0 0 0 21 0 0 0.00771139900239786
-0 0 0 0 0 14336 0 0 0 24 0 0 0.00729459031803057
+0 0 0 0 0 12288 0 0 0 12 0 0 0.00937221889390502
+0 0 0 0 0 12800 0 0 0 15 0 0 0.00863741780959683
+0 0 0 0 0 13312 0 0 0 18 0 0 0.00805467724490476
+0 0 0 0 0 13824 0 0 0 21 0 0 0.00771139900239788
+0 0 0 0 0 14336 0 0 0 24 0 0 0.00729459031803058
0 0 0 0 0 14848 0 0 0 27 0 0 0.00682998012851579
-0 0 0 0 0 15360 0 0 0 30 0 0 0.0066151040714429
-0 0 0 0 0 15872 0 0 0 33 0 0 0.00623731508880677
-0 0 0 0 0 16384 0 0 0 36 0 0 0.0059325389252119
-0 0 0 0 0 16896 0 0 0 39 0 0 0.00567598618032643
-0 0 0 0 0 17408 0 0 0 42 0 0 0.00544138936297846
-0 0 0 0 0 17920 0 0 0 45 0 0 0.00522419408816049
-0 0 0 0 0 18432 0 0 0 48 0 0 0.00502353902579796
-0 0 0 0 0 18944 0 0 0 51 0 0 0.00483764765262118
-0 0 0 0 0 19456 0 0 0 54 0 0 0.00466515069006338
-0 0 0 0 0 19968 0 0 0 57 0 0 0.0045045015001085
+0 0 0 0 0 15360 0 0 0 30 0 0 0.00661510407144292
+0 0 0 0 0 15872 0 0 0 33 0 0 0.00623731508880679
+0 0 0 0 0 16384 0 0 0 36 0 0 0.00593253892521191
+0 0 0 0 0 16896 0 0 0 39 0 0 0.00567598618032644
+0 0 0 0 0 17408 0 0 0 42 0 0 0.00544138936297847
+0 0 0 0 0 17920 0 0 0 45 0 0 0.0052241940881605
+0 0 0 0 0 18432 0 0 0 48 0 0 0.00502353902579797
+0 0 0 0 0 18944 0 0 0 51 0 0 0.00483764765262119
+0 0 0 0 0 19456 0 0 0 54 0 0 0.00466515069006339
+0 0 0 0 0 19968 0 0 0 57 0 0 0.00450450150010851
0 0 0 0 0 20480 0 0 0 60 0 0 0.0043546373664384
diff --git a/test/bhns_interp/puncture_u.y.asc b/test/bhns_interp/puncture_u.y.asc
index 194beb4..5a66816 100644
--- a/test/bhns_interp/puncture_u.y.asc
+++ b/test/bhns_interp/puncture_u.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# TWOPUNCTURES::puncture_u y (puncture_u)
+# puncture_u y (puncture_u)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -12,19 +12,19 @@
0 0 0 0 0 10240 2048 0 0 0 12 0 0.0120380935336914
0 0 0 0 0 10240 2560 0 0 0 15 0 0.0116549616469626
0 0 0 0 0 10240 3072 0 0 0 18 0 0.0111875492908265
-0 0 0 0 0 10240 3584 0 0 0 21 0 0.0107171705088834
+0 0 0 0 0 10240 3584 0 0 0 21 0 0.0106893347002228
0 0 0 0 0 10240 4096 0 0 0 24 0 0.0101812567757114
-0 0 0 0 0 10240 4608 0 0 0 27 0 0.00971146899560261
+0 0 0 0 0 10240 4608 0 0 0 27 0 0.00971146899560262
0 0 0 0 0 10240 5120 0 0 0 30 0 0.00925038027193534
-0 0 0 0 0 10240 5632 0 0 0 33 0 0.00877735689397837
-0 0 0 0 0 10240 6144 0 0 0 36 0 0.00836695951077499
-0 0 0 0 0 10240 6656 0 0 0 39 0 0.00797906970310381
-0 0 0 0 0 10240 7168 0 0 0 42 0 0.00758586201338622
+0 0 0 0 0 10240 5632 0 0 0 33 0 0.00877735689397838
+0 0 0 0 0 10240 6144 0 0 0 36 0 0.008366959510775
+0 0 0 0 0 10240 6656 0 0 0 39 0 0.00797906970310382
+0 0 0 0 0 10240 7168 0 0 0 42 0 0.00758817501432744
0 0 0 0 0 10240 7680 0 0 0 45 0 0.00724643753279889
0 0 0 0 0 10240 8192 0 0 0 48 0 0.00693008790484062
0 0 0 0 0 10240 8704 0 0 0 51 0 0.00663521759617813
0 0 0 0 0 10240 9216 0 0 0 54 0 0.00634101353455646
-0 0 0 0 0 10240 9728 0 0 0 57 0 0.00608618571984241
+0 0 0 0 0 10240 9728 0 0 0 57 0 0.00608618571984242
0 0 0 0 0 10240 10240 0 0 0 60 0 0.00584469509619151
diff --git a/test/bhns_interp/puncture_u.z.asc b/test/bhns_interp/puncture_u.z.asc
index e307f86..6e9c83c 100644
--- a/test/bhns_interp/puncture_u.z.asc
+++ b/test/bhns_interp/puncture_u.z.asc
@@ -1,30 +1,30 @@
# 1D ASCII output created by CarpetIOASCII
#
-# TWOPUNCTURES::puncture_u z (puncture_u)
+# puncture_u z (puncture_u)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
0 0 0 0 0 10240 0 0 0 0 0 0 0.0128247451351201
0 0 0 0 0 10240 0 512 0 0 0 3 0.0127536537117542
-0 0 0 0 0 10240 0 1024 0 0 0 6 0.0125805691835752
+0 0 0 0 0 10240 0 1024 0 0 0 6 0.0125805691835753
0 0 0 0 0 10240 0 1536 0 0 0 9 0.0123117397002641
0 0 0 0 0 10240 0 2048 0 0 0 12 0.0120380935336913
0 0 0 0 0 10240 0 2560 0 0 0 15 0.0116549616469625
0 0 0 0 0 10240 0 3072 0 0 0 18 0.0111875492908265
-0 0 0 0 0 10240 0 3584 0 0 0 21 0.0107171705088834
+0 0 0 0 0 10240 0 3584 0 0 0 21 0.0106893347002228
0 0 0 0 0 10240 0 4096 0 0 0 24 0.0101812567757114
-0 0 0 0 0 10240 0 4608 0 0 0 27 0.00971146899560258
-0 0 0 0 0 10240 0 5120 0 0 0 30 0.00925038027193531
-0 0 0 0 0 10240 0 5632 0 0 0 33 0.00877735689397834
-0 0 0 0 0 10240 0 6144 0 0 0 36 0.00836695951077496
-0 0 0 0 0 10240 0 6656 0 0 0 39 0.00797906970310378
-0 0 0 0 0 10240 0 7168 0 0 0 42 0.0075858620133862
-0 0 0 0 0 10240 0 7680 0 0 0 45 0.00724643753279886
-0 0 0 0 0 10240 0 8192 0 0 0 48 0.00693008790484059
-0 0 0 0 0 10240 0 8704 0 0 0 51 0.0066352175961781
-0 0 0 0 0 10240 0 9216 0 0 0 54 0.00634101353455643
-0 0 0 0 0 10240 0 9728 0 0 0 57 0.00608618571984239
-0 0 0 0 0 10240 0 10240 0 0 0 60 0.00584469509619148
+0 0 0 0 0 10240 0 4608 0 0 0 27 0.00971146899560259
+0 0 0 0 0 10240 0 5120 0 0 0 30 0.00925038027193532
+0 0 0 0 0 10240 0 5632 0 0 0 33 0.00877735689397835
+0 0 0 0 0 10240 0 6144 0 0 0 36 0.00836695951077497
+0 0 0 0 0 10240 0 6656 0 0 0 39 0.00797906970310379
+0 0 0 0 0 10240 0 7168 0 0 0 42 0.00758817501432742
+0 0 0 0 0 10240 0 7680 0 0 0 45 0.00724643753279887
+0 0 0 0 0 10240 0 8192 0 0 0 48 0.0069300879048406
+0 0 0 0 0 10240 0 8704 0 0 0 51 0.00663521759617811
+0 0 0 0 0 10240 0 9216 0 0 0 54 0.00634101353455644
+0 0 0 0 0 10240 0 9728 0 0 0 57 0.0060861857198424
+0 0 0 0 0 10240 0 10240 0 0 0 60 0.00584469509619149
diff --git a/test/bhns_interp/rho.d.asc b/test/bhns_interp/rho.d.asc
index 48dc076..b14c0e4 100644
--- a/test/bhns_interp/rho.d.asc
+++ b/test/bhns_interp/rho.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::rho d (rho)
+# rho d (rho)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 1e-11
0 0 0 0 0 9728 9728 9728 0 -3 57 57 1e-11
0 0 0 0 0 10240 10240 10240 0 0 60 60 1e-11
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/rho.maximum.asc b/test/bhns_interp/rho.maximum.asc
index bbf9eff..06a7150 100644
--- a/test/bhns_interp/rho.maximum.asc
+++ b/test/bhns_interp/rho.maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::rho (rho)
+# HYDROBASE::rho (rho)
# 1:iteration 2:time 3:data
-0 0 0.000395773053415456
+0 0 0.000395773053415455
diff --git a/test/bhns_interp/rho.minimum.asc b/test/bhns_interp/rho.minimum.asc
index c62e5f0..57394ca 100644
--- a/test/bhns_interp/rho.minimum.asc
+++ b/test/bhns_interp/rho.minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::rho (rho)
+# HYDROBASE::rho (rho)
# 1:iteration 2:time 3:data
0 0 1e-11
diff --git a/test/bhns_interp/rho.norm1.asc b/test/bhns_interp/rho.norm1.asc
index 11aea86..bebe024 100644
--- a/test/bhns_interp/rho.norm1.asc
+++ b/test/bhns_interp/rho.norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::rho (rho)
+# HYDROBASE::rho (rho)
# 1:iteration 2:time 3:data
-0 0 2.74360859712335e-07
+0 0 2.74360859712336e-07
diff --git a/test/bhns_interp/rho.norm2.asc b/test/bhns_interp/rho.norm2.asc
index 184a796..b975325 100644
--- a/test/bhns_interp/rho.norm2.asc
+++ b/test/bhns_interp/rho.norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::rho (rho)
+# HYDROBASE::rho (rho)
# 1:iteration 2:time 3:data
0 0 7.11052473402051e-06
diff --git a/test/bhns_interp/rho.x.asc b/test/bhns_interp/rho.x.asc
index 5f92b60..c3248b2 100644
--- a/test/bhns_interp/rho.x.asc
+++ b/test/bhns_interp/rho.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::rho x (rho)
+# rho x (rho)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -14,9 +14,9 @@
0 0 0 0 0 3072 0 0 0 -42 0 0 1e-11
0 0 0 0 0 3584 0 0 0 -39 0 0 4.41047742504036e-05
0 0 0 0 0 4096 0 0 0 -36 0 0 0.000186863594402134
-0 0 0 0 0 4608 0 0 0 -33 0 0 0.000333699562448278
-0 0 0 0 0 5120 0 0 0 -30 0 0 0.000395773053415456
-0 0 0 0 0 5632 0 0 0 -27 0 0 0.000324063385270625
+0 0 0 0 0 4608 0 0 0 -33 0 0 0.000333699562448277
+0 0 0 0 0 5120 0 0 0 -30 0 0 0.000395773053415455
+0 0 0 0 0 5632 0 0 0 -27 0 0 0.000324063385270626
0 0 0 0 0 6144 0 0 0 -24 0 0 0.000177142121005456
0 0 0 0 0 6656 0 0 0 -21 0 0 4.03920939339767e-05
0 0 0 0 0 7168 0 0 0 -18 0 0 1e-11
diff --git a/test/bhns_interp/rho.y.asc b/test/bhns_interp/rho.y.asc
index b58b82f..a3d9eca 100644
--- a/test/bhns_interp/rho.y.asc
+++ b/test/bhns_interp/rho.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::rho y (rho)
+# rho y (rho)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/rho.z.asc b/test/bhns_interp/rho.z.asc
index e6ff316..71a2ba6 100644
--- a/test/bhns_interp/rho.z.asc
+++ b/test/bhns_interp/rho.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::rho z (rho)
+# rho z (rho)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/scon[0].d.asc b/test/bhns_interp/scon[0].d.asc
index cd1a513..b124d5a 100644
--- a/test/bhns_interp/scon[0].d.asc
+++ b/test/bhns_interp/scon[0].d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sx d (sx)
+# scon[0] d (scon[0])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/scon[0].maximum.asc b/test/bhns_interp/scon[0].maximum.asc
index b058345..88f0396 100644
--- a/test/bhns_interp/scon[0].maximum.asc
+++ b/test/bhns_interp/scon[0].maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sx (sx)
+# GRHYDRO::scon[0] (scon[0])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/scon[0].minimum.asc b/test/bhns_interp/scon[0].minimum.asc
index b058345..88f0396 100644
--- a/test/bhns_interp/scon[0].minimum.asc
+++ b/test/bhns_interp/scon[0].minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sx (sx)
+# GRHYDRO::scon[0] (scon[0])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/scon[0].norm1.asc b/test/bhns_interp/scon[0].norm1.asc
index b058345..88f0396 100644
--- a/test/bhns_interp/scon[0].norm1.asc
+++ b/test/bhns_interp/scon[0].norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sx (sx)
+# GRHYDRO::scon[0] (scon[0])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/scon[0].norm2.asc b/test/bhns_interp/scon[0].norm2.asc
index b058345..88f0396 100644
--- a/test/bhns_interp/scon[0].norm2.asc
+++ b/test/bhns_interp/scon[0].norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sx (sx)
+# GRHYDRO::scon[0] (scon[0])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/scon[0].x.asc b/test/bhns_interp/scon[0].x.asc
index 316bbec..fc9656d 100644
--- a/test/bhns_interp/scon[0].x.asc
+++ b/test/bhns_interp/scon[0].x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sx x (sx)
+# scon[0] x (scon[0])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/scon[0].y.asc b/test/bhns_interp/scon[0].y.asc
index aa6b088..36a4dd2 100644
--- a/test/bhns_interp/scon[0].y.asc
+++ b/test/bhns_interp/scon[0].y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sx y (sx)
+# scon[0] y (scon[0])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/scon[0].z.asc b/test/bhns_interp/scon[0].z.asc
index 13972a4..d32d699 100644
--- a/test/bhns_interp/scon[0].z.asc
+++ b/test/bhns_interp/scon[0].z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sx z (sx)
+# scon[0] z (scon[0])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/scon[1].d.asc b/test/bhns_interp/scon[1].d.asc
index b2cd07f..2185a8d 100644
--- a/test/bhns_interp/scon[1].d.asc
+++ b/test/bhns_interp/scon[1].d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sy d (sy)
+# scon[1] d (scon[1])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/scon[1].maximum.asc b/test/bhns_interp/scon[1].maximum.asc
index 91f974a..2c88c85 100644
--- a/test/bhns_interp/scon[1].maximum.asc
+++ b/test/bhns_interp/scon[1].maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sy (sy)
+# GRHYDRO::scon[1] (scon[1])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/scon[1].minimum.asc b/test/bhns_interp/scon[1].minimum.asc
index 91f974a..2c88c85 100644
--- a/test/bhns_interp/scon[1].minimum.asc
+++ b/test/bhns_interp/scon[1].minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sy (sy)
+# GRHYDRO::scon[1] (scon[1])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/scon[1].norm1.asc b/test/bhns_interp/scon[1].norm1.asc
index 91f974a..2c88c85 100644
--- a/test/bhns_interp/scon[1].norm1.asc
+++ b/test/bhns_interp/scon[1].norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sy (sy)
+# GRHYDRO::scon[1] (scon[1])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/scon[1].norm2.asc b/test/bhns_interp/scon[1].norm2.asc
index 91f974a..2c88c85 100644
--- a/test/bhns_interp/scon[1].norm2.asc
+++ b/test/bhns_interp/scon[1].norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sy (sy)
+# GRHYDRO::scon[1] (scon[1])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/scon[1].x.asc b/test/bhns_interp/scon[1].x.asc
index 2ecd912..e851b45 100644
--- a/test/bhns_interp/scon[1].x.asc
+++ b/test/bhns_interp/scon[1].x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sy x (sy)
+# scon[1] x (scon[1])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/scon[1].y.asc b/test/bhns_interp/scon[1].y.asc
index d3f0989..f8761ca 100644
--- a/test/bhns_interp/scon[1].y.asc
+++ b/test/bhns_interp/scon[1].y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sy y (sy)
+# scon[1] y (scon[1])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/scon[1].z.asc b/test/bhns_interp/scon[1].z.asc
index d9f9b56..241915a 100644
--- a/test/bhns_interp/scon[1].z.asc
+++ b/test/bhns_interp/scon[1].z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sy z (sy)
+# scon[1] z (scon[1])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/scon[2].d.asc b/test/bhns_interp/scon[2].d.asc
index e907f60..5d4ed0c 100644
--- a/test/bhns_interp/scon[2].d.asc
+++ b/test/bhns_interp/scon[2].d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sz d (sz)
+# scon[2] d (scon[2])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/scon[2].maximum.asc b/test/bhns_interp/scon[2].maximum.asc
index ab1bc22..924fd71 100644
--- a/test/bhns_interp/scon[2].maximum.asc
+++ b/test/bhns_interp/scon[2].maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sz (sz)
+# GRHYDRO::scon[2] (scon[2])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/scon[2].minimum.asc b/test/bhns_interp/scon[2].minimum.asc
index ab1bc22..924fd71 100644
--- a/test/bhns_interp/scon[2].minimum.asc
+++ b/test/bhns_interp/scon[2].minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sz (sz)
+# GRHYDRO::scon[2] (scon[2])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/scon[2].norm1.asc b/test/bhns_interp/scon[2].norm1.asc
index ab1bc22..924fd71 100644
--- a/test/bhns_interp/scon[2].norm1.asc
+++ b/test/bhns_interp/scon[2].norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sz (sz)
+# GRHYDRO::scon[2] (scon[2])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/scon[2].norm2.asc b/test/bhns_interp/scon[2].norm2.asc
index ab1bc22..924fd71 100644
--- a/test/bhns_interp/scon[2].norm2.asc
+++ b/test/bhns_interp/scon[2].norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::sz (sz)
+# GRHYDRO::scon[2] (scon[2])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/scon[2].x.asc b/test/bhns_interp/scon[2].x.asc
index 08d6541..aeb00bb 100644
--- a/test/bhns_interp/scon[2].x.asc
+++ b/test/bhns_interp/scon[2].x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sz x (sz)
+# scon[2] x (scon[2])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/scon[2].y.asc b/test/bhns_interp/scon[2].y.asc
index 5c8356a..2306449 100644
--- a/test/bhns_interp/scon[2].y.asc
+++ b/test/bhns_interp/scon[2].y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sz y (sz)
+# scon[2] y (scon[2])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/scon[2].z.asc b/test/bhns_interp/scon[2].z.asc
index 2278789..f7acd05 100644
--- a/test/bhns_interp/scon[2].z.asc
+++ b/test/bhns_interp/scon[2].z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::sz z (sz)
+# scon[2] z (scon[2])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/tau.d.asc b/test/bhns_interp/tau.d.asc
index 6f973a8..9dd8d9f 100644
--- a/test/bhns_interp/tau.d.asc
+++ b/test/bhns_interp/tau.d.asc
@@ -1,30 +1,50 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::tau d (tau)
+# tau d (tau)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 0 0 0 0 -60 0 0 1.08931237807278e-20
-0 0 0 0 0 512 512 512 0 -57 3 3 1.09837813909394e-20
-0 0 0 0 0 1024 1024 1024 0 -54 6 6 1.1059339404309e-20
-0 0 0 0 0 1536 1536 1536 0 -51 9 9 1.10998643730904e-20
-0 0 0 0 0 2048 2048 2048 0 -48 12 12 1.10913935578689e-20
-0 0 0 0 0 2560 2560 2560 0 -45 15 15 1.10370474494163e-20
-0 0 0 0 0 3072 3072 3072 0 -42 18 18 1.09543368389522e-20
-0 0 0 0 0 3584 3584 3584 0 -39 21 21 1.08623836288334e-20
-0 0 0 0 0 4096 4096 4096 0 -36 24 24 1.07737490113925e-20
-0 0 0 0 0 4608 4608 4608 0 -33 27 27 1.06941154751627e-20
-0 0 0 0 0 5120 5120 5120 0 -30 30 30 1.06249152026395e-20
-0 0 0 0 0 5632 5632 5632 0 -27 33 33 1.05655996089053e-20
-0 0 0 0 0 6144 6144 6144 0 -24 36 36 1.05149223095072e-20
-0 0 0 0 0 6656 6656 6656 0 -21 39 39 1.04715336778211e-20
-0 0 0 0 0 7168 7168 7168 0 -18 42 42 1.04342061445154e-20
-0 0 0 0 0 7680 7680 7680 0 -15 45 45 1.04018965325508e-20
-0 0 0 0 0 8192 8192 8192 0 -12 48 48 1.03737457345363e-20
-0 0 0 0 0 8704 8704 8704 0 -9 51 51 1.03490592467972e-20
-0 0 0 0 0 9216 9216 9216 0 -6 54 54 1.03272713724452e-20
-0 0 0 0 0 9728 9728 9728 0 -3 57 57 1.03079272992475e-20
-0 0 0 0 0 10240 10240 10240 0 0 60 60 1.02906574947792e-20
+0 0 0 0 0 0 0 0 0 -60 0 0 1.27107480981739e-20
+0 0 0 0 0 512 512 512 0 -57 3 3 1.28754830558684e-20
+0 0 0 0 0 1024 1024 1024 0 -54 6 6 1.3024966871019e-20
+0 0 0 0 0 1536 1536 1536 0 -51 9 9 1.31352662358241e-20
+0 0 0 0 0 2048 2048 2048 0 -48 12 12 1.31886371567922e-20
+0 0 0 0 0 2560 2560 2560 0 -45 15 15 1.31877905891341e-20
+0 0 0 0 0 3072 3072 3072 0 -42 18 18 1.31503445105447e-20
+0 0 0 0 0 3584 3584 3584 0 -39 21 21 1.30933191314797e-20
+0 0 0 0 0 4096 4096 4096 0 -36 24 24 1.30288151995719e-20
+0 0 0 0 0 4608 4608 4608 0 -33 27 27 1.29619864377784e-20
+0 0 0 0 0 5120 5120 5120 0 -30 30 30 1.28942610251257e-20
+0 0 0 0 0 5632 5632 5632 0 -27 33 33 1.28241930111287e-20
+0 0 0 0 0 6144 6144 6144 0 -24 36 36 1.27513768834171e-20
+0 0 0 0 0 6656 6656 6656 0 -21 39 39 1.26749628431582e-20
+0 0 0 0 0 7168 7168 7168 0 -18 42 42 1.25958330009273e-20
+0 0 0 0 0 7680 7680 7680 0 -15 45 45 1.25133621245035e-20
+0 0 0 0 0 8192 8192 8192 0 -12 48 48 1.24289363876476e-20
+0 0 0 0 0 8704 8704 8704 0 -9 51 51 1.23434055891922e-20
+0 0 0 0 0 9216 9216 9216 0 -6 54 54 1.22577633152246e-20
+0 0 0 0 0 9728 9728 9728 0 -3 57 57 1.21729950738964e-20
+0 0 0 0 0 10240 10240 10240 0 0 60 60 1.20899215834716e-20
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/tau.maximum.asc b/test/bhns_interp/tau.maximum.asc
index 4da8c34..3d5a100 100644
--- a/test/bhns_interp/tau.maximum.asc
+++ b/test/bhns_interp/tau.maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::tau (tau)
+# GRHYDRO::tau (tau)
# 1:iteration 2:time 3:data
-0 0 3.13338175511396e-05
+0 0 3.13338175511397e-05
diff --git a/test/bhns_interp/tau.minimum.asc b/test/bhns_interp/tau.minimum.asc
index 571ad3e..6b38164 100644
--- a/test/bhns_interp/tau.minimum.asc
+++ b/test/bhns_interp/tau.minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::tau (tau)
+# GRHYDRO::tau (tau)
# 1:iteration 2:time 3:data
-0 0 1.02107951794206e-20
+0 0 1.15679819260606e-20
diff --git a/test/bhns_interp/tau.norm1.asc b/test/bhns_interp/tau.norm1.asc
index 45b46d9..6546870 100644
--- a/test/bhns_interp/tau.norm1.asc
+++ b/test/bhns_interp/tau.norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::tau (tau)
+# GRHYDRO::tau (tau)
# 1:iteration 2:time 3:data
-0 0 9.27697909085264e-09
+0 0 9.27697909086468e-09
diff --git a/test/bhns_interp/tau.norm2.asc b/test/bhns_interp/tau.norm2.asc
index 5336fe7..ab156b4 100644
--- a/test/bhns_interp/tau.norm2.asc
+++ b/test/bhns_interp/tau.norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::tau (tau)
+# GRHYDRO::tau (tau)
# 1:iteration 2:time 3:data
0 0 3.36803403809457e-07
diff --git a/test/bhns_interp/tau.x.asc b/test/bhns_interp/tau.x.asc
index f705b09..2d847a5 100644
--- a/test/bhns_interp/tau.x.asc
+++ b/test/bhns_interp/tau.x.asc
@@ -1,50 +1,50 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::tau x (tau)
+# tau x (tau)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 0 0 0 0 -60 0 0 1.08931237807278e-20
-0 0 0 0 0 512 0 0 0 -57 0 0 1.0996334983386e-20
-0 0 0 0 0 1024 0 0 0 -54 0 0 1.11264949556768e-20
-0 0 0 0 0 1536 0 0 0 -51 0 0 1.12957267865625e-20
-0 0 0 0 0 2048 0 0 0 -48 0 0 1.1524701087484e-20
-0 0 0 0 0 2560 0 0 0 -45 0 0 1.18517537531991e-20
-0 0 0 0 0 3072 0 0 0 -42 0 0 1.23568116073781e-20
-0 0 0 0 0 3584 0 0 0 -39 0 0 3.07519805984543e-07
+0 0 0 0 0 0 0 0 0 -60 0 0 1.27107480981739e-20
+0 0 0 0 0 512 0 0 0 -57 0 0 1.28910718561234e-20
+0 0 0 0 0 1024 0 0 0 -54 0 0 1.31071065520803e-20
+0 0 0 0 0 1536 0 0 0 -51 0 0 1.33713891422039e-20
+0 0 0 0 0 2048 0 0 0 -48 0 0 1.36978944552022e-20
+0 0 0 0 0 2560 0 0 0 -45 0 0 1.4123735758715e-20
+0 0 0 0 0 3072 0 0 0 -42 0 0 1.47515157604416e-20
+0 0 0 0 0 3584 0 0 0 -39 0 0 3.07519805984547e-07
0 0 0 0 0 4096 0 0 0 -36 0 0 6.09221825446113e-06
0 0 0 0 0 4608 0 0 0 -33 0 0 2.12895766216937e-05
-0 0 0 0 0 5120 0 0 0 -30 0 0 3.13338175511396e-05
-0 0 0 0 0 5632 0 0 0 -27 0 0 2.05382677087921e-05
-0 0 0 0 0 6144 0 0 0 -24 0 0 5.70273078218313e-06
-0 0 0 0 0 6656 0 0 0 -21 0 0 2.75585883824865e-07
-0 0 0 0 0 7168 0 0 0 -18 0 0 1.23568116073781e-20
-0 0 0 0 0 7680 0 0 0 -15 0 0 1.18517537531991e-20
-0 0 0 0 0 8192 0 0 0 -12 0 0 1.1524701087484e-20
-0 0 0 0 0 8704 0 0 0 -9 0 0 1.12957267865625e-20
-0 0 0 0 0 9216 0 0 0 -6 0 0 1.11264949556768e-20
-0 0 0 0 0 9728 0 0 0 -3 0 0 1.0996334983386e-20
-0 0 0 0 0 10240 0 0 0 0 0 0 1.08931237807278e-20
-0 0 0 0 0 10752 0 0 0 3 0 0 1.08092789626203e-20
-0 0 0 0 0 11264 0 0 0 6 0 0 1.07398215845509e-20
-0 0 0 0 0 11776 0 0 0 9 0 0 1.06813392740572e-20
-0 0 0 0 0 12288 0 0 0 12 0 0 1.06314237492363e-20
-0 0 0 0 0 12800 0 0 0 15 0 0 1.05883195760594e-20
-0 0 0 0 0 13312 0 0 0 18 0 0 1.05507241968662e-20
-0 0 0 0 0 13824 0 0 0 21 0 0 1.05176436524383e-20
-0 0 0 0 0 14336 0 0 0 24 0 0 1.04883124731738e-20
-0 0 0 0 0 14848 0 0 0 27 0 0 1.04621259845672e-20
-0 0 0 0 0 15360 0 0 0 30 0 0 1.04386037364062e-20
-0 0 0 0 0 15872 0 0 0 33 0 0 1.04173609767727e-20
-0 0 0 0 0 16384 0 0 0 36 0 0 1.03980807090115e-20
-0 0 0 0 0 16896 0 0 0 39 0 0 1.03805027249866e-20
-0 0 0 0 0 17408 0 0 0 42 0 0 1.03644103277627e-20
-0 0 0 0 0 17920 0 0 0 45 0 0 1.03496244632692e-20
-0 0 0 0 0 18432 0 0 0 48 0 0 1.03359921910983e-20
-0 0 0 0 0 18944 0 0 0 51 0 0 1.03233818330097e-20
-0 0 0 0 0 19456 0 0 0 54 0 0 1.03116841538564e-20
-0 0 0 0 0 19968 0 0 0 57 0 0 1.03008039499599e-20
-0 0 0 0 0 20480 0 0 0 60 0 0 1.02906574947792e-20
+0 0 0 0 0 5120 0 0 0 -30 0 0 3.13338175511397e-05
+0 0 0 0 0 5632 0 0 0 -27 0 0 2.05382677087922e-05
+0 0 0 0 0 6144 0 0 0 -24 0 0 5.70273078218315e-06
+0 0 0 0 0 6656 0 0 0 -21 0 0 2.75585883824847e-07
+0 0 0 0 0 7168 0 0 0 -18 0 0 1.61968070857249e-20
+0 0 0 0 0 7680 0 0 0 -15 0 0 1.59559553558042e-20
+0 0 0 0 0 8192 0 0 0 -12 0 0 1.59665891503195e-20
+0 0 0 0 0 8704 0 0 0 -9 0 0 1.61211620649418e-20
+0 0 0 0 0 9216 0 0 0 -6 0 0 1.63842668920447e-20
+0 0 0 0 0 9728 0 0 0 -3 0 0 1.67833686129045e-20
+0 0 0 0 0 10240 0 0 0 0 0 0 1.73475930323709e-20
+0 0 0 0 0 10752 0 0 0 3 0 0 1.81384035473657e-20
+0 0 0 0 0 11264 0 0 0 6 0 0 1.9221344527911e-20
+0 0 0 0 0 11776 0 0 0 9 0 0 2.07378347781849e-20
+0 0 0 0 0 12288 0 0 0 12 0 0 2.29215495900595e-20
+0 0 0 0 0 12800 0 0 0 15 0 0 2.63573379683522e-20
+0 0 0 0 0 13312 0 0 0 18 0 0 3.23916302304494e-20
+0 0 0 0 0 13824 0 0 0 21 0 0 4.5124311539553e-20
+0 0 0 0 0 14336 0 0 0 24 0 0 8.33660150935703e-20
+0 0 0 0 0 14848 0 0 0 27 0 0 3.88273978340234e-19
+0 0 0 0 0 15360 0 0 0 30 0 0 1.79818556666526e-16
+0 0 0 0 0 15872 0 0 0 33 0 0 3.87524242512531e-19
+0 0 0 0 0 16384 0 0 0 36 0 0 8.28887189554301e-20
+0 0 0 0 0 16896 0 0 0 39 0 0 4.46973183224137e-20
+0 0 0 0 0 17408 0 0 0 42 0 0 3.19763274018109e-20
+0 0 0 0 0 17920 0 0 0 45 0 0 2.59013901985993e-20
+0 0 0 0 0 18432 0 0 0 48 0 0 2.24056086076766e-20
+0 0 0 0 0 18944 0 0 0 51 0 0 2.01526400377206e-20
+0 0 0 0 0 19456 0 0 0 54 0 0 1.85863509296316e-20
+0 0 0 0 0 19968 0 0 0 57 0 0 1.74369446943979e-20
+0 0 0 0 0 20480 0 0 0 60 0 0 1.65586921413683e-20
diff --git a/test/bhns_interp/tau.y.asc b/test/bhns_interp/tau.y.asc
index c602596..c0ea17b 100644
--- a/test/bhns_interp/tau.y.asc
+++ b/test/bhns_interp/tau.y.asc
@@ -1,30 +1,30 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::tau y (tau)
+# tau y (tau)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 10240 0 0 0 0 0 0 1.08931237807278e-20
-0 0 0 0 0 10240 512 0 0 0 3 0 1.0888533265014e-20
-0 0 0 0 0 10240 1024 0 0 0 6 0 1.08751690241128e-20
-0 0 0 0 0 10240 1536 0 0 0 9 0 1.08541608677681e-20
-0 0 0 0 0 10240 2048 0 0 0 12 0 1.08271139669945e-20
-0 0 0 0 0 10240 2560 0 0 0 15 0 1.07958056151562e-20
-0 0 0 0 0 10240 3072 0 0 0 18 0 1.07619305189804e-20
-0 0 0 0 0 10240 3584 0 0 0 21 0 1.07269329250125e-20
-0 0 0 0 0 10240 4096 0 0 0 24 0 1.06919369063997e-20
-0 0 0 0 0 10240 4608 0 0 0 27 0 1.06577526690459e-20
-0 0 0 0 0 10240 5120 0 0 0 30 0 1.06249152026395e-20
-0 0 0 0 0 10240 5632 0 0 0 33 0 1.05937493356467e-20
-0 0 0 0 0 10240 6144 0 0 0 36 0 1.0564412588602e-20
-0 0 0 0 0 10240 6656 0 0 0 39 0 1.05369563636819e-20
-0 0 0 0 0 10240 7168 0 0 0 42 0 1.05113583369116e-20
-0 0 0 0 0 10240 7680 0 0 0 45 0 1.04875460648277e-20
-0 0 0 0 0 10240 8192 0 0 0 48 0 1.04654212529947e-20
-0 0 0 0 0 10240 8704 0 0 0 51 0 1.04448754645927e-20
-0 0 0 0 0 10240 9216 0 0 0 54 0 1.04257902198134e-20
-0 0 0 0 0 10240 9728 0 0 0 57 0 1.04080542908468e-20
-0 0 0 0 0 10240 10240 0 0 0 60 0 1.03915567180959e-20
+0 0 0 0 0 10240 0 0 0 0 0 0 1.73475930323709e-20
+0 0 0 0 0 10240 512 0 0 0 3 0 1.73016231160631e-20
+0 0 0 0 0 10240 1024 0 0 0 6 0 1.71714940347766e-20
+0 0 0 0 0 10240 1536 0 0 0 9 0 1.69686570701164e-20
+0 0 0 0 0 10240 2048 0 0 0 12 0 1.67167159501086e-20
+0 0 0 0 0 10240 2560 0 0 0 15 0 1.64223818237075e-20
+0 0 0 0 0 10240 3072 0 0 0 18 0 1.61033873752947e-20
+0 0 0 0 0 10240 3584 0 0 0 21 0 1.57771615588705e-20
+0 0 0 0 0 10240 4096 0 0 0 24 0 1.54548810062274e-20
+0 0 0 0 0 10240 4608 0 0 0 27 0 1.51469177867648e-20
+0 0 0 0 0 10240 5120 0 0 0 30 0 1.4854457741439e-20
+0 0 0 0 0 10240 5632 0 0 0 33 0 1.45777367459716e-20
+0 0 0 0 0 10240 6144 0 0 0 36 0 1.43235079545822e-20
+0 0 0 0 0 10240 6656 0 0 0 39 0 1.40881783014852e-20
+0 0 0 0 0 10240 7168 0 0 0 42 0 1.38689786703329e-20
+0 0 0 0 0 10240 7680 0 0 0 45 0 1.36689996793125e-20
+0 0 0 0 0 10240 8192 0 0 0 48 0 1.34851571725855e-20
+0 0 0 0 0 10240 8704 0 0 0 51 0 1.3315945422943e-20
+0 0 0 0 0 10240 9216 0 0 0 54 0 1.31586211634316e-20
+0 0 0 0 0 10240 9728 0 0 0 57 0 1.30150083919257e-20
+0 0 0 0 0 10240 10240 0 0 0 60 0 1.28821085787045e-20
diff --git a/test/bhns_interp/tau.z.asc b/test/bhns_interp/tau.z.asc
index 1a1aeab..a02c4ed 100644
--- a/test/bhns_interp/tau.z.asc
+++ b/test/bhns_interp/tau.z.asc
@@ -1,30 +1,30 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::tau z (tau)
+# tau z (tau)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
# column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data
-0 0 0 0 0 10240 0 0 0 0 0 0 1.08931237807278e-20
-0 0 0 0 0 10240 0 512 0 0 0 3 1.0888533265014e-20
-0 0 0 0 0 10240 0 1024 0 0 0 6 1.08751690241128e-20
-0 0 0 0 0 10240 0 1536 0 0 0 9 1.08541608677681e-20
-0 0 0 0 0 10240 0 2048 0 0 0 12 1.08271139669945e-20
-0 0 0 0 0 10240 0 2560 0 0 0 15 1.07958056151562e-20
-0 0 0 0 0 10240 0 3072 0 0 0 18 1.07619305189804e-20
-0 0 0 0 0 10240 0 3584 0 0 0 21 1.07269329250125e-20
-0 0 0 0 0 10240 0 4096 0 0 0 24 1.06919369063997e-20
-0 0 0 0 0 10240 0 4608 0 0 0 27 1.06577526690459e-20
-0 0 0 0 0 10240 0 5120 0 0 0 30 1.06249152026395e-20
-0 0 0 0 0 10240 0 5632 0 0 0 33 1.05937493356467e-20
-0 0 0 0 0 10240 0 6144 0 0 0 36 1.0564412588602e-20
-0 0 0 0 0 10240 0 6656 0 0 0 39 1.05369563636819e-20
-0 0 0 0 0 10240 0 7168 0 0 0 42 1.05113583369116e-20
-0 0 0 0 0 10240 0 7680 0 0 0 45 1.04875460648277e-20
-0 0 0 0 0 10240 0 8192 0 0 0 48 1.04654212529947e-20
-0 0 0 0 0 10240 0 8704 0 0 0 51 1.04448754645927e-20
-0 0 0 0 0 10240 0 9216 0 0 0 54 1.04257902198134e-20
-0 0 0 0 0 10240 0 9728 0 0 0 57 1.04080542908468e-20
-0 0 0 0 0 10240 0 10240 0 0 0 60 1.03915567180959e-20
+0 0 0 0 0 10240 0 0 0 0 0 0 1.73475930323709e-20
+0 0 0 0 0 10240 0 512 0 0 0 3 1.73016231160631e-20
+0 0 0 0 0 10240 0 1024 0 0 0 6 1.71714940347766e-20
+0 0 0 0 0 10240 0 1536 0 0 0 9 1.69686570701164e-20
+0 0 0 0 0 10240 0 2048 0 0 0 12 1.67167159501086e-20
+0 0 0 0 0 10240 0 2560 0 0 0 15 1.64223818237075e-20
+0 0 0 0 0 10240 0 3072 0 0 0 18 1.61033873752947e-20
+0 0 0 0 0 10240 0 3584 0 0 0 21 1.57771615588705e-20
+0 0 0 0 0 10240 0 4096 0 0 0 24 1.54548810062274e-20
+0 0 0 0 0 10240 0 4608 0 0 0 27 1.51469177867648e-20
+0 0 0 0 0 10240 0 5120 0 0 0 30 1.4854457741439e-20
+0 0 0 0 0 10240 0 5632 0 0 0 33 1.45777367459716e-20
+0 0 0 0 0 10240 0 6144 0 0 0 36 1.43235079545822e-20
+0 0 0 0 0 10240 0 6656 0 0 0 39 1.40881799170723e-20
+0 0 0 0 0 10240 0 7168 0 0 0 42 1.38689786703329e-20
+0 0 0 0 0 10240 0 7680 0 0 0 45 1.36689996793125e-20
+0 0 0 0 0 10240 0 8192 0 0 0 48 1.34851571725855e-20
+0 0 0 0 0 10240 0 8704 0 0 0 51 1.3315945422943e-20
+0 0 0 0 0 10240 0 9216 0 0 0 54 1.31586211634316e-20
+0 0 0 0 0 10240 0 9728 0 0 0 57 1.30150083919257e-20
+0 0 0 0 0 10240 0 10240 0 0 0 60 1.28821085787045e-20
diff --git a/test/bhns_interp/vel[0].d.asc b/test/bhns_interp/vel[0].d.asc
index 8af059d..e1c7694 100644
--- a/test/bhns_interp/vel[0].d.asc
+++ b/test/bhns_interp/vel[0].d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::velx d (velx)
+# vel[0] d (vel[0])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/vel[0].maximum.asc b/test/bhns_interp/vel[0].maximum.asc
index 3b6b5e5..f217a8b 100644
--- a/test/bhns_interp/vel[0].maximum.asc
+++ b/test/bhns_interp/vel[0].maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::velx (velx)
+# HYDROBASE::vel[0] (vel[0])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/vel[0].minimum.asc b/test/bhns_interp/vel[0].minimum.asc
index 3b6b5e5..f217a8b 100644
--- a/test/bhns_interp/vel[0].minimum.asc
+++ b/test/bhns_interp/vel[0].minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::velx (velx)
+# HYDROBASE::vel[0] (vel[0])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/vel[0].norm1.asc b/test/bhns_interp/vel[0].norm1.asc
index 3b6b5e5..f217a8b 100644
--- a/test/bhns_interp/vel[0].norm1.asc
+++ b/test/bhns_interp/vel[0].norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::velx (velx)
+# HYDROBASE::vel[0] (vel[0])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/vel[0].norm2.asc b/test/bhns_interp/vel[0].norm2.asc
index 3b6b5e5..f217a8b 100644
--- a/test/bhns_interp/vel[0].norm2.asc
+++ b/test/bhns_interp/vel[0].norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::velx (velx)
+# HYDROBASE::vel[0] (vel[0])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/vel[0].x.asc b/test/bhns_interp/vel[0].x.asc
index 2701e4c..0cf14da 100644
--- a/test/bhns_interp/vel[0].x.asc
+++ b/test/bhns_interp/vel[0].x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::velx x (velx)
+# vel[0] x (vel[0])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/vel[0].y.asc b/test/bhns_interp/vel[0].y.asc
index 8977239..0d9ccb5 100644
--- a/test/bhns_interp/vel[0].y.asc
+++ b/test/bhns_interp/vel[0].y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::velx y (velx)
+# vel[0] y (vel[0])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/vel[0].z.asc b/test/bhns_interp/vel[0].z.asc
index 315fccc..02fb80a 100644
--- a/test/bhns_interp/vel[0].z.asc
+++ b/test/bhns_interp/vel[0].z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::velx z (velx)
+# vel[0] z (vel[0])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/vel[1].d.asc b/test/bhns_interp/vel[1].d.asc
index dcfe4bb..4b46c5a 100644
--- a/test/bhns_interp/vel[1].d.asc
+++ b/test/bhns_interp/vel[1].d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::vely d (vely)
+# vel[1] d (vel[1])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/vel[1].maximum.asc b/test/bhns_interp/vel[1].maximum.asc
index 189b739..3caed43 100644
--- a/test/bhns_interp/vel[1].maximum.asc
+++ b/test/bhns_interp/vel[1].maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::vely (vely)
+# HYDROBASE::vel[1] (vel[1])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/vel[1].minimum.asc b/test/bhns_interp/vel[1].minimum.asc
index 189b739..3caed43 100644
--- a/test/bhns_interp/vel[1].minimum.asc
+++ b/test/bhns_interp/vel[1].minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::vely (vely)
+# HYDROBASE::vel[1] (vel[1])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/vel[1].norm1.asc b/test/bhns_interp/vel[1].norm1.asc
index 189b739..3caed43 100644
--- a/test/bhns_interp/vel[1].norm1.asc
+++ b/test/bhns_interp/vel[1].norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::vely (vely)
+# HYDROBASE::vel[1] (vel[1])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/vel[1].norm2.asc b/test/bhns_interp/vel[1].norm2.asc
index 189b739..3caed43 100644
--- a/test/bhns_interp/vel[1].norm2.asc
+++ b/test/bhns_interp/vel[1].norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::vely (vely)
+# HYDROBASE::vel[1] (vel[1])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/vel[1].x.asc b/test/bhns_interp/vel[1].x.asc
index 3e3a027..f69b76f 100644
--- a/test/bhns_interp/vel[1].x.asc
+++ b/test/bhns_interp/vel[1].x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::vely x (vely)
+# vel[1] x (vel[1])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/vel[1].y.asc b/test/bhns_interp/vel[1].y.asc
index 66c936c..a6c4a04 100644
--- a/test/bhns_interp/vel[1].y.asc
+++ b/test/bhns_interp/vel[1].y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::vely y (vely)
+# vel[1] y (vel[1])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/vel[1].z.asc b/test/bhns_interp/vel[1].z.asc
index e01fcd6..e5e56be 100644
--- a/test/bhns_interp/vel[1].z.asc
+++ b/test/bhns_interp/vel[1].z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::vely z (vely)
+# vel[1] z (vel[1])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/vel[2].d.asc b/test/bhns_interp/vel[2].d.asc
index d239a31..839f588 100644
--- a/test/bhns_interp/vel[2].d.asc
+++ b/test/bhns_interp/vel[2].d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::velz d (velz)
+# vel[2] d (vel[2])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 0
0 0 0 0 0 9728 9728 9728 0 -3 57 57 0
0 0 0 0 0 10240 10240 10240 0 0 60 60 0
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/vel[2].maximum.asc b/test/bhns_interp/vel[2].maximum.asc
index 6217851..6993feb 100644
--- a/test/bhns_interp/vel[2].maximum.asc
+++ b/test/bhns_interp/vel[2].maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::velz (velz)
+# HYDROBASE::vel[2] (vel[2])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/vel[2].minimum.asc b/test/bhns_interp/vel[2].minimum.asc
index 6217851..6993feb 100644
--- a/test/bhns_interp/vel[2].minimum.asc
+++ b/test/bhns_interp/vel[2].minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::velz (velz)
+# HYDROBASE::vel[2] (vel[2])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/vel[2].norm1.asc b/test/bhns_interp/vel[2].norm1.asc
index 6217851..6993feb 100644
--- a/test/bhns_interp/vel[2].norm1.asc
+++ b/test/bhns_interp/vel[2].norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::velz (velz)
+# HYDROBASE::vel[2] (vel[2])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/vel[2].norm2.asc b/test/bhns_interp/vel[2].norm2.asc
index 6217851..6993feb 100644
--- a/test/bhns_interp/vel[2].norm2.asc
+++ b/test/bhns_interp/vel[2].norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::velz (velz)
+# HYDROBASE::vel[2] (vel[2])
# 1:iteration 2:time 3:data
0 0 0
diff --git a/test/bhns_interp/vel[2].x.asc b/test/bhns_interp/vel[2].x.asc
index e0a8e30..d52f5d8 100644
--- a/test/bhns_interp/vel[2].x.asc
+++ b/test/bhns_interp/vel[2].x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::velz x (velz)
+# vel[2] x (vel[2])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/vel[2].y.asc b/test/bhns_interp/vel[2].y.asc
index 879b50f..bb44a40 100644
--- a/test/bhns_interp/vel[2].y.asc
+++ b/test/bhns_interp/vel[2].y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::velz y (velz)
+# vel[2] y (vel[2])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/vel[2].z.asc b/test/bhns_interp/vel[2].z.asc
index 564c594..33a2832 100644
--- a/test/bhns_interp/vel[2].z.asc
+++ b/test/bhns_interp/vel[2].z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::velz z (velz)
+# vel[2] z (vel[2])
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/w_lorentz.d.asc b/test/bhns_interp/w_lorentz.d.asc
index ad1bb31..e0a8c4d 100644
--- a/test/bhns_interp/w_lorentz.d.asc
+++ b/test/bhns_interp/w_lorentz.d.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::w_lorentz d (w_lorentz)
+# w_lorentz d (w_lorentz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
@@ -26,5 +26,25 @@
0 0 0 0 0 9216 9216 9216 0 -6 54 54 1
0 0 0 0 0 9728 9728 9728 0 -3 57 57 1
0 0 0 0 0 10240 10240 10240 0 0 60 60 1
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
diff --git a/test/bhns_interp/w_lorentz.maximum.asc b/test/bhns_interp/w_lorentz.maximum.asc
index c0cb89c..7ba38a8 100644
--- a/test/bhns_interp/w_lorentz.maximum.asc
+++ b/test/bhns_interp/w_lorentz.maximum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::w_lorentz (w_lorentz)
+# GRHYDRO::w_lorentz (w_lorentz)
# 1:iteration 2:time 3:data
0 0 1
diff --git a/test/bhns_interp/w_lorentz.minimum.asc b/test/bhns_interp/w_lorentz.minimum.asc
index c0cb89c..7ba38a8 100644
--- a/test/bhns_interp/w_lorentz.minimum.asc
+++ b/test/bhns_interp/w_lorentz.minimum.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::w_lorentz (w_lorentz)
+# GRHYDRO::w_lorentz (w_lorentz)
# 1:iteration 2:time 3:data
0 0 1
diff --git a/test/bhns_interp/w_lorentz.norm1.asc b/test/bhns_interp/w_lorentz.norm1.asc
index c0cb89c..7ba38a8 100644
--- a/test/bhns_interp/w_lorentz.norm1.asc
+++ b/test/bhns_interp/w_lorentz.norm1.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::w_lorentz (w_lorentz)
+# GRHYDRO::w_lorentz (w_lorentz)
# 1:iteration 2:time 3:data
0 0 1
diff --git a/test/bhns_interp/w_lorentz.norm2.asc b/test/bhns_interp/w_lorentz.norm2.asc
index c0cb89c..7ba38a8 100644
--- a/test/bhns_interp/w_lorentz.norm2.asc
+++ b/test/bhns_interp/w_lorentz.norm2.asc
@@ -1,5 +1,5 @@
# Scalar ASCII output created by CarpetIOScalar
#
-# WHISKY::w_lorentz (w_lorentz)
+# GRHYDRO::w_lorentz (w_lorentz)
# 1:iteration 2:time 3:data
0 0 1
diff --git a/test/bhns_interp/w_lorentz.x.asc b/test/bhns_interp/w_lorentz.x.asc
index d1eb0cc..78d8520 100644
--- a/test/bhns_interp/w_lorentz.x.asc
+++ b/test/bhns_interp/w_lorentz.x.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::w_lorentz x (w_lorentz)
+# w_lorentz x (w_lorentz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/w_lorentz.y.asc b/test/bhns_interp/w_lorentz.y.asc
index cefe4b5..802748e 100644
--- a/test/bhns_interp/w_lorentz.y.asc
+++ b/test/bhns_interp/w_lorentz.y.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::w_lorentz y (w_lorentz)
+# w_lorentz y (w_lorentz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0
diff --git a/test/bhns_interp/w_lorentz.z.asc b/test/bhns_interp/w_lorentz.z.asc
index cd13ec8..a0c273b 100644
--- a/test/bhns_interp/w_lorentz.z.asc
+++ b/test/bhns_interp/w_lorentz.z.asc
@@ -1,6 +1,6 @@
# 1D ASCII output created by CarpetIOASCII
#
-# WHISKY::w_lorentz z (w_lorentz)
+# w_lorentz z (w_lorentz)
#
# iteration 0
# refinement level 0 multigrid level 0 map 0 component 0 time level 0