Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java @ 8050:9e79e384aa8b
Sediment load: Added more 'sums' to be calculated.
author | Sascha L. Teichmann <teichmann@intevation.de> |
---|---|
date | Thu, 17 Jul 2014 18:22:16 +0200 |
parents | cde6d2a9ec32 |
children | fbe3ba5a480e |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java Thu Jul 17 16:51:18 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java Thu Jul 17 18:22:16 2014 +0200 @@ -38,7 +38,10 @@ /* GF_SAND */ Station.BED_LOAD, /* GF_SUSP_SAND */ Station.BED_LOAD, /* GF_SUSP_SAND_BED */ Station.BED_LOAD, - /* GF_SUSP_SEDIMENT */ Station.SUSPENDED + /* GF_SUSP_SEDIMENT */ Station.SUSPENDED, + /* GF_TOTAL */ Station.BED_LOAD|Station.SUSPENDED, + /* GF_BED_LOAD */ Station.BED_LOAD, + /* GF_SUSPENDED_LOAD */ Station.BED_LOAD }; public static final int measurementStationType(int grainFraction) { @@ -173,7 +176,7 @@ } public boolean isType(int type) { - return (this.type & type) == type; + return (this.type & type) != 0; } public void setNext(Station next) {