Remove fix for GOC and WOC above/below reservoir
Include goc and woc in the span for the phase pressure calculation
effectiveRadius: Fix numerator formula

We must take the square root of the permeability ratios, not use them
as is.  This was lost in the refactorisation commit 96cf137.

Pointy hat: @bska.
Merge pull request #647 from totto82/fix_init

Fix initialization
Merge pull request #648 from bska/fix-peaceman

effectiveRadius: Fix Numerator Formula