Skip to content

Commit

Permalink
Merge pull request #18 from feelpp/17-accept-points-in-material-names…
Browse files Browse the repository at this point in the history
…-for-ifc2mo

Don't remove points from material names #17
  • Loading branch information
JavierCladellas authored Jan 19, 2024
2 parents 74539c2 + 60d4054 commit 17d7485
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ def browsePropertySet(ps,mat):
k = prop["k"] if "k" in prop else None
c = prop["Cp"] if "Cp" in prop else None
d = prop["rho"] if "rho" in prop else None
buildingData.addMaterial(bdm.Material(name=re.sub('[^0-9a-zA-Z_]', '', mat.Name), density=d, capacity=c, conductivity=k))
buildingData.addMaterial(bdm.Material(name=re.sub('[^0-9a-zA-Z_.]', '', mat.Name), density=d, capacity=c, conductivity=k))

## Construction types
for con in MaterialLayerset.items():
Expand All @@ -288,7 +288,7 @@ def browsePropertySet(ps,mat):
thickness.append(layer.Thickness/1000.0)
else: # length unit in the IFC file in m
thickness.append(layer.Thickness)
material.append(re.sub('[^0-9a-zA-Z_]', '',layer.Material.Name))
material.append(re.sub('[^0-9a-zA-Z_.]', '',layer.Material.Name))
#material.append("BuildingSystems.HAM.Data.MaterialProperties.Thermal.Masea.Concrete")
buildingData.addConstruction(bdm.Construction(name="Construction"+str(ico),
numberOfLayers=len(con[1]),
Expand Down

0 comments on commit 17d7485

Please sign in to comment.