From 435589b48faefab4c0af4b089f1afb8ea87e4f8c Mon Sep 17 00:00:00 2001 From: Paolo Tormene Date: Thu, 31 Aug 2023 14:23:39 +0200 Subject: [PATCH 1/2] Use 'residents' instead of 'occupants_avg' or 'occupants_night' when consequence is 'homeless' --- openquake/risklib/scientific.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openquake/risklib/scientific.py b/openquake/risklib/scientific.py index 940d501ef73..c634d0eb48f 100644 --- a/openquake/risklib/scientific.py +++ b/openquake/risklib/scientific.py @@ -1651,7 +1651,7 @@ def consequence(consequence, coeffs, asset, dmgdist, loss_type): elif consequence == 'fatalities': return dmgdist @ coeffs * asset['occupants_night'] elif consequence == 'homeless': - return dmgdist @ coeffs * asset['occupants_avg'] + return dmgdist @ coeffs * asset['residents'] def get_agg_value(consequence, agg_values, agg_id, xltype): @@ -1667,7 +1667,7 @@ def get_agg_value(consequence, agg_values, agg_id, xltype): elif consequence == 'fatalities': return aval['occupants_night'] elif consequence == 'homeless': - return aval['occupants_night'] + return aval['redsidents'] elif consequence in ('loss', 'losses'): if xltype.endswith('_ins'): xltype = xltype[:-4] From 19bfa609c62d93760369a6aef342c58b652d58a3 Mon Sep 17 00:00:00 2001 From: Paolo Tormene Date: Thu, 31 Aug 2023 14:35:26 +0200 Subject: [PATCH 2/2] Fix a typo --- openquake/risklib/scientific.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openquake/risklib/scientific.py b/openquake/risklib/scientific.py index c634d0eb48f..aec81550d97 100644 --- a/openquake/risklib/scientific.py +++ b/openquake/risklib/scientific.py @@ -1667,7 +1667,7 @@ def get_agg_value(consequence, agg_values, agg_id, xltype): elif consequence == 'fatalities': return aval['occupants_night'] elif consequence == 'homeless': - return aval['redsidents'] + return aval['residents'] elif consequence in ('loss', 'losses'): if xltype.endswith('_ins'): xltype = xltype[:-4]