fix cpp variable names
revert back to 2D and added 3D mesh