generation components are all added to north_america_energy_system_catalog.py
pv_generation_system.py is modified Tools4CitiesESMF.xml is modified
This commit is contained in:
parent
32a40f17a6
commit
923b1fe267
|
|
@ -20,11 +20,16 @@ class PvGenerationSystem(GenerationSystem):
|
|||
standard_test_condition_cell_temperature, standard_test_condition_maximum_power,
|
||||
cell_temperature_coefficient, width, height, model_name, manufacturer, electricity_efficiency,
|
||||
nominal_electricity_output):
|
||||
super(GenerationSystem, self).__init__(model_name=model_name, manufacturer=manufacturer, system_type='pv',
|
||||
super(PvGenerationSystem, self).__init__(model_name=model_name, manufacturer=manufacturer, system_type='pv',
|
||||
fuel_type='renewable', nominal_thermal_output=None, modulation_range=None,
|
||||
source_types=None, heat_efficiency=None, cooling_efficiency=None,
|
||||
electricity_efficiency=electricity_efficiency, source_temperature=None,
|
||||
source_mass_flow=None, nominal_electricity_output=nominal_electricity_output)
|
||||
source_types=None,supply_medium=None, heat_efficiency=None,
|
||||
cooling_efficiency=None, electricity_efficiency=electricity_efficiency,
|
||||
source_temperature=None, source_mass_flow=None,
|
||||
nominal_electricity_output=nominal_electricity_output,
|
||||
maximum_heating_supply_temperature=None,
|
||||
minimum_heating_supply_temperature=None,
|
||||
maximum_cooling_supply_temperature=None,
|
||||
minimum_cooling_supply_temperature=None)
|
||||
self._nominal_ambient_temperature = nominal_ambient_temperature
|
||||
self._nominal_cell_temperature = nominal_cell_temperature
|
||||
self._nominal_radiation = nominal_radiation
|
||||
|
|
@ -112,7 +117,7 @@ class PvGenerationSystem(GenerationSystem):
|
|||
'nominal radiation [W/m2]': self.nominal_radiation,
|
||||
'standard test condition cell temperature [Celsius]': self.standard_test_condition_cell_temperature,
|
||||
'standard test condition maximum power [kW]': self.standard_test_condition_maximum_power,
|
||||
'cell temperature coefficient':self.cell_temperature_coefficient,
|
||||
'cell temperature coefficient': self.cell_temperature_coefficient,
|
||||
'width': self.width,
|
||||
'height': self.height,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ class NorthAmericaEnergySystemCatalog(Catalog):
|
|||
def __init__(self, path):
|
||||
path = str(path / 'Tools4CitiesESMF.xml')
|
||||
with open(path, 'r', encoding='utf-8') as xml:
|
||||
self._archetypes = xmltodict.parse(xml.read(), force_list=['boilers', 'photovoltaicModules'])
|
||||
self._archetypes = xmltodict.parse(xml.read(), force_list=['photovoltaicModules'])
|
||||
self._generation_components = self._load_generation_components()
|
||||
print(self._generation_components)
|
||||
self._storage_components = self._load_storage_components()
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
<heatPumps modelName="CMAA 140" description="A second degree equation is used in form of A*T_source^2 + B*T_source + C*T_source*T_sup + D*T_sup + E*T_sup^2 + F" manufacturer="TRANE" installedThermalPower="279.3" modulationRange="0.0" fuel="Electricity" heatSource="Air" nominalCOP="3.46" maxHeatingSupTemperature="55.0" minHeatingSupTemperature="6.0" maxCoolingSupTemperature="30.0" minCoolingSupTemperature="11.0" supply_medium="water">
|
||||
<coefficientOfPerformance xsi:type="encomp:SecondDegreePolynomialFunction" parameter="COP" parameterA="0.00109" parameterB="0.209" parameterC="-0.00291" parameterD="-0.172" parameterE="0.00102" parameterF="8.95"/>
|
||||
</heatPumps>
|
||||
<thermalStorages modelName="HF 200" manufacturer="//@energycomponent.0/@manufacturers.5" volume="0.5" maxTemp="95.0" insulationThickness="90.0" tankThickness="0" usesMedium="Water" insulationMaterial="Polyurethane" height="1.5" tankMaterial="Steel"/>
|
||||
<thermalStorages modelName="HF 300" manufacturer="//@energycomponent.0/@manufacturers.5" volume="0.6" maxTemp="95.0" insulationThickness="90.0" tankThickness="0" usesMedium="Water" insulationMaterial="Polyurethane" height="1.3" tankMaterial="Steel"/>
|
||||
<thermalStorages modelName="HF 500" manufacturer="//@energycomponent.0/@manufacturers.5" volume="0.5" maxTemp="95.0" insulationThickness="90.0" tankThickness="0" usesMedium="Water" insulationMaterial="Polyurethane" height="1.5" tankMaterial="Steel"/>
|
||||
<thermalStorages modelName="HF 200" manufacturer="//@energycomponent.0/@manufacturers.5" volume="0.5" maxTemp="95.0" insulationThickness="90.0" tankThickness="0" usesMedium="Water" insulationMaterial="Polyurethane" height="1.5" tankMaterial="Steel"/>
|
||||
<thermalStorages modelName="HF 200" manufacturer="//@energycomponent.0/@manufacturers.5" volume="0.5" maxTemp="95.0" insulationThickness="90.0" tankThickness="0" usesMedium="Water" insulationMaterial="Polyurethane" height="1.5" tankMaterial="Steel"/>
|
||||
<thermalStorages modelName="HF 200" manufacturer="reflex" volume="0.5" maxTemp="95.0" insulationThickness="90.0" tankThickness="0" usesMedium="Water" insulationMaterial="Polyurethane" height="1.5" tankMaterial="Steel"/>
|
||||
<thermalStorages modelName="HF 300" manufacturer="reflex" volume="0.6" maxTemp="95.0" insulationThickness="90.0" tankThickness="0" usesMedium="Water" insulationMaterial="Polyurethane" height="1.3" tankMaterial="Steel"/>
|
||||
<thermalStorages modelName="HF 500" manufacturer="reflex" volume="0.5" maxTemp="95.0" insulationThickness="90.0" tankThickness="0" usesMedium="Water" insulationMaterial="Polyurethane" height="1.5" tankMaterial="Steel"/>
|
||||
<thermalStorages modelName="HF 200" manufacturer="reflex" volume="0.5" maxTemp="95.0" insulationThickness="90.0" tankThickness="0" usesMedium="Water" insulationMaterial="Polyurethane" height="1.5" tankMaterial="Steel"/>
|
||||
<thermalStorages modelName="HF 200" manufacturer="reflex" volume="0.5" maxTemp="95.0" insulationThickness="90.0" tankThickness="0" usesMedium="Water" insulationMaterial="Polyurethane" height="1.5" tankMaterial="Steel"/>
|
||||
<powerStorages/>
|
||||
<manufacturers name="Alpine" country="USA"/>
|
||||
<manufacturers name="Alta" country="USA"/>
|
||||
|
|
@ -40,14 +40,20 @@
|
|||
<materials name="Steel" thermalConductivity="18.0"/>
|
||||
</energycomponent>
|
||||
<energysystemconfiguration configurationName="PvHpBoiler">
|
||||
<demands type="Heating"/>
|
||||
<demands type="Domestic Hot Water"/>
|
||||
<demands type="Electricity"/>
|
||||
<components Name="VirtualBoiler"/>
|
||||
<components Name="VirtualPV"/>
|
||||
<components Name="VirtualHPair"/>
|
||||
<components>
|
||||
<boilers modelName="virtualBoiler" description="template boiler north america" nominalEfficiency="0.95"/>
|
||||
<photovoltaicModules modelName="virtualPv" nominalEfficiency="0.2" width="1.0" height="1.0"/>
|
||||
<heatPumps modelName="virtualHp" fuel="Electricity" heatSource="Ground" nominalCOP="2.5" supply_medium="water"/>
|
||||
</components>
|
||||
<demands name="heating"/>
|
||||
<demands name="electricity"/>
|
||||
<demands name="domesticHotWater"/>
|
||||
</energysystemconfiguration>
|
||||
|
||||
<energysystemconfiguration configurationName="hpTesBoiler"/>
|
||||
<energysystemconfiguration configurationName="hpTes"/>
|
||||
<energysystemconfiguration/>
|
||||
<energydemand name="heating"/>
|
||||
<energydemand name="domesticHotWater"/>
|
||||
<energydemand name="electricity"/>
|
||||
<energydemand/>
|
||||
</encomp:EnergySystemCatalog>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user