Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadCalculation.java @ 6376:8d6f23243d1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SedimentLoad*: Switch from snake_case to camelCase.
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Thu, 20 Jun 2013 11:42:47 +0200
parents 2f39cf68a1dd
children fa8425c8694c
comparison
equal deleted inserted replaced
6375:2f39cf68a1dd 6376:8d6f23243d1d
156 if (f.getCoarse() > 0d) { 156 if (f.getCoarse() > 0d) {
157 double c = resLoad.getFraction(km).getCoarse(); 157 double c = resLoad.getFraction(km).getCoarse();
158 resLoad.setCoarse(km, c + f.getCoarse(), f.getCoarseRange()); 158 resLoad.setCoarse(km, c + f.getCoarse(), f.getCoarseRange());
159 cSum++; 159 cSum++;
160 } 160 }
161 if (f.getFine_middle() > 0d) { 161 if (f.getFineMiddle() > 0d) {
162 double fm = resLoad.getFraction(km).getFine_middle(); 162 double fm = resLoad.getFraction(km).getFineMiddle();
163 resLoad.setFineMiddle(km, fm + f.getFine_middle(), f.getFineMiddleRange()); 163 resLoad.setFineMiddle(km, fm + f.getFineMiddle(), f.getFineMiddleRange());
164 fmSum++; 164 fmSum++;
165 } 165 }
166 if (f.getSand() > 0d) { 166 if (f.getSand() > 0d) {
167 double s = resLoad.getFraction(km).getSand(); 167 double s = resLoad.getFraction(km).getSand();
168 resLoad.setSand(km, s + f.getSand(), f.getSandRange()); 168 resLoad.setSand(km, s + f.getSand(), f.getSandRange());
169 sSum++; 169 sSum++;
170 } 170 }
171 if (f.getSusp_sand() > 0d) { 171 if (f.getSuspSand() > 0d) {
172 double s = resLoad.getFraction(km).getSusp_sand(); 172 double s = resLoad.getFraction(km).getSuspSand();
173 resLoad.setSuspSand(km, s + f.getSusp_sand(), f.getSuspSandRange()); 173 resLoad.setSuspSand(km, s + f.getSuspSand(), f.getSuspSandRange());
174 ssSum++; 174 ssSum++;
175 } 175 }
176 if (f.getSusp_sand_bed() > 0d) { 176 if (f.getSuspSandBed() > 0d) {
177 double s = resLoad.getFraction(km).getSusp_sand_bed(); 177 double s = resLoad.getFraction(km).getSuspSandBed();
178 resLoad.setSuspSandBed(km, s + f.getSusp_sand_bed(), f.getSuspSandBedRange()); 178 resLoad.setSuspSandBed(km, s + f.getSuspSandBed(), f.getSuspSandBedRange());
179 ssbSum++; 179 ssbSum++;
180 } 180 }
181 if (f.getSusp_sediment() > 0d) { 181 if (f.getSuspSediment() > 0d) {
182 double s = resLoad.getFraction(km).getSusp_sediment(); 182 double s = resLoad.getFraction(km).getSuspSediment();
183 resLoad.setSuspSediment(km, s + f.getSusp_sediment(), f.getSuspSedimentRange()); 183 resLoad.setSuspSediment(km, s + f.getSuspSediment(), f.getSuspSedimentRange());
184 sseSum++; 184 sseSum++;
185 } 185 }
186 } 186 }
187 SedimentLoadFraction fr = resLoad.getFraction(km); 187 SedimentLoadFraction fr = resLoad.getFraction(km);
188 resLoad.setCoarse(km, fr.getCoarse()/cSum, fr.getCoarseRange()); 188 resLoad.setCoarse(km, fr.getCoarse()/cSum, fr.getCoarseRange());
189 resLoad.setFineMiddle(km, fr.getFine_middle()/fmSum, fr.getFineMiddleRange()); 189 resLoad.setFineMiddle(km, fr.getFineMiddle()/fmSum, fr.getFineMiddleRange());
190 resLoad.setSand(km, fr.getSand()/sSum, fr.getSandRange()); 190 resLoad.setSand(km, fr.getSand()/sSum, fr.getSandRange());
191 resLoad.setSuspSand(km, fr.getSusp_sand()/ssSum, fr.getSuspSandRange()); 191 resLoad.setSuspSand(km, fr.getSuspSand()/ssSum, fr.getSuspSandRange());
192 resLoad.setSuspSandBed(km, fr.getSusp_sand_bed()/ssbSum, fr.getSuspSandBedRange()); 192 resLoad.setSuspSandBed(km, fr.getSuspSandBed()/ssbSum, fr.getSuspSandBedRange());
193 resLoad.setSuspSediment(km, fr.getSusp_sediment()/sseSum, fr.getSuspSedimentRange()); 193 resLoad.setSuspSediment(km, fr.getSuspSediment()/sseSum, fr.getSuspSedimentRange());
194 } 194 }
195 resLoad.setDescription(""); 195 resLoad.setDescription("");
196 resLoad.setEpoch(true); 196 resLoad.setEpoch(true);
197 197
198 SedimentLoadResult result; 198 SedimentLoadResult result;
306 } 306 }
307 if (fraction.getSand() <= 0d && load.hasSand()) { 307 if (fraction.getSand() <= 0d && load.hasSand()) {
308 addProblem(km, "missing data.sand"); 308 addProblem(km, "missing data.sand");
309 continue; 309 continue;
310 } 310 }
311 if (fraction.getSusp_sand() <= 0d && load.hasSuspSand()) { 311 if (fraction.getSuspSand() <= 0d && load.hasSuspSand()) {
312 addProblem(km, "missing.data.susp_sand"); 312 addProblem(km, "missing.data.susp_sand");
313 continue; 313 continue;
314 } 314 }
315 if (fraction.getSusp_sediment() <= 0d && load.hasSuspSediment()) { 315 if (fraction.getSuspSediment() <= 0d && load.hasSuspSediment()) {
316 addProblem(km, "missing.data.susp_sediment"); 316 addProblem(km, "missing.data.susp_sediment");
317 continue; 317 continue;
318 } 318 }
319 total += fraction.getCoarse() + 319 total += fraction.getCoarse() +
320 fraction.getFine_middle() + 320 fraction.getFineMiddle() +
321 fraction.getSand() + 321 fraction.getSand() +
322 fraction.getSusp_sand() + 322 fraction.getSuspSand() +
323 fraction.getSusp_sediment(); 323 fraction.getSuspSediment();
324 load.setTotal(km, total, fraction.getTotalRange()); 324 load.setTotal(km, total, fraction.getTotalRange());
325 } 325 }
326 return load; 326 return load;
327 } 327 }
328 328
331 SedimentDensityFactory.getSedimentDensity(river, kmLow, kmUp, year); 331 SedimentDensityFactory.getSedimentDensity(river, kmLow, kmUp, year);
332 for (double km: load.getKms()) { 332 for (double km: load.getKms()) {
333 double dens = density.getDensity(km, year); 333 double dens = density.getDensity(km, year);
334 SedimentLoadFraction fraction = load.getFraction(km); 334 SedimentLoadFraction fraction = load.getFraction(km);
335 double coarse = fraction.getCoarse(); 335 double coarse = fraction.getCoarse();
336 double fineMiddle = fraction.getFine_middle(); 336 double fineMiddle = fraction.getFineMiddle();
337 double sand = fraction.getSand(); 337 double sand = fraction.getSand();
338 double suspSand = fraction.getSusp_sand(); 338 double suspSand = fraction.getSuspSand();
339 double bedSand = fraction.getSusp_sand_bed(); 339 double bedSand = fraction.getSuspSandBed();
340 double sediment = fraction.getSusp_sediment(); 340 double sediment = fraction.getSuspSediment();
341 double total = fraction.getTotal(); 341 double total = fraction.getTotal();
342 load.setCoarse(km, (coarse * dens), fraction.getCoarseRange()); 342 load.setCoarse(km, (coarse * dens), fraction.getCoarseRange());
343 load.setFineMiddle(km, (fineMiddle * dens), fraction.getFineMiddleRange()); 343 load.setFineMiddle(km, (fineMiddle * dens), fraction.getFineMiddleRange());
344 load.setSand(km, (sand * dens), fraction.getSandRange()); 344 load.setSand(km, (sand * dens), fraction.getSandRange());
345 load.setSuspSand(km, (suspSand * dens), fraction.getSuspSandRange()); 345 load.setSuspSand(km, (suspSand * dens), fraction.getSuspSandRange());
http://dive4elements.wald.intevation.org