both the Model and the ufl expression for the initial data, i.e., only a
single function call needed to set up a test case. Later we can use run
time parameters to choose the problem

Also added static const ints for haveDiffusion,haveAdvection to
'Additional'

Added an advection/diffusion test case