added r factor to dtrw and retained single sided neumann bdry conditions