Merge branch 'master' into a_bug_in_comnet_factory
This commit is contained in:
commit
e5521f87b4
|
@ -172,7 +172,7 @@ class ComnetCatalog(Catalog):
|
|||
"""
|
||||
number_usage_types = 33
|
||||
xl_file = pd.ExcelFile(self._comnet_archetypes_path)
|
||||
file_data = pd.read_excel(xl_file, sheet_name="Modeling Data", skiprows=[0, 1, 2],
|
||||
file_data = pd.read_excel(xl_file, sheet_name="Modeling Data", skiprows=[0, 1, 2, 24],
|
||||
nrows=number_usage_types, usecols="A:AB")
|
||||
|
||||
lighting_data = {}
|
||||
|
@ -182,8 +182,7 @@ class ComnetCatalog(Catalog):
|
|||
water_heating = {}
|
||||
process_data = {}
|
||||
schedules_key = {}
|
||||
|
||||
for j in range(0, number_usage_types):
|
||||
for j in range(0, number_usage_types-1):
|
||||
usage_parameters = file_data.iloc[j]
|
||||
usage_type = usage_parameters[0]
|
||||
lighting_data[usage_type] = usage_parameters[1:6].values.tolist()
|
||||
|
@ -194,6 +193,7 @@ class ComnetCatalog(Catalog):
|
|||
process_data[usage_type] = usage_parameters[24:26].values.tolist()
|
||||
schedules_key[usage_type] = usage_parameters[27:28].item()
|
||||
|
||||
|
||||
return {'lighting': lighting_data,
|
||||
'plug loads': plug_loads_data,
|
||||
'occupancy': occupancy_data,
|
||||
|
|
|
@ -84,14 +84,12 @@ class UsageHelper:
|
|||
'C-3 Hotel Motel': 'C-3 Hotel',
|
||||
'C-4 Manufacturing': 'C-4 Manufacturing',
|
||||
'C-5 Office': 'C-5 Office',
|
||||
'C-6 Parking Garage': 'C-6 Parking',
|
||||
'C-7 Restaurant': 'C-7 Restaurant',
|
||||
'C-8 Retail': 'C-8 Retail',
|
||||
'C-9 Schools': 'C-9 School',
|
||||
'C-10 Warehouse': 'C-10 Warehouse',
|
||||
'C-11 Laboratory': 'C-11 Lab',
|
||||
'C-12 Residential': 'C-12 Residential',
|
||||
'C-13 Data Center': 'C-13 Data',
|
||||
'C-14 Gymnasium': 'C-14 Gymnasium'
|
||||
}
|
||||
|
||||
|
|
|
@ -204,7 +204,7 @@
|
|||
<landfilling_ratio>0.2</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="concrete" id="1" name="light weight expanded clay">
|
||||
<material type="concrete" id="5" name="light weight expanded clay">
|
||||
<density unit="ton/m3">1.6</density>
|
||||
<embodied_carbon unit="kgCO2/ton">900</embodied_carbon>
|
||||
<recycling_ratio>0.8</recycling_ratio>
|
||||
|
@ -213,7 +213,7 @@
|
|||
<landfilling_ratio>0.2</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="concrete" id="2" name="lightweight Expanded perlite">
|
||||
<material type="concrete" id="6" name="lightweight Expanded perlite">
|
||||
<density unit="ton/m3">1.6</density>
|
||||
<embodied_carbon unit="kgCO2/ton">2340</embodied_carbon>
|
||||
<recycling_ratio>0.8</recycling_ratio>
|
||||
|
@ -222,7 +222,7 @@
|
|||
<landfilling_ratio>0.2</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="concrete" id="3" name="lightweight expanded vermiculite">
|
||||
<material type="concrete" id="7" name="lightweight expanded vermiculite">
|
||||
<density unit="ton/m3">1.6</density>
|
||||
<embodied_carbon unit="kgCO2/ton">1570</embodied_carbon>
|
||||
<recycling_ratio>0.8</recycling_ratio>
|
||||
|
@ -231,7 +231,7 @@
|
|||
<landfilling_ratio>0.2</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="concrete" id="4" name="lightweight polystyrene">
|
||||
<material type="concrete" id="8" name="lightweight polystyrene">
|
||||
<density unit="ton/m3">1.4</density>
|
||||
<embodied_carbon unit="kgCO2/ton">1840</embodied_carbon>
|
||||
<recycling_ratio>0.8</recycling_ratio>
|
||||
|
@ -240,7 +240,7 @@
|
|||
<landfilling_ratio>0.2</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="concrete" id="5" name="lightweight pumice">
|
||||
<material type="concrete" id="9" name="lightweight pumice">
|
||||
<density unit="ton/m3">1.3</density>
|
||||
<embodied_carbon unit="kgCO2/ton">410</embodied_carbon>
|
||||
<recycling_ratio>0.8</recycling_ratio>
|
||||
|
@ -249,7 +249,7 @@
|
|||
<landfilling_ratio>0.2</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="concrete" id="6" name="concrete 20 MPa">
|
||||
<material type="concrete" id="10" name="concrete 20 MPa">
|
||||
<density unit="ton/m3">2.3</density>
|
||||
<embodied_carbon unit="kgCO2/ton">160</embodied_carbon>
|
||||
<recycling_ratio>0.8</recycling_ratio>
|
||||
|
@ -258,7 +258,7 @@
|
|||
<landfilling_ratio>0.2</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="concrete" id="7" name="concrete 25 MPa">
|
||||
<material type="concrete" id="11" name="concrete 25 MPa">
|
||||
<density unit="ton/m3">2.3</density>
|
||||
<embodied_carbon unit="kgCO2/ton">170</embodied_carbon>
|
||||
<recycling_ratio>0.8</recycling_ratio>
|
||||
|
@ -267,7 +267,7 @@
|
|||
<landfilling_ratio>0.2</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="concrete" id="8" name="concrete 30-32 MPa">
|
||||
<material type="concrete" id="12" name="concrete 30-32 MPa">
|
||||
<density unit="ton/m3">2.3</density>
|
||||
<embodied_carbon unit="kgCO2/ton">230</embodied_carbon>
|
||||
<recycling_ratio>0.8</recycling_ratio>
|
||||
|
@ -276,7 +276,7 @@
|
|||
<landfilling_ratio>0.2</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="concrete" id="9" name="concrete 35 MPae">
|
||||
<material type="concrete" id="13" name="concrete 35 MPae">
|
||||
<density unit="ton/m3">2.4</density>
|
||||
<embodied_carbon unit="kgCO2/ton">240</embodied_carbon>
|
||||
<recycling_ratio>0.8</recycling_ratio>
|
||||
|
@ -285,7 +285,7 @@
|
|||
<landfilling_ratio>0.2</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="concrete" id="10" name="concrete 50 MPa">
|
||||
<material type="concrete" id="14" name="concrete 50 MPa">
|
||||
<density unit="ton/m3">2.4</density>
|
||||
<embodied_carbon unit="kgCO2/ton">280</embodied_carbon>
|
||||
<recycling_ratio>0.8</recycling_ratio>
|
||||
|
@ -294,7 +294,7 @@
|
|||
<landfilling_ratio>0.2</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="concrete" id="11" name="concrete block">
|
||||
<material type="concrete" id="15" name="concrete block">
|
||||
<density unit="ton/m3">2.3</density>
|
||||
<embodied_carbon unit="kgCO2/ton">170</embodied_carbon>
|
||||
<recycling_ratio>0.8</recycling_ratio>
|
||||
|
@ -303,7 +303,7 @@
|
|||
<landfilling_ratio>0.2</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="concrete" id="12" name="concrete roof tile">
|
||||
<material type="concrete" id="16" name="concrete roof tile">
|
||||
<density unit="ton/m3">1.2</density>
|
||||
<embodied_carbon unit="kgCO2/ton">440</embodied_carbon>
|
||||
<recycling_ratio>0.8</recycling_ratio>
|
||||
|
@ -312,7 +312,7 @@
|
|||
<landfilling_ratio>0.2</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="glass" id="1" name="flat glass, coated">
|
||||
<material type="glass" id="17" name="flat glass, coated">
|
||||
<density unit="ton/m3">2.58</density>
|
||||
<embodied_carbon unit="kgCO2/ton">2660</embodied_carbon>
|
||||
<recycling_ratio>0.95</recycling_ratio>
|
||||
|
@ -321,7 +321,7 @@
|
|||
<landfilling_ratio>0.05</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="glass" id="2" name="glass fibre">
|
||||
<material type="glass" id="18" name="glass fibre">
|
||||
<density unit="ton/m3">2.58</density>
|
||||
<embodied_carbon unit="kgCO2/ton">5260</embodied_carbon>
|
||||
<recycling_ratio>0.95</recycling_ratio>
|
||||
|
@ -330,7 +330,7 @@
|
|||
<landfilling_ratio>0.05</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="insulation" id="1" name="cellulose fibre">
|
||||
<material type="insulation" id="19" name="cellulose fibre">
|
||||
<density unit="ton/m3">0.06</density>
|
||||
<embodied_carbon unit="kgCO2/ton">1760</embodied_carbon>
|
||||
<recycling_ratio>0.9</recycling_ratio>
|
||||
|
@ -339,7 +339,7 @@
|
|||
<landfilling_ratio>0.1</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="insulation" id="2" name="cork slab">
|
||||
<material type="insulation" id="20" name="cork slab">
|
||||
<density unit="ton/m3">0.122</density>
|
||||
<embodied_carbon unit="kgCO2/ton">3080</embodied_carbon>
|
||||
<recycling_ratio>0.9</recycling_ratio>
|
||||
|
@ -348,7 +348,7 @@
|
|||
<landfilling_ratio>0.1</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="insulation" id="3" name="polystyren foam">
|
||||
<material type="insulation" id="21" name="polystyren foam">
|
||||
<density unit="ton/m3">0.028</density>
|
||||
<embodied_carbon unit="kgCO2/ton">3180</embodied_carbon>
|
||||
<recycling_ratio>0.9</recycling_ratio>
|
||||
|
@ -357,7 +357,7 @@
|
|||
<landfilling_ratio>0.1</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="insulation" id="4" name="polystyrene 10% recycled">
|
||||
<material type="insulation" id="22" name="polystyrene 10% recycled">
|
||||
<density unit="ton/m3">0.024</density>
|
||||
<embodied_carbon unit="kgCO2/ton">5140</embodied_carbon>
|
||||
<recycling_ratio>0.9</recycling_ratio>
|
||||
|
@ -366,7 +366,7 @@
|
|||
<landfilling_ratio>0.1</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="insulation" id="5" name="stone wool">
|
||||
<material type="insulation" id="23" name="stone wool">
|
||||
<density unit="ton/m3">0.1</density>
|
||||
<embodied_carbon unit="kgCO2/ton">6040</embodied_carbon>
|
||||
<recycling_ratio>0.9</recycling_ratio>
|
||||
|
@ -375,7 +375,7 @@
|
|||
<landfilling_ratio>0.1</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="insulation" id="6" name="foam glass">
|
||||
<material type="insulation" id="24" name="foam glass">
|
||||
<density unit="ton/m3">0.3</density>
|
||||
<embodied_carbon unit="kgCO2/ton">5380</embodied_carbon>
|
||||
<recycling_ratio>0.9</recycling_ratio>
|
||||
|
@ -384,7 +384,7 @@
|
|||
<landfilling_ratio>0.1</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="insulation" id="7" name="glass wool mat">
|
||||
<material type="insulation" id="25" name="glass wool mat">
|
||||
<density unit="ton/m3">0.032</density>
|
||||
<embodied_carbon unit="kgCO2/ton">2150</embodied_carbon>
|
||||
<recycling_ratio>0.9</recycling_ratio>
|
||||
|
@ -393,7 +393,7 @@
|
|||
<landfilling_ratio>0.1</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="wood" id="1" name="fiberboard, hard">
|
||||
<material type="wood" id="26" name="fiberboard, hard">
|
||||
<density unit="ton/m3">0.9</density>
|
||||
<embodied_carbon unit="kgCO2/ton">3420</embodied_carbon>
|
||||
<recycling_ratio>0.6</recycling_ratio>
|
||||
|
@ -402,7 +402,7 @@
|
|||
<landfilling_ratio>0.4</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="wood" id="2" name="three layerd laminated board">
|
||||
<material type="wood" id="27" name="three layerd laminated board">
|
||||
<density unit="ton/m3">0.7</density>
|
||||
<embodied_carbon unit="kgCO2/ton">1430</embodied_carbon>
|
||||
<recycling_ratio>0.6</recycling_ratio>
|
||||
|
@ -411,7 +411,7 @@
|
|||
<landfilling_ratio>0.4</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="wood" id="3" name="fibreboard, soft">
|
||||
<material type="wood" id="28" name="fibreboard, soft">
|
||||
<density unit="ton/m3">0.65</density>
|
||||
<embodied_carbon unit="kgCO2/ton">2780</embodied_carbon>
|
||||
<recycling_ratio>0.6</recycling_ratio>
|
||||
|
@ -420,7 +420,7 @@
|
|||
<landfilling_ratio>0.4</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="wood" id="4" name="plywood">
|
||||
<material type="wood" id="29" name="plywood">
|
||||
<density unit="ton/m3">0.72</density>
|
||||
<embodied_carbon unit="kgCO2/ton">2190</embodied_carbon>
|
||||
<recycling_ratio>0.6</recycling_ratio>
|
||||
|
@ -429,7 +429,7 @@
|
|||
<landfilling_ratio>0.4</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="covering" id="1" name="acrylic filler">
|
||||
<material type="covering" id="30" name="acrylic filler">
|
||||
<density unit="ton/m3">1.43</density>
|
||||
<embodied_carbon unit="kgCO2/ton">1070</embodied_carbon>
|
||||
<recycling_ratio>0</recycling_ratio>
|
||||
|
@ -438,7 +438,7 @@
|
|||
<landfilling_ratio>1</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="covering" id="2" name="anhydrite floor">
|
||||
<material type="covering" id="31" name="anhydrite floor">
|
||||
<density unit="ton/m3">1.43</density>
|
||||
<embodied_carbon unit="kgCO2/ton">240</embodied_carbon>
|
||||
<recycling_ratio>0</recycling_ratio>
|
||||
|
@ -447,7 +447,7 @@
|
|||
<landfilling_ratio>1</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="covering" id="3" name="base plaster">
|
||||
<material type="covering" id="32" name="base plaster">
|
||||
<density unit="ton/m3">1.43</density>
|
||||
<embodied_carbon unit="kgCO2/ton">430</embodied_carbon>
|
||||
<recycling_ratio>0</recycling_ratio>
|
||||
|
@ -456,7 +456,7 @@
|
|||
<landfilling_ratio>1</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="covering" id="4" name="cement cast plaster floor">
|
||||
<material type="covering" id="33" name="cement cast plaster floor">
|
||||
<density unit="ton/m3">1.43</density>
|
||||
<embodied_carbon unit="kgCO2/ton">340</embodied_carbon>
|
||||
<recycling_ratio>0</recycling_ratio>
|
||||
|
@ -465,7 +465,7 @@
|
|||
<landfilling_ratio>1</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="covering" id="5" name="cement tile">
|
||||
<material type="covering" id="34" name="cement tile">
|
||||
<density unit="ton/m3">1.2</density>
|
||||
<embodied_carbon unit="kgCO2/ton">440</embodied_carbon>
|
||||
<recycling_ratio>0.8</recycling_ratio>
|
||||
|
@ -474,7 +474,7 @@
|
|||
<landfilling_ratio>0.2</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="covering" id="6" name="ceramic tile">
|
||||
<material type="covering" id="35" name="ceramic tile">
|
||||
<density unit="ton/m3">2.1</density>
|
||||
<embodied_carbon unit="kgCO2/ton">1410</embodied_carbon>
|
||||
<recycling_ratio>0.8</recycling_ratio>
|
||||
|
@ -483,7 +483,7 @@
|
|||
<landfilling_ratio>0.2</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="covering" id="7" name="clay plaster">
|
||||
<material type="covering" id="36" name="clay plaster">
|
||||
<density unit="ton/m3">1.43</density>
|
||||
<embodied_carbon unit="kgCO2/ton">250</embodied_carbon>
|
||||
<recycling_ratio>0</recycling_ratio>
|
||||
|
@ -492,7 +492,7 @@
|
|||
<landfilling_ratio>1</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="covering" id="8" name="fiber cement corrugated slab">
|
||||
<material type="covering" id="37" name="fiber cement corrugated slab">
|
||||
<density unit="ton/m3">1.44</density>
|
||||
<embodied_carbon unit="kgCO2/ton">1480</embodied_carbon>
|
||||
<recycling_ratio>0.8</recycling_ratio>
|
||||
|
@ -501,7 +501,7 @@
|
|||
<landfilling_ratio>0.2</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="covering" id="9" name="fiber cement facing tile">
|
||||
<material type="covering" id="38" name="fiber cement facing tile">
|
||||
<density unit="ton/m3">1.44</density>
|
||||
<embodied_carbon unit="kgCO2/ton">2220</embodied_carbon>
|
||||
<recycling_ratio>0.8</recycling_ratio>
|
||||
|
@ -510,7 +510,7 @@
|
|||
<landfilling_ratio>0.2</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="wood" id="10" name="gypsum fibreboard">
|
||||
<material type="wood" id="39" name="gypsum fibreboard">
|
||||
<density unit="ton/m3">1.27</density>
|
||||
<embodied_carbon unit="kgCO2/ton">3960</embodied_carbon>
|
||||
<recycling_ratio>0.8</recycling_ratio>
|
||||
|
@ -519,7 +519,7 @@
|
|||
<landfilling_ratio>0.2</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="covering" id="11" name="gypsum plaster board">
|
||||
<material type="covering" id="40" name="gypsum plaster board">
|
||||
<density unit="ton/m3">1.15</density>
|
||||
<embodied_carbon unit="kgCO2/ton">760</embodied_carbon>
|
||||
<recycling_ratio>0.8</recycling_ratio>
|
||||
|
@ -528,7 +528,7 @@
|
|||
<landfilling_ratio>0.2</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="metal" id="1" name="steel">
|
||||
<material type="metal" id="41" name="steel">
|
||||
<density unit="ton/m3">8</density>
|
||||
<embodied_carbon unit="kgCO2/ton">3160</embodied_carbon>
|
||||
<recycling_ratio> 0.98</recycling_ratio>
|
||||
|
@ -537,7 +537,7 @@
|
|||
<landfilling_ratio>0.02</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="metal" id="2" name="aluminium">
|
||||
<material type="metal" id="42" name="aluminium">
|
||||
<density unit="ton/m3">2.7</density>
|
||||
<embodied_carbon unit="kgCO2/ton">5370</embodied_carbon>
|
||||
<recycling_ratio> 0.98</recycling_ratio>
|
||||
|
@ -546,7 +546,7 @@
|
|||
<landfilling_ratio>0.02</landfilling_ratio>
|
||||
<cost unit="CAD">0.1</cost>
|
||||
</material>
|
||||
<material type="metal" id="3" name="reinforcing steel">
|
||||
<material type="metal" id="43" name="reinforcing steel">
|
||||
<density unit="ton/m3">7.85</density>
|
||||
<embodied_carbon unit="kgCO2/ton">3910</embodied_carbon>
|
||||
<recycling_ratio> 0.98</recycling_ratio>
|
||||
|
|
Loading…
Reference in New Issue
Block a user