From f01c736e85938735568831ef44e6a7c8cdad2bd2 Mon Sep 17 00:00:00 2001 From: PH Tools Date: Mon, 26 Sep 2022 19:10:27 +0200 Subject: [PATCH] fix(phpp): Update PHPP write DHW --- PHX/to_PHPP/phpp_model/hot_water_piping.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PHX/to_PHPP/phpp_model/hot_water_piping.py b/PHX/to_PHPP/phpp_model/hot_water_piping.py index 30bb7ce..3843640 100644 --- a/PHX/to_PHPP/phpp_model/hot_water_piping.py +++ b/PHX/to_PHPP/phpp_model/hot_water_piping.py @@ -106,18 +106,20 @@ def create_xl_items(self, _sheet_name: str, _row_num: int) -> List[xl_data.XlIte XLItemDHW = partial(xl_data.XlItem, _sheet_name) return [ + # -- Branch Piping XLItemDHW( - self.create_range(_row_num + self.shape.branch_piping.input_rows_offset.diameter.row), + self.create_range(_row_num + self.shape.branch_piping.input_rows_offset.diameter.row), # type: ignore sum(s.diameter * s.length for s in self.phx_pipe) / sum(s.length for s in self.phx_pipe), "M", self._get_target_unit('diameter') ), XLItemDHW( - self.create_range(_row_num + self.shape.branch_piping.input_rows_offset.total_length.row), + self.create_range(_row_num + self.shape.branch_piping.input_rows_offset.total_length.row), # type: ignore sum(s.length for s in self.phx_pipe), "M", self._get_target_unit('total_length') ), + # -- Add Tapping Points XLItemDHW( self.create_range(_row_num + self.shape.branch_piping.input_rows_offset.num_taps), self.num_tap_points,