Mercurial > dive4elements > river
changeset 8177:aa80f9ba56a9
We have to calculate bed load plus suspended sand instead of suspended load.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Wed, 03 Sep 2014 09:55:32 +0200 |
| parents | 7b0b3b1a2ee8 |
| children | 5bab2e57e965 |
| files | artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java |
| diffstat | 1 files changed, 21 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- 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) {