From db465e2fa374b43b9a0032ee1927649531a4546d Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Mon, 2 Jun 2025 12:54:04 +0100 Subject: [PATCH 1/9] Modify filter to detect fuels --- src/muse/filters.py | 22 +++++++++++++++++----- tests/test_filters.py | 23 ++++++++++++++++++----- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/muse/filters.py b/src/muse/filters.py index 29942c80..6f26721c 100644 --- a/src/muse/filters.py +++ b/src/muse/filters.py @@ -275,11 +275,23 @@ def similar_technology( def same_fuels( agent: Agent, search_space: xr.DataArray, *, technologies: xr.Dataset, **kwargs ): - """Filters technologies with the same fuel type.""" - fuel = agent.filter_input(technologies.fuel) - asset_fuel = fuel.sel(technology=search_space.asset) - tech_fuel = fuel.sel(technology=search_space.replacement) - return search_space & (asset_fuel == tech_fuel) + """Filters technologies with the same fuel type. + + Determines fuel type based on the energy commodities used as inputs by the + technology. + """ + from muse.commodities import is_fuel + + # Get the fixed inputs that are fuels (energy commodities) + tech_fuels = agent.filter_input( + technologies.fixed_inputs, + commodity=is_fuel(technologies.comm_usage), + ) + tech_fuels = (tech_fuels > 0).astype(int).rename(technology="replacement") + asset_fuels = tech_fuels.sel(replacement=search_space.asset) + + # Technologies must use exactly the same fuels + return search_space & (tech_fuels == asset_fuels).all("commodity") @register_filter(name="existing") diff --git a/tests/test_filters.py b/tests/test_filters.py index c98744a3..835e48aa 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -108,16 +108,29 @@ def test_similar_tech(retro_agent, search_space, technologies): def test_similar_fuels(retro_agent, search_space, technologies): + from muse.commodities import is_fuel from muse.filters import same_fuels actual = same_fuels(retro_agent, search_space, technologies=technologies) assert sorted(actual.dims) == sorted(search_space.dims) - fuel_type = technologies.fuel - for tech in actual.replacement: - for asset in actual.asset: - expected = fuel_type.loc[tech] == fuel_type.loc[asset] - assert expected == actual.sel(replacement=tech, asset=asset) + # Get the fixed inputs that are fuels + fuels = is_fuel(technologies.comm_usage) + finputs = technologies.sel(region=retro_agent.region, commodity=fuels) + finputs = finputs.fixed_inputs > 0 + + expected = search_space.copy() + for asset in actual.asset: + asset_fuels = finputs.sel(technology=asset) + asset_fuels = set(asset_fuels.commodity.loc[asset_fuels].values) + for tech in actual.replacement: + tech_fuels = finputs.sel(technology=tech) + tech_fuels = set(tech_fuels.commodity.loc[tech_fuels].values) + expected.loc[{"replacement": tech, "asset": asset}] = ( + asset_fuels == tech_fuels + ) + + assert (actual == expected).all() def test_currently_existing(retro_agent, search_space, technologies, agent_market, rng): From 359eaa9cc1951f6e0ad618b0dcbccb115348981a Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Mon, 2 Jun 2025 13:05:25 +0100 Subject: [PATCH 2/9] Remove columns from example technodata files --- src/muse/data/example/default/gas/Technodata.csv | 6 +++--- src/muse/data/example/default/power/Technodata.csv | 8 ++++---- .../data/example/default/residential/Technodata.csv | 8 ++++---- .../data/example/default_retro/gas/Technodata.csv | 6 +++--- .../data/example/default_retro/power/Technodata.csv | 8 ++++---- .../example/default_retro/residential/Technodata.csv | 8 ++++---- .../example/default_timeslice/gas/Technodata.csv | 6 +++--- .../example/default_timeslice/power/Technodata.csv | 6 +++--- .../default_timeslice/residential/Technodata.csv | 8 ++++---- .../data/example/medium/residential/Technodata.csv | 12 ++++++------ .../example/minimum_service/industry/Technodata.csv | 12 ++++++------ .../multiple_agents/residential/Technodata.csv | 8 ++++---- src/muse/data/example/trade/gas/Technodata.csv | 8 ++++---- src/muse/data/example/trade/power/Technodata.csv | 12 ++++++------ .../data/example/trade/residential/Technodata.csv | 12 ++++++------ 15 files changed, 64 insertions(+), 64 deletions(-) diff --git a/src/muse/data/example/default/gas/Technodata.csv b/src/muse/data/example/default/gas/Technodata.csv index 54cfdc9d..4a3878fe 100644 --- a/src/muse/data/example/default/gas/Technodata.csv +++ b/src/muse/data/example/default/gas/Technodata.csv @@ -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 diff --git a/src/muse/data/example/default/power/Technodata.csv b/src/muse/data/example/default/power/Technodata.csv index 24109432..260851bc 100644 --- a/src/muse/data/example/default/power/Technodata.csv +++ b/src/muse/data/example/default/power/Technodata.csv @@ -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 diff --git a/src/muse/data/example/default/residential/Technodata.csv b/src/muse/data/example/default/residential/Technodata.csv index efa8acb4..1567fbe7 100644 --- a/src/muse/data/example/default/residential/Technodata.csv +++ b/src/muse/data/example/default/residential/Technodata.csv @@ -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 diff --git a/src/muse/data/example/default_retro/gas/Technodata.csv b/src/muse/data/example/default_retro/gas/Technodata.csv index 518222a0..04af421a 100644 --- a/src/muse/data/example/default_retro/gas/Technodata.csv +++ b/src/muse/data/example/default_retro/gas/Technodata.csv @@ -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,Agent2 -Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit -gassupply1,R1,2020,0,1,0,1,2.55,1,10,1,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,Agent2 +Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,Retrofit +gassupply1,R1,2020,0,1,0,1,2.55,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,1 diff --git a/src/muse/data/example/default_retro/power/Technodata.csv b/src/muse/data/example/default_retro/power/Technodata.csv index 725755ca..3ba3365f 100644 --- a/src/muse/data/example/default_retro/power/Technodata.csv +++ b/src/muse/data/example/default_retro/power/Technodata.csv @@ -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,Agent2 -Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit -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,Agent2 +Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,Retrofit +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 diff --git a/src/muse/data/example/default_retro/residential/Technodata.csv b/src/muse/data/example/default_retro/residential/Technodata.csv index 3fe7758a..5969f10c 100644 --- a/src/muse/data/example/default_retro/residential/Technodata.csv +++ b/src/muse/data/example/default_retro/residential/Technodata.csv @@ -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,Agent2 -Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit -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,Agent2 +Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,Retrofit +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 diff --git a/src/muse/data/example/default_timeslice/gas/Technodata.csv b/src/muse/data/example/default_timeslice/gas/Technodata.csv index 54cfdc9d..4a3878fe 100644 --- a/src/muse/data/example/default_timeslice/gas/Technodata.csv +++ b/src/muse/data/example/default_timeslice/gas/Technodata.csv @@ -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 diff --git a/src/muse/data/example/default_timeslice/power/Technodata.csv b/src/muse/data/example/default_timeslice/power/Technodata.csv index 24109432..29f605db 100644 --- a/src/muse/data/example/default_timeslice/power/Technodata.csv +++ b/src/muse/data/example/default_timeslice/power/Technodata.csv @@ -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 +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,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,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 diff --git a/src/muse/data/example/default_timeslice/residential/Technodata.csv b/src/muse/data/example/default_timeslice/residential/Technodata.csv index efa8acb4..1567fbe7 100644 --- a/src/muse/data/example/default_timeslice/residential/Technodata.csv +++ b/src/muse/data/example/default_timeslice/residential/Technodata.csv @@ -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 diff --git a/src/muse/data/example/medium/residential/Technodata.csv b/src/muse/data/example/medium/residential/Technodata.csv index 4826c9f2..8995dd0a 100644 --- a/src/muse/data/example/medium/residential/Technodata.csv +++ b/src/muse/data/example/medium/residential/Technodata.csv @@ -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.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1 -heatpump,R1,2020,8.866666667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1 -estove,R1,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,cook,1 -gasstove,R1,2020,8.866666667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,cook,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.2,60,10,1,0.00000189,86,0.1,energy,1 +heatpump,R1,2020,8.866666667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,1 +estove,R1,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,1 +gasstove,R1,2020,8.866666667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,1 diff --git a/src/muse/data/example/minimum_service/industry/Technodata.csv b/src/muse/data/example/minimum_service/industry/Technodata.csv index 8b55470b..6a8027d9 100644 --- a/src/muse/data/example/minimum_service/industry/Technodata.csv +++ b/src/muse/data/example/minimum_service/industry/Technodata.csv @@ -1,6 +1,6 @@ -ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,InterestRate,ScalingSize,Agent1,Type,Fuel,MinimumServiceFactor,Enduse -Unit,-,Year,MUS$2010/Mt,-,MUS$2010/Mt,-,MUS$2010/Mt,-,Mt,-,Mt,Years,-,-,-,New,-,-,-,- -procammonia_1,R1,2010,100,1,0.5,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,fuel1,0.01,ammonia -procammonia_1,R1,2050,100,1,0.5,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,fuel1,0.85,ammonia -procammonia_2,R1,2010,97.5,1,0.4875,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,fuel2,0,ammonia -procammonia_2,R1,2050,97.5,1,0.4875,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,fuel2,0,ammonia +ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,InterestRate,ScalingSize,Agent1,Type,MinimumServiceFactor +Unit,-,Year,MUS$2010/Mt,-,MUS$2010/Mt,-,MUS$2010/Mt,-,Mt,-,Mt,Years,-,-,-,New,-,- +procammonia_1,R1,2010,100,1,0.5,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,0.01 +procammonia_1,R1,2050,100,1,0.5,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,0.85 +procammonia_2,R1,2010,97.5,1,0.4875,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,0 +procammonia_2,R1,2050,97.5,1,0.4875,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,0 diff --git a/src/muse/data/example/multiple_agents/residential/Technodata.csv b/src/muse/data/example/multiple_agents/residential/Technodata.csv index 8f678bd0..1fb784f3 100644 --- a/src/muse/data/example/multiple_agents/residential/Technodata.csv +++ b/src/muse/data/example/multiple_agents/residential/Technodata.csv @@ -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.2,60,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.2,60,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.2,60,10,1,0.00000189,86,0.1,energy,0.5,0.5 +heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,0.5,0.5 diff --git a/src/muse/data/example/trade/gas/Technodata.csv b/src/muse/data/example/trade/gas/Technodata.csv index 4968c8ea..88d52d60 100644 --- a/src/muse/data/example/trade/gas/Technodata.csv +++ b/src/muse/data/example/trade/gas/Technodata.csv @@ -1,4 +1,4 @@ -ProcessName,RegionName,Time,var_par,var_exp,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 -Unit,-,Year,MUS$2010/PJ,-,Years,-,PJ,%,-,-,-,-,New -gassupply1,R1,2010,3,1,10,0.9,0.00000189,86,0.1,energy,gas,gas,1 -gassupply1,R2,2010,3,1,10,0.9,0.00000189,86,0.1,energy,gas,gas,1 +ProcessName,RegionName,Time,var_par,var_exp,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Agent1 +Unit,-,Year,MUS$2010/PJ,-,Years,-,PJ,%,-,-,New +gassupply1,R1,2010,3,1,10,0.9,0.00000189,86,0.1,energy,1 +gassupply1,R2,2010,3,1,10,0.9,0.00000189,86,0.1,energy,1 diff --git a/src/muse/data/example/trade/power/Technodata.csv b/src/muse/data/example/trade/power/Technodata.csv index 84e68a57..9f54d0e3 100644 --- a/src/muse/data/example/trade/power/Technodata.csv +++ b/src/muse/data/example/trade/power/Technodata.csv @@ -1,6 +1,6 @@ -ProcessName,RegionName,Time,cap_exp,fix_exp,var_par,var_exp,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 -Unit,-,Year,-,-,MUS$2010/PJ,-,Years,-,PJ,%,-,-,-,-,New -gasCCGT,R1,2010,1,1,0,1,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R1,2010,1,1,0,1,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 -gasCCGT,R2,2010,1,1,0,1,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R2,2010,1,1,0,1,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 +ProcessName,RegionName,Time,cap_exp,fix_exp,var_par,var_exp,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Agent1 +Unit,-,Year,-,-,MUS$2010/PJ,-,Years,-,PJ,%,-,-,New +gasCCGT,R1,2010,1,1,0,1,35,0.9,0.00000189,86,0.1,energy,1 +windturbine,R1,2010,1,1,0,1,25,0.4,0.00000189,86,0.1,energy,1 +gasCCGT,R2,2010,1,1,0,1,35,0.9,0.00000189,86,0.1,energy,1 +windturbine,R2,2010,1,1,0,1,25,0.4,0.00000189,86,0.1,energy,1 diff --git a/src/muse/data/example/trade/residential/Technodata.csv b/src/muse/data/example/trade/residential/Technodata.csv index 604debd0..24ab2921 100644 --- a/src/muse/data/example/trade/residential/Technodata.csv +++ b/src/muse/data/example/trade/residential/Technodata.csv @@ -1,6 +1,6 @@ -ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2 -Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,PJ,Years,-,PJ,%,-,-,-,-,Retrofit -gasboiler,R1,2010,4.52,1,0,1,0,1,600,2000,10,0.9,0.00000189,86,0.1,energy,gas,heat,1 -heatpump,R1,2010,10.55,1,0,1,0,1,600,2000,10,0.9,0.00000189,86,0.1,energy,electricity,heat,1 -gasboiler,R2,2010,4.94,1,0,1,0,1,600,2000,10,0.9,0.00000189,86,0.1,energy,gas,heat,1 -heatpump,R2,2010,11.53,1,0,1,0,1,600,2000,10,0.9,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,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Agent2 +Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,PJ,Years,-,PJ,%,-,-,Retrofit +gasboiler,R1,2010,4.52,1,0,1,0,1,600,2000,10,0.9,0.00000189,86,0.1,energy,1 +heatpump,R1,2010,10.55,1,0,1,0,1,600,2000,10,0.9,0.00000189,86,0.1,energy,1 +gasboiler,R2,2010,4.94,1,0,1,0,1,600,2000,10,0.9,0.00000189,86,0.1,energy,1 +heatpump,R2,2010,11.53,1,0,1,0,1,600,2000,10,0.9,0.00000189,86,0.1,energy,1 From 94294a34789000e8cd8896ac87e346de9e50645b Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Mon, 2 Jun 2025 13:13:57 +0100 Subject: [PATCH 3/9] Remove references to fuel and enduse from tests --- src/muse/readers/csv.py | 12 +----------- tests/conftest.py | 9 ++++----- tests/test_readers.py | 4 +--- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py index 5a7efbc7..4ff735eb 100644 --- a/src/muse/readers/csv.py +++ b/src/muse/readers/csv.py @@ -79,9 +79,7 @@ def read_technodictionary(filename: str | Path) -> xr.Dataset: csv = pd.read_csv(filename, float_precision="high", low_memory=False) csv.drop(csv.filter(regex="Unname"), axis=1, inplace=True) - csv = csv.rename(columns=camel_to_snake).rename( - columns={"end_use": "enduse", "availabiliy year": "availability"} - ) + csv = csv.rename(columns=camel_to_snake) data = csv[csv.process_name != "Unit"] ts = pd.MultiIndex.from_arrays( @@ -95,19 +93,11 @@ def read_technodictionary(filename: str | Path) -> xr.Dataset: data = data.apply(to_numeric, axis=0) result = xr.Dataset.from_dataframe(data.sort_index()) - if "fuel" in result.variables: - result["fuel"] = result.fuel.isel(region=0, year=0) - result["fuel"].values = [camel_to_snake(name) for name in result["fuel"].values] if "type" in result.variables: result["tech_type"] = result.type.isel(region=0, year=0) result["tech_type"].values = [ camel_to_snake(name) for name in result["tech_type"].values ] - if "enduse" in result.variables: - result["enduse"] = result.enduse.isel(region=0, year=0) - result["enduse"].values = [ - camel_to_snake(name) for name in result["enduse"].values - ] units = csv[csv.process_name == "Unit"].drop( ["process_name", "region_name", "time"], axis=1 diff --git a/tests/conftest.py b/tests/conftest.py index 9649883b..ba082220 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -221,9 +221,8 @@ def technologies(coords) -> Dataset: result["comm_type"] = ("commodity", coords["comm_type"]) result["tech_type"] = "technology", ["solid", "liquid", "solid", "liquid"] - result["fuel"] = "technology", ["person", "person", "oil", "person"] - result = result.set_coords(("comm_type", "fuel", "tech_type")) + result = result.set_coords(("comm_type", "tech_type")) def var(*dims, factor=100.0): shape = tuple(len(result[u]) for u in dims) @@ -233,8 +232,8 @@ def var(*dims, factor=100.0): result["agent_share"] /= sum(result.agent_share) result["agent_share_zero"] = result["agent_share"] * 0 - # first create a mask so each teach will have the same enduse, fuel, or - # environmentals across years and regions + # first create a mask so each tech will have consistent inputs/outputs across years + # and regions fuels = result.comm_type == "energy" result["fixed_inputs"] = var("technology", "commodity") result.fixed_inputs[:] = randint(0, 3, result.fixed_inputs.shape) == 0 @@ -249,7 +248,7 @@ def var(*dims, factor=100.0): environmentals = result.comm_type == "environmental" result.fixed_outputs.loc[{"commodity": ~(enduses | environmentals)}] = 0 - # make sure at least one fuel or enduse is set + # make sure at least one energy input and service output is set for tech in result.technology: fin = result.fixed_inputs if (fin.sel(technology=tech, commodity=fuels) < 1e-12).all(): diff --git a/tests/test_readers.py b/tests/test_readers.py index 7eee3cd6..d587200c 100644 --- a/tests/test_readers.py +++ b/tests/test_readers.py @@ -409,8 +409,6 @@ def test_read_technodictionary(default_model): var_par=np.dtype("int64"), interest_rate=np.dtype("float64"), type=np.dtype("O"), - fuel=np.dtype(" Date: Mon, 2 Jun 2025 13:35:15 +0100 Subject: [PATCH 4/9] Remove more references to fuel and enduse columns --- docs/inputs/technodata.rst | 6 ---- .../add-service-demand/generate_models.py | 6 +--- docs/user-guide/add-solar.ipynb | 30 ++++++++-------- .../additional-service-demand.ipynb | 12 +++---- src/muse/outputs/mca.py | 34 ++++++++----------- 5 files changed, 36 insertions(+), 52 deletions(-) diff --git a/docs/inputs/technodata.rst b/docs/inputs/technodata.rst index 86c15d2a..53347053 100644 --- a/docs/inputs/technodata.rst +++ b/docs/inputs/technodata.rst @@ -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. diff --git a/docs/tutorial-code/add-service-demand/generate_models.py b/docs/tutorial-code/add-service-demand/generate_models.py index c579ae77..4f555fa9 100644 --- a/docs/tutorial-code/add-service-demand/generate_models.py +++ b/docs/tutorial-code/add-service-demand/generate_models.py @@ -52,13 +52,9 @@ def generate_model_1(): df.loc[1:, "cook"] = 0 df.to_csv(commin_file, index=False) - # Change cap_par, Fuel and EndUse + # Change cap_par technodata_file = model_path / "residential/Technodata.csv" df = pd.read_csv(technodata_file) - df.loc[df["ProcessName"] == "gas_stove", "Fuel"] = "gas" - df.loc[df["ProcessName"] == "electric_stove", "Fuel"] = "electricity" - df.loc[df["ProcessName"] == "gas_stove", "EndUse"] = "cook" - df.loc[df["ProcessName"] == "electric_stove", "EndUse"] = "cook" df.to_csv(technodata_file, index=False) diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb index 3163ef7b..94a0a68f 100644 --- a/docs/user-guide/add-solar.ipynb +++ b/docs/user-guide/add-solar.ipynb @@ -150,12 +150,12 @@ "Finally, the `Technodata.csv` file contains parametrisation data for the technology, such as the cost, growth constraints, lifetime of the power plant and fuel used. \n", "We will only display the some of the parameters, as the table is too large to display in full. The remaining parameters will be copied from the `windturbine` technology. You can see the full file [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv), and details about each parameter [here](../inputs/technodata.rst).\n", "\n", - "|ProcessName|RegionName|Time|cap_par|cap_exp|…|Fuel|EndUse|Agent1|\n", - "|-|-|-|-|-|-|-|-|-|\n", - "|Unit|-|Year|MUS$2010/PJ_a|-|…|-|-|New|\n", - "|gasCCGT|R1|2020|23.78234399|1|…|gas|electricity|1|\n", - "|windturbine|R1|2020|36.30771182|1|…|wind|electricity|1|\n", - "|**solarPV**|**R1**|**2020**|**30**|**1**|...|**solar**|**electricity**|**1**|\n", + "|ProcessName|RegionName|Time|cap_par|cap_exp|…|Agent1|\n", + "|-|-|-|-|-|-|-|\n", + "|Unit|-|Year|MUS$2010/PJ_a|-|…|New|\n", + "|gasCCGT|R1|2020|23.78234399|1|…|1|\n", + "|windturbine|R1|2020|36.30771182|1|…|1|\n", + "|**solarPV**|**R1**|**2020**|**30**|**1**|...|**1**|\n", "\n", "Again, flat forward extension is used. Therefore, as we only provide data for the benchmark year 2020, 2025 and the following benchmark years will keep the same characteristics." ] @@ -345,15 +345,15 @@ "\n", "First, we will amend the `Technodata.csv` file as follows:\n", "\n", - "|ProcessName|RegionName|Time|cap_par|cap_exp|…|Fuel|EndUse|Agent1|\n", - "|-|-|-|-|-|-|-|-|-|\n", - "|Unit|-|Year|MUS$2010/PJ_a|-|…|-|-|New|\n", - "|gasCCGT|R1|2020|23.78234399|1|…|gas|electricity|1|\n", - "|**gasCCGT**|**R1**|**2040**|**23.78234399**|**1**|**…**|**gas**|**electricity**|**1**|\n", - "|windturbine|R1|2020|36.30771182|1|…|wind|electricity|1|\n", - "|**windturbine**|**R1**|**2040**|**36.30771182**|**1**|**…**|**wind**|**electricity**|**1**|\n", - "|solarPV|R1|2020|**40**|1|...|solar|electricity|1|\n", - "|**solarPV**|**R1**|**2040**|**30**|**1**|**...**|**solar**|**electricity**|**1**|\n", + "|ProcessName|RegionName|Time|cap_par|cap_exp|…|Agent1|\n", + "|-|-|-|-|-|-|-|\n", + "|Unit|-|Year|MUS$2010/PJ_a|-|…|New|\n", + "|gasCCGT|R1|2020|23.78234399|1|…|1|\n", + "|**gasCCGT**|**R1**|**2040**|**23.78234399**|**1**|**…**|**1**|\n", + "|windturbine|R1|2020|36.30771182|1|…|1|\n", + "|**windturbine**|**R1**|**2040**|**36.30771182**|**1**|**…**|**1**|\n", + "|solarPV|R1|2020|**40**|1|...|1|\n", + "|**solarPV**|**R1**|**2040**|**30**|**1**|**...**|**1**|\n", "\n", "Here, we increase `cap_par` for `solarPV` to 40 in the year 2020, and create a new row for 2040 with a reduced `cap_par` of 30.\n", "\n", diff --git a/docs/user-guide/additional-service-demand.ipynb b/docs/user-guide/additional-service-demand.ipynb index bfe5bea9..05766bba 100644 --- a/docs/user-guide/additional-service-demand.ipynb +++ b/docs/user-guide/additional-service-demand.ipynb @@ -111,12 +111,12 @@ "\n", "Again, in the interests of space, we have omitted the existing `gasboiler` and `heatpump` technologies. For the new `electric_stove` technology, we will copy and paste the data from the `heatpump` row. For `gas_stove`, we copy and paste the data for `gasboiler`. Importantly, however, we must specify the end-use for these new technologies to be `cook` and not `heat`:\n", "\n", - "|ProcessName|RegionName|Time|cap_par|…|Fuel|EndUse|Agent1|\n", - "|-|-|-|-|-|-|-|-|\n", - "|Unit|-|Year|MUS$2010/PJ_a|…|-|-|New|\n", - "|...|...|...|...|...|...|...|...|\n", - "|**electric_stove**|**R1**|**2020**|**8.8667**|**…**|**electricity**|**cook**|**1**|\n", - "|**gas_stove**|**R1**|**2020**|**3.8**|**…**|**gas**|**cook**|**1**|\n", + "|ProcessName|RegionName|Time|cap_par|…|Agent1|\n", + "|-|-|-|-|-|-|\n", + "|Unit|-|Year|MUS$2010/PJ_a|…|New|\n", + "|...|...|...|...|...|...|\n", + "|**electric_stove**|**R1**|**2020**|**8.8667**|**…**|**1**|\n", + "|**gas_stove**|**R1**|**2020**|**3.8**|**…**|**1**|\n", "\n", "As can be seen, we have added two technologies with different `cap_par` costs. We specified their respective fuels, and the enduse for both is `cook`. For the full file please see [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/residential/Technodata.csv)." ] diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py index fa38b2d3..cdf13105 100644 --- a/src/muse/outputs/mca.py +++ b/src/muse/outputs/mca.py @@ -423,6 +423,7 @@ def sector_lcoe( sector: AbstractSector, market: xr.Dataset, year: int, **kwargs ) -> pd.DataFrame: """Levelized cost of energy () of technologies over their lifetime.""" + from muse.commodities import is_enduse from muse.costs import levelized_cost_of_energy as LCOE from muse.quantities import capacity_to_service_demand, consumption @@ -439,16 +440,12 @@ def sector_lcoe( for agent in agents: agent_market = market.sel(year=agent.year) agent_market["consumption"] = agent_market.consumption * agent.quantity - enduses = [ - i.strip() - for entry in technologies.enduse.values - for i in entry.split(",") - ] - # temporary hack to allow comma separated list in input file - included = [i for i in agent_market["commodity"].values if i in enduses] - excluded = [ - i for i in agent_market["commodity"].values if i not in included - ] + + # Use is_enduse to determine end-use commodities + enduses = is_enduse(technologies.comm_usage) + included = agent_market.commodity.values[enduses] + excluded = agent_market.commodity.values[~enduses] + agent_market.loc[dict(commodity=excluded)] = 0 agent_market["prices"] = agent.filter_input( market["prices"], year=agent.year @@ -510,6 +507,7 @@ def sector_eac( sector: AbstractSector, market: xr.Dataset, year: int, **kwargs ) -> pd.DataFrame: """Net Present Value of technologies over their lifetime.""" + from muse.commodities import is_enduse from muse.costs import equivalent_annual_cost as EAC from muse.quantities import capacity_to_service_demand, consumption @@ -526,16 +524,12 @@ def sector_eac( for agent in agents: agent_market = market.sel(year=agent.year) agent_market["consumption"] = agent_market.consumption * agent.quantity - enduses = [ - i.strip() - for entry in technologies.enduse.values - for i in entry.split(",") - ] - # temporary hack to allow comma separated list in input file - included = [i for i in agent_market["commodity"].values if i in enduses] - excluded = [ - i for i in agent_market["commodity"].values if i not in included - ] + + # Use is_enduse to determine end-use commodities + enduses = is_enduse(technologies.comm_usage) + included = agent_market.commodity.values[enduses] + excluded = agent_market.commodity.values[~enduses] + agent_market.loc[dict(commodity=excluded)] = 0 agent_market["prices"] = agent.filter_input( market["prices"], year=agent.year From 79e2ecf425fc6df575e3ec99476b2dbc5fff07e2 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Mon, 2 Jun 2025 13:41:40 +0100 Subject: [PATCH 5/9] Fix mistake in default_timeslice --- src/muse/data/example/default_timeslice/power/Technodata.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/muse/data/example/default_timeslice/power/Technodata.csv b/src/muse/data/example/default_timeslice/power/Technodata.csv index 29f605db..260851bc 100644 --- a/src/muse/data/example/default_timeslice/power/Technodata.csv +++ b/src/muse/data/example/default_timeslice/power/Technodata.csv @@ -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,Agent1 -Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New +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 From bb8e24e1526b211de55e4265c2d8f412fa842c69 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Mon, 2 Jun 2025 14:18:47 +0100 Subject: [PATCH 6/9] Add deprecation warning --- .../add-new-technology/generate_models.py | 1 - docs/user-guide/add-agent.ipynb | 10 ++++----- src/muse/readers/csv.py | 21 +++++++++++++++++++ 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/docs/tutorial-code/add-new-technology/generate_models.py b/docs/tutorial-code/add-new-technology/generate_models.py index 639080b8..f9a78dfc 100644 --- a/docs/tutorial-code/add-new-technology/generate_models.py +++ b/docs/tutorial-code/add-new-technology/generate_models.py @@ -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 diff --git a/docs/user-guide/add-agent.ipynb b/docs/user-guide/add-agent.ipynb index 880de329..050e4a02 100644 --- a/docs/user-guide/add-agent.ipynb +++ b/docs/user-guide/add-agent.ipynb @@ -50,11 +50,11 @@ "\n", "The new technodata file for the power sector should look like the following:\n", "\n", - "|ProcessName|RegionName|Time|cap_par|cap_exp|…|Fuel|EndUse|Agent1|Agent2|\n", - "|-|-|-|-|-|-|-|-|-|-|\n", - "|Unit|-|Year|MUS$2010/PJ_a|-|…|-|-|New|**New**|\n", - "|gasCCGT|R1|2020|23.78234399|1|…|gas|electricity|**0.5**|**0.5**|\n", - "|windturbine|R1|2020|36.30771182|1|…|wind|electricity|**0.5**|**0.5**|\n", + "|ProcessName|RegionName|Time|cap_par|cap_exp|…|Agent1|Agent2|\n", + "|-|-|-|-|-|-|-|-|\n", + "|Unit|-|Year|MUS$2010/PJ_a|-|…|New|**New**|\n", + "|gasCCGT|R1|2020|23.78234399|1|…|**0.5**|**0.5**|\n", + "|windturbine|R1|2020|36.30771182|1|…|**0.5**|**0.5**|\n", "\n", "Remember you will have to make the same changes for the residential and gas sectors!" ] diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py index 4ff735eb..6acb5170 100644 --- a/src/muse/readers/csv.py +++ b/src/muse/readers/csv.py @@ -75,10 +75,31 @@ def read_technodictionary(filename: str | Path) -> xr.Dataset: There are three axes: technologies, regions, and year. """ + from logging import getLogger + from muse.readers import camel_to_snake csv = pd.read_csv(filename, float_precision="high", low_memory=False) csv.drop(csv.filter(regex="Unname"), axis=1, inplace=True) + + # Check for deprecated Fuel and EndUse columns (#715) + columns_lower = [col.lower() for col in csv.columns] + if "fuel" in columns_lower: + msg = ( + f"The 'Fuel' column in {filename} has been deprecated. " + "This information is now determined from CommIn files. " + "Please remove this column from your Technodata files." + ) + getLogger(__name__).warning(msg) + + if "enduse" in columns_lower: + msg = ( + f"The 'EndUse' column in {filename} has been deprecated. " + "This information is now determined from CommOut files. " + "Please remove this column from your Technodata files." + ) + getLogger(__name__).warning(msg) + csv = csv.rename(columns=camel_to_snake) data = csv[csv.process_name != "Unit"] From a483b6ccd55ff76189fe7e5ef86e06a19341fe43 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Mon, 2 Jun 2025 14:30:21 +0100 Subject: [PATCH 7/9] Update tutorials --- .../1-single-objective/gas/Technodata.csv | 6 +++--- .../1-single-objective/power/Technodata.csv | 8 ++++---- .../residential/Technodata.csv | 8 ++++---- .../2-multiple-objective/gas/Technodata.csv | 6 +++--- .../2-multiple-objective/power/Technodata.csv | 8 ++++---- .../residential/Technodata.csv | 8 ++++---- .../1-correlation/gas/Technodata.csv | 6 +++--- .../1-correlation/power/Technodata.csv | 8 ++++---- .../1-correlation/residential/Technodata.csv | 8 ++++---- .../1-introduction/gas/Technodata.csv | 6 +++--- .../1-introduction/power/Technodata.csv | 10 +++++----- .../1-introduction/residential/Technodata.csv | 8 ++++---- .../2-scenario/gas/Technodata.csv | 6 +++--- .../2-scenario/power/Technodata.csv | 16 ++++++++-------- .../2-scenario/residential/Technodata.csv | 8 ++++---- .../add-region/1-new-region/gas/Technodata.csv | 8 ++++---- .../add-region/1-new-region/power/Technodata.csv | 12 ++++++------ .../1-new-region/residential/Technodata.csv | 12 ++++++------ .../1-residential-subsectors/gas/Technodata.csv | 6 +++--- .../power/Technodata.csv | 8 ++++---- .../residential/Technodata.csv | 12 ++++++------ .../2-agents/gas/Technodata.csv | 6 +++--- .../2-agents/power/Technodata.csv | 8 ++++---- .../2-agents/residential/Technodata.csv | 12 ++++++------ .../1-exogenous-demand/gas/Technodata.csv | 6 +++--- .../1-exogenous-demand/power/Technodata.csv | 8 ++++---- .../residential/Technodata.csv | 12 ++++++------ .../1-carbon-budget/gas/Technodata.csv | 6 +++--- .../1-carbon-budget/power/Technodata.csv | 8 ++++---- .../1-carbon-budget/residential/Technodata.csv | 8 ++++---- .../1-min-constraint/gas/Technodata.csv | 6 +++--- .../1-min-constraint/power/Technodata.csv | 8 ++++---- .../1-min-constraint/residential/Technodata.csv | 8 ++++---- .../2-max-constraint/gas/Technodata.csv | 6 +++--- .../2-max-constraint/power/Technodata.csv | 8 ++++---- .../2-max-constraint/residential/Technodata.csv | 8 ++++---- .../1-modify-timeslices/gas/Technodata.csv | 6 +++--- .../1-modify-timeslices/power/Technodata.csv | 8 ++++---- .../residential/Technodata.csv | 8 ++++---- .../2-modify-time-framework/gas/Technodata.csv | 6 +++--- .../2-modify-time-framework/power/Technodata.csv | 8 ++++---- .../residential/Technodata.csv | 8 ++++---- .../new-decision-metric/gas/Technodata.csv | 6 +++--- .../new-decision-metric/power/Technodata.csv | 10 +++++----- .../residential/Technodata.csv | 8 ++++---- 45 files changed, 182 insertions(+), 182 deletions(-) diff --git a/docs/tutorial-code/add-agent/1-single-objective/gas/Technodata.csv b/docs/tutorial-code/add-agent/1-single-objective/gas/Technodata.csv index 483a8799..ceef085f 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/gas/Technodata.csv +++ b/docs/tutorial-code/add-agent/1-single-objective/gas/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-agent/1-single-objective/power/Technodata.csv b/docs/tutorial-code/add-agent/1-single-objective/power/Technodata.csv index 4ed3c22b..94159648 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/power/Technodata.csv +++ b/docs/tutorial-code/add-agent/1-single-objective/power/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-agent/1-single-objective/residential/Technodata.csv b/docs/tutorial-code/add-agent/1-single-objective/residential/Technodata.csv index b915a3cb..7c739014 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/residential/Technodata.csv +++ b/docs/tutorial-code/add-agent/1-single-objective/residential/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/gas/Technodata.csv b/docs/tutorial-code/add-agent/2-multiple-objective/gas/Technodata.csv index 483a8799..ceef085f 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/gas/Technodata.csv +++ b/docs/tutorial-code/add-agent/2-multiple-objective/gas/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/power/Technodata.csv b/docs/tutorial-code/add-agent/2-multiple-objective/power/Technodata.csv index 4ed3c22b..94159648 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/power/Technodata.csv +++ b/docs/tutorial-code/add-agent/2-multiple-objective/power/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/residential/Technodata.csv b/docs/tutorial-code/add-agent/2-multiple-objective/residential/Technodata.csv index b915a3cb..7c739014 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/residential/Technodata.csv +++ b/docs/tutorial-code/add-agent/2-multiple-objective/residential/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/gas/Technodata.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/gas/Technodata.csv index 54cfdc9d..4a3878fe 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/gas/Technodata.csv +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/gas/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/power/Technodata.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/power/Technodata.csv index 24109432..260851bc 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/power/Technodata.csv +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/power/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/residential/Technodata.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/residential/Technodata.csv index efa8acb4..1567fbe7 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/residential/Technodata.csv +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/residential/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/gas/Technodata.csv b/docs/tutorial-code/add-new-technology/1-introduction/gas/Technodata.csv index 54cfdc9d..4a3878fe 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/gas/Technodata.csv +++ b/docs/tutorial-code/add-new-technology/1-introduction/gas/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/power/Technodata.csv b/docs/tutorial-code/add-new-technology/1-introduction/power/Technodata.csv index 2539f000..fdc597a8 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/power/Technodata.csv +++ b/docs/tutorial-code/add-new-technology/1-introduction/power/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/residential/Technodata.csv b/docs/tutorial-code/add-new-technology/1-introduction/residential/Technodata.csv index efa8acb4..1567fbe7 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/residential/Technodata.csv +++ b/docs/tutorial-code/add-new-technology/1-introduction/residential/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/gas/Technodata.csv b/docs/tutorial-code/add-new-technology/2-scenario/gas/Technodata.csv index 54cfdc9d..4a3878fe 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/gas/Technodata.csv +++ b/docs/tutorial-code/add-new-technology/2-scenario/gas/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/power/Technodata.csv b/docs/tutorial-code/add-new-technology/2-scenario/power/Technodata.csv index fb9ee5e6..355c4ac3 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/power/Technodata.csv +++ b/docs/tutorial-code/add-new-technology/2-scenario/power/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/residential/Technodata.csv b/docs/tutorial-code/add-new-technology/2-scenario/residential/Technodata.csv index efa8acb4..1567fbe7 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/residential/Technodata.csv +++ b/docs/tutorial-code/add-new-technology/2-scenario/residential/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-region/1-new-region/gas/Technodata.csv b/docs/tutorial-code/add-region/1-new-region/gas/Technodata.csv index a9163eb9..031e7cb1 100644 --- a/docs/tutorial-code/add-region/1-new-region/gas/Technodata.csv +++ b/docs/tutorial-code/add-region/1-new-region/gas/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-region/1-new-region/power/Technodata.csv b/docs/tutorial-code/add-region/1-new-region/power/Technodata.csv index 951a06be..96576cb4 100644 --- a/docs/tutorial-code/add-region/1-new-region/power/Technodata.csv +++ b/docs/tutorial-code/add-region/1-new-region/power/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-region/1-new-region/residential/Technodata.csv b/docs/tutorial-code/add-region/1-new-region/residential/Technodata.csv index d08c0ffa..9866dbb4 100644 --- a/docs/tutorial-code/add-region/1-new-region/residential/Technodata.csv +++ b/docs/tutorial-code/add-region/1-new-region/residential/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/gas/Technodata.csv b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/gas/Technodata.csv index 54cfdc9d..4a3878fe 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/gas/Technodata.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/gas/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/power/Technodata.csv b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/power/Technodata.csv index 24109432..260851bc 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/power/Technodata.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/power/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/residential/Technodata.csv b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/residential/Technodata.csv index 2b14d6c8..56bea9c7 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/residential/Technodata.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/residential/Technodata.csv @@ -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 -electric_stove,R1,2020,8.866667,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,electricity,cook,1 -gas_stove,R1,2020,3.8,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,gas,cook,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 +electric_stove,R1,2020,8.866667,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,1 +gas_stove,R1,2020,3.8,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,1 diff --git a/docs/tutorial-code/add-service-demand-subsectors/2-agents/gas/Technodata.csv b/docs/tutorial-code/add-service-demand-subsectors/2-agents/gas/Technodata.csv index 54cfdc9d..4a3878fe 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/2-agents/gas/Technodata.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/2-agents/gas/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-service-demand-subsectors/2-agents/power/Technodata.csv b/docs/tutorial-code/add-service-demand-subsectors/2-agents/power/Technodata.csv index 24109432..260851bc 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/2-agents/power/Technodata.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/2-agents/power/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-service-demand-subsectors/2-agents/residential/Technodata.csv b/docs/tutorial-code/add-service-demand-subsectors/2-agents/residential/Technodata.csv index 2b14d6c8..56bea9c7 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/2-agents/residential/Technodata.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/2-agents/residential/Technodata.csv @@ -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 -electric_stove,R1,2020,8.866667,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,electricity,cook,1 -gas_stove,R1,2020,3.8,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,gas,cook,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 +electric_stove,R1,2020,8.866667,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,1 +gas_stove,R1,2020,3.8,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,1 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/gas/Technodata.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/gas/Technodata.csv index 54cfdc9d..4a3878fe 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/gas/Technodata.csv +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/gas/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/power/Technodata.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/power/Technodata.csv index 24109432..260851bc 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/power/Technodata.csv +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/power/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/residential/Technodata.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/residential/Technodata.csv index 2b14d6c8..56bea9c7 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/residential/Technodata.csv +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/residential/Technodata.csv @@ -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 -electric_stove,R1,2020,8.866667,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,electricity,cook,1 -gas_stove,R1,2020,3.8,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,gas,cook,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 +electric_stove,R1,2020,8.866667,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,1 +gas_stove,R1,2020,3.8,1,0,1,0,1,10,0.5,100,10,1,0.00000189,86,0.1,energy,1 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/gas/Technodata.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/gas/Technodata.csv index 54cfdc9d..4a3878fe 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/gas/Technodata.csv +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/gas/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/power/Technodata.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/power/Technodata.csv index 24109432..260851bc 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/power/Technodata.csv +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/power/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/residential/Technodata.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/residential/Technodata.csv index efa8acb4..1567fbe7 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/residential/Technodata.csv +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/residential/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/gas/Technodata.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/gas/Technodata.csv index 54cfdc9d..4a3878fe 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/gas/Technodata.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/gas/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/power/Technodata.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/power/Technodata.csv index 24109432..260851bc 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/power/Technodata.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/power/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/residential/Technodata.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/residential/Technodata.csv index efa8acb4..1567fbe7 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/residential/Technodata.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/residential/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/gas/Technodata.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/gas/Technodata.csv index 54cfdc9d..4a3878fe 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/gas/Technodata.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/gas/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/power/Technodata.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/power/Technodata.csv index 24109432..260851bc 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/power/Technodata.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/power/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/residential/Technodata.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/residential/Technodata.csv index efa8acb4..1567fbe7 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/residential/Technodata.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/residential/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/gas/Technodata.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/gas/Technodata.csv index 54cfdc9d..4a3878fe 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/gas/Technodata.csv +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/gas/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/power/Technodata.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/power/Technodata.csv index 24109432..260851bc 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/power/Technodata.csv +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/power/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/residential/Technodata.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/residential/Technodata.csv index efa8acb4..1567fbe7 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/residential/Technodata.csv +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/residential/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/gas/Technodata.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/gas/Technodata.csv index 54cfdc9d..4a3878fe 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/gas/Technodata.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/gas/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/power/Technodata.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/power/Technodata.csv index 24109432..260851bc 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/power/Technodata.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/power/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/residential/Technodata.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/residential/Technodata.csv index efa8acb4..1567fbe7 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/residential/Technodata.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/residential/Technodata.csv @@ -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 diff --git a/docs/tutorial-code/new-decision-metric/gas/Technodata.csv b/docs/tutorial-code/new-decision-metric/gas/Technodata.csv index 784df8fb..5f79d503 100644 --- a/docs/tutorial-code/new-decision-metric/gas/Technodata.csv +++ b/docs/tutorial-code/new-decision-metric/gas/Technodata.csv @@ -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,5,1,60,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,5,1,60,35,0.9,0.00000189,86,0.1,energy,1 diff --git a/docs/tutorial-code/new-decision-metric/power/Technodata.csv b/docs/tutorial-code/new-decision-metric/power/Technodata.csv index 9aafaebb..4d800af8 100644 --- a/docs/tutorial-code/new-decision-metric/power/Technodata.csv +++ b/docs/tutorial-code/new-decision-metric/power/Technodata.csv @@ -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,2,0.5,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R1,2020,36.30771182,1,0,1,0,1,2,0.5,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 -solarPV,R1,2020,30,1,0,1,0,1,2,0.5,60,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,2,0.5,60,35,0.9,0.00000189,86,0.1,energy,1 +windturbine,R1,2020,36.30771182,1,0,1,0,1,2,0.5,60,25,0.4,0.00000189,86,0.1,energy,1 +solarPV,R1,2020,30,1,0,1,0,1,2,0.5,60,25,0.4,0.00000189,86,0.1,energy,1 diff --git a/docs/tutorial-code/new-decision-metric/residential/Technodata.csv b/docs/tutorial-code/new-decision-metric/residential/Technodata.csv index 8de57576..4c23804d 100644 --- a/docs/tutorial-code/new-decision-metric/residential/Technodata.csv +++ b/docs/tutorial-code/new-decision-metric/residential/Technodata.csv @@ -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.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1 -heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.2,60,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.2,60,10,1,0.00000189,86,0.1,energy,1 +heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,1 From 546fa97d1397119866a1b834b2449f0b73e9d04f Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 10 Jun 2025 10:18:09 +0100 Subject: [PATCH 8/9] Fix LCOE output --- src/muse/outputs/mca.py | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py index cdf13105..2ac950a9 100644 --- a/src/muse/outputs/mca.py +++ b/src/muse/outputs/mca.py @@ -441,12 +441,17 @@ def sector_lcoe( agent_market = market.sel(year=agent.year) agent_market["consumption"] = agent_market.consumption * agent.quantity - # Use is_enduse to determine end-use commodities - enduses = is_enduse(technologies.comm_usage) - included = agent_market.commodity.values[enduses] - excluded = agent_market.commodity.values[~enduses] - - agent_market.loc[dict(commodity=excluded)] = 0 + # Filter commodities based on end-use status + enduse_mask = is_enduse(technologies.comm_usage) + commodities = agent_market.commodity.values + included_commodities = commodities[ + np.isin(commodities, enduse_mask.commodity[enduse_mask]) + ] + excluded_commodities = commodities[ + ~np.isin(commodities, enduse_mask.commodity[enduse_mask]) + ] + + agent_market.loc[dict(commodity=excluded_commodities)] = 0 agent_market["prices"] = agent.filter_input( market["prices"], year=agent.year ) @@ -456,7 +461,7 @@ def sector_lcoe( year=agent.year, ) prices = agent_market["prices"].sel(commodity=techs.commodity) - demand = agent_market.consumption.sel(commodity=included) + demand = agent_market.consumption.sel(commodity=included_commodities) capacity = agent.filter_input(capacity_to_service_demand(demand, techs)) production = ( broadcast_timeslice(capacity) @@ -525,12 +530,17 @@ def sector_eac( agent_market = market.sel(year=agent.year) agent_market["consumption"] = agent_market.consumption * agent.quantity - # Use is_enduse to determine end-use commodities - enduses = is_enduse(technologies.comm_usage) - included = agent_market.commodity.values[enduses] - excluded = agent_market.commodity.values[~enduses] - - agent_market.loc[dict(commodity=excluded)] = 0 + # Filter commodities based on end-use status + enduse_mask = is_enduse(technologies.comm_usage) + commodities = agent_market.commodity.values + included_commodities = commodities[ + np.isin(commodities, enduse_mask.commodity[enduse_mask]) + ] + excluded_commodities = commodities[ + ~np.isin(commodities, enduse_mask.commodity[enduse_mask]) + ] + + agent_market.loc[dict(commodity=excluded_commodities)] = 0 agent_market["prices"] = agent.filter_input( market["prices"], year=agent.year ) @@ -540,7 +550,7 @@ def sector_eac( year=agent.year, ) prices = agent_market["prices"].sel(commodity=techs.commodity) - demand = agent_market.consumption.sel(commodity=included) + demand = agent_market.consumption.sel(commodity=included_commodities) capacity = agent.filter_input(capacity_to_service_demand(demand, techs)) production = ( broadcast_timeslice(capacity) From 0d49de812676aeb84b153c5bc55762610347ba6d Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 10 Jun 2025 10:23:41 +0100 Subject: [PATCH 9/9] Update test_readers --- tests/test_readers.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/test_readers.py b/tests/test_readers.py index 14a4b6ae..ab566cc5 100644 --- a/tests/test_readers.py +++ b/tests/test_readers.py @@ -372,8 +372,6 @@ def test_read_technodictionary(default_model): "var_par": np.int64, "interest_rate": np.float64, "type": np.dtype("O"), - "fuel": np.dtype("