[PATCH] We have to calculate bed load plus suspended sand instead of suspended load

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1409730932 -7200
# Node ID aa80f9ba56a9ce9163f18a2de4cb9d224fcc82ca
# Parent  7b0b3b1a2ee81a042398191260db80b810c8303a
We have to calculate bed load plus suspended sand instead of suspended load.

diff -r 7b0b3b1a2ee8 -r aa80f9ba56a9 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java	Tue Sep 02 17:47:03 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java	Wed Sep 03 09:55:32 2014 +0200
@@ -21,29 +21,29 @@
 
 public class SedimentLoadData implements Serializable
 {
-    public static final int GF_UNKNOWN        = -1;
-    public static final int GF_COARSE         =  0;
-    public static final int GF_FINE_MIDDLE    =  1;
-    public static final int GF_SAND           =  2;
-    public static final int GF_SUSP_SAND      =  3;
-    public static final int GF_SUSP_SAND_BED  =  4;
-    public static final int GF_SUSP_SEDIMENT  =  5;
-    public static final int GF_TOTAL          =  6;
-    public static final int GF_BED_LOAD       =  7;
-    public static final int GF_SUSPENDED_LOAD =  8;
-    public static final int GF_AVERAGE        =  9;
-    public static final int GF_MAX            =  9;
+    public static final int GF_UNKNOWN            = -1;
+    public static final int GF_COARSE             =  0;
+    public static final int GF_FINE_MIDDLE        =  1;
+    public static final int GF_SAND               =  2;
+    public static final int GF_SUSP_SAND          =  3;
+    public static final int GF_SUSP_SAND_BED      =  4;
+    public static final int GF_SUSP_SEDIMENT      =  5;
+    public static final int GF_TOTAL              =  6;
+    public static final int GF_BED_LOAD           =  7;
+    public static final int GF_BED_LOAD_SUSP_SAND =  8;
+    public static final int GF_AVERAGE            =  9;
+    public static final int GF_MAX                =  9;
 
     public static final int [] MEASUREMENT_STATION_GF = {
-        /* GF_COARSE         */ Station.BED_LOAD,
-        /* GF_FINE_MIDDLE    */ Station.BED_LOAD,
-        /* GF_SAND           */ Station.BED_LOAD,
-        /* GF_SUSP_SAND      */ Station.BED_LOAD,
-        /* GF_SUSP_SAND_BED  */ Station.BED_LOAD,
-        /* GF_SUSP_SEDIMENT  */ Station.SUSPENDED,
-        /* GF_TOTAL          */ Station.BED_LOAD|Station.SUSPENDED,
-        /* GF_BED_LOAD       */ Station.BED_LOAD,
-        /* GF_SUSPENDED_LOAD */ Station.BED_LOAD
+        /* GF_COARSE             */ Station.BED_LOAD,
+        /* GF_FINE_MIDDLE        */ Station.BED_LOAD,
+        /* GF_SAND               */ Station.BED_LOAD,
+        /* GF_SUSP_SAND          */ Station.BED_LOAD,
+        /* GF_SUSP_SAND_BED      */ Station.BED_LOAD,
+        /* GF_SUSP_SEDIMENT      */ Station.SUSPENDED,
+        /* GF_TOTAL              */ Station.BED_LOAD|Station.SUSPENDED,
+        /* GF_BED_LOAD           */ Station.BED_LOAD,
+        /* GF_BED_LOAD_SUSP_SAND */ Station.BED_LOAD
     };
 
     public static final int measurementStationType(int grainFraction) {