Fix bugs related to friction and wind forcing

Bugs are related to switch to non-monolithic source term calculation.