Mercurial > dive4elements > river
changeset 8041:01ad09af0975
Sediment load: Recognize grain fractions 'total', 'bed_load' and 'suspended_load' from pre-calculations.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Wed, 16 Jul 2014 17:09:02 +0200 |
| parents | f1500a524b76 |
| children | 9342d7fe0ee7 |
| files | artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java |
| diffstat | 1 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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; }