removed ns2DComp
add ns2DComp
remove calcRHS