changed from water and oil to wetting and non-wetting, improved on the buckley leverett code with clearer most consistent notation