aboutsummaryrefslogtreecommitdiff
path: root/test/bhns_interp
diff options
context:
space:
mode:
Diffstat (limited to 'test/bhns_interp')
-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
174 files changed, 1070 insertions, 490 deletions
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