Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java @ 8185:76e1e9d81ce2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
8184:143b24546b26 8185:76e1e9d81ce2
29 public static final int GF_SUSP_SAND_BED = 4; 29 public static final int GF_SUSP_SAND_BED = 4;
30 public static final int GF_SUSP_SEDIMENT = 5; 30 public static final int GF_SUSP_SEDIMENT = 5;
31 public static final int GF_TOTAL = 6; 31 public static final int GF_TOTAL = 6;
32 public static final int GF_BED_LOAD = 7; 32 public static final int GF_BED_LOAD = 7;
33 public static final int GF_BED_LOAD_SUSP_SAND = 8; 33 public static final int GF_BED_LOAD_SUSP_SAND = 8;
34 public static final int GF_AVERAGE = 9; 34 public static final int GF_MAX = 8;
35 public static final int GF_MAX = 9;
36 35
37 public static final int [] MEASUREMENT_STATION_GF = { 36 public static final int [] MEASUREMENT_STATION_GF = {
38 /* GF_COARSE */ Station.BED_LOAD, 37 /* GF_COARSE */ Station.BED_LOAD,
39 /* GF_FINE_MIDDLE */ Station.BED_LOAD, 38 /* GF_FINE_MIDDLE */ Station.BED_LOAD,
40 /* GF_SAND */ Station.BED_LOAD, 39 /* GF_SAND */ Station.BED_LOAD,
60 if ("susp_sand_bed".equals(name)) return GF_SUSP_SAND_BED; 59 if ("susp_sand_bed".equals(name)) return GF_SUSP_SAND_BED;
61 if ("suspended_sediment".equals(name)) return GF_SUSP_SEDIMENT; 60 if ("suspended_sediment".equals(name)) return GF_SUSP_SEDIMENT;
62 if ("total".equals(name)) return GF_TOTAL; 61 if ("total".equals(name)) return GF_TOTAL;
63 if ("bed_load".equals(name)) return GF_BED_LOAD; 62 if ("bed_load".equals(name)) return GF_BED_LOAD;
64 if ("bed_load_susp_sand".equals(name)) return GF_BED_LOAD_SUSP_SAND; 63 if ("bed_load_susp_sand".equals(name)) return GF_BED_LOAD_SUSP_SAND;
65 if ("average".equals(name)) return GF_AVERAGE;
66 return GF_UNKNOWN; 64 return GF_UNKNOWN;
67 } 65 }
68 66
69 public interface Visitor { 67 public interface Visitor {
70 void visit(Station station); 68 void visit(Station station);
114 112
115 public Load() { 113 public Load() {
116 } 114 }
117 115
118 public Load( 116 public Load(
119 int id, 117 int id,
120 int kind, 118 int kind,
121 String description, 119 String description,
122 Date startTime, 120 Date startTime,
123 Date stopTime 121 Date stopTime
124 ) { 122 ) {
150 } 148 }
151 149
152 public boolean isEpoch() { 150 public boolean isEpoch() {
153 return startTime != null && stopTime != null; 151 return startTime != null && stopTime != null;
154 } 152 }
155 } // class SedimentLoad 153 } // class Load
156 154
157 public static class Station implements Serializable { 155 public static class Station implements Serializable {
158 156
159 public static final int UNKNOWN = 0; 157 public static final int UNKNOWN = 0;
160 public static final int BED_LOAD = 1; 158 public static final int BED_LOAD = 1;
http://dive4elements.wald.intevation.org