Made correct unit conversions from p-file to 6-field BOUT++