ESMTool: don't print mWater twice for interior cells.
Don't print it for other cells.
Merge branch 'porting2' into bigmix