X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=parse-xml.c;h=8f916b09aea3ed02b2d7ebb7c927263eb2bd7a83;hb=a93641b7222e767d6a3a1be598cd8099d8517059;hp=1eb6e95fdd1007aff73d326c7d6b073c7fe36f36;hpb=15463fdeb26ed1b5fdff62e4721a6dbbc507cefc;p=ext%2Fsubsurface.git diff --git a/parse-xml.c b/parse-xml.c index 1eb6e95..8f916b0 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -1051,7 +1051,7 @@ static void match_standard_cylinder(cylinder_type_t *type) return; cuft = type->size.mliter / 28317.0; - cuft *= type->workingpressure.mbar / 1013.25; + cuft *= to_ATM(type->workingpressure); psi = type->workingpressure.mbar / 68.95; switch (psi) { @@ -1106,7 +1106,7 @@ static void sanitize_cylinder_type(cylinder_type_t *type) if (input_units.volume == CUFT || import_source == SUUNTO) { volume_of_air = type->size.mliter * 28.317; /* milli-cu ft to milliliter */ - atm = type->workingpressure.mbar / 1013.25; /* working pressure in atm */ + 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; }