Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "osut"
version = "0.9.0"
version = "0.9.1"
description = "OpenStudio SDK utilities for Python"
readme = "README.md"
requires-python = ">=3.2"
Expand Down
10 changes: 5 additions & 5 deletions src/osut/osut.py
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ def rsi(lc=None, film=0.0, t=0.0) -> float:
if m.to_StandardOpaqueMaterial():
rsi += m.to_StandardOpaqueMaterial().get().thermalResistance()
elif m.to_MasslessOpaqueMaterial():
rsi += m.to_MasslessOpaqueMaterial()
rsi += m.to_MasslessOpaqueMaterial().get().thermalResistance()
elif m.to_RoofVegetation():
rsi += m.to_RoofVegetation().get().thermalResistance()
elif m.to_AirGap():
Expand Down Expand Up @@ -563,7 +563,7 @@ def insulatingLayer(lc=None) -> dict:
mth = "osut.insulatingLayer"
cl = openstudio.model.LayeredConstruction
res = dict(index=None, type=None, r=0.0)
i = 0 # iterator
i = 0 # iterator

if not isinstance(lc, cl):
return oslg.mismatch("lc", lc, cl, mth, CN.DBG, res)
Expand All @@ -572,11 +572,11 @@ def insulatingLayer(lc=None) -> dict:
if l.to_MasslessOpaqueMaterial():
l = l.to_MasslessOpaqueMaterial().get()

if l.thermalResistance() < 0.001 or l.thermalResistance() < res["r"]:
if l.thermalResistance() < CN.RMIN or l.thermalResistance() < res["r"]:
i += 1
continue
else:
res["r" ] = m.thermalResistance()
res["r" ] = l.thermalResistance()
res["index"] = i
res["type" ] = "massless"

Expand All @@ -585,7 +585,7 @@ def insulatingLayer(lc=None) -> dict:
k = l.thermalConductivity()
d = l.thickness()

if (d < 0.003) or (k > 3.0) or (d / k < res["r"]):
if (d < CN.DMIN) or (k > CN.KMAX) or (d / k < res["r"]):
i += 1
continue
else:
Expand Down
Loading