changeset 8293:301a32bd7045 3.1.6

Though not yet part of the calculation, suspended load has to be optionally loadable through datacage.
author "Tom Gottfried <tom@intevation.de>"
date Wed, 17 Sep 2014 19:28:39 +0200
parents 86e532106abb
children d08e3737ab2d
files artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java	Wed Sep 17 17:56:37 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java	Wed Sep 17 19:28:39 2014 +0200
@@ -35,7 +35,8 @@
     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_MAX                =  8;
+    public static final int GF_SUSP_LOAD          =  9;
+    public static final int GF_MAX                =  9;
 
     public static final String [] GF_NAMES = {
         "coarse",
@@ -46,7 +47,8 @@
         "suspended_sediment",
         "total",
         "bed_load",
-        "bed_load_susp_sand"
+        "bed_load_susp_sand",
+        "suspended_load"
     };
 
     public static final int [] MEASUREMENT_STATION_GF = {
@@ -58,7 +60,8 @@
         /* 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
+        /* GF_BED_LOAD_SUSP_SAND */ Station.BED_LOAD,
+        /* GF_SUSP_LOAD          */ Station.SUSPENDED
     };
 
     public static final int measurementStationType(int grainFraction) {

http://dive4elements.wald.intevation.org