-
Notifications
You must be signed in to change notification settings - Fork 10
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature/stratified therm storage a1 #718
Merged
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
3372a85
Add fixed thermal losses absolute and relative to D1_model_components.py
MaGering 90cfd69
Include fixed thermal losses of thermal storage component in C0_data_…
MaGering e4e703f
Integrate fixed thermal losses in A1_csv_to_json.py and provide defau…
MaGering a109d69
Add relative and absolute fixed thermal losses to constants_json_stri…
MaGering 75080c3
Update data_parser.py with fixed thermal losses
MaGering 715eaf3
Add fixed thermal losses to test inputs
MaGering 5de95dc
Add tests of stratified thermal storage with fixed thermal losses
MaGering 6993eb1
Update MVS_parameters_list.csv
MaGering 0fc93f6
Update docs with stratified thermal storage component
MaGering 78c3977
Update CHANGELOG.md
MaGering e5f5b41
Add minimal_degree_of_autonomy in test_data/known_oemof_errors/insuff…
MaGering c7c36bd
Update docs/Model_Assumptions.rst
MaGering File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
tests/benchmark_test_inputs/Feature_stratified_thermal_storage/csv_elements/constraints.csv
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
,unit,constraints | ||
minimal_renewable_factor,factor,0 | ||
maximum_emissions,kgCO2eq/a,None | ||
minimal_degree_of_autonomy,factor,0 |
5 changes: 5 additions & 0 deletions
5
...s/benchmark_test_inputs/Feature_stratified_thermal_storage/csv_elements/economic_data.csv
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
,unit,economic_data | ||
project_duration,year,30 | ||
currency,str,EUR | ||
discount_factor,factor,0.08 | ||
tax,factor,0.0 |
3 changes: 3 additions & 0 deletions
3
tests/benchmark_test_inputs/Feature_stratified_thermal_storage/csv_elements/energyBusses.csv
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
,unit,Electricity,Heat | ||
energyVector,str,Electricity,Heat | ||
|
8 changes: 8 additions & 0 deletions
8
...nchmark_test_inputs/Feature_stratified_thermal_storage/csv_elements/energyConsumption.csv
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
,unit,demand_elec,demand_heat | ||
dsm,str,False,False | ||
file_name,str,demand_elec.csv,demand_heat.csv | ||
type_asset,str,demand,demand | ||
type_oemof,str,sink,sink | ||
energyVector,str,Electricity,Heat | ||
inflow_direction,str,Electricity,Heat | ||
unit,str,kW,kWh |
16 changes: 16 additions & 0 deletions
16
...enchmark_test_inputs/Feature_stratified_thermal_storage/csv_elements/energyConversion.csv
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
,unit,Heat pump | ||
age_installed,year,0 | ||
development_costs,currency,0 | ||
specific_costs,currency/kW,1000 | ||
efficiency,factor,3.8 | ||
inflow_direction,str,Electricity | ||
installedCap,kW,0 | ||
maximumCap,kW,None | ||
lifetime,year,20 | ||
specific_costs_om,currency/kW/year,20 | ||
dispatch_price,currency/kWh,0 | ||
optimizeCap,bool,True | ||
outflow_direction,str,Heat | ||
energyVector,str,Heat | ||
type_oemof,str,transformer | ||
unit,str,kW |
17 changes: 17 additions & 0 deletions
17
...enchmark_test_inputs/Feature_stratified_thermal_storage/csv_elements/energyProduction.csv
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
,unit | ||
age_installed,year | ||
development_costs,currency | ||
specific_costs,currency/unit | ||
file_name | ||
installedCap,kWp | ||
maximumCap, kWp | ||
lifetime,year | ||
specific_costs_om,currency/unit/year | ||
dispatch_price,currency/kWh | ||
optimizeCap,bool | ||
outflow_direction,str | ||
type_oemof,str | ||
unit,str | ||
energyVector,str | ||
renewableAsset,bool | ||
emission_factor,kgCO2eq/unit |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, we will again and again recompile
mvs_config.json
(from thetests/inputs
csv
data), so adding the parameters here will probably be lost. Is there a reason that you have this additionally to the benchmark test input files?