Refactor sweep functions and remove unused code

Refactor sweep functions and consolidate logic for handling boundary conditions. Remove unused sweep4 function and update sweep3 to handle circular boundaries more effectively.

Author: Sierd