Branch to implement revised momentum trends diagnostics to correspond more closely to terms in the primitive equations.