Move water analysis to be first part of calc, move check afterwards
Move water analysis to be first part of calc, move check afterwards

alanmitchell/fnsb-benchmark,alanmitchell/fnsb-benchmark,alanmitchell/fnsb-benchmark