Skip to content

Commit

Permalink
Merge pull request #3005 from quintel/pkev-d2
Browse files Browse the repository at this point in the history
Add small-scale wind & update solar PV and industry efficiency sliders
  • Loading branch information
Charlottevm authored Feb 1, 2024
2 parents 830c3d6 + 403a210 commit dec7488
Show file tree
Hide file tree
Showing 136 changed files with 628 additions and 372 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- query =
PRODUCT(
V(energy_battery_solar_pv_solar_radiation, electricity_output_capacity),
THOUSANDS
)
- unit = kW
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- query =
DIVIDE(
V(energy_battery_solar_pv_solar_radiation, output_of_electricity),
PRODUCT(
MJ_PER_MWH,
THOUSANDS
)
)
- unit = GWh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(energy_battery_solar_pv_solar_radiation, full_load_hours)
- unit = hours
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(energy_battery_solar_pv_solar_radiation, 'electricity_output_capacity * number_of_units')
- unit = MW
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- query =
PRODUCT(
V(energy_battery_solar_pv_solar_radiation, land_use_per_unit),
MILLIONS
)
- unit = m2
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(energy_battery_solar_pv_solar_radiation, number_of_units)
- unit = number
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- query =
PRODUCT(
DIVIDE(
Q(land_use_solar_wind_battery_solar_pv_land_use_per_unit),
MILLIONS
),
Q(land_use_solar_wind_battery_solar_pv_number_of_units)
)
- unit = km2
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- query =
PRODUCT(
V(energy_battery_wind_turbine_inland, electricity_output_capacity),
THOUSANDS
)
- unit = kW
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- query =
DIVIDE(
V(energy_battery_wind_turbine_inland, output_of_electricity),
PRODUCT(
MJ_PER_MWH,
THOUSANDS
)
)
- unit = GWh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(energy_battery_wind_turbine_inland, full_load_hours)
- unit = hours
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(energy_battery_wind_turbine_inland, 'electricity_output_capacity * number_of_units')
- unit = MW
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- query =
PRODUCT(
V(energy_battery_wind_turbine_inland, land_use_per_unit),
MILLIONS
)
- unit = m2
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(energy_battery_wind_turbine_inland, number_of_units)
- unit = number
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- query =
PRODUCT(
DIVIDE(
Q(land_use_solar_wind_battery_wind_inland_land_use_per_unit),
MILLIONS
),
Q(land_use_solar_wind_battery_wind_inland_number_of_units)
)
- unit = km2
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = AREA(buildings_roof_surface_available_for_pv)
- unit = km2
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- query =
AREA(residences_roof_surface_available_for_pv)
- unit = km2
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- query =
PRODUCT(
V(buildings_solar_pv_solar_radiation, electricity_output_capacity),
THOUSANDS
)
- unit = kW
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- query =
DIVIDE(
V(buildings_solar_pv_solar_radiation, output_of_electricity),
MJ_PER_MWH * THOUSANDS
)
- unit = GWh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(buildings_solar_pv_solar_radiation, full_load_hours)
- unit = hours
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(buildings_solar_pv_solar_radiation, 'electricity_output_capacity * number_of_units')
- unit = MW
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- query =
PRODUCT(
V(buildings_solar_pv_solar_radiation, land_use_per_unit),
MILLIONS
)
- unit = m2
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(buildings_solar_pv_solar_radiation, number_of_units)
- unit = number
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- query =
PRODUCT(
DIVIDE(
Q(land_use_solar_wind_solar_pv_buildings_land_use_per_unit),
MILLIONS
),
Q(land_use_solar_wind_solar_pv_buildings_number_of_units)
)
- unit = km2
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- query =
PRODUCT(
V(households_solar_pv_solar_radiation, electricity_output_capacity),
THOUSANDS
)
- unit = kW
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- query =
DIVIDE(
V(households_solar_pv_solar_radiation, output_of_electricity),
MJ_PER_MWH * THOUSANDS
)
- unit = GWh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(households_solar_pv_solar_radiation, full_load_hours)
- unit = hours
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(households_solar_pv_solar_radiation, 'electricity_output_capacity * number_of_units')
- unit = MW
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- query =
PRODUCT(
V(households_solar_pv_solar_radiation, land_use_per_unit),
MILLIONS
)
- unit = m2
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(households_solar_pv_solar_radiation, number_of_units)
- unit = number
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- query =
PRODUCT(
DIVIDE(
Q(land_use_solar_wind_solar_pv_households_land_use_per_unit),
MILLIONS
),
Q(land_use_solar_wind_solar_pv_households_number_of_units)
)
- unit = km2
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- query =
PRODUCT(
V(energy_power_solar_pv_solar_radiation, electricity_output_capacity),
THOUSANDS
)
- unit = kW
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- query =
DIVIDE(
V(energy_power_solar_pv_solar_radiation, output_of_electricity),
MJ_PER_MWH * THOUSANDS
)
- unit = GWh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(energy_power_solar_pv_solar_radiation, full_load_hours)
- unit = hours
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(energy_power_solar_pv_solar_radiation, 'electricity_output_capacity * number_of_units')
- unit = MW
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- query =
PRODUCT(
V(energy_power_solar_pv_solar_radiation, land_use_per_unit),
MILLIONS
)
- unit = m2
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(energy_power_solar_pv_solar_radiation, number_of_units)
- unit = number
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- query =
PRODUCT(
DIVIDE(
Q(land_use_solar_wind_solar_pv_plants_onshore_land_use_per_unit),
MILLIONS
),
Q(land_use_solar_wind_solar_pv_plants_onshore_number_of_units)
)
- unit = km2
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- query =
PRODUCT(
V(households_solar_pvt_solar_radiation, electricity_output_capacity),
THOUSANDS
)
- unit = kW
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- query =
DIVIDE(
V(households_solar_pvt_solar_radiation, output_of_electricity),
MJ_PER_MWH * THOUSANDS
)
- unit = GWh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(households_solar_pvt_solar_radiation, full_load_hours)
- unit = hours
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(households_solar_pvt_solar_radiation, 'electricity_output_capacity * number_of_units')
- unit = MW
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- query =
PRODUCT(
V(households_solar_pvt_solar_radiation, land_use_per_unit),
MILLIONS
)
- unit = m2
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(households_solar_pvt_solar_radiation, number_of_units)
- unit = number
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- query =
PRODUCT(
DIVIDE(
Q(land_use_solar_wind_solar_pvt_households_land_use_per_unit),
MILLIONS
),
Q(land_use_solar_wind_solar_pvt_households_number_of_units)
)
- unit = km2
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- query =
PRODUCT(
V(buildings_space_heater_solar_thermal, land_use_per_unit),
MILLIONS
)
- unit = m2
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(buildings_space_heater_solar_thermal, number_of_units)
- unit = number
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- query =
PRODUCT(
DIVIDE(
Q(land_use_solar_wind_solar_thermal_buildings_land_use_per_unit),
MILLIONS
),
Q(land_use_solar_wind_solar_thermal_buildings_number_of_units)
)
- unit = km2
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- query =
PRODUCT(
V(households_water_heater_solar_thermal, land_use_per_unit),
MILLIONS
)
- unit = m2
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(households_water_heater_solar_thermal, number_of_units)
- unit = number
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- query =
PRODUCT(
DIVIDE(
Q(land_use_solar_wind_solar_thermal_households_land_use_per_unit),
MILLIONS
),
Q(land_use_solar_wind_solar_thermal_households_number_of_units)
)
- unit = km2
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- query =
PRODUCT(
V(energy_power_wind_turbine_coastal, electricity_output_capacity),
THOUSANDS
)
- unit = kW
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- query =
DIVIDE(
V(energy_power_wind_turbine_coastal, output_of_electricity),
PRODUCT(
MJ_PER_MWH,
THOUSANDS
)
)
- unit = GWh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(energy_power_wind_turbine_coastal, full_load_hours)
- unit = hours
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(energy_power_wind_turbine_coastal, 'electricity_output_capacity * number_of_units')
- unit = MW
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- query =
PRODUCT(
V(energy_power_wind_turbine_coastal, land_use_per_unit),
MILLIONS
)
- unit = m2
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- query = V(energy_power_wind_turbine_coastal, number_of_units)
- unit = number
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- query =
PRODUCT(
DIVIDE(
Q(land_use_solar_wind_wind_coastal_land_use_per_unit),
MILLIONS
),
Q(land_use_solar_wind_wind_coastal_number_of_units)
)
- unit = km2
Loading

0 comments on commit dec7488

Please sign in to comment.