Pas "diffusivity" as the second argument as well to use it as the default... then you don't need the `_has_diff` member variable and you don't need the ternary operator below....