Remove fix for GOC and WOC above/below reservoir
Include goc and woc in the span for the phase pressure calculation
Merge pull request #647 from totto82/fix_init

Fix initialization