Allow different superposition models for wake and blockage + add blockage to flowmap with weightedSum (was missing before)