Refactored boundaryType and boundaryGrid to CellType and cellTypeGrid