Modified Water Layer Calculation

Changed how layers are merged in DiscreteCostAnalysis and calculation
for water later