Particles vs wind vs indoor

[ExBemined]

We are trying to figure out how to properly use the particle system in combination with wind and indoor buildings. Basically particles outdoor should be influenced by wind, but smoke inside a building should not. What would be the way to approach this? The outdoor wind object has the size of the entire scene, so also covers the buildings. The only way to exclude the global wind from indoor emitters I see is the physical mask, but that would require us to specify the correct mask per object (users can dynamically place smoke in the environment) and particles that enters/leaves the building from an open window or roof don't get the updates mask.

 

In the attachment you can see my test case. Blue smoke is spawned outside (physical mask 1), wind blows some particles through the window. They continue with the same velocity inside, the dampening does not kick in because it's still within the wind, causing all particles to clutter up in the top corner instead of spreading out a bit. Red smoke is spawned inside (physical mark 2), some particles escape through the open roof and just continue straight up since they are excluded from the wind. Is there a better way to do this, like some system that discards the global wind if the particle is contained within a local wind force? Right now it seems multiple wind forces always seem to be additive, making it impossible to cancel out global wind with local wind...