Skip to content

Commit a2a1b4f

Browse files
authored
Merge pull request #374 from EnergySystemsModellingLab/level_parameter
Remove Level parameter from Technodata files
2 parents e09a23d + 33b5d43 commit a2a1b4f

File tree

65 files changed

+304
-298
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+304
-298
lines changed

docs/inputs/commodities_io.rst

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,11 @@ Time
6161
contain at least the base year of the simulation.
6262

6363
Level
64-
characterises either a fixed or a flexible input type the following columns should
65-
contain the list of commodities the row.
64+
characterises either a fixed or a flexible input type.
6665

67-
Unit
68-
reports the unit in which the technology consumption is defined; it is for the user
69-
internal reference only.
66+
The remaining columns should contain the full list of commodities.
67+
68+
The first row of the table reports the units for each column; it is for user reference only.
7069

7170
The input data has to be provided for the base year. Additional years within the time
7271
framework of the overall simulation can be defined. In this case, MUSE would interpolate

docs/inputs/technodata.rst

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ the electric boiler used in households is taken as an example for a generic regi
1111

1212

1313
.. csv-table:: Techno-data: cost inputs
14-
:header: ProcessName, RegionName, Time, Level, cap_par, cap_exp, fix_par, ...
14+
:header: ProcessName, RegionName, Time, cap_par, cap_exp, fix_par, ...
1515

16-
resBoilerElectric, region1, 2010, fixed, 3.81, 1.00, 0.38, ...
17-
resBoilerElectric, region1, 2030, fixed, 3.81, 1.00, 0.38, ...
16+
resBoilerElectric, region1, 2010, 3.81, 1.00, 0.38, ...
17+
resBoilerElectric, region1, 2030, 3.81, 1.00, 0.38, ...
1818

1919

2020
ProcessName
@@ -27,9 +27,6 @@ Time
2727
represents the period of the simulation to which the value applies; it needs to
2828
contain at least the base year of the simulation
2929

30-
Level
31-
characterises either a fixed or a flexible input type
32-
3330
cap_par, cap_exp
3431
are used in the capital cost estimation. Capital costs are calculated as:
3532

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
2-
Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
3-
gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
1+
ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
2+
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
3+
gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
2-
Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
3-
gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
4-
windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
5-
solarPV,R1,2020,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
1+
ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
2+
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
3+
gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
4+
windturbine,R1,2020,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
5+
solarPV,R1,2020,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
2-
Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
3-
gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1,0
4-
heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1,0
1+
ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
2+
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
3+
gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1,0
4+
heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1,0

docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ constraints = [
5959
"max_production",
6060
"max_capacity_expansion",
6161
"demand",
62-
"search_space"
62+
"search_space",
63+
"minimum_service"
6364
]
6465
demand_share = "new_and_retro" # Optional, default to new_and_retro
6566
forecast = 5 # Optional, defaults to 5
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
2-
Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
3-
gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
1+
ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
2+
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
3+
gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
2-
Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
3-
gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
4-
windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
5-
solarPV,R1,2020,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
1+
ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
2+
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
3+
gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
4+
windturbine,R1,2020,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
5+
solarPV,R1,2020,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
2-
Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
3-
gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
4-
heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
1+
ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
2+
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
3+
gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
4+
heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1

docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ constraints = [
5959
"max_production",
6060
"max_capacity_expansion",
6161
"demand",
62-
"search_space"
62+
"search_space",
63+
"minimum_service"
6364
]
6465
demand_share = "new_and_retro" # Optional, default to new_and_retro
6566
forecast = 5 # Optional, defaults to 5

0 commit comments

Comments
 (0)