Added time step warning, and dem/cfd test