Fix the wake addition model so that factors above increase the combined factor.
Fix the derivative of dolfin expressions and changed a few variables in the
approxdimate shallow water wake model.
Changed some values in make wake to reflect changes made elsewhere