Fix cochran CSV pressure data import

The cochran CSV pressure data is actually in units of '4 psi', not in
just psi.  That seems to be the resolution cochran internally keeps
things in, and unlike the depth reading there's no conversion to
standard units in the export (for depth, the quarter-foot depth
resolution is converted to tenths of feet when exporting).

Yeah, none of this makes any sense to me either, but I knew it was the
case.  I had just forgotten that factor-of-four when I did the importer.

With this fix, I get the same subsurface data (modulo some rounding
differences particularly for temperature) whether I go through David
McNett's UDDF converter, or just import the CSV data directly.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/file.c b/file.c
index 3f06259faa1cd7087ef926e1cdd8a60b4d1bf9c1..538f5c78312c060216726e71492b123e48b93d4b 100644 (file)
--- a/file.c
+++ b/file.c
@@ -140,7 +140,7 @@ static void add_sample_data(struct sample *sample, enum csv_format type, double
                sample->temperature.mkelvin = F_to_mkelvin(val);
                break;
        case CSV_PRESSURE:
-               sample->cylinderpressure.mbar = psi_to_mbar(val);
+               sample->cylinderpressure.mbar = psi_to_mbar(val*4);
                break;
        }
 }