refs #10384 Various modifications to satisfy different analysis tools

Modifications related to different error calculation formula.