Fixed water layer combination bug

Fixed line that caused discrete analysis to ignore all but water layer