Fixed condition for F and G, BCs in sor for P and BCs for U/V in uvp
Resolved merged conflict