Commit Graph

1795 Commits

Author SHA1 Message Date
a3e4a47f5f fix: small bugs in the simulation model resolved 2024-06-25 18:31:59 -04:00
0e3db345be feat: tests conducted on Lachine 2024-06-24 21:35:04 -04:00
c0f7b206b8 feat: central vs decentral rough comparison 2024-06-20 14:53:33 -04:00
0471b6d4ba Merge pull request 'fix: different fuel pricings are added, operational and maintenance cost calculations are modified, cost catalogue adjusted to the changes' (#10) from costing_modification into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/s_ranjbar/energy_system_modelling_workflow/pulls/10
2024-06-20 09:42:43 -04:00
ef21ad949d fix: different fuel pricings are added, operational and maintenance cost calculations are modified, cost catalogue adjusted to the changes 2024-06-20 09:39:47 -04:00
b1b5477b25 Merge pull request 'feat: stratified model for tes added, all the demand and consumptions are converted to J, cold water temperature fixed' (#9) from stratified_tes into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/s_ranjbar/energy_system_modelling_workflow/pulls/9
2024-06-13 15:43:46 -04:00
ee0b985245 feat: stratified model for tes added, all the demand and consumptions are converted to J, cold water temperature fixed 2024-06-13 15:41:20 -04:00
cb842b5917 feat: PV sizing module is added
fix: bugs in catalogue and building are fixed

feat: new archetype completed

fix: building enrichment with results from archetype 13 is completed
2024-06-10 13:53:16 -04:00
1e34687496 Merge pull request 'feat: PV sizing module is added' (#7) from pv_sizing into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/s_ranjbar/energy_system_modelling_workflow/pulls/7
2024-05-30 17:29:04 -04:00
84bde67d0f feat: PV sizing module is added 2024-05-30 17:26:50 -04:00
e636459b86 feat: two new codes added to separate energy system retrofit and pv calculations 2024-05-28 11:25:18 -04:00
c14c88005d Merge pull request 'fix: bugs in costing solved' (#6) from radiation_tilted into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/s_ranjbar/energy_system_modelling_workflow/pulls/6
2024-05-28 10:37:51 -04:00
dce5bb8c06 fix: bugs in costing solved
fix: SRA is fixed and finalized

feat: A code is written to calculate solar angles and values are validated using PVLIB

feat: solar radiation on tilted surface is calculated

fix: Required attributes for PV calculations are added to CDM and surface class
2024-05-28 10:36:57 -04:00
28c642bacd fix: bugs in costing solved 2024-05-17 09:52:59 -04:00
1e8d064080 fix: the issue in some of cost modules in the imports is solved 2024-05-13 17:44:50 -04:00
5b956e6b60 fix: the existing bug in montreal custon system archetypes is solved 2024-05-13 17:37:35 -04:00
1bc240fd7e Fix: units of radiation are fixed 2024-05-10 17:32:59 -04:00
2664974d48 Merge pull request 'Costing initiated' (#5) from hp_cop into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/s_ranjbar/energy_system_modelling_workflow/pulls/5
2024-05-10 16:17:40 -04:00
01cd78eb3e Costing initiated
The classes and scripts of costs library are copied in scripts folder

fix: updating the energy system catalogue parameter importer

fix: units are fixed in the sizing and simulation modules

fix: adding costing workflow

feat: new function created to store current and new system analysis results

fix: updating the code to implement all the changes

feat: new attributes added to energy system catalogue

fix: samll bug in calculating capital cost of TES is solved

feat: a new method for calculating peak dhw demand is created in building class

fix: small bug in generation system class of CDM is fixed

fix: small issues in current system simulation and sizing modules are resolved

feat: new class called EnergySystemsSimulationFactory is created to handle all the system simulation models

fix: the operational cost class is modified and completed

fix: slight changes before merge

fix: The simulation model for 1st archetype is modified.

fix: small changes to building code that affect cost and total operational cost code

feat: new attribute added to store fuel consumption values found from simulation

fix: cleaning

fix: redundant attributes removed from energy system data model

feat: new setters added to classes

Fix: codes modified to accommodate the changes

feat: added cop curves for heating and cooling of HP and finalized the heating and cooling simulation models of archetype 1

feat: redundant files in the input folder are removed

fix: cost values are checked and fixed

fix: System analysis report is fixed

fix: SRA fixed
2024-05-10 16:16:50 -04:00
a6520ee4f0 Merge pull request 'Costing initiated' (#4) from fixing_simulation_model into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/s_ranjbar/energy_system_modelling_workflow/pulls/4
2024-05-06 10:41:18 -04:00
7846963271 Costing initiated
The classes and scripts of costs library are copied in scripts folder

fix: updating the energy system catalogue parameter importer

fix: units are fixed in the sizing and simulation modules

fix: adding costing workflow

feat: new function created to store current and new system analysis results

fix: updating the code to implement all the changes

feat: new attributes added to energy system catalogue

fix: samll bug in calculating capital cost of TES is solved

feat: a new method for calculating peak dhw demand is created in building class

fix: small bug in generation system class of CDM is fixed

fix: small issues in current system simulation and sizing modules are resolved

feat: new class called EnergySystemsSimulationFactory is created to handle all the system simulation models

fix: the operational cost class is modified and completed

fix: slight changes before merge

fix: The simulation model for 1st archetype is modified.

fix: small changes to building code that affect cost and total operational cost code

feat: new attribute added to store fuel consumption values found from simulation

fix: cleaning

fix: redundant attributes removed from energy system data model

feat: new setters added to classes

Fix: codes modified to accommodate the changes
2024-05-06 10:40:06 -04:00
181de80aff Merge pull request 'Costing initiated' (#3) from fixing_simulation_model into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/s_ranjbar/energy_system_modelling_workflow/pulls/3
2024-05-02 18:38:02 -04:00
bd329b1c71 Costing initiated
The classes and scripts of costs library are copied in scripts folder

fix: updating the energy system catalogue parameter importer

fix: units are fixed in the sizing and simulation modules

fix: adding costing workflow

feat: new function created to store current and new system analysis results

fix: updating the code to implement all the changes

feat: new attributes added to energy system catalogue

fix: samll bug in calculating capital cost of TES is solved

feat: a new method for calculating peak dhw demand is created in building class

fix: small bug in generation system class of CDM is fixed

fix: small issues in current system simulation and sizing modules are resolved

feat: new class called EnergySystemsSimulationFactory is created to handle all the system simulation models

fix: the operational cost class is modified and completed

fix: slight changes before merge

fix: The simulation model for 1st archetype is modified.

fix: small changes to building code that affect cost and total operational cost code

feat: new attribute added to store fuel consumption values found from simulation

fix: cleaning
2024-05-02 18:36:42 -04:00
1371dffb42 Merge pull request 'Costing initiated' (#2) from costing into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/s_ranjbar/energy_system_modelling_workflow/pulls/2
2024-05-01 15:19:51 -04:00
efac4c3948 Costing initiated
The classes and scripts of costs library are copied in scripts folder

fix: updating the energy system catalogue parameter importer

fix: units are fixed in the sizing and simulation modules

fix: adding costing workflow

feat: new function created to store current and new system analysis results

fix: updating the code to implement all the changes

feat: new attributes added to energy system catalogue

fix: samll bug in calculating capital cost of TES is solved

feat: a new method for calculating peak dhw demand is created in building class

fix: small bug in generation system class of CDM is fixed

fix: small issues in current system simulation and sizing modules are resolved

feat: new class called EnergySystemsSimulationFactory is created to handle all the system simulation models

fix: the operational cost class is modified and completed

fix: slight changes before merge
2024-05-01 15:18:52 -04:00
70826837cf Costing initiated
The classes and scripts of costs library are copied in scripts folder
2024-04-10 10:27:10 -04:00
cfaa783bac Merge pull request 'New EP workflow' (#1) from system_simulation into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/s_ranjbar/energy_system_modelling_workflow/pulls/1
2024-04-04 13:31:39 -04:00
ad48b4432d ep and units are fixed 2024-04-04 13:23:32 -04:00
ee7ff91410 Codes transfered 2024-03-29 19:20:48 -04:00
8e44d3704f Merge branch 'ep_branch' 2024-03-29 10:49:44 -04:00
918cd26a5c Merge branch 'hub_branch' 2024-03-29 10:49:27 -04:00
c9279fe209 first commit 2024-03-29 10:08:45 -04:00
b949e4e4cf Cleaning my mess 2024-03-28 16:06:03 -04:00
3b3c8ea952 test commit majid 2024-03-28 13:34:07 -04:00
a69a58d8d8 testing 2024-03-28 13:30:57 -04:00
3cbc13d302 New Cost Catalogue
The xml file and catalogue importer are changed and tested
2024-03-27 19:56:35 -04:00
bf23730281 correct the unit tests 2024-03-12 16:21:43 +01:00
11d493ba0e remove north_america catalog for energy systems 2024-03-12 14:56:22 +01:00
1266f50e29 Correct small error in unittest 2024-02-16 06:01:54 +01:00
674393970c Merge remote-tracking branch 'origin/main' into final_energy_system_model
# Conflicts:
#	.gitignore
#	hub/city_model_structure/building.py
#	hub/exports/building_energy/idf.py
#	hub/imports/geometry_factory.py
2024-02-16 05:50:45 +01:00
8d75fe1f3a remove pychache 2024-02-16 05:38:07 +01:00
57a9d24f4c Title: Improvement of Energy System Parameters Importer
>> To make life easier for people who want to work on energy systems in future, I tried to make my code as generic as possible.
2024-02-13 20:05:03 -05:00
087fead489 Title: Finalizing the energy system data model and system factory
A new XML file named montreal_future_systems.xml is created where the elements of the file are the same as attributes of various classes. Therefore, the catalogue importer and energy system importer should have been updated accordingly. The catalog importer is organized in a general method so whenever someone wants to create a new catalogue they can use the created code as the blueprint.
2024-02-07 20:51:10 -05:00
ebaec9bb7c Title: Finalizing the energy system data model and system factory
A new XML file named montreal_future_systems.xml is created where the elements of the file are the same as attributes of various classes. Therefore, the catalogue importer and energy system importer should have been updated accordingly. The catalog importer is organized in a general method so whenever someone wants to create a new catalogue they can use the created code as the blueprint.
2024-02-07 18:54:09 -05:00
3e193f04a6 The dual_supply_capability is added to the city model structure 2024-02-01 15:41:05 -05:00
ac4742d2c4 A new attribute "dual_supply_capability" is added to NonPVGeneration class in non_pv_generation_system.py and the catalogue importer is adjusted 2024-02-01 12:24:15 -05:00
f976040f45 A new attribute "dual_supply_capability" is added to NonPVGeneration class in non_pv_generation_system.py and the catalogue importer is adjusted 2024-02-01 12:23:58 -05:00
6e2e6a0a4d Rechanged the Minimal.idf to give the necessary results, without additional stuff not used by the tool 2024-01-29 11:46:07 -05:00
54b62ec2d0 update version 2024-01-25 06:57:33 +01:00
9357cef641 remove wrong indentation 2024-01-25 06:57:00 +01:00