diff --git a/README.md b/README.md
index f389ea67ee5f36c61ddbde40132887321dc7c559..46d3b7a9b22e558732defaa3bb1ee7b41bc37df9 100644
--- a/README.md
+++ b/README.md
@@ -22,31 +22,80 @@ mkgrid - Convert scattered data to regular gridded data in 2D, 3D, and 4D.
- **-m**, **-\-method** *METHOD*
- Set interpolation method.
+ Set interpolation method. If undefined, linear interpolation will be applied.
- **-p**, **-\-plot** [*FILENAME*]
- Set filename of plot. If undefined, a plot widget will be raised.
+ Set filename of plot. If undefined, an interactive plot widget will be raised.
- **-u**, **-\-usecols** *USECOLS*
- Set comma-separated list of data columns to use from input file.
+ Set comma-separated list of data columns to use from input file. If undefined, all available data columns will be used.
- **-r**, **-\-range** *RANGE*
- Set comma-separated list of range specifiers for output data.
+ Set comma-separated list of range specifiers for output data. If undefined, ranges will be auto-detected from input data.
- **-s**, **-\-steps** *STEPS*
- Set comma-separated list of discretization steps along each column.
+ Set comma-separated list of discretization steps along each column. If undefined, a default of 10 discretization steps will be used.
# EXAMPLES
-## 2D
+## 2D data
+
+```text
+ time eps1 sig1
+ 0.000 0.000 0.000
+ 1.000 0.005 0.615
+ 2.000 0.010 1.526
+ 3.000 0.014 2.935
+ 4.000 0.019 4.712
+ 5.000 0.024 6.905
+ 6.000 0.029 9.221
+ 7.000 0.033 11.599
+[...]
+```
+
+```bash
+$ mkgrid -i testdata2.csv -u 2,3 -r 0:0.14 -s 14 -p
+```
+
+The output will look like the following:
+
+```text
+ eps1 sig1
+ 0.000 0.000
+ 0.010 1.526
+ 0.020 5.123
+ 0.030 9.808
+ 0.040 14.861
+ 0.050 19.338
+ 0.060 23.308
+[...]
+ 0.120 55.220
+ 0.130 63.375
+ 0.140 72.230
+```
+
+
+
+## 3D data
+
+```bash
+$ mkgrid -i testdata3.csv -u 2,4,3 -r 0:0.13,0:0.13 -s 26 -p
+```
+
+
+
+## 4D data
+
+```bash
+$ mkgrid -i testdata4.csv -p
+```
-## 3D
+
-## 4D
# BUGS
diff --git a/bin/mkgrid b/bin/mkgrid
index b6db963bee25f52a4f899c016bb379cbc76d8a7c..1f9b0667b4d963d95c29a7c9c3844d35f68ec214 100755
--- a/bin/mkgrid
+++ b/bin/mkgrid
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
#
# Created: Mon 2024-07-15 18:40:27 CEST (boljen)
-# Modified: Tue 2024-07-16 14:30:12 CEST (boljen)
+# Modified: Tue 2024-07-16 18:34:55 CEST (boljen)
#
# mkgrid:
# Convert scattered data to regular gridded data in 2D, 3D and 4D
@@ -282,7 +282,8 @@ def execute_main():
if len(usecols)==2:
# Create 2D plot
- fig, ax = plt.subplots()
+ fig = plt.figure(figsize=(8,6))
+ ax = fig.add_subplot()
# Add decorations
ax.grid(which='major', color='#DDDDDD', linewidth=0.7)
@@ -294,14 +295,14 @@ def execute_main():
ax.set_ylabel(label[1], fontsize=10, labelpad=10)
# Add data
- ax.plot(xi, yi, label='Interpolated data')
- ax.scatter(x, y, label='Input data')
+ ax.plot(xi, yi, marker='o', label='Interpolated data')
+ ax.scatter(x, y, color='black', marker='o', label='Input data')
ax.legend(loc='best')
elif len(usecols)==3:
# Create 3D plot
- fig = plt.figure()
+ fig = plt.figure(figsize=(8,6))
ax = fig.add_subplot(projection='3d')
# Add labels
@@ -309,6 +310,9 @@ def execute_main():
ax.set_ylabel(label[1], fontsize=10, labelpad=10)
ax.set_zlabel(label[2], fontsize=10, labelpad=10)
+ # Set view angles
+ ax.view_init(elev=30, azim=-125)
+
# Add data
plot = ax.plot_surface(xi, yi, zi, cmap='viridis', linewidth=0.3, edgecolor='black')
ax.scatter(x, y, z, s=4, c='black', marker='o')
@@ -319,7 +323,7 @@ def execute_main():
elif len(usecols)==4:
# Create 4D plot
- fig = plt.figure()
+ fig = plt.figure(figsize=(8,6))
ax = fig.add_subplot(projection='3d')
# Add labels
diff --git a/test/Makefile b/test/Makefile
index d0265a375ceee545b4d9da78d76bbd7c04e3336d..b76d8b04ca2e7c8a4529d2bda69f732837bf8fa1 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -5,10 +5,10 @@ OUTFILES = $(addsuffix .out, testdata2 testdata3 testdata4)
default: $(OUTFILES)
testdata2.out: testdata2.csv
- $(MKGRID) -i $< -o $@ -p $(subst .csv,.png,$<)
+ $(MKGRID) -i $< -o $@ -p $(subst .csv,.png,$<) -u 2,3 -r 0:0.14 -s 14 -m cubic
testdata3.out: testdata3.csv
- $(MKGRID) -i $< -u 2,4,3 -o $@ -p $(subst .csv,.png,$<)
+ $(MKGRID) -i $< -o $@ -p $(subst .csv,.png,$<) -u 2,4,3 -r 0:0.13,0:0.13 -s 26
testdata4.out: testdata4.csv
$(MKGRID) -i $< -o $@ -p $(subst .csv,.png,$<)
diff --git a/test/testdata2.csv b/test/testdata2.csv
index 17bd7e1bbaadb2fe54ecb55e600f88b99f334d9e..9297e01c973d61c9d9f1ca30fd592522e32ad44d 100644
--- a/test/testdata2.csv
+++ b/test/testdata2.csv
@@ -1,8 +1,41 @@
- X Y
- 0.000 0.000
- 1.000 1.000
- 2.000 4.000
- 3.000 9.000
- 4.000 16.000
- 5.000 20.000
- 6.000 10.000
+ time eps1 sig1
+ 0.000 0.000 0.000
+ 1.000 0.005 0.615
+ 2.000 0.010 1.526
+ 3.000 0.014 2.935
+ 4.000 0.019 4.712
+ 5.000 0.024 6.905
+ 6.000 0.029 9.221
+ 7.000 0.033 11.599
+ 8.000 0.038 13.814
+ 9.000 0.042 15.976
+ 10.000 0.046 17.888
+ 11.000 0.051 19.718
+ 12.000 0.055 21.449
+ 13.000 0.059 22.973
+ 14.000 0.064 24.658
+ 15.000 0.068 26.255
+ 16.000 0.072 27.894
+ 17.000 0.076 29.594
+ 18.000 0.080 31.284
+ 19.000 0.084 33.191
+ 20.000 0.088 35.087
+ 21.000 0.092 37.076
+ 22.000 0.095 39.155
+ 23.000 0.099 41.141
+ 24.000 0.102 43.313
+ 25.000 0.106 45.497
+ 26.000 0.109 47.519
+ 27.000 0.113 49.743
+ 28.000 0.116 51.956
+ 29.000 0.119 54.392
+ 30.000 0.122 56.772
+ 31.000 0.125 59.091
+ 32.000 0.127 61.370
+ 33.000 0.130 63.375
+ 34.000 0.133 65.625
+ 35.000 0.136 68.049
+ 36.000 0.138 70.579
+ 37.000 0.141 73.057
+ 38.000 0.143 75.443
+ 39.000 0.145 77.677
diff --git a/test/testdata2.png b/test/testdata2.png
index 0f8e5e03fa3e8b7909b4547b591caa3925ea9ba6..63de808d6801c8b422717c00de58197c08b62a05 100644
Binary files a/test/testdata2.png and b/test/testdata2.png differ
diff --git a/test/testdata3.csv b/test/testdata3.csv
index 28c4348bc466bc522ab2f78e1bc25b6ac6b78e40..e26a551114c1cc77a2e61fbe576782a8fd27b80d 100644
--- a/test/testdata3.csv
+++ b/test/testdata3.csv
@@ -1,205 +1,205 @@
- TIME GL_0 PK2_0 GL_90 PK2_90
- 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00
- 1.0000e+00 4.6856e-03 6.1530e-01 0.0000e+00 -3.0288e-02
- 2.0000e+00 9.5605e-03 1.5255e+00 0.0000e+00 -2.4232e-02
- 3.0000e+00 1.4485e-02 2.9353e+00 0.0000e+00 1.2132e-01
- 4.0000e+00 1.9407e-02 4.7123e+00 0.0000e+00 4.2307e-01
- 5.0000e+00 2.4180e-02 6.9046e+00 0.0000e+00 1.1281e+00
- 6.0000e+00 2.8794e-02 9.2207e+00 0.0000e+00 1.8310e+00
- 7.0000e+00 3.3217e-02 1.1599e+01 0.0000e+00 2.3934e+00
- 8.0000e+00 3.7560e-02 1.3814e+01 0.0000e+00 2.8474e+00
- 9.0000e+00 4.1835e-02 1.5976e+01 0.0000e+00 3.9861e+00
- 1.0000e+01 4.6209e-02 1.7888e+01 0.0000e+00 5.1977e+00
- 1.1000e+01 5.0578e-02 1.9718e+01 0.0000e+00 5.8237e+00
- 1.2000e+01 5.4892e-02 2.1449e+01 0.0000e+00 6.0538e+00
- 1.3000e+01 5.9252e-02 2.2973e+01 0.0000e+00 6.3365e+00
- 1.4000e+01 6.3571e-02 2.4658e+01 0.0000e+00 7.2576e+00
- 1.5000e+01 6.7891e-02 2.6255e+01 0.0000e+00 7.6752e+00
- 1.6000e+01 7.2148e-02 2.7894e+01 0.0000e+00 8.0822e+00
- 1.7000e+01 7.6352e-02 2.9594e+01 0.0000e+00 8.4749e+00
- 1.8000e+01 8.0436e-02 3.1284e+01 0.0000e+00 8.7699e+00
- 1.9000e+01 8.4384e-02 3.3191e+01 0.0000e+00 9.1898e+00
- 2.0000e+01 8.8149e-02 3.5087e+01 0.0000e+00 9.5274e+00
- 2.1000e+01 9.1832e-02 3.7076e+01 0.0000e+00 9.8619e+00
- 2.2000e+01 9.5399e-02 3.9155e+01 0.0000e+00 1.0185e+01
- 2.3000e+01 9.8943e-02 4.1141e+01 0.0000e+00 1.0542e+01
- 2.4000e+01 1.0243e-01 4.3313e+01 0.0000e+00 1.0822e+01
- 2.5000e+01 1.0598e-01 4.5497e+01 0.0000e+00 1.1130e+01
- 2.6000e+01 1.0932e-01 4.7519e+01 0.0000e+00 1.1364e+01
- 2.7000e+01 1.1253e-01 4.9743e+01 0.0000e+00 1.1579e+01
- 2.8000e+01 1.1557e-01 5.1956e+01 0.0000e+00 1.1863e+01
- 2.9000e+01 1.1859e-01 5.4392e+01 0.0000e+00 1.1615e+01
- 3.0000e+01 1.2161e-01 5.6772e+01 0.0000e+00 1.1859e+01
- 3.1000e+01 1.2451e-01 5.9091e+01 0.0000e+00 1.2534e+01
- 3.2000e+01 1.2742e-01 6.1370e+01 0.0000e+00 1.2761e+01
- 3.3000e+01 1.3021e-01 6.3375e+01 0.0000e+00 1.2872e+01
- 3.4000e+01 1.3302e-01 6.5625e+01 0.0000e+00 1.3064e+01
- 3.5000e+01 1.3558e-01 6.8049e+01 0.0000e+00 1.3240e+01
- 3.6000e+01 1.3808e-01 7.0579e+01 0.0000e+00 1.2873e+01
- 3.7000e+01 1.4052e-01 7.3057e+01 0.0000e+00 1.3108e+01
- 3.8000e+01 1.4295e-01 7.5443e+01 0.0000e+00 1.3253e+01
- 3.9000e+01 1.4524e-01 7.7677e+01 0.0000e+00 1.3817e+01
-
- 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00
- 1.0000e+00 4.4878e-03 1.1447e+00 -3.3894e-07 2.0309e-01
- 2.0000e+00 9.0494e-03 2.4131e+00 5.2990e-04 4.8688e-01
- 3.0000e+00 1.3592e-02 4.1955e+00 1.2860e-03 9.5507e-01
- 4.0000e+00 1.8000e-02 6.5071e+00 2.4377e-03 2.0707e+00
- 5.0000e+00 2.2152e-02 9.0449e+00 3.7709e-03 3.4773e+00
- 6.0000e+00 2.6162e-02 1.1605e+01 5.1056e-03 5.0075e+00
- 7.0000e+00 3.0209e-02 1.3939e+01 6.5415e-03 6.4426e+00
- 8.0000e+00 3.4143e-02 1.6123e+01 7.9171e-03 7.8836e+00
- 9.0000e+00 3.8146e-02 1.8096e+01 9.3178e-03 9.1963e+00
- 1.0000e+01 4.2198e-02 1.9881e+01 1.0784e-02 1.0349e+01
- 1.1000e+01 4.6253e-02 2.1446e+01 1.2266e-02 1.1445e+01
- 1.2000e+01 5.0348e-02 2.3068e+01 1.3756e-02 1.2486e+01
- 1.3000e+01 5.4415e-02 2.4605e+01 1.5206e-02 1.3367e+01
- 1.4000e+01 5.8420e-02 2.6117e+01 1.6716e-02 1.4272e+01
- 1.5000e+01 6.2389e-02 2.7687e+01 1.8191e-02 1.5130e+01
- 1.6000e+01 6.6220e-02 2.9354e+01 1.9707e-02 1.6017e+01
- 1.7000e+01 6.9944e-02 3.0964e+01 2.1217e-02 1.6821e+01
- 1.8000e+01 7.3495e-02 3.2712e+01 2.2717e-02 1.7612e+01
- 1.9000e+01 7.6951e-02 3.4345e+01 2.4219e-02 1.8265e+01
- 2.0000e+01 8.0381e-02 3.6167e+01 2.5701e-02 1.8974e+01
- 2.1000e+01 8.3751e-02 3.7931e+01 2.7202e-02 1.9654e+01
- 2.2000e+01 8.7057e-02 3.9733e+01 2.8685e-02 2.0293e+01
- 2.3000e+01 9.0429e-02 4.1672e+01 3.0125e-02 2.0957e+01
- 2.4000e+01 9.3723e-02 4.3647e+01 3.1602e-02 2.1624e+01
- 2.5000e+01 9.7037e-02 4.5719e+01 3.3050e-02 2.2303e+01
- 2.6000e+01 1.0005e-01 4.7713e+01 3.4508e-02 2.2930e+01
- 2.7000e+01 1.0300e-01 4.9853e+01 3.5923e-02 2.3675e+01
- 2.8000e+01 1.0599e-01 5.1925e+01 3.7365e-02 2.4333e+01
- 2.9000e+01 1.0885e-01 5.4128e+01 3.8755e-02 2.5005e+01
- 3.0000e+01 1.1161e-01 5.6209e+01 4.0161e-02 2.5710e+01
- 3.1000e+01 1.1435e-01 5.8428e+01 4.1494e-02 2.6402e+01
- 3.2000e+01 1.1693e-01 6.0522e+01 4.2895e-02 2.7147e+01
- 3.3000e+01 1.1949e-01 6.2698e+01 4.4244e-02 2.7812e+01
- 3.4000e+01 1.2204e-01 6.4932e+01 4.5583e-02 2.8572e+01
- 3.5000e+01 1.2468e-01 6.7268e+01 4.6877e-02 2.9338e+01
- 3.6000e+01 1.2728e-01 6.9573e+01 4.8137e-02 3.0103e+01
- 3.7000e+01 1.2959e-01 7.1828e+01 4.9428e-02 3.0810e+01
- 3.8000e+01 1.3173e-01 7.3880e+01 5.0669e-02 3.1540e+01
- 3.9000e+01 1.3378e-01 7.6073e+01 5.1905e-02 3.2294e+01
-
- 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00
- 1.0000e+00 4.2477e-03 2.1273e+00 4.4526e-03 2.4461e+00
- 2.0000e+00 8.5251e-03 5.4903e+00 8.8999e-03 6.2740e+00
- 3.0000e+00 1.2562e-02 8.9212e+00 1.3221e-02 1.0191e+01
- 4.0000e+00 1.6592e-02 1.2106e+01 1.7503e-02 1.3679e+01
- 5.0000e+00 2.0742e-02 1.4840e+01 2.1818e-02 1.6449e+01
- 6.0000e+00 2.5036e-02 1.7043e+01 2.6231e-02 1.8764e+01
- 7.0000e+00 2.9455e-02 1.8879e+01 3.0654e-02 2.0622e+01
- 8.0000e+00 3.3901e-02 2.0541e+01 3.5142e-02 2.2358e+01
- 9.0000e+00 3.8376e-02 2.2243e+01 3.9624e-02 2.4073e+01
- 1.0000e+01 4.2808e-02 2.3841e+01 4.4056e-02 2.5860e+01
- 1.1000e+01 4.7117e-02 2.5528e+01 4.8399e-02 2.7794e+01
- 1.2000e+01 5.1330e-02 2.7258e+01 5.2647e-02 2.9727e+01
- 1.3000e+01 5.5313e-02 2.8930e+01 5.6747e-02 3.1745e+01
- 1.4000e+01 5.9154e-02 3.0732e+01 6.0730e-02 3.3935e+01
- 1.5000e+01 6.2784e-02 3.2626e+01 6.4535e-02 3.6120e+01
- 1.6000e+01 6.6342e-02 3.4513e+01 6.8247e-02 3.8384e+01
- 1.7000e+01 6.9787e-02 3.6535e+01 7.1925e-02 4.0760e+01
- 1.8000e+01 7.3349e-02 3.8600e+01 7.5531e-02 4.3169e+01
- 1.9000e+01 7.6978e-02 4.0669e+01 7.8996e-02 4.5475e+01
- 2.0000e+01 8.0637e-02 4.2910e+01 8.2373e-02 4.7977e+01
- 2.1000e+01 8.4093e-02 4.5128e+01 8.5631e-02 5.0561e+01
- 2.2000e+01 8.7293e-02 4.7370e+01 8.8823e-02 5.3047e+01
- 2.3000e+01 9.0194e-02 4.9683e+01 9.1872e-02 5.5591e+01
- 2.4000e+01 9.3140e-02 5.2012e+01 9.4642e-02 5.8141e+01
- 2.5000e+01 9.6145e-02 5.4422e+01 9.7350e-02 6.0745e+01
- 2.6000e+01 9.9313e-02 5.6789e+01 1.0002e-01 6.3353e+01
- 2.7000e+01 1.0245e-01 5.9315e+01 1.0279e-01 6.5985e+01
- 2.8000e+01 1.0536e-01 6.1662e+01 1.0552e-01 6.8542e+01
- 2.9000e+01 1.0800e-01 6.4019e+01 1.0820e-01 7.1164e+01
- 3.0000e+01 1.1043e-01 6.6240e+01 1.1065e-01 7.3760e+01
- 3.1000e+01 1.1284e-01 6.8501e+01 1.1321e-01 7.6374e+01
- 3.2000e+01 1.1549e-01 7.0963e+01 1.1567e-01 7.9016e+01
- 3.3000e+01 1.1812e-01 7.3478e+01 1.1793e-01 8.1708e+01
- 3.4000e+01 1.2058e-01 7.5915e+01 1.2011e-01 8.4374e+01
- 3.5000e+01 1.2286e-01 7.8266e+01 1.2245e-01 8.7016e+01
- 3.6000e+01 1.2496e-01 8.0551e+01 1.2484e-01 8.9754e+01
- 3.7000e+01 1.2714e-01 8.2882e+01 1.2731e-01 9.2680e+01
- 3.8000e+01 1.2958e-01 8.5428e+01 1.2976e-01 9.5547e+01
- 3.9000e+01 1.3181e-01 8.7946e+01 1.3209e-01 9.8415e+01
-
- 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00
- 1.0000e+00 1.4401e-03 1.0571e+00 4.3294e-03 1.5169e+00
- 2.0000e+00 2.7341e-03 2.7518e+00 8.5858e-03 3.8222e+00
- 3.0000e+00 4.0221e-03 4.6409e+00 1.2670e-02 6.7878e+00
- 4.0000e+00 5.3331e-03 6.4468e+00 1.6708e-02 9.6872e+00
- 5.0000e+00 6.6701e-03 8.0348e+00 2.0789e-02 1.2446e+01
- 6.0000e+00 8.0216e-03 9.5222e+00 2.4792e-02 1.4816e+01
- 7.0000e+00 9.3682e-03 1.0831e+01 2.8851e-02 1.6885e+01
- 8.0000e+00 1.0778e-02 1.2049e+01 3.3018e-02 1.8686e+01
- 9.0000e+00 1.2201e-02 1.3007e+01 3.7194e-02 2.0273e+01
- 1.0000e+01 1.3658e-02 1.3991e+01 4.1344e-02 2.1860e+01
- 1.1000e+01 1.5112e-02 1.4860e+01 4.5529e-02 2.3310e+01
- 1.2000e+01 1.6578e-02 1.5743e+01 4.9711e-02 2.4846e+01
- 1.3000e+01 1.8034e-02 1.6614e+01 5.3837e-02 2.6460e+01
- 1.4000e+01 1.9538e-02 1.7408e+01 5.7857e-02 2.8183e+01
- 1.5000e+01 2.0998e-02 1.8219e+01 6.1788e-02 2.9944e+01
- 1.6000e+01 2.2471e-02 1.8954e+01 6.5669e-02 3.1742e+01
- 1.7000e+01 2.3950e-02 1.9711e+01 6.9458e-02 3.3615e+01
- 1.8000e+01 2.5400e-02 2.0391e+01 7.3216e-02 3.5613e+01
- 1.9000e+01 2.6841e-02 2.1098e+01 7.6933e-02 3.7628e+01
- 2.0000e+01 2.8307e-02 2.1780e+01 8.0484e-02 3.9610e+01
- 2.1000e+01 2.9760e-02 2.2477e+01 8.3989e-02 4.1745e+01
- 2.2000e+01 3.1172e-02 2.3140e+01 8.7355e-02 4.3815e+01
- 2.3000e+01 3.2586e-02 2.3732e+01 9.0690e-02 4.5965e+01
- 2.4000e+01 3.3984e-02 2.4396e+01 9.3915e-02 4.8074e+01
- 2.5000e+01 3.5344e-02 2.5030e+01 9.7006e-02 5.0252e+01
- 2.6000e+01 3.6649e-02 2.5805e+01 1.0004e-01 5.2612e+01
- 2.7000e+01 3.7982e-02 2.6537e+01 1.0303e-01 5.4869e+01
- 2.8000e+01 3.9224e-02 2.7221e+01 1.0591e-01 5.7123e+01
- 2.9000e+01 4.0452e-02 2.7913e+01 1.0885e-01 5.9496e+01
- 3.0000e+01 4.1678e-02 2.8615e+01 1.1173e-01 6.1879e+01
- 3.1000e+01 4.2892e-02 2.9356e+01 1.1458e-01 6.4301e+01
- 3.2000e+01 4.4097e-02 3.0105e+01 1.1733e-01 6.6747e+01
- 3.3000e+01 4.5274e-02 3.0886e+01 1.1991e-01 6.9109e+01
- 3.4000e+01 4.6452e-02 3.1549e+01 1.2243e-01 7.1503e+01
- 3.5000e+01 4.7603e-02 3.2406e+01 1.2494e-01 7.4067e+01
- 3.6000e+01 4.8765e-02 3.3065e+01 1.2736e-01 7.6438e+01
- 3.7000e+01 4.9941e-02 3.3818e+01 1.2969e-01 7.8794e+01
- 3.8000e+01 5.1138e-02 3.4572e+01 1.3200e-01 8.1256e+01
- 3.9000e+01 5.1628e-02 3.4542e+01 1.3227e-01 7.8680e+01
-
- 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00
- 1.0000e+00 0.0000e+00 7.0364e-01 4.3878e-03 1.7640e+00
- 2.0000e+00 0.0000e+00 8.7403e-01 9.1154e-03 3.8336e+00
- 3.0000e+00 0.0000e+00 2.1732e+00 1.3828e-02 6.4112e+00
- 4.0000e+00 0.0000e+00 4.1045e+00 1.8465e-02 9.2378e+00
- 5.0000e+00 0.0000e+00 5.5689e+00 2.2996e-02 1.1826e+01
- 6.0000e+00 0.0000e+00 6.5673e+00 2.7549e-02 1.4313e+01
- 7.0000e+00 0.0000e+00 7.4303e+00 3.2082e-02 1.6464e+01
- 8.0000e+00 0.0000e+00 8.1184e+00 3.6627e-02 1.8393e+01
- 9.0000e+00 0.0000e+00 8.6834e+00 4.1164e-02 2.0042e+01
- 1.0000e+01 0.0000e+00 8.7020e+00 4.5814e-02 2.1648e+01
- 1.1000e+01 0.0000e+00 9.1453e+00 5.0358e-02 2.3263e+01
- 1.2000e+01 0.0000e+00 9.5366e+00 5.4817e-02 2.4832e+01
- 1.3000e+01 0.0000e+00 9.9260e+00 5.9276e-02 2.6500e+01
- 1.4000e+01 0.0000e+00 1.0809e+01 6.3558e-02 2.8333e+01
- 1.5000e+01 0.0000e+00 1.1204e+01 6.7836e-02 3.0203e+01
- 1.6000e+01 0.0000e+00 1.1650e+01 7.1976e-02 3.2107e+01
- 1.7000e+01 0.0000e+00 1.1958e+01 7.6094e-02 3.4151e+01
- 1.8000e+01 0.0000e+00 1.2354e+01 8.0075e-02 3.6295e+01
- 1.9000e+01 0.0000e+00 1.2651e+01 8.3975e-02 3.8460e+01
- 2.0000e+01 0.0000e+00 1.3014e+01 8.7775e-02 4.0620e+01
- 2.1000e+01 0.0000e+00 1.3370e+01 9.1467e-02 4.2994e+01
- 2.2000e+01 0.0000e+00 1.3651e+01 9.5055e-02 4.5246e+01
- 2.3000e+01 0.0000e+00 1.3974e+01 9.8546e-02 4.7602e+01
- 2.4000e+01 0.0000e+00 1.4208e+01 1.0198e-01 5.0054e+01
- 2.5000e+01 0.0000e+00 1.4426e+01 1.0525e-01 5.2506e+01
- 2.6000e+01 0.0000e+00 1.4729e+01 1.0841e-01 5.4930e+01
- 2.7000e+01 0.0000e+00 1.4866e+01 1.1157e-01 5.7407e+01
- 2.8000e+01 0.0000e+00 1.5056e+01 1.1456e-01 5.9965e+01
- 2.9000e+01 0.0000e+00 1.5240e+01 1.1748e-01 6.2441e+01
- 3.0000e+01 0.0000e+00 1.5499e+01 1.2033e-01 6.5041e+01
- 3.1000e+01 0.0000e+00 1.5684e+01 1.2320e-01 6.7720e+01
- 3.2000e+01 0.0000e+00 1.5817e+01 1.2603e-01 7.0342e+01
- 3.3000e+01 0.0000e+00 1.5977e+01 1.2890e-01 7.2873e+01
- 3.4000e+01 0.0000e+00 1.6163e+01 1.3163e-01 7.5614e+01
- 3.5000e+01 0.0000e+00 1.6302e+01 1.3427e-01 7.8228e+01
- 3.6000e+01 0.0000e+00 1.6441e+01 1.3672e-01 8.0876e+01
- 3.7000e+01 0.0000e+00 1.6610e+01 1.3911e-01 8.3589e+01
- 3.8000e+01 0.0000e+00 1.6723e+01 1.4139e-01 8.6106e+01
- 3.9000e+01 0.0000e+00 1.6854e+01 1.4364e-01 8.8666e+01
+ time eps1 sig1 eps2 sig2
+ 0.000 0.000 0.000 0.000 0.000
+ 1.000 0.005 0.615 0.000 -0.030
+ 2.000 0.010 1.526 0.000 -0.024
+ 3.000 0.014 2.935 0.000 0.121
+ 4.000 0.019 4.712 0.000 0.423
+ 5.000 0.024 6.905 0.000 1.128
+ 6.000 0.029 9.221 0.000 1.831
+ 7.000 0.033 11.599 0.000 2.393
+ 8.000 0.038 13.814 0.000 2.847
+ 9.000 0.042 15.976 0.000 3.986
+ 10.000 0.046 17.888 0.000 5.198
+ 11.000 0.051 19.718 0.000 5.824
+ 12.000 0.055 21.449 0.000 6.054
+ 13.000 0.059 22.973 0.000 6.337
+ 14.000 0.064 24.658 0.000 7.258
+ 15.000 0.068 26.255 0.000 7.675
+ 16.000 0.072 27.894 0.000 8.082
+ 17.000 0.076 29.594 0.000 8.475
+ 18.000 0.080 31.284 0.000 8.770
+ 19.000 0.084 33.191 0.000 9.190
+ 20.000 0.088 35.087 0.000 9.527
+ 21.000 0.092 37.076 0.000 9.862
+ 22.000 0.095 39.155 0.000 10.185
+ 23.000 0.099 41.141 0.000 10.542
+ 24.000 0.102 43.313 0.000 10.822
+ 25.000 0.106 45.497 0.000 11.130
+ 26.000 0.109 47.519 0.000 11.364
+ 27.000 0.113 49.743 0.000 11.579
+ 28.000 0.116 51.956 0.000 11.863
+ 29.000 0.119 54.392 0.000 11.615
+ 30.000 0.122 56.772 0.000 11.859
+ 31.000 0.125 59.091 0.000 12.534
+ 32.000 0.127 61.370 0.000 12.761
+ 33.000 0.130 63.375 0.000 12.872
+ 34.000 0.133 65.625 0.000 13.064
+ 35.000 0.136 68.049 0.000 13.240
+ 36.000 0.138 70.579 0.000 12.873
+ 37.000 0.141 73.057 0.000 13.108
+ 38.000 0.143 75.443 0.000 13.253
+ 39.000 0.145 77.677 0.000 13.817
+
+ 0.000 0.000 0.000 0.000 0.000
+ 1.000 0.004 1.145 0.000 0.203
+ 2.000 0.009 2.413 0.001 0.487
+ 3.000 0.014 4.196 0.001 0.955
+ 4.000 0.018 6.507 0.002 2.071
+ 5.000 0.022 9.045 0.004 3.477
+ 6.000 0.026 11.605 0.005 5.008
+ 7.000 0.030 13.939 0.007 6.443
+ 8.000 0.034 16.123 0.008 7.884
+ 9.000 0.038 18.096 0.009 9.196
+ 10.000 0.042 19.881 0.011 10.349
+ 11.000 0.046 21.446 0.012 11.445
+ 12.000 0.050 23.068 0.014 12.486
+ 13.000 0.054 24.605 0.015 13.367
+ 14.000 0.058 26.117 0.017 14.272
+ 15.000 0.062 27.687 0.018 15.130
+ 16.000 0.066 29.354 0.020 16.017
+ 17.000 0.070 30.964 0.021 16.821
+ 18.000 0.073 32.712 0.023 17.612
+ 19.000 0.077 34.345 0.024 18.265
+ 20.000 0.080 36.167 0.026 18.974
+ 21.000 0.084 37.931 0.027 19.654
+ 22.000 0.087 39.733 0.029 20.293
+ 23.000 0.090 41.672 0.030 20.957
+ 24.000 0.094 43.647 0.032 21.624
+ 25.000 0.097 45.719 0.033 22.303
+ 26.000 0.100 47.713 0.035 22.930
+ 27.000 0.103 49.853 0.036 23.675
+ 28.000 0.106 51.925 0.037 24.333
+ 29.000 0.109 54.128 0.039 25.005
+ 30.000 0.112 56.209 0.040 25.710
+ 31.000 0.114 58.428 0.041 26.402
+ 32.000 0.117 60.522 0.043 27.147
+ 33.000 0.119 62.698 0.044 27.812
+ 34.000 0.122 64.932 0.046 28.572
+ 35.000 0.125 67.268 0.047 29.338
+ 36.000 0.127 69.573 0.048 30.103
+ 37.000 0.130 71.828 0.049 30.810
+ 38.000 0.132 73.880 0.051 31.540
+ 39.000 0.134 76.073 0.052 32.294
+
+ 0.000 0.000 0.000 0.000 0.000
+ 1.000 0.004 2.127 0.004 2.446
+ 2.000 0.009 5.490 0.009 6.274
+ 3.000 0.013 8.921 0.013 10.191
+ 4.000 0.017 12.106 0.018 13.679
+ 5.000 0.021 14.840 0.022 16.449
+ 6.000 0.025 17.043 0.026 18.764
+ 7.000 0.029 18.879 0.031 20.622
+ 8.000 0.034 20.541 0.035 22.358
+ 9.000 0.038 22.243 0.040 24.073
+ 10.000 0.043 23.841 0.044 25.860
+ 11.000 0.047 25.528 0.048 27.794
+ 12.000 0.051 27.258 0.053 29.727
+ 13.000 0.055 28.930 0.057 31.745
+ 14.000 0.059 30.732 0.061 33.935
+ 15.000 0.063 32.626 0.065 36.120
+ 16.000 0.066 34.513 0.068 38.384
+ 17.000 0.070 36.535 0.072 40.760
+ 18.000 0.073 38.600 0.076 43.169
+ 19.000 0.077 40.669 0.079 45.475
+ 20.000 0.081 42.910 0.082 47.977
+ 21.000 0.084 45.128 0.086 50.561
+ 22.000 0.087 47.370 0.089 53.047
+ 23.000 0.090 49.683 0.092 55.591
+ 24.000 0.093 52.012 0.095 58.141
+ 25.000 0.096 54.422 0.097 60.745
+ 26.000 0.099 56.789 0.100 63.353
+ 27.000 0.102 59.315 0.103 65.985
+ 28.000 0.105 61.662 0.106 68.542
+ 29.000 0.108 64.019 0.108 71.164
+ 30.000 0.110 66.240 0.111 73.760
+ 31.000 0.113 68.501 0.113 76.374
+ 32.000 0.115 70.963 0.116 79.016
+ 33.000 0.118 73.478 0.118 81.708
+ 34.000 0.121 75.915 0.120 84.374
+ 35.000 0.123 78.266 0.122 87.016
+ 36.000 0.125 80.551 0.125 89.754
+ 37.000 0.127 82.882 0.127 92.680
+ 38.000 0.130 85.428 0.130 95.547
+ 39.000 0.132 87.946 0.132 98.415
+
+ 0.000 0.000 0.000 0.000 0.000
+ 1.000 0.001 1.057 0.004 1.517
+ 2.000 0.003 2.752 0.009 3.822
+ 3.000 0.004 4.641 0.013 6.788
+ 4.000 0.005 6.447 0.017 9.687
+ 5.000 0.007 8.035 0.021 12.446
+ 6.000 0.008 9.522 0.025 14.816
+ 7.000 0.009 10.831 0.029 16.885
+ 8.000 0.011 12.049 0.033 18.686
+ 9.000 0.012 13.007 0.037 20.273
+ 10.000 0.014 13.991 0.041 21.860
+ 11.000 0.015 14.860 0.046 23.310
+ 12.000 0.017 15.743 0.050 24.846
+ 13.000 0.018 16.614 0.054 26.460
+ 14.000 0.020 17.408 0.058 28.183
+ 15.000 0.021 18.219 0.062 29.944
+ 16.000 0.022 18.954 0.066 31.742
+ 17.000 0.024 19.711 0.069 33.615
+ 18.000 0.025 20.391 0.073 35.613
+ 19.000 0.027 21.098 0.077 37.628
+ 20.000 0.028 21.780 0.080 39.610
+ 21.000 0.030 22.477 0.084 41.745
+ 22.000 0.031 23.140 0.087 43.815
+ 23.000 0.033 23.732 0.091 45.965
+ 24.000 0.034 24.396 0.094 48.074
+ 25.000 0.035 25.030 0.097 50.252
+ 26.000 0.037 25.805 0.100 52.612
+ 27.000 0.038 26.537 0.103 54.869
+ 28.000 0.039 27.221 0.106 57.123
+ 29.000 0.040 27.913 0.109 59.496
+ 30.000 0.042 28.615 0.112 61.879
+ 31.000 0.043 29.356 0.115 64.301
+ 32.000 0.044 30.105 0.117 66.747
+ 33.000 0.045 30.886 0.120 69.109
+ 34.000 0.046 31.549 0.122 71.503
+ 35.000 0.048 32.406 0.125 74.067
+ 36.000 0.049 33.065 0.127 76.438
+ 37.000 0.050 33.818 0.130 78.794
+ 38.000 0.051 34.572 0.132 81.256
+ 39.000 0.052 34.542 0.132 78.680
+
+ 0.000 0.000 0.000 0.000 0.000
+ 1.000 0.000 0.704 0.004 1.764
+ 2.000 0.000 0.874 0.009 3.834
+ 3.000 0.000 2.173 0.014 6.411
+ 4.000 0.000 4.105 0.018 9.238
+ 5.000 0.000 5.569 0.023 11.826
+ 6.000 0.000 6.567 0.028 14.313
+ 7.000 0.000 7.430 0.032 16.464
+ 8.000 0.000 8.118 0.037 18.393
+ 9.000 0.000 8.683 0.041 20.042
+ 10.000 0.000 8.702 0.046 21.648
+ 11.000 0.000 9.145 0.050 23.263
+ 12.000 0.000 9.537 0.055 24.832
+ 13.000 0.000 9.926 0.059 26.500
+ 14.000 0.000 10.809 0.064 28.333
+ 15.000 0.000 11.204 0.068 30.203
+ 16.000 0.000 11.650 0.072 32.107
+ 17.000 0.000 11.958 0.076 34.151
+ 18.000 0.000 12.354 0.080 36.295
+ 19.000 0.000 12.651 0.084 38.460
+ 20.000 0.000 13.014 0.088 40.620
+ 21.000 0.000 13.370 0.091 42.994
+ 22.000 0.000 13.651 0.095 45.246
+ 23.000 0.000 13.974 0.099 47.602
+ 24.000 0.000 14.208 0.102 50.054
+ 25.000 0.000 14.426 0.105 52.506
+ 26.000 0.000 14.729 0.108 54.930
+ 27.000 0.000 14.866 0.112 57.407
+ 28.000 0.000 15.056 0.115 59.965
+ 29.000 0.000 15.240 0.117 62.441
+ 30.000 0.000 15.499 0.120 65.041
+ 31.000 0.000 15.684 0.123 67.720
+ 32.000 0.000 15.817 0.126 70.342
+ 33.000 0.000 15.977 0.129 72.873
+ 34.000 0.000 16.163 0.132 75.614
+ 35.000 0.000 16.302 0.134 78.228
+ 36.000 0.000 16.441 0.137 80.876
+ 37.000 0.000 16.610 0.139 83.589
+ 38.000 0.000 16.723 0.141 86.106
+ 39.000 0.000 16.854 0.144 88.666
diff --git a/test/testdata3.png b/test/testdata3.png
index 7caed158e6f790673908b957111907aaf48435f2..7062eaf8b794b0203a9a997aa1b630a558b501d9 100644
Binary files a/test/testdata3.png and b/test/testdata3.png differ
diff --git a/test/testdata4.png b/test/testdata4.png
index 86379285f5020fc9cd0ee7e026f8ca8a25ccddec..ee6bd416d4f0c06f9cecc7384170dcb1db87734f 100644
Binary files a/test/testdata4.png and b/test/testdata4.png differ