r1630 modify the implementation of the convection part