diff --git a/hub/imports/construction/nrcan_physics_parameters.py b/hub/imports/construction/nrcan_physics_parameters.py index dbe37684..77240a81 100644 --- a/hub/imports/construction/nrcan_physics_parameters.py +++ b/hub/imports/construction/nrcan_physics_parameters.py @@ -87,7 +87,7 @@ class NrcanPhysicsParameters: for thermal_zone in thermal_zones: thermal_zone.additional_thermal_bridge_u_value = archetype.extra_loses_due_to_thermal_bridges thermal_zone.effective_thermal_capacity = archetype.thermal_capacity - thermal_zone.indirectly_heated_area_ratio = archetype.indirect_heated_ratio + thermal_zone.indirectly_heated_area_ratio = 0 thermal_zone.infiltration_rate_system_on = archetype.infiltration_rate_for_ventilation_system_on thermal_zone.infiltration_rate_system_off = archetype.infiltration_rate_for_ventilation_system_off for thermal_boundary in thermal_zone.thermal_boundaries: diff --git a/hub/imports/geometry/citygml.py b/hub/imports/geometry/citygml.py index bcd3dec8..f6490f97 100644 --- a/hub/imports/geometry/citygml.py +++ b/hub/imports/geometry/citygml.py @@ -22,8 +22,8 @@ class CityGml: def __init__(self, path, extrusion_height_field=None, - year_of_construction_field='yearOfConstruction', - function_field='function', + year_of_construction_field=None, + function_field=None, function_to_hub=None): self._city = None self._lod = None @@ -31,6 +31,8 @@ class CityGml: self._lod2_tags = ['lod2Solid', 'lod2MultiSurface', 'lod2MultiCurve'] self._extrusion_height_field = extrusion_height_field self._function_to_hub = function_to_hub + if year_of_construction_field is None: + year_of_construction_field = 'yearOfConstruction' self._year_of_construction_field = year_of_construction_field if function_field is None: function_field = 'function'