Injection of Water above Gas for Improved Sweep in Gas EOR: Non-uniform Injection and Sweep