Added subclassed water sim version of MACGrid