[PATCH] fixed #404 Corrects volumes of cylinders
Dirk Hohndel
dirk at hohndel.org
Mon Mar 23 08:49:52 PDT 2015
On Sun, Mar 22, 2015 at 10:58:21PM +0530, Harshal Jalan wrote:
> The volumes of cylinders displayed in equipments tab was wrong. It was
> corrected by changing data about the cylinders in the code.
> Please have a look at the attached patch and suggest changes...
>
> Harshal Jalan
> From f6adc09d5aa9d8a5a9f958c318e14d2dc62dd781 Mon Sep 17 00:00:00 2001
> From: Harshal Jalan <harshal.jalan at gmail.com>
> Date: Sun, 22 Mar 2015 22:30:07 +0530
> Subject: [PATCH] [PATCH] Fixed #404 Corrects volumes of cylinders
> The volumes of cylinders displayed in equipments tab was wrong.
> It was corrected by changing data about the cylinders in the code.
>
> Signed-off-by: Harshal Jalan <harshal.jalan at gmail.com>
> ---
> equipment.c | 30 +++++++++++++++---------------
> 1 file changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/equipment.c b/equipment.c
> index aebac51..dfde924 100644
> --- a/equipment.c
> +++ b/equipment.c
> @@ -141,28 +141,28 @@ struct tank_info_t tank_info[100] = {
> { "11.1ℓ", .ml = 11100 },
>
> /* Most common AL cylinders */
> - { "AL40", .cuft = 40, .psi = 3000 },
> - { "AL50", .cuft = 50, .psi = 3000 },
> - { "AL63", .cuft = 63, .psi = 3000 },
> - { "AL72", .cuft = 72, .psi = 3000 },
> - { "AL80", .cuft = 80, .psi = 3000 },
> - { "AL100", .cuft = 100, .psi = 3300 },
> + { "AL40", .ml = 5700, .bar = 207 },
> + { "AL50", .ml = 6900, .bar = 207 },
> + { "AL63", .ml = 9000, .bar = 207 },
> + { "AL72", .ml = 6900, .bar = 207 },
> + { "AL80", .ml = 11100, .bar = 207 },
> + { "AL100", .ml = 13200, .bar = 228 },
NO, these are not cylinders defined by a metric wet volume and a pointless
pressure in bar. They are defined by an insane imperial air volume and a
working pressure given in psi.
> - { "LP85", .cuft = 85, .psi = 2640 },
> - { "LP95", .cuft = 95, .psi = 2640 },
> - { "LP108", .cuft = 108, .psi = 2640 },
> - { "LP121", .cuft = 121, .psi = 2640 },
> + { "LP85", .ml = 13400, .bar = 182 },
> + { "LP95", .ml = 15000, .bar = 182 },
> + { "LP108", .ml = 17000, .bar = 182 },
> + { "LP121", .ml = 19100, .bar = 182 },
DITTO.
So regardless of the whitespace damage,
NAK
/D
More information about the subsurface
mailing list