summaryrefslogtreecommitdiffstats
path: root/file.c
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org>2012-06-19 22:41:44 -0700
committerGravatar Linus Torvalds <torvalds@linux-foundation.org>2012-06-19 22:41:44 -0700
commite96a1864be076fcdf870188b95b1d43f16308590 (patch)
treed6630307e9a2b7446a57c6138ea8c2859bfef6ca /file.c
parentba31e37063308ab74b282db983557797d05f59d1 (diff)
downloadsubsurface-e96a1864be076fcdf870188b95b1d43f16308590.tar.gz
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>
Diffstat (limited to 'file.c')
-rw-r--r--file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/file.c b/file.c
index 3f06259fa..538f5c783 100644
--- 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;
}
}