--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhcalculation/FlowVelocityModelKmValueFinder.java	Fri May 25 16:03:15 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhcalculation/FlowVelocityModelKmValueFinder.java	Sat May 26 15:41:47 2018 +0200
@@ -52,7 +52,7 @@
      * (Might be several 10000 rows if many stations and large q range)
      */
     private static final String SQL_SELECT_ALL = //
-            "SELECT DISTINCT fvmv.station AS station, fvmv.q AS q, fvmv.main_channel AS vmain, fvmv.shear_stress AS tau"
+            "SELECT fvmv.station AS station, fvmv.q AS q, fvmv.main_channel AS vmain, fvmv.shear_stress AS tau"
             + "  FROM (discharge_zone dz INNER JOIN flow_velocity_model fvm ON dz.id = fvm.discharge_zone_id)"
             + "    INNER JOIN flow_velocity_model_values fvmv ON fvm.id = fvmv.flow_velocity_model_id"
             + "  WHERE (dz.river_id = :river_id) AND (fvmv.station BETWEEN :kmfrom - 0.0001 AND :kmto + 0.0001)"
@@ -63,10 +63,10 @@
      * Query for a river's max km below a limit with all its q, main-v and tau values.
      */
     private static final String SQL_SELECT_KMLOWER = //
-            "SELECT DISTINCT fvmv.station AS station, fvmv.q AS q, fvmv.main_channel AS vmain, fvmv.shear_stress AS tau"
+            "SELECT fvmv.station AS station, fvmv.q AS q, fvmv.main_channel AS vmain, fvmv.shear_stress AS tau"
             + "  FROM flow_velocity_model_values fvmv"
             + "    INNER JOIN (SELECT MAX(fvmvi.station) AS kmmax"
-                    + "      FROM discharge_zone dz INNER JOIN flow_velocity_model fvm ON dz.id = fvm.discharge_zone_id"
+            + "      FROM discharge_zone dz INNER JOIN flow_velocity_model fvm ON dz.id = fvm.discharge_zone_id"
             + "        INNER JOIN flow_velocity_model_values fvmvi ON fvm.id = fvmvi.flow_velocity_model_id"
             + "        WHERE (dz.river_id = :river_id) AND (fvmvi.station < :kmfrom - 0.0001)) finf ON fvmv.station = finf.kmmax"
             + "  ORDER BY fvmv.q ASC";
@@ -75,10 +75,10 @@
      * Query for a river's min km above a limit with all its q, main-v and tau values.
      */
     private static final String SQL_SELECT_KMUPPER = //
-            "SELECT DISTINCT fvmv.station AS station, fvmv.q AS q, fvmv.main_channel AS vmain, fvmv.shear_stress AS tau"
+            "SELECT fvmv.station AS station, fvmv.q AS q, fvmv.main_channel AS vmain, fvmv.shear_stress AS tau"
             + "  FROM flow_velocity_model_values fvmv"
             + "    INNER JOIN (SELECT MIN(fvmvi.station) AS kmmin"
-                    + "      FROM discharge_zone dz INNER JOIN flow_velocity_model fvm ON dz.id = fvm.discharge_zone_id"
+            + "      FROM discharge_zone dz INNER JOIN flow_velocity_model fvm ON dz.id = fvm.discharge_zone_id"
             + "        INNER JOIN flow_velocity_model_values fvmvi ON fvm.id = fvmvi.flow_velocity_model_id"
             + "        WHERE (dz.river_id = :river_id) AND (fvmvi.station > :kmto + 0.0001)) fsup ON fvmv.station = fsup.kmmin"
             + "  ORDER BY fvmv.q ASC";
@@ -277,6 +277,7 @@
      * @return Number of rows
      */
     private int addKms(final List<Object[]> rows, final boolean isDemoValuesCorrection) {
+        log.trace("addKms i km j q v tau");
         for (final Object[] row : rows) {
             if ((this.kms.size() == 0) || !Utils.epsilonEquals(this.kms.get(this.kms.size() - 1), (double) row[0], 0.0001)) {
                 this.kms.add((double) row[0]);
@@ -288,8 +289,8 @@
             else
                 this.values.get(this.values.size() - 1).addValues((double) row[1], (double) row[2], (double) row[3]);
             final int j = this.values.size() - 1;
-            log.trace(String.format("addKms %d km %.3f q %.0f v %.2f tau %.2f", this.values.size() - 1, this.values.get(j).getKm(), (double) row[1],
-                    (double) row[2], (double) row[3]));
+            log.trace(String.format("addKms %d %.3f %d %.0f %.2f %.2f", this.values.size() - 1, this.values.get(j).getKm(),
+                    this.values.get(j).size() - 1, (double) row[1], (double) row[2], (double) row[3]));
         }
         return rows.size();
     }