[PATCH] Sediment load: Recognize grain fractions 'total', 'bed_load' and 'suspended_load' from pre-calculations

[Wald Commits]

# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1405523342 -7200
# Node ID 01ad09af0975522f68597df8cea0aafb445824a0
# Parent  f1500a524b7660419a5ad1da96b1345725dad9f4
Sediment load: Recognize grain fractions 'total', 'bed_load' and 'suspended_load' from pre-calculations.

diff -r f1500a524b76 -r 01ad09af0975 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	Wed Jul 16 16:03:50 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java	Wed Jul 16 17:09:02 2014 +0200
@@ -19,14 +19,17 @@
 
 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_MAX           =  5;
+    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_MAX            =  8;
 
     public static final int grainFractionIndex(String name) {
         if ("coarse".equals(name))             return GF_COARSE;
@@ -35,6 +38,9 @@
         if ("susp_sand".equals(name))          return GF_SUSP_SAND;
         if ("susp_sand_bed".equals(name))      return GF_SUSP_SAND_BED;
         if ("suspended_sediment".equals(name)) return GF_SUSP_SEDIMENT;
+        if ("total".equals(name))              return GF_TOTAL;
+        if ("bed_load".equals(name))           return GF_BED_LOAD;
+        if ("suspended_load".equals(name))     return GF_SUSPENDED_LOAD;
         return GF_UNKNOWN;
     }