Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java @ 8185:76e1e9d81ce2
Removed obsolete average and renamed some symbols to make the difference between single fractions and sums of them clearer in the calculation.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Thu, 04 Sep 2014 12:03:02 +0200 |
| parents | 5bab2e57e965 |
| children | a1ceacf15d3a |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java Thu Sep 04 12:00:17 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java Thu Sep 04 12:03:02 2014 +0200 @@ -31,8 +31,7 @@ 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 GF_MAX = 8; public static final int [] MEASUREMENT_STATION_GF = { /* GF_COARSE */ Station.BED_LOAD, @@ -62,7 +61,6 @@ if ("total".equals(name)) return GF_TOTAL; if ("bed_load".equals(name)) return GF_BED_LOAD; if ("bed_load_susp_sand".equals(name)) return GF_BED_LOAD_SUSP_SAND; - if ("average".equals(name)) return GF_AVERAGE; return GF_UNKNOWN; } @@ -116,7 +114,7 @@ } public Load( - int id, + int id, int kind, String description, Date startTime, @@ -152,7 +150,7 @@ public boolean isEpoch() { return startTime != null && stopTime != null; } - } // class SedimentLoad + } // class Load public static class Station implements Serializable {