X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=parse-xml.c;h=6eafb0d3aaf993bf8efc78b5d6916387ac0f3c0a;hb=529412aa379ead5beaa9e66c19fbc127d24b9ed4;hp=50f83f68bf8845977739e0d2db821f58d1c2bd1f;hpb=d9ca1b6fbf42b15b597e51f018fdb5df65ee2c29;p=ext%2Fsubsurface.git diff --git a/parse-xml.c b/parse-xml.c index 50f83f6..6eafb0d 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -1083,7 +1083,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) { @@ -1138,7 +1138,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; }