Merge changes for conflict solving and remove debug messages

This commit is contained in:
Guille 2020-11-16 09:42:43 -05:00
parent ce2c873aa0
commit 6a5e39fba6

View File

@ -92,18 +92,6 @@ class IdfHelper:
schedule_occupancy.Hour_23 = occupancy.occupant_schedule[22]
schedule_occupancy.Hour_24 = occupancy.occupant_schedule[23]
def add_material(self, layer):
materials = self._idf.newidfobject("MATERIAL".upper())
materials.Name = layer.material.name
materials.Roughness = cte.roughness
materials.Thickness = layer.thickness
materials.Conductivity = layer.material.conductivity
materials.Density = layer.material.density
materials.Specific_Heat = layer.material.specific_heat
materials.Thermal_Absorptance = layer.material.thermal_absorptance
materials.Solar_Absorptance = layer.material.solar_absorptance
materials.Visible_Absorptance = layer.material.visible_absorptance
def _add_construction(self, thermal_boundary):
for construction in self._idf.idfobjects[self._CONSTRUCTION]:
if construction.Name == thermal_boundary.construction_name: