Skip to content

Remove Fuel and EndUse columns from technodata files #715

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.

Sign up for GitHub

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

Merged
tsmbland merged 11 commits into from
Jun 10, 2025
Merged

Remove Fuel and EndUse columns from technodata files #715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
db465e2
Modify filter to detect fuels
tsmbland Jun 2, 2025
359eaa9
Remove columns from example technodata files
tsmbland Jun 2, 2025
94294a3
Remove references to fuel and enduse from tests
tsmbland Jun 2, 2025
0f921f6
Remove more references to fuel and enduse columns
tsmbland Jun 2, 2025
79e2ecf
Fix mistake in default_timeslice
tsmbland Jun 2, 2025
bb8e24e
Add deprecation warning
tsmbland Jun 2, 2025
a483b6c
Update tutorials
tsmbland Jun 2, 2025
d7ef24c
Merge branch 'main' into fuels_column
tsmbland Jun 10, 2025
546fa97
Fix LCOE output
tsmbland Jun 10, 2025
0d49de8
Update test_readers
tsmbland Jun 10, 2025
51b9f15
Merge branch 'main' into fuels_column
tsmbland Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions docs/inputs/technodata.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,6 @@ efficiency (optional)
Type (optional)
defines the type of a technology. Required when using the "similar_technology" search space, which allows agents to filter for technologies of a similar type (see :ref:`inputs-agents`).

Fuel (optional)
defines the fuel used by a technology. Required when using the "fueltype" search space, which allows agents to filter for technologies using the same fuel (see :ref:`inputs-agents`).

EndUse (optional)
defines the end use of a technology, defined to restrict the new investments of each agent to selected technologies using selected end uses (see :ref:`inputs-agents`).

InterestRate
is the technology interest rate (called hurdle rates in other models).
This is used for the interest used in the discount rate and corresponds to the interest built when borrowing money.
Expand Down
6 changes: 3 additions & 3 deletions docs/tutorial-code/add-agent/1-single-objective/gas/Technodata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
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,Agent1,Agent2
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New
gassupply1,R1,2020,0,1,0,1,2.55,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,0.5,0.5
ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Agent1,Agent2
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,New,New
gassupply1,R1,2020,0,1,0,1,2.55,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,0.5,0.5
8 changes: 4 additions & 4 deletions docs/tutorial-code/add-agent/1-single-objective/power/Technodata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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,Agent1,Agent2
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New
gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
windturbine,R1,2020,36.30771182,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Agent1,Agent2
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,New,New
gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,0.5,0.5
windturbine,R1,2020,36.30771182,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,0.5,0.5
8 changes: 4 additions & 4 deletions docs/tutorial-code/add-agent/1-single-objective/residential/Technodata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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,Agent1,Agent2
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New
gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Agent1,Agent2
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,New,New
gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,0.5,0.5
heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,0.5,0.5
6 changes: 3 additions & 3 deletions docs/tutorial-code/add-agent/2-multiple-objective/gas/Technodata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
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,Agent1,Agent2
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New
gassupply1,R1,2020,0,1,0,1,2.55,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,0.5,0.5
ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Agent1,Agent2
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,New,New
gassupply1,R1,2020,0,1,0,1,2.55,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,0.5,0.5
8 changes: 4 additions & 4 deletions docs/tutorial-code/add-agent/2-multiple-objective/power/Technodata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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,Agent1,Agent2
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New
gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
windturbine,R1,2020,36.30771182,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Agent1,Agent2
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,New,New
gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,0.5,0.5
windturbine,R1,2020,36.30771182,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,0.5,0.5
8 changes: 4 additions & 4 deletions docs/tutorial-code/add-agent/2-multiple-objective/residential/Technodata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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,Agent1,Agent2
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New
gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Agent1,Agent2
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,New,New
gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,0.5,0.5
heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,0.5,0.5
6 changes: 3 additions & 3 deletions docs/tutorial-code/add-correlation-demand/1-correlation/gas/Technodata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
gassupply1,R1,2020,0,1,0,1,2.55,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,New
gassupply1,R1,2020,0,1,0,1,2.55,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,1
8 changes: 4 additions & 4 deletions docs/tutorial-code/add-correlation-demand/1-correlation/power/Technodata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
windturbine,R1,2020,36.30771182,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,New
gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,1
windturbine,R1,2020,36.30771182,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,1
8 changes: 4 additions & 4 deletions docs/tutorial-code/add-correlation-demand/1-correlation/residential/Technodata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,gas,heat,1
heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,electricity,heat,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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,New
gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,1
heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,1
6 changes: 3 additions & 3 deletions docs/tutorial-code/add-new-technology/1-introduction/gas/Technodata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
gassupply1,R1,2020,0,1,0,1,2.55,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,New
gassupply1,R1,2020,0,1,0,1,2.55,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,1
10 changes: 5 additions & 5 deletions docs/tutorial-code/add-new-technology/1-introduction/power/Technodata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
windturbine,R1,2020,36.30771182,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
solarPV,R1,2020,30,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,solar,electricity,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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,New
gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,1
windturbine,R1,2020,36.30771182,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,1
solarPV,R1,2020,30,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,1
8 changes: 4 additions & 4 deletions docs/tutorial-code/add-new-technology/1-introduction/residential/Technodata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,gas,heat,1
heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,electricity,heat,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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,New
gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,1
heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,1
6 changes: 3 additions & 3 deletions docs/tutorial-code/add-new-technology/2-scenario/gas/Technodata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
gassupply1,R1,2020,0,1,0,1,2.55,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,New
gassupply1,R1,2020,0,1,0,1,2.55,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,1
16 changes: 8 additions & 8 deletions docs/tutorial-code/add-new-technology/2-scenario/power/Technodata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
gasCCGT,R1,2040,23.78234399,1,0,1,0,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
windturbine,R1,2020,36.30771182,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
windturbine,R1,2040,36.30771182,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
solarPV,R1,2020,40,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
solarPV,R1,2040,30,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,solar,electricity,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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,New
gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,1
gasCCGT,R1,2040,23.78234399,1,0,1,0,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,1
windturbine,R1,2020,36.30771182,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,1
windturbine,R1,2040,36.30771182,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,1
solarPV,R1,2020,40,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,1
solarPV,R1,2040,30,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,1
8 changes: 4 additions & 4 deletions docs/tutorial-code/add-new-technology/2-scenario/residential/Technodata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,gas,heat,1
heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,electricity,heat,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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,New
gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,1
heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,1
1 change: 0 additions & 1 deletion docs/tutorial-code/add-new-technology/generate_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ def generate_model_1() -> None:
technodata_file = model_path / "power/Technodata.csv"
df = pd.read_csv(technodata_file)
df.loc[df["ProcessName"] == "solarPV", "cap_par"] = 30
df.loc[df["ProcessName"] == "solarPV", "Fuel"] = "solar"
df.to_csv(technodata_file, index=False)

# Add solar to excluded commodities
Expand Down
8 changes: 4 additions & 4 deletions docs/tutorial-code/add-region/1-new-region/gas/Technodata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
gassupply1,R1,2020,0,1,0,1,2.55,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
gassupply1,R2,2020,0,1,0,1,2.55,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,New
gassupply1,R1,2020,0,1,0,1,2.55,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,1
gassupply1,R2,2020,0,1,0,1,2.55,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,1
12 changes: 6 additions & 6 deletions docs/tutorial-code/add-region/1-new-region/power/Technodata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
windturbine,R1,2020,36.30771182,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
gasCCGT,R2,2020,23.78234399,1,0,1,0,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
windturbine,R2,2020,36.30771182,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,New
gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,1
windturbine,R1,2020,36.30771182,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,1
gasCCGT,R2,2020,23.78234399,1,0,1,0,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,1
windturbine,R2,2020,36.30771182,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,1
12 changes: 6 additions & 6 deletions docs/tutorial-code/add-region/1-new-region/residential/Technodata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,gas,heat,1
heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,electricity,heat,1
gasboiler,R2,2020,3.8,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,gas,heat,1
heatpump,R2,2020,8.866667,1,0,1,0,1,10,0.5,20,10,1,0.00000189,86,0.1,energy,electricity,heat,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,Agent1
Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,New
gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,1
heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,1
gasboiler,R2,2020,3.8,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,1
heatpump,R2,2020,8.866667,1,0,1,0,1,10,0.5,20,10,1,0.00000189,86,0.1,energy,1
Loading
Loading