Reaction calculation 4190

resolve the merge conflict...
Ref #4190 
@cpritam I though you would do it when you move it out. I am going to finish it right now.