Moved some code in FlowAdvection.cpp