Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation6.java @ 6301:20a32dbdbb59
Remove discharge table scaling but add reference system to W
- Discharge_Tables are now always W[cm] Q[m³] no need for
special case handling depending on historical / master tables
- W now has a referenceSystem value that can be CENTIMETER_AT_GAUGE or
METER_OVER_REFPOINT. The default is METER_OVER_REFPOINT as this is
the case for everything except the objects created from discharge tables
Known issue: WINFO input validation is currently broken as it still scales
the user input.
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Wed, 12 Jun 2013 10:54:27 +0200 |
| parents | 9e84e323bdf6 |
| children | fe03337c8011 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation6.java Wed Jun 12 16:36:34 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation6.java Wed Jun 12 10:54:27 2013 +0200 @@ -39,8 +39,6 @@ private Long officialGaugeNumber; - public static final double SCALE = 1d; - public Calculation6(HistoricalDischargeAccess access) { EvaluationMode mode = access.getEvaluationMode(); Timerange tr = access.getEvaluationTimerange(); @@ -329,8 +327,7 @@ Integer id = dt.getId(); double [][] vs = cache.get(id); if (vs == null) { - vs = DischargeTables.loadDischargeTableValues( - dt, DischargeTables.HISTORICAL_SCALE); + vs = DischargeTables.loadDischargeTableValues(dt); cache.put(id, vs); } return vs;