Description

As part of EE2, we've been asked to reduce the number of goto statements in different submodules. This issue will deal with the goto statements in FV3.

Solution

Remove goto statements and replace with more modern code conventions and ensure that no baseline changes occur.