diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2011-11-01 21:12:21 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2011-11-01 21:34:06 -0700 |
| commit | 485b02937d8ca1f9a9043c89e74a3d2f15d6426b (patch) | |
| tree | b589a44458c22dcbdeada5996eaf634cc064723e /parse-xml.c | |
| parent | 56980579514f2900e43441b483e435b3e3235266 (diff) | |
| download | subsurface-485b02937d8ca1f9a9043c89e74a3d2f15d6426b.tar.gz | |
Even more places with pressure and volume conversions
Amazing at how many spots we are re-implementing the wheel.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'parse-xml.c')
| -rw-r--r-- | parse-xml.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/parse-xml.c b/parse-xml.c index c44b6f6ae..5eabc353c 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -425,7 +425,7 @@ static void water_pressure(char *buffer, void *_depth) if (!val.fp) break; /* cbar to atm */ - atm = (val.fp / 100) / 1.01325; + atm = bar_to_atm(val.fp * 10); /* * atm to cm. Why not mm? The precision just isn't * there. @@ -1122,9 +1122,9 @@ static void match_standard_cylinder(cylinder_type_t *type) if (type->description) return; - cuft = type->size.mliter / 28317.0; + cuft = ml_to_cuft(type->size.mliter); cuft *= to_ATM(type->workingpressure); - psi = type->workingpressure.mbar / 68.95; + psi = to_PSI(type->workingpressure); switch (psi) { case 2300 ... 2500: /* 2400 psi: LP tank */ @@ -1177,7 +1177,8 @@ static void sanitize_cylinder_type(cylinder_type_t *type) return; if (input_units.volume == CUFT || import_source == SUUNTO) { - volume_of_air = type->size.mliter * 28.317; /* milli-cu ft to milliliter */ + /* confusing - we don't really start from ml but millicuft !*/ + volume_of_air = cuft_to_l(type->size.mliter); atm = to_ATM(type->workingpressure); /* working pressure in atm */ volume = volume_of_air / atm; /* milliliters at 1 atm: "true size" */ type->size.mliter = volume + 0.5; |