Mercurial > dive4elements > river

comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentLoadCalculation.java @ 4543:e357716cf346

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed some debug logs and changed report strings.
author Raimund Renkert <rrenkert@intevation.de>
date Thu, 15 Nov 2012 17:36:36 +0100
parents a9753f717b3d
children b6297a67823e
comparison
equal deleted inserted replaced
4542:8e8cabaeab6a 4543:e357716cf346
81 logger.debug("internalCalulate; mode:" + yearEpoch); 81 logger.debug("internalCalulate; mode:" + yearEpoch);
82 if (yearEpoch.equals("year")) { 82 if (yearEpoch.equals("year")) {
83 List<SedimentLoadResult> results = 83 List<SedimentLoadResult> results =
84 new ArrayList<SedimentLoadResult>(); 84 new ArrayList<SedimentLoadResult>();
85 for (int i = period[0]; i <= period[1]; i++) { 85 for (int i = period[0]; i <= period[1]; i++) {
86 logger.debug("calculating for year: " + i);
87 SedimentLoadResult res = calculateYear(i); 86 SedimentLoadResult res = calculateYear(i);
88 results.add(res); 87 results.add(res);
89 } 88 }
90 return new CalculationResult( 89 return new CalculationResult(
91 results.toArray(new SedimentLoadResult[results.size()]), this); 90 results.toArray(new SedimentLoadResult[results.size()]), this);
256 } 255 }
257 256
258 private SedimentLoad calculateTotalLoad(SedimentLoad load, int year) { 257 private SedimentLoad calculateTotalLoad(SedimentLoad load, int year) {
259 logger.debug("calculateTotalLoad"); 258 logger.debug("calculateTotalLoad");
260 if (!load.hasCoarse()) { 259 if (!load.hasCoarse()) {
261 addProblem("missing.fraction.coarse" + " " + year); 260 addProblem(year, "missing.fraction.coarse");
262 } 261 }
263 if (!load.hasFineMiddle()) { 262 if (!load.hasFineMiddle()) {
264 addProblem("missing.fraction.fine_middle" + " " + year); 263 addProblem(year, "missing.fraction.fine_middle");
265 } 264 }
266 if (!load.hasSand()) { 265 if (!load.hasSand()) {
267 addProblem("missing.fraction.sand" + " " + year); 266 addProblem(year, "missing.fraction.sand");
268 } 267 }
269 if (!load.hasSuspSand()) { 268 if (!load.hasSuspSand()) {
270 addProblem("missing.fraction.susp_sand" + " " + year); 269 addProblem(year, "missing.fraction.susp_sand");
271 } 270 }
272 if (!load.hasSuspSediment()) { 271 if (!load.hasSuspSediment()) {
273 addProblem("missing.fraction.susp_sediment" + " " + year); 272 addProblem(year, "missing.fraction.susp_sediment");
274 } 273 }
275 if (hasProblems()) { 274 if (hasProblems()) {
276 return load; 275 return load;
277 } 276 }
278 for(double km : load.getKms()) { 277 for(double km : load.getKms()) {
279 logger.debug("total at km " + km);
280 SedimentLoadFraction fraction = load.getFraction(km); 278 SedimentLoadFraction fraction = load.getFraction(km);
281 double total = 0d; 279 double total = 0d;
282 if ((fraction.getCoarse() <= 0d && load.hasCoarse())){ 280 if ((fraction.getCoarse() <= 0d && load.hasCoarse())){
283 addProblem(km, "missing.data.coarse"); 281 addProblem(km, "missing.data.coarse");
284 continue; 282 continue;
312 private SedimentLoad calculateUnit(SedimentLoad load, int year) { 310 private SedimentLoad calculateUnit(SedimentLoad load, int year) {
313 SedimentDensity density = 311 SedimentDensity density =
314 SedimentDensityFactory.getSedimentDensity(river, kmLow, kmUp, year); 312 SedimentDensityFactory.getSedimentDensity(river, kmLow, kmUp, year);
315 for (double km: load.getKms()) { 313 for (double km: load.getKms()) {
316 double dens = density.getDensity(km, year); 314 double dens = density.getDensity(km, year);
317 logger.debug("factor: " + dens);
318 SedimentLoadFraction fraction = load.getFraction(km); 315 SedimentLoadFraction fraction = load.getFraction(km);
319 double coarse = fraction.getCoarse(); 316 double coarse = fraction.getCoarse();
320 double fineMiddle = fraction.getFine_middle(); 317 double fineMiddle = fraction.getFine_middle();
321 double sand = fraction.getSand(); 318 double sand = fraction.getSand();
322 double suspSand = fraction.getSusp_sand(); 319 double suspSand = fraction.getSusp_sand();
323 double bedSand = fraction.getSusp_sand_bed(); 320 double bedSand = fraction.getSusp_sand_bed();
324 double sediment = fraction.getSusp_sediment(); 321 double sediment = fraction.getSusp_sediment();
325 double total = fraction.getTotal(); 322 double total = fraction.getTotal();
326 logger.debug("orig: " + coarse);
327 load.setCoarse(km, (coarse * dens)); 323 load.setCoarse(km, (coarse * dens));
328 load.setFineMiddle(km, (fineMiddle * dens)); 324 load.setFineMiddle(km, (fineMiddle * dens));
329 load.setSand(km, (sand * dens)); 325 load.setSand(km, (sand * dens));
330 load.setSuspSand(km, (suspSand * dens)); 326 load.setSuspSand(km, (suspSand * dens));
331 load.setSuspSandBed(km, (bedSand * dens)); 327 load.setSuspSandBed(km, (bedSand * dens));
332 load.setSuspSediment(km, (sediment * dens)); 328 load.setSuspSediment(km, (sediment * dens));
333 load.setTotal(km, (total * dens)); 329 load.setTotal(km, (total * dens));
334 logger.debug("m3/a: " + load.getFraction(km).getCoarse());
335 } 330 }
336 return load; 331 return load;
337 } 332 }
338 } 333 }
339 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : 334 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :
http://dive4elements.wald.intevation.org