[PATCH] Though not yet part of the calculation, suspended load has to be optionally loadable through datacage

Wald Commits scm-commit at wald.intevation.org
Wed Sep 17 19:28:44 CEST 2014


# HG changeset patch
# User "Tom Gottfried <tom at intevation.de>"
# Date 1410974919 -7200
# Node ID 301a32bd7045b5c7f1eb8fdf686925d0a7a65d31
# Parent  86e532106abb15c75886cfdc5d6b7e449641fda6
Though not yet part of the calculation, suspended load has to be optionally loadable through datacage.

diff -r 86e532106abb -r 301a32bd7045 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 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) {


More information about the Dive4Elements-commits mailing list