Commit Graph

1812 Commits

Author SHA1 Message Date
1f95943cbb fix: small bugs and typos in montreal_custom_systems data file are fixed 2024-07-31 15:25:49 -04:00
8f1cbd4a67 Merge pull request 'dhw_model_fixing' (#16) from dhw_model_fixing into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/s_ranjbar/energy_system_modelling_workflow/pulls/16
2024-07-26 17:50:42 -04:00
05d88e2461 fix: small bug is cooling simulation and operational income are fixed
fix: simulation models and cop curves modified and finalized

fix: all system simulation models are fixed
2024-07-26 17:49:22 -04:00
ogavalda
a474a7d97e Change percentages according to Energuide and data from HQ and Energir 2024-07-26 15:19:13 -04:00
ogavalda
0ae92e77a1 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	scripts/random_assignation.py
2024-07-26 15:19:01 -04:00
ogavalda
e09338c300 Change percentages according to Energuide and data from HQ and Energir 2024-07-26 15:15:34 -04:00
af988e28ed Merge pull request 'fix: small bug is cooling simulation and operational income are fixed' (#15) from cooling_system_simulation_fix into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/s_ranjbar/energy_system_modelling_workflow/pulls/15
2024-07-22 17:43:18 -04:00
96711ad41e fix: small bug is cooling simulation and operational income are fixed 2024-07-22 17:37:40 -04:00
faeb3e63d4 Merge pull request 'fix: importers are fixed for mixed use buildings' (#14) from mixed_usage into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/s_ranjbar/energy_system_modelling_workflow/pulls/14
2024-07-22 09:13:25 -04:00
93ab78b34e fix: importers are fixed for mixed use buildings 2024-07-22 09:12:31 -04:00
6044cfc4e5 fix: cleaning the repo 2024-07-18 08:52:58 -04:00
a717f9a644 Merge pull request 'report' (#13) from report into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/s_ranjbar/energy_system_modelling_workflow/pulls/13
2024-07-18 08:48:43 -04:00
f32c74f84a fix: The report is almost completed. It will be continued after fixing all the simulation models 2024-07-18 08:47:18 -04:00
c4f98a30c1 fix: current and retrofitted status energy consumption analysis and system schematic added to the report 2024-07-15 08:51:15 -04:00
7369bc65a4 fix: first stages of report creation are started 2024-06-28 16:40:37 -04:00
58201afda8 Merge pull request 'fix: cost workflow finalized' (#12) from finalizing_cost into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/s_ranjbar/energy_system_modelling_workflow/pulls/12
2024-06-25 19:58:48 -04:00
2ef3be7fe3 fix: cost workflow finalized 2024-06-25 19:57:22 -04:00
2bd8a9a47d Merge pull request 'central_heating_system_archetype' (#11) from central_heating_system_archetype into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/s_ranjbar/energy_system_modelling_workflow/pulls/11
2024-06-25 18:15:55 -04:00
5f95d2a5fb feat: simulation models of 2 archetypes with central heating and decentral cooling and dhw are added 2024-06-25 18:14:12 -04:00
ee6dc92b40 fix: new archetype to model a system with central heating and decenral cooling and dhw created 2024-06-24 19:21:28 -04:00
335b316072 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 10:30:49 -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