--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/W.java	Mon Jan 21 12:49:44 2013 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/W.java	Mon Jan 21 14:03:22 2013 +0100
@@ -1,6 +1,7 @@
 package de.intevation.flys.artifacts.model;
 
 import de.intevation.flys.utils.DataUtil;
+import de.intevation.flys.utils.DoubleUtil;
 
 import gnu.trove.TDoubleArrayList;
 
@@ -60,34 +61,8 @@
         return ws.min();
     }
 
-    public static void removeNaNs(TDoubleArrayList [] arrays) {
-
-        int dest = 0;
-
-        int A = arrays.length;
-        int N = arrays[0].size();
-
-        OUTER: for (int i = 0; i < N; ++i) {
-            for (int j = 0; j < A; ++j) {
-                TDoubleArrayList a = arrays[j];
-                double v = a.getQuick(i);
-                if (Double.isNaN(v)) {
-                    continue OUTER;
-                }
-                a.setQuick(dest, v);
-            }
-            ++dest;
-        }
-
-        if (dest < N) {
-            for (int i = 0; i < A; ++i) {
-                arrays[i].remove(dest, N-dest);
-            }
-        }
-    }
-
     public void removeNaNs() {
-        removeNaNs(new TDoubleArrayList [] { ws });
+        DoubleUtil.removeNaNs(new TDoubleArrayList [] { ws });
     }
 
     public boolean guessWaterIncreasing() {