diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_solar_pv/land_use_solar_wind_battery_solar_pv_capacity_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_solar_pv/land_use_solar_wind_battery_solar_pv_capacity_per_unit.gql new file mode 100644 index 0000000000..d4fcd09b9d --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_solar_pv/land_use_solar_wind_battery_solar_pv_capacity_per_unit.gql @@ -0,0 +1,6 @@ +- query = + PRODUCT( + V(energy_battery_solar_pv_solar_radiation, electricity_output_capacity), + THOUSANDS + ) +- unit = kW \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_solar_pv/land_use_solar_wind_battery_solar_pv_electricity_output.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_solar_pv/land_use_solar_wind_battery_solar_pv_electricity_output.gql new file mode 100644 index 0000000000..d1b97ff364 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_solar_pv/land_use_solar_wind_battery_solar_pv_electricity_output.gql @@ -0,0 +1,9 @@ +- query = + DIVIDE( + V(energy_battery_solar_pv_solar_radiation, output_of_electricity), + PRODUCT( + MJ_PER_MWH, + THOUSANDS + ) + ) +- unit = GWh \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_solar_pv/land_use_solar_wind_battery_solar_pv_full_load_hours.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_solar_pv/land_use_solar_wind_battery_solar_pv_full_load_hours.gql new file mode 100644 index 0000000000..c024f3c90a --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_solar_pv/land_use_solar_wind_battery_solar_pv_full_load_hours.gql @@ -0,0 +1,2 @@ +- query = V(energy_battery_solar_pv_solar_radiation, full_load_hours) +- unit = hours \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_solar_pv/land_use_solar_wind_battery_solar_pv_installed_capacity.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_solar_pv/land_use_solar_wind_battery_solar_pv_installed_capacity.gql new file mode 100644 index 0000000000..c5406b979d --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_solar_pv/land_use_solar_wind_battery_solar_pv_installed_capacity.gql @@ -0,0 +1,2 @@ +- query = V(energy_battery_solar_pv_solar_radiation, 'electricity_output_capacity * number_of_units') +- unit = MW \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_solar_pv/land_use_solar_wind_battery_solar_pv_land_use_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_solar_pv/land_use_solar_wind_battery_solar_pv_land_use_per_unit.gql new file mode 100644 index 0000000000..7a55c1e695 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_solar_pv/land_use_solar_wind_battery_solar_pv_land_use_per_unit.gql @@ -0,0 +1,6 @@ +- query = + PRODUCT( + V(energy_battery_solar_pv_solar_radiation, land_use_per_unit), + MILLIONS + ) +- unit = m2 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_solar_pv/land_use_solar_wind_battery_solar_pv_number_of_units.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_solar_pv/land_use_solar_wind_battery_solar_pv_number_of_units.gql new file mode 100644 index 0000000000..4ca0e77e9c --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_solar_pv/land_use_solar_wind_battery_solar_pv_number_of_units.gql @@ -0,0 +1,2 @@ +- query = V(energy_battery_solar_pv_solar_radiation, number_of_units) +- unit = number \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_solar_pv/land_use_solar_wind_battery_solar_pv_total_land_use.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_solar_pv/land_use_solar_wind_battery_solar_pv_total_land_use.gql new file mode 100644 index 0000000000..e05560cdce --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_solar_pv/land_use_solar_wind_battery_solar_pv_total_land_use.gql @@ -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 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_wind_inland/land_use_solar_wind_battery_wind_inland_capacity_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_wind_inland/land_use_solar_wind_battery_wind_inland_capacity_per_unit.gql new file mode 100644 index 0000000000..7277e3b4ee --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_wind_inland/land_use_solar_wind_battery_wind_inland_capacity_per_unit.gql @@ -0,0 +1,6 @@ +- query = + PRODUCT( + V(energy_battery_wind_turbine_inland, electricity_output_capacity), + THOUSANDS + ) +- unit = kW \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_wind_inland/land_use_solar_wind_battery_wind_inland_electricity_output.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_wind_inland/land_use_solar_wind_battery_wind_inland_electricity_output.gql new file mode 100644 index 0000000000..f3ded338e4 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_wind_inland/land_use_solar_wind_battery_wind_inland_electricity_output.gql @@ -0,0 +1,9 @@ +- query = + DIVIDE( + V(energy_battery_wind_turbine_inland, output_of_electricity), + PRODUCT( + MJ_PER_MWH, + THOUSANDS + ) + ) +- unit = GWh \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_wind_inland/land_use_solar_wind_battery_wind_inland_full_load_hours.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_wind_inland/land_use_solar_wind_battery_wind_inland_full_load_hours.gql new file mode 100644 index 0000000000..69191bbe60 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_wind_inland/land_use_solar_wind_battery_wind_inland_full_load_hours.gql @@ -0,0 +1,2 @@ +- query = V(energy_battery_wind_turbine_inland, full_load_hours) +- unit = hours \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_wind_inland/land_use_solar_wind_battery_wind_inland_installed_capacity.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_wind_inland/land_use_solar_wind_battery_wind_inland_installed_capacity.gql new file mode 100644 index 0000000000..06f0319a32 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_wind_inland/land_use_solar_wind_battery_wind_inland_installed_capacity.gql @@ -0,0 +1,2 @@ +- query = V(energy_battery_wind_turbine_inland, 'electricity_output_capacity * number_of_units') +- unit = MW \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_wind_inland/land_use_solar_wind_battery_wind_inland_land_use_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_wind_inland/land_use_solar_wind_battery_wind_inland_land_use_per_unit.gql new file mode 100644 index 0000000000..ece2ca7bcf --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_wind_inland/land_use_solar_wind_battery_wind_inland_land_use_per_unit.gql @@ -0,0 +1,6 @@ +- query = + PRODUCT( + V(energy_battery_wind_turbine_inland, land_use_per_unit), + MILLIONS + ) +- unit = m2 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_wind_inland/land_use_solar_wind_battery_wind_inland_number_of_units.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_wind_inland/land_use_solar_wind_battery_wind_inland_number_of_units.gql new file mode 100644 index 0000000000..c2f68526cd --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_wind_inland/land_use_solar_wind_battery_wind_inland_number_of_units.gql @@ -0,0 +1,2 @@ +- query = V(energy_battery_wind_turbine_inland, number_of_units) +- unit = number \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_wind_inland/land_use_solar_wind_battery_wind_inland_total_land_use.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_wind_inland/land_use_solar_wind_battery_wind_inland_total_land_use.gql new file mode 100644 index 0000000000..58dec19a55 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/battery_wind_inland/land_use_solar_wind_battery_wind_inland_total_land_use.gql @@ -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 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/land_use_solar_wind_buildings_roof_surface_area_available.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/land_use_solar_wind_buildings_roof_surface_area_available.gql new file mode 100644 index 0000000000..4ef7d47f2e --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/land_use_solar_wind_buildings_roof_surface_area_available.gql @@ -0,0 +1,2 @@ +- query = AREA(buildings_roof_surface_available_for_pv) +- unit = km2 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/land_use_solar_wind_households_roof_surface_area_available.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/land_use_solar_wind_households_roof_surface_area_available.gql new file mode 100644 index 0000000000..ed6da20b0c --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/land_use_solar_wind_households_roof_surface_area_available.gql @@ -0,0 +1,3 @@ +- query = + AREA(residences_roof_surface_available_for_pv) +- unit = km2 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_buildings/land_use_solar_wind_solar_pv_buildings_capacity_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_buildings/land_use_solar_wind_solar_pv_buildings_capacity_per_unit.gql new file mode 100644 index 0000000000..009129c493 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_buildings/land_use_solar_wind_solar_pv_buildings_capacity_per_unit.gql @@ -0,0 +1,6 @@ +- query = + PRODUCT( + V(buildings_solar_pv_solar_radiation, electricity_output_capacity), + THOUSANDS + ) +- unit = kW \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_buildings/land_use_solar_wind_solar_pv_buildings_electricity_output.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_buildings/land_use_solar_wind_solar_pv_buildings_electricity_output.gql new file mode 100644 index 0000000000..1904535b17 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_buildings/land_use_solar_wind_solar_pv_buildings_electricity_output.gql @@ -0,0 +1,6 @@ +- query = + DIVIDE( + V(buildings_solar_pv_solar_radiation, output_of_electricity), + MJ_PER_MWH * THOUSANDS + ) +- unit = GWh \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_buildings/land_use_solar_wind_solar_pv_buildings_full_load_hours.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_buildings/land_use_solar_wind_solar_pv_buildings_full_load_hours.gql new file mode 100644 index 0000000000..6e58cc284d --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_buildings/land_use_solar_wind_solar_pv_buildings_full_load_hours.gql @@ -0,0 +1,2 @@ +- query = V(buildings_solar_pv_solar_radiation, full_load_hours) +- unit = hours \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_buildings/land_use_solar_wind_solar_pv_buildings_installed_capacity.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_buildings/land_use_solar_wind_solar_pv_buildings_installed_capacity.gql new file mode 100644 index 0000000000..e25d9f0443 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_buildings/land_use_solar_wind_solar_pv_buildings_installed_capacity.gql @@ -0,0 +1,2 @@ +- query = V(buildings_solar_pv_solar_radiation, 'electricity_output_capacity * number_of_units') +- unit = MW \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_buildings/land_use_solar_wind_solar_pv_buildings_land_use_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_buildings/land_use_solar_wind_solar_pv_buildings_land_use_per_unit.gql new file mode 100644 index 0000000000..0cc792ca05 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_buildings/land_use_solar_wind_solar_pv_buildings_land_use_per_unit.gql @@ -0,0 +1,6 @@ +- query = + PRODUCT( + V(buildings_solar_pv_solar_radiation, land_use_per_unit), + MILLIONS + ) +- unit = m2 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_buildings/land_use_solar_wind_solar_pv_buildings_number_of_units.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_buildings/land_use_solar_wind_solar_pv_buildings_number_of_units.gql new file mode 100644 index 0000000000..f476cb878d --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_buildings/land_use_solar_wind_solar_pv_buildings_number_of_units.gql @@ -0,0 +1,2 @@ +- query = V(buildings_solar_pv_solar_radiation, number_of_units) +- unit = number \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_buildings/land_use_solar_wind_solar_pv_buildings_total_land_use.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_buildings/land_use_solar_wind_solar_pv_buildings_total_land_use.gql new file mode 100644 index 0000000000..53a11a3d63 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_buildings/land_use_solar_wind_solar_pv_buildings_total_land_use.gql @@ -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 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_households/land_use_solar_wind_solar_pv_households_capacity_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_households/land_use_solar_wind_solar_pv_households_capacity_per_unit.gql new file mode 100644 index 0000000000..5b7739e9e4 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_households/land_use_solar_wind_solar_pv_households_capacity_per_unit.gql @@ -0,0 +1,6 @@ +- query = + PRODUCT( + V(households_solar_pv_solar_radiation, electricity_output_capacity), + THOUSANDS + ) +- unit = kW \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_households/land_use_solar_wind_solar_pv_households_electricity_output.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_households/land_use_solar_wind_solar_pv_households_electricity_output.gql new file mode 100644 index 0000000000..eb9265b72a --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_households/land_use_solar_wind_solar_pv_households_electricity_output.gql @@ -0,0 +1,6 @@ +- query = + DIVIDE( + V(households_solar_pv_solar_radiation, output_of_electricity), + MJ_PER_MWH * THOUSANDS + ) +- unit = GWh \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_households/land_use_solar_wind_solar_pv_households_full_load_hours.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_households/land_use_solar_wind_solar_pv_households_full_load_hours.gql new file mode 100644 index 0000000000..8cdef79653 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_households/land_use_solar_wind_solar_pv_households_full_load_hours.gql @@ -0,0 +1,2 @@ +- query = V(households_solar_pv_solar_radiation, full_load_hours) +- unit = hours \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_households/land_use_solar_wind_solar_pv_households_installed_capacity.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_households/land_use_solar_wind_solar_pv_households_installed_capacity.gql new file mode 100644 index 0000000000..989b9b6781 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_households/land_use_solar_wind_solar_pv_households_installed_capacity.gql @@ -0,0 +1,2 @@ +- query = V(households_solar_pv_solar_radiation, 'electricity_output_capacity * number_of_units') +- unit = MW \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_households/land_use_solar_wind_solar_pv_households_land_use_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_households/land_use_solar_wind_solar_pv_households_land_use_per_unit.gql new file mode 100644 index 0000000000..c2a2cfe195 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_households/land_use_solar_wind_solar_pv_households_land_use_per_unit.gql @@ -0,0 +1,6 @@ +- query = + PRODUCT( + V(households_solar_pv_solar_radiation, land_use_per_unit), + MILLIONS + ) +- unit = m2 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_households/land_use_solar_wind_solar_pv_households_number_of_units.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_households/land_use_solar_wind_solar_pv_households_number_of_units.gql new file mode 100644 index 0000000000..a9adb45786 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_households/land_use_solar_wind_solar_pv_households_number_of_units.gql @@ -0,0 +1,2 @@ +- query = V(households_solar_pv_solar_radiation, number_of_units) +- unit = number \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_households/land_use_solar_wind_solar_pv_households_total_land_use.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_households/land_use_solar_wind_solar_pv_households_total_land_use.gql new file mode 100644 index 0000000000..70d5be01b7 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_households/land_use_solar_wind_solar_pv_households_total_land_use.gql @@ -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 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_plants_onshore/land_use_solar_wind_solar_pv_plants_onshore_capacity_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_plants_onshore/land_use_solar_wind_solar_pv_plants_onshore_capacity_per_unit.gql new file mode 100644 index 0000000000..3f79c69d9c --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_plants_onshore/land_use_solar_wind_solar_pv_plants_onshore_capacity_per_unit.gql @@ -0,0 +1,6 @@ +- query = + PRODUCT( + V(energy_power_solar_pv_solar_radiation, electricity_output_capacity), + THOUSANDS + ) +- unit = kW \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_plants_onshore/land_use_solar_wind_solar_pv_plants_onshore_electricity_output.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_plants_onshore/land_use_solar_wind_solar_pv_plants_onshore_electricity_output.gql new file mode 100644 index 0000000000..8e38b492df --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_plants_onshore/land_use_solar_wind_solar_pv_plants_onshore_electricity_output.gql @@ -0,0 +1,6 @@ +- query = + DIVIDE( + V(energy_power_solar_pv_solar_radiation, output_of_electricity), + MJ_PER_MWH * THOUSANDS + ) +- unit = GWh \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_plants_onshore/land_use_solar_wind_solar_pv_plants_onshore_full_load_hours.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_plants_onshore/land_use_solar_wind_solar_pv_plants_onshore_full_load_hours.gql new file mode 100644 index 0000000000..1b3e7b13bb --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_plants_onshore/land_use_solar_wind_solar_pv_plants_onshore_full_load_hours.gql @@ -0,0 +1,2 @@ +- query = V(energy_power_solar_pv_solar_radiation, full_load_hours) +- unit = hours \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_plants_onshore/land_use_solar_wind_solar_pv_plants_onshore_installed_capacity.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_plants_onshore/land_use_solar_wind_solar_pv_plants_onshore_installed_capacity.gql new file mode 100644 index 0000000000..30dbb8b44d --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_plants_onshore/land_use_solar_wind_solar_pv_plants_onshore_installed_capacity.gql @@ -0,0 +1,2 @@ +- query = V(energy_power_solar_pv_solar_radiation, 'electricity_output_capacity * number_of_units') +- unit = MW \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_plants_onshore/land_use_solar_wind_solar_pv_plants_onshore_land_use_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_plants_onshore/land_use_solar_wind_solar_pv_plants_onshore_land_use_per_unit.gql new file mode 100644 index 0000000000..d6f112ef1b --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_plants_onshore/land_use_solar_wind_solar_pv_plants_onshore_land_use_per_unit.gql @@ -0,0 +1,6 @@ +- query = + PRODUCT( + V(energy_power_solar_pv_solar_radiation, land_use_per_unit), + MILLIONS + ) +- unit = m2 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_plants_onshore/land_use_solar_wind_solar_pv_plants_onshore_number_of_units.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_plants_onshore/land_use_solar_wind_solar_pv_plants_onshore_number_of_units.gql new file mode 100644 index 0000000000..33f67e1ef1 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_plants_onshore/land_use_solar_wind_solar_pv_plants_onshore_number_of_units.gql @@ -0,0 +1,2 @@ +- query = V(energy_power_solar_pv_solar_radiation, number_of_units) +- unit = number \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_plants_onshore/land_use_solar_wind_solar_pv_plants_onshore_total_land_use.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_plants_onshore/land_use_solar_wind_solar_pv_plants_onshore_total_land_use.gql new file mode 100644 index 0000000000..3b42328cad --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pv_plants_onshore/land_use_solar_wind_solar_pv_plants_onshore_total_land_use.gql @@ -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 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pvt_households/land_use_solar_wind_solar_pvt_households_capacity_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pvt_households/land_use_solar_wind_solar_pvt_households_capacity_per_unit.gql new file mode 100644 index 0000000000..f4f7c3a813 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pvt_households/land_use_solar_wind_solar_pvt_households_capacity_per_unit.gql @@ -0,0 +1,6 @@ +- query = + PRODUCT( + V(households_solar_pvt_solar_radiation, electricity_output_capacity), + THOUSANDS + ) +- unit = kW \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pvt_households/land_use_solar_wind_solar_pvt_households_electricity_output.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pvt_households/land_use_solar_wind_solar_pvt_households_electricity_output.gql new file mode 100644 index 0000000000..5d70b7e7fb --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pvt_households/land_use_solar_wind_solar_pvt_households_electricity_output.gql @@ -0,0 +1,6 @@ +- query = + DIVIDE( + V(households_solar_pvt_solar_radiation, output_of_electricity), + MJ_PER_MWH * THOUSANDS + ) +- unit = GWh \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pvt_households/land_use_solar_wind_solar_pvt_households_full_load_hours.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pvt_households/land_use_solar_wind_solar_pvt_households_full_load_hours.gql new file mode 100644 index 0000000000..fefa648946 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pvt_households/land_use_solar_wind_solar_pvt_households_full_load_hours.gql @@ -0,0 +1,2 @@ +- query = V(households_solar_pvt_solar_radiation, full_load_hours) +- unit = hours \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pvt_households/land_use_solar_wind_solar_pvt_households_installed_capacity.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pvt_households/land_use_solar_wind_solar_pvt_households_installed_capacity.gql new file mode 100644 index 0000000000..1b293480a6 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pvt_households/land_use_solar_wind_solar_pvt_households_installed_capacity.gql @@ -0,0 +1,2 @@ +- query = V(households_solar_pvt_solar_radiation, 'electricity_output_capacity * number_of_units') +- unit = MW \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pvt_households/land_use_solar_wind_solar_pvt_households_land_use_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pvt_households/land_use_solar_wind_solar_pvt_households_land_use_per_unit.gql new file mode 100644 index 0000000000..1ed27f4f53 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pvt_households/land_use_solar_wind_solar_pvt_households_land_use_per_unit.gql @@ -0,0 +1,6 @@ +- query = + PRODUCT( + V(households_solar_pvt_solar_radiation, land_use_per_unit), + MILLIONS + ) +- unit = m2 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pvt_households/land_use_solar_wind_solar_pvt_households_number_of_units.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pvt_households/land_use_solar_wind_solar_pvt_households_number_of_units.gql new file mode 100644 index 0000000000..c7efc2793e --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pvt_households/land_use_solar_wind_solar_pvt_households_number_of_units.gql @@ -0,0 +1,2 @@ +- query = V(households_solar_pvt_solar_radiation, number_of_units) +- unit = number \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pvt_households/land_use_solar_wind_solar_pvt_households_total_land_use.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pvt_households/land_use_solar_wind_solar_pvt_households_total_land_use.gql new file mode 100644 index 0000000000..238b8ea4fc --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_pvt_households/land_use_solar_wind_solar_pvt_households_total_land_use.gql @@ -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 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_thermal_buildings/land_use_solar_wind_solar_thermal_buildings_land_use_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_thermal_buildings/land_use_solar_wind_solar_thermal_buildings_land_use_per_unit.gql new file mode 100644 index 0000000000..3bc1e9e7d8 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_thermal_buildings/land_use_solar_wind_solar_thermal_buildings_land_use_per_unit.gql @@ -0,0 +1,6 @@ +- query = + PRODUCT( + V(buildings_space_heater_solar_thermal, land_use_per_unit), + MILLIONS + ) +- unit = m2 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_thermal_buildings/land_use_solar_wind_solar_thermal_buildings_number_of_units.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_thermal_buildings/land_use_solar_wind_solar_thermal_buildings_number_of_units.gql new file mode 100644 index 0000000000..3949ce01b5 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_thermal_buildings/land_use_solar_wind_solar_thermal_buildings_number_of_units.gql @@ -0,0 +1,2 @@ +- query = V(buildings_space_heater_solar_thermal, number_of_units) +- unit = number \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_thermal_buildings/land_use_solar_wind_solar_thermal_buildings_total_land_use.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_thermal_buildings/land_use_solar_wind_solar_thermal_buildings_total_land_use.gql new file mode 100644 index 0000000000..04099fc88e --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_thermal_buildings/land_use_solar_wind_solar_thermal_buildings_total_land_use.gql @@ -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 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_thermal_households/land_use_solar_wind_solar_thermal_households_land_use_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_thermal_households/land_use_solar_wind_solar_thermal_households_land_use_per_unit.gql new file mode 100644 index 0000000000..f9123704c7 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_thermal_households/land_use_solar_wind_solar_thermal_households_land_use_per_unit.gql @@ -0,0 +1,6 @@ +- query = + PRODUCT( + V(households_water_heater_solar_thermal, land_use_per_unit), + MILLIONS + ) +- unit = m2 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_thermal_households/land_use_solar_wind_solar_thermal_households_number_of_units.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_thermal_households/land_use_solar_wind_solar_thermal_households_number_of_units.gql new file mode 100644 index 0000000000..14b638d516 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_thermal_households/land_use_solar_wind_solar_thermal_households_number_of_units.gql @@ -0,0 +1,2 @@ +- query = V(households_water_heater_solar_thermal, number_of_units) +- unit = number \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_thermal_households/land_use_solar_wind_solar_thermal_households_total_land_use.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_thermal_households/land_use_solar_wind_solar_thermal_households_total_land_use.gql new file mode 100644 index 0000000000..ffb5a8d5a0 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/solar_thermal_households/land_use_solar_wind_solar_thermal_households_total_land_use.gql @@ -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 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_coastal/land_use_solar_wind_wind_coastal_capacity_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_coastal/land_use_solar_wind_wind_coastal_capacity_per_unit.gql new file mode 100644 index 0000000000..95f2befc0f --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_coastal/land_use_solar_wind_wind_coastal_capacity_per_unit.gql @@ -0,0 +1,6 @@ +- query = + PRODUCT( + V(energy_power_wind_turbine_coastal, electricity_output_capacity), + THOUSANDS + ) +- unit = kW \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_coastal/land_use_solar_wind_wind_coastal_electricity_output.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_coastal/land_use_solar_wind_wind_coastal_electricity_output.gql new file mode 100644 index 0000000000..fbd5f1733c --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_coastal/land_use_solar_wind_wind_coastal_electricity_output.gql @@ -0,0 +1,9 @@ +- query = + DIVIDE( + V(energy_power_wind_turbine_coastal, output_of_electricity), + PRODUCT( + MJ_PER_MWH, + THOUSANDS + ) + ) +- unit = GWh \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_coastal/land_use_solar_wind_wind_coastal_full_load_hours.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_coastal/land_use_solar_wind_wind_coastal_full_load_hours.gql new file mode 100644 index 0000000000..af49159258 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_coastal/land_use_solar_wind_wind_coastal_full_load_hours.gql @@ -0,0 +1,2 @@ +- query = V(energy_power_wind_turbine_coastal, full_load_hours) +- unit = hours \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_coastal/land_use_solar_wind_wind_coastal_installed_capacity.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_coastal/land_use_solar_wind_wind_coastal_installed_capacity.gql new file mode 100644 index 0000000000..d5bcc70837 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_coastal/land_use_solar_wind_wind_coastal_installed_capacity.gql @@ -0,0 +1,2 @@ +- query = V(energy_power_wind_turbine_coastal, 'electricity_output_capacity * number_of_units') +- unit = MW \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_coastal/land_use_solar_wind_wind_coastal_land_use_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_coastal/land_use_solar_wind_wind_coastal_land_use_per_unit.gql new file mode 100644 index 0000000000..dbc0663cdf --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_coastal/land_use_solar_wind_wind_coastal_land_use_per_unit.gql @@ -0,0 +1,6 @@ +- query = + PRODUCT( + V(energy_power_wind_turbine_coastal, land_use_per_unit), + MILLIONS + ) +- unit = m2 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_coastal/land_use_solar_wind_wind_coastal_number_of_units.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_coastal/land_use_solar_wind_wind_coastal_number_of_units.gql new file mode 100644 index 0000000000..ced1148e30 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_coastal/land_use_solar_wind_wind_coastal_number_of_units.gql @@ -0,0 +1,2 @@ +- query = V(energy_power_wind_turbine_coastal, number_of_units) +- unit = number \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_coastal/land_use_solar_wind_wind_coastal_total_land_use.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_coastal/land_use_solar_wind_wind_coastal_total_land_use.gql new file mode 100644 index 0000000000..c10dff9afd --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_coastal/land_use_solar_wind_wind_coastal_total_land_use.gql @@ -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 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_capacity_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_capacity_per_unit.gql new file mode 100644 index 0000000000..e6bf31671c --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_capacity_per_unit.gql @@ -0,0 +1,6 @@ +- query = + PRODUCT( + V(energy_power_wind_turbine_inland, electricity_output_capacity), + THOUSANDS + ) +- unit = kW \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_electricity_output.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_electricity_output.gql new file mode 100644 index 0000000000..0237171e2b --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_electricity_output.gql @@ -0,0 +1,12 @@ +- query = + DIVIDE( + PRODUCT( + V(energy_power_wind_turbine_inland, output_of_electricity), + DIVIDE( + Q(land_use_solar_wind_wind_inland_large_electricity_output_share), + 100.0 + ) + ), + MJ_PER_MWH * THOUSANDS + ) +- unit = GWh diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_electricity_output_share.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_electricity_output_share.gql new file mode 100644 index 0000000000..7daafb186a --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_electricity_output_share.gql @@ -0,0 +1,2 @@ +- query = INPUT_VALUE(land_use_impact_visual_wind_inland_large_scale) +- unit = % \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_full_load_hours.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_full_load_hours.gql new file mode 100644 index 0000000000..91af562fbd --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_full_load_hours.gql @@ -0,0 +1,2 @@ +- query = V(energy_power_wind_turbine_inland, full_load_hours) +- unit = hours \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_installed_capacity.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_installed_capacity.gql new file mode 100644 index 0000000000..79c83210f0 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_installed_capacity.gql @@ -0,0 +1,9 @@ +- query = + DIVIDE( + PRODUCT( + Q(land_use_solar_wind_wind_inland_large_electricity_output), + THOUSANDS + ), + Q(land_use_solar_wind_wind_inland_large_full_load_hours) + ) +- unit = MW \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_land_use_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_land_use_per_unit.gql new file mode 100644 index 0000000000..0eca58db48 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_land_use_per_unit.gql @@ -0,0 +1,6 @@ +- query = + PRODUCT( + V(energy_power_wind_turbine_inland, land_use_per_unit), + MILLIONS + ) +- unit = m2 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_number_of_units.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_number_of_units.gql new file mode 100644 index 0000000000..0bd7f06a7a --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_number_of_units.gql @@ -0,0 +1,9 @@ +- query = + DIVIDE( + Q(land_use_solar_wind_wind_inland_large_installed_capacity), + DIVIDE( + Q(land_use_solar_wind_wind_inland_large_capacity_per_unit), + THOUSANDS + ) + ) +- unit = number \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_total_land_use.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_total_land_use.gql new file mode 100644 index 0000000000..8d570554b7 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_large/land_use_solar_wind_wind_inland_large_total_land_use.gql @@ -0,0 +1,9 @@ +- query = + PRODUCT( + DIVIDE( + Q(land_use_solar_wind_wind_inland_large_land_use_per_unit), + MILLIONS + ), + Q(land_use_solar_wind_wind_inland_large_number_of_units) + ) +- unit = km2 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_capacity_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_capacity_per_unit.gql new file mode 100644 index 0000000000..e20b4c27f5 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_capacity_per_unit.gql @@ -0,0 +1,5 @@ +# A typical small-scale wind turbine is assumed to have 15 kW capacity +# Source: based on EAZ as mentioned in this source on p. 12: https://refman.energytransitionmodel.com/publications/2187 + +- query = 15 +- unit = kW \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_electricity_output.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_electricity_output.gql new file mode 100644 index 0000000000..f6fbfd31e7 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_electricity_output.gql @@ -0,0 +1,12 @@ +- query = + DIVIDE( + PRODUCT( + V(energy_power_wind_turbine_inland, output_of_electricity), + DIVIDE( + Q(land_use_solar_wind_wind_inland_small_electricity_output_share), + 100.0 + ) + ), + MJ_PER_MWH * THOUSANDS + ) +- unit = GWh \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_electricity_output_share.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_electricity_output_share.gql new file mode 100644 index 0000000000..e0f1a689bb --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_electricity_output_share.gql @@ -0,0 +1,2 @@ +- query = INPUT_VALUE(land_use_impact_visual_wind_inland_small_scale) +- unit = % \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_full_load_hours.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_full_load_hours.gql new file mode 100644 index 0000000000..9a1f0e9286 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_full_load_hours.gql @@ -0,0 +1,5 @@ +# For lack of better measurement-based data, +# a small-scale wind turbine is assumed to have the same number of full load hours as a large-scale wind turbine. + +- query = V(energy_power_wind_turbine_inland, full_load_hours) +- unit = hours \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_installed_capacity.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_installed_capacity.gql new file mode 100644 index 0000000000..27e3b0babf --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_installed_capacity.gql @@ -0,0 +1,9 @@ +- query = + DIVIDE( + PRODUCT( + Q(land_use_solar_wind_wind_inland_small_electricity_output), + THOUSANDS + ), + Q(land_use_solar_wind_wind_inland_small_full_load_hours) + ) +- unit = MW \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_land_use_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_land_use_per_unit.gql new file mode 100644 index 0000000000..acc4d08a8d --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_land_use_per_unit.gql @@ -0,0 +1,8 @@ +# Land use per unit is calculated based on a rotor diameter of 12 m +# and a separating distance of 5x the rotor diameter (square area) +# Sources: +# Rotor diameter: based on EAZ as mentioned in this source on p. 12: https://refman.energytransitionmodel.com/publications/2187 +# Separating distance: https://refman.energytransitionmodel.com/publications/2186, p. 10 + +- query = (12.0 * 5.0)**2 +- unit = m2 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_number_of_units.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_number_of_units.gql new file mode 100644 index 0000000000..ab9bdc0c32 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_number_of_units.gql @@ -0,0 +1,9 @@ +- query = + DIVIDE( + Q(land_use_solar_wind_wind_inland_small_installed_capacity), + DIVIDE( + Q(land_use_solar_wind_wind_inland_small_capacity_per_unit), + THOUSANDS + ) + ) +- unit = number \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_total_land_use.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_total_land_use.gql new file mode 100644 index 0000000000..8cdb02de10 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_inland_small/land_use_solar_wind_wind_inland_small_total_land_use.gql @@ -0,0 +1,9 @@ +- query = + PRODUCT( + DIVIDE( + Q(land_use_solar_wind_wind_inland_small_land_use_per_unit), + MILLIONS + ), + Q(land_use_solar_wind_wind_inland_small_number_of_units) + ) +- unit = km2 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_offshore/land_use_solar_wind_wind_offshore_capacity_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_offshore/land_use_solar_wind_wind_offshore_capacity_per_unit.gql new file mode 100644 index 0000000000..32f435955d --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_offshore/land_use_solar_wind_wind_offshore_capacity_per_unit.gql @@ -0,0 +1,6 @@ +- query = + PRODUCT( + V(energy_power_wind_turbine_offshore, electricity_output_capacity), + THOUSANDS + ) +- unit = kW \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_offshore/land_use_solar_wind_wind_offshore_electricity_output.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_offshore/land_use_solar_wind_wind_offshore_electricity_output.gql new file mode 100644 index 0000000000..416a69e15e --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_offshore/land_use_solar_wind_wind_offshore_electricity_output.gql @@ -0,0 +1,9 @@ +- query = + DIVIDE( + V(energy_power_wind_turbine_offshore, output_of_electricity), + PRODUCT( + MJ_PER_MWH, + THOUSANDS + ) + ) +- unit = GWh \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_offshore/land_use_solar_wind_wind_offshore_full_load_hours.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_offshore/land_use_solar_wind_wind_offshore_full_load_hours.gql new file mode 100644 index 0000000000..d27a47194a --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_offshore/land_use_solar_wind_wind_offshore_full_load_hours.gql @@ -0,0 +1,2 @@ +- query = V(energy_power_wind_turbine_offshore, full_load_hours) +- unit = hours \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_offshore/land_use_solar_wind_wind_offshore_installed_capacity.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_offshore/land_use_solar_wind_wind_offshore_installed_capacity.gql new file mode 100644 index 0000000000..3ec64cc566 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_offshore/land_use_solar_wind_wind_offshore_installed_capacity.gql @@ -0,0 +1,2 @@ +- query = V(energy_power_wind_turbine_offshore, 'electricity_output_capacity * number_of_units') +- unit = MW \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_offshore/land_use_solar_wind_wind_offshore_land_use_per_unit.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_offshore/land_use_solar_wind_wind_offshore_land_use_per_unit.gql new file mode 100644 index 0000000000..66c52a63e6 --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_offshore/land_use_solar_wind_wind_offshore_land_use_per_unit.gql @@ -0,0 +1,6 @@ +- query = + PRODUCT( + V(energy_power_wind_turbine_offshore, land_use_per_unit), + MILLIONS + ) +- unit = m2 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_offshore/land_use_solar_wind_wind_offshore_number_of_units.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_offshore/land_use_solar_wind_wind_offshore_number_of_units.gql new file mode 100644 index 0000000000..a5a2361d0d --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_offshore/land_use_solar_wind_wind_offshore_number_of_units.gql @@ -0,0 +1,2 @@ +- query = V(energy_power_wind_turbine_offshore, number_of_units) +- unit = number \ No newline at end of file diff --git a/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_offshore/land_use_solar_wind_wind_offshore_total_land_use.gql b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_offshore/land_use_solar_wind_wind_offshore_total_land_use.gql new file mode 100644 index 0000000000..0e5774335b --- /dev/null +++ b/gqueries/output_elements/output_series/table_260_land_use_solar_wind/wind_offshore/land_use_solar_wind_wind_offshore_total_land_use.gql @@ -0,0 +1,9 @@ +- query = + PRODUCT( + DIVIDE( + Q(land_use_solar_wind_wind_offshore_land_use_per_unit), + MILLIONS + ), + Q(land_use_solar_wind_wind_offshore_number_of_units) + ) +- unit = km2 \ No newline at end of file diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_5_roof_top_for_pv_in_households/solar_thermal_heaters_in_roof_area_for_pv_in_households.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_5_roof_top_for_pv_in_households/solar_thermal_heaters_in_roof_area_for_pv_in_households.gql index 893f52c18b..c5cc1cc832 100644 --- a/gqueries/output_elements/output_series/vertical_stacked_bar_5_roof_top_for_pv_in_households/solar_thermal_heaters_in_roof_area_for_pv_in_households.gql +++ b/gqueries/output_elements/output_series/vertical_stacked_bar_5_roof_top_for_pv_in_households/solar_thermal_heaters_in_roof_area_for_pv_in_households.gql @@ -3,5 +3,5 @@ - query = PRODUCT( V(households_water_heater_solar_thermal,number_of_units), - V(households_solar_pvt_solar_radiation,land_use_per_unit) + V(households_water_heater_solar_thermal,land_use_per_unit) ) diff --git a/graphs/energy/edges/buildings/buildings_solar_pv_solar_radiation-buildings_local_production_electricity@electricity.ad b/graphs/energy/edges/buildings/buildings_solar_pv_solar_radiation-buildings_local_production_electricity@electricity.ad index 95585ec3c1..6e18d46630 100644 --- a/graphs/energy/edges/buildings/buildings_solar_pv_solar_radiation-buildings_local_production_electricity@electricity.ad +++ b/graphs/energy/edges/buildings/buildings_solar_pv_solar_radiation-buildings_local_production_electricity@electricity.ad @@ -1,2 +1,2 @@ -- type = constant -- reversed = false +- type = share +- reversed = true diff --git a/graphs/energy/edges/households/households_solar_pv_solar_radiation-households_locally_available_electricity@electricity.ad b/graphs/energy/edges/households/households_solar_pv_solar_radiation-households_locally_available_electricity@electricity.ad index 95585ec3c1..6e18d46630 100644 --- a/graphs/energy/edges/households/households_solar_pv_solar_radiation-households_locally_available_electricity@electricity.ad +++ b/graphs/energy/edges/households/households_solar_pv_solar_radiation-households_locally_available_electricity@electricity.ad @@ -1,2 +1,2 @@ -- type = constant -- reversed = false +- type = share +- reversed = true diff --git a/graphs/energy/nodes/buildings/buildings_solar_pv_solar_radiation.ad b/graphs/energy/nodes/buildings/buildings_solar_pv_solar_radiation.ad index a4153c7027..1797772839 100644 --- a/graphs/energy/nodes/buildings/buildings_solar_pv_solar_radiation.ad +++ b/graphs/energy/nodes/buildings/buildings_solar_pv_solar_radiation.ad @@ -1,6 +1,6 @@ - output.electricity = 0.17 - output.loss = elastic -- groups = [electricity_production, primary_energy_demand, sustainable_production, volatile_production, lv_net_supply, wacc_proven_tech, costs_building_and_installations_buildings] +- groups = [electricity_production, primary_energy_demand, sustainable_production, volatile_production, lv_net_supply, wacc_proven_tech, costs_building_and_installations_buildings, preset_demand] - use = energetic - presentation_group = solar_panel - graph_methods = [demand, full_load_hours] @@ -21,19 +21,11 @@ - merit_order.subtype = volatile - merit_order.type = producer - electricity_output_capacity = 0.00027200000000000005 -- forecasting_error = 0.05 - free_co2_factor = 0.0 - heat_output_capacity = 0.0 - land_use_per_unit = 1.6000000000000001e-06 -- part_load_efficiency_penalty = 0.1 -- part_load_operating_point = 0.7 - sustainability_share = 1.0 - takes_part_in_ets = 0.0 -- hours_maint_nl = 0.33 -- hours_place_nl = 16.67 -- hours_prep_nl = 0.0 -- hours_prod_nl = 0.0 -- hours_remov_nl = 0.0 ~ demand = CENTRAL_PRODUCTION(buildings_solar_pv_solar_radiation, demand) ~ full_load_hours = CENTRAL_PRODUCTION(buildings_solar_pv_solar_radiation, full_load_hours) diff --git a/graphs/energy/nodes/buildings/buildings_space_heater_solar_thermal.ad b/graphs/energy/nodes/buildings/buildings_space_heater_solar_thermal.ad index 48823aef69..9619c344a7 100644 --- a/graphs/energy/nodes/buildings/buildings_space_heater_solar_thermal.ad +++ b/graphs/energy/nodes/buildings/buildings_space_heater_solar_thermal.ad @@ -4,19 +4,22 @@ - use = energetic - presentation_group = traditional_heat - availability = 0.0 -- full_load_hours = 791.666666666667 +- full_load_hours = 600.0 - ccs_investment = 0.0 - construction_time = 0.0 - cost_of_installing = 0.0 - decommissioning_costs = 0.0 -- fixed_operation_and_maintenance_costs_per_year = 1837.5 -- initial_investment = 144375.0 -- technical_lifetime = 20.0 +- fixed_operation_and_maintenance_costs_per_year = 20.0 +- initial_investment = 600.0 +- technical_lifetime = 25.0 - variable_operation_and_maintenance_costs_for_ccs_per_full_load_hour = 0.0 - variable_operation_and_maintenance_costs_per_full_load_hour = 0.0 - wacc = 0.04 - energy_balance_group = technologies - electricity_output_capacity = 0.0 - free_co2_factor = 0.0 -- heat_output_capacity = 0.175 +- heat_output_capacity = 0.0011 +- land_use_per_unit = 1.62e-06 +- part_load_efficiency_penalty = 0.0 +- part_load_operating_point = 0.0 - takes_part_in_ets = 0.0 diff --git a/graphs/energy/nodes/households/households_solar_pv_solar_radiation.ad b/graphs/energy/nodes/households/households_solar_pv_solar_radiation.ad index 997df5dcce..f4899c2e75 100644 --- a/graphs/energy/nodes/households/households_solar_pv_solar_radiation.ad +++ b/graphs/energy/nodes/households/households_solar_pv_solar_radiation.ad @@ -1,6 +1,6 @@ - output.electricity = 0.17 - output.loss = elastic -- groups = [electricity_production, primary_energy_demand, sustainable_production, volatile_production, lv_net_supply, wacc_households, costs_building_and_installations_households] +- groups = [electricity_production, primary_energy_demand, sustainable_production, volatile_production, lv_net_supply, wacc_households, costs_building_and_installations_households, preset_demand] - use = energetic - presentation_group = solar_panel - graph_methods = [demand, full_load_hours] @@ -21,19 +21,11 @@ - merit_order.subtype = volatile - merit_order.type = producer - electricity_output_capacity = 0.000272 -- forecasting_error = 0.05 - free_co2_factor = 0.0 - heat_output_capacity = 0.0 - land_use_per_unit = 1.6000000000000001e-06 -- part_load_efficiency_penalty = 0.1 -- part_load_operating_point = 0.7 - sustainability_share = 1.0 - takes_part_in_ets = 0.0 -- hours_maint_nl = 0.33 -- hours_place_nl = 16.67 -- hours_prep_nl = 0.0 -- hours_prod_nl = 0.0 -- hours_remov_nl = 0.0 ~ demand = CENTRAL_PRODUCTION(households_solar_pv_solar_radiation, demand) ~ full_load_hours = CENTRAL_PRODUCTION(households_solar_pv_solar_radiation, full_load_hours) diff --git a/graphs/energy/nodes/households/households_water_heater_solar_thermal.converter.ad b/graphs/energy/nodes/households/households_water_heater_solar_thermal.converter.ad index f237f399dd..a6c861e0b2 100644 --- a/graphs/energy/nodes/households/households_water_heater_solar_thermal.converter.ad +++ b/graphs/energy/nodes/households/households_water_heater_solar_thermal.converter.ad @@ -1,23 +1,27 @@ +- input.solar_thermal = 1.0 - output.loss = elastic -- output.useable_heat = 1.0 +- output.useable_heat = 0.48 - groups = [heat_production, application_group, wacc_households, costs_building_and_installations_households] - use = energetic - presentation_group = traditional_heat - availability = 0.0 -- full_load_hours = 791.666666666667 +- full_load_hours = 600.0 - ccs_investment = 0.0 - construction_time = 0.0 - cost_of_installing = 0.0 - decommissioning_costs = 0.0 -- fixed_operation_and_maintenance_costs_per_year = 14.7 -- initial_investment = 1155.0 -- technical_lifetime = 20.0 +- fixed_operation_and_maintenance_costs_per_year = 20.0 +- initial_investment = 600.0 +- technical_lifetime = 25.0 - variable_operation_and_maintenance_costs_for_ccs_per_full_load_hour = 0.0 - variable_operation_and_maintenance_costs_per_full_load_hour = 0.0 - wacc = 0.02 - energy_balance_group = preferred technologies - electricity_output_capacity = 0.0 - free_co2_factor = 0.0 -- heat_output_capacity = 0.0014 +- heat_output_capacity = 0.0011 - households_supplied_per_unit = 0.0 +- land_use_per_unit = 1.62e-06 +- part_load_efficiency_penalty = 0.0 +- part_load_operating_point = 0.0 - takes_part_in_ets = 0.0 diff --git a/inputs/demand/buildings/buildings_misc/buildings_solar_pv_solar_radiation_market_penetration.ad b/inputs/demand/buildings/buildings_misc/buildings_solar_pv_solar_radiation_market_penetration.ad deleted file mode 100644 index bf126197b2..0000000000 --- a/inputs/demand/buildings/buildings_misc/buildings_solar_pv_solar_radiation_market_penetration.ad +++ /dev/null @@ -1,17 +0,0 @@ -- query = - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(buildings_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (USER_INPUT() / 100.0) * - (AREA(buildings_roof_surface_available_for_pv) / V(buildings_solar_pv_solar_radiation, land_use_per_unit)) * - V(buildings_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) -- priority = 0 -- max_value = 100.0 -- min_value = 0.0 -- start_value_gql = present:DIVIDE(V(buildings_solar_pv_solar_radiation,output_of_electricity),Q(buildings_potential_electricity_production_of_solar_roof_pv)) * 100 -- step_value = 0.1 -- unit = % -- update_period = future diff --git a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_future.ad b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_future.ad index 6162fae121..8f0e6296d1 100644 --- a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_future.ad +++ b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_future.ad @@ -33,16 +33,7 @@ UPDATE(AREA(), buildings_roof_surface_available_for_pv, roof_surface_for_pv_future), UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future_after_solar_thermal), number_of_units, USER_INPUT()), - UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future_after_solar_thermal), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_buildings_future)})), - UPDATE_ABSOLUTE( - V(OUTPUT_SLOTS(LOOKUP(buildings_solar_pv_solar_radiation), electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - ((INPUT_VALUE(buildings_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(buildings_roof_surface_available_for_pv) }) / V(buildings_solar_pv_solar_radiation, land_use_per_unit)) * - V(buildings_solar_pv_solar_radiation, typical_electricity_production_per_unit)) - ) - ) + UPDATE(V(buildings_useful_demand_for_space_heating_buildings_future_after_solar_thermal), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_buildings_future)})) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_buildings) diff --git a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_present.ad b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_present.ad index ee259f5f90..ba0e0abde5 100644 --- a/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_present.ad +++ b/inputs/demand/buildings/buildings_number/buildings_number_of_buildings_present.ad @@ -37,16 +37,7 @@ UPDATE(AREA(), buildings_roof_surface_available_for_pv, roof_surface_for_pv_future), UPDATE(V(buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal), number_of_units, USER_INPUT()), - UPDATE(V(buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_buildings_present)})), - UPDATE_ABSOLUTE( - V(OUTPUT_SLOTS(LOOKUP(buildings_solar_pv_solar_radiation), electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - ((INPUT_VALUE(buildings_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(buildings_roof_surface_available_for_pv) }) / V(buildings_solar_pv_solar_radiation, land_use_per_unit)) * - V(buildings_solar_pv_solar_radiation, typical_electricity_production_per_unit)) - ) - ) + UPDATE(V(buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_buildings_present)})) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_buildings) diff --git a/inputs/demand/households/households_misc/households_solar_pv_solar_radiation_market_penetration.ad b/inputs/demand/households/households_misc/households_solar_pv_solar_radiation_market_penetration.ad deleted file mode 100644 index aee0c37b32..0000000000 --- a/inputs/demand/households/households_misc/households_solar_pv_solar_radiation_market_penetration.ad +++ /dev/null @@ -1,17 +0,0 @@ -- query = - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (USER_INPUT() / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) -- priority = 0 -- max_value = 100.0 -- min_value = 0.0 -- start_value_gql = present:DIVIDE(V(households_solar_pv_solar_radiation,output_of_electricity),Q(households_potential_electricity_production_of_solar_roof_pv)) * 100 -- step_value = 0.1 -- unit = % -- update_period = future diff --git a/inputs/demand/households/households_number/households_number_of_apartments_1945_1964.ad b/inputs/demand/households/households_number/households_number_of_apartments_1945_1964.ad index 8aa84a06be..06d4b94cca 100644 --- a/inputs/demand/households/households_number/households_number_of_apartments_1945_1964.ad +++ b/inputs/demand/households/households_number/households_number_of_apartments_1945_1964.ad @@ -59,16 +59,7 @@ UPDATE(V(households_useful_demand_for_space_heating_apartments_1945_1964), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_apartments_1945_1964), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_1945_1964)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_apartments_1945_1964) diff --git a/inputs/demand/households/households_number/households_number_of_apartments_1965_1984.ad b/inputs/demand/households/households_number/households_number_of_apartments_1965_1984.ad index ec53ceb27c..8e5140d7d9 100644 --- a/inputs/demand/households/households_number/households_number_of_apartments_1965_1984.ad +++ b/inputs/demand/households/households_number/households_number_of_apartments_1965_1984.ad @@ -59,16 +59,7 @@ UPDATE(V(households_useful_demand_for_space_heating_apartments_1965_1984), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_apartments_1965_1984), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_1965_1984)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_apartments_1965_1984) diff --git a/inputs/demand/households/households_number/households_number_of_apartments_1985_2004.ad b/inputs/demand/households/households_number/households_number_of_apartments_1985_2004.ad index 609142693e..e1b064202c 100644 --- a/inputs/demand/households/households_number/households_number_of_apartments_1985_2004.ad +++ b/inputs/demand/households/households_number/households_number_of_apartments_1985_2004.ad @@ -59,16 +59,7 @@ UPDATE(V(households_useful_demand_for_space_heating_apartments_1985_2004), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_apartments_1985_2004), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_1985_2004)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_apartments_1985_2004) diff --git a/inputs/demand/households/households_number/households_number_of_apartments_2005_present.ad b/inputs/demand/households/households_number/households_number_of_apartments_2005_present.ad index 0a10d24fc0..858ea284c5 100644 --- a/inputs/demand/households/households_number/households_number_of_apartments_2005_present.ad +++ b/inputs/demand/households/households_number/households_number_of_apartments_2005_present.ad @@ -59,16 +59,7 @@ UPDATE(V(households_useful_demand_for_space_heating_apartments_2005_present), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_apartments_2005_present), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_2005_present)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_apartments_2005_present) diff --git a/inputs/demand/households/households_number/households_number_of_apartments_before_1945.ad b/inputs/demand/households/households_number/households_number_of_apartments_before_1945.ad index fe520e46a5..b5d45df19c 100644 --- a/inputs/demand/households/households_number/households_number_of_apartments_before_1945.ad +++ b/inputs/demand/households/households_number/households_number_of_apartments_before_1945.ad @@ -59,16 +59,7 @@ UPDATE(V(households_useful_demand_for_space_heating_apartments_before_1945), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_apartments_before_1945), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_before_1945)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_apartments_before_1945) diff --git a/inputs/demand/households/households_number/households_number_of_apartments_future.ad b/inputs/demand/households/households_number/households_number_of_apartments_future.ad index 6e03483caf..af9db9e35a 100644 --- a/inputs/demand/households/households_number/households_number_of_apartments_future.ad +++ b/inputs/demand/households/households_number/households_number_of_apartments_future.ad @@ -55,16 +55,7 @@ UPDATE(V(households_useful_demand_for_space_heating_apartments_future), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_apartments_future), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_apartments_future)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(QUERY_FUTURE(-> { Q(number_of_residences)}), DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, QUERY_FUTURE(-> { Q(number_of_residences)})), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, QUERY_FUTURE(-> { Q(number_of_residences)})) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_residences) diff --git a/inputs/demand/households/households_number/households_number_of_detached_houses_1945_1964.ad b/inputs/demand/households/households_number/households_number_of_detached_houses_1945_1964.ad index 9d2d95209d..69a5f76317 100644 --- a/inputs/demand/households/households_number/households_number_of_detached_houses_1945_1964.ad +++ b/inputs/demand/households/households_number/households_number_of_detached_houses_1945_1964.ad @@ -59,16 +59,7 @@ UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1945_1964), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1945_1964), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_1945_1964)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_detached_houses_1945_1964) diff --git a/inputs/demand/households/households_number/households_number_of_detached_houses_1965_1984.ad b/inputs/demand/households/households_number/households_number_of_detached_houses_1965_1984.ad index 61a1becf25..c4abb3d540 100644 --- a/inputs/demand/households/households_number/households_number_of_detached_houses_1965_1984.ad +++ b/inputs/demand/households/households_number/households_number_of_detached_houses_1965_1984.ad @@ -59,16 +59,7 @@ UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1965_1984), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1965_1984), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_1965_1984)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_detached_houses_1965_1984) diff --git a/inputs/demand/households/households_number/households_number_of_detached_houses_1985_2004.ad b/inputs/demand/households/households_number/households_number_of_detached_houses_1985_2004.ad index 207e57b836..f9e5d8775a 100644 --- a/inputs/demand/households/households_number/households_number_of_detached_houses_1985_2004.ad +++ b/inputs/demand/households/households_number/households_number_of_detached_houses_1985_2004.ad @@ -59,16 +59,7 @@ UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1985_2004), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_detached_houses_1985_2004), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_1985_2004)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_detached_houses_1985_2004) diff --git a/inputs/demand/households/households_number/households_number_of_detached_houses_2005_present.ad b/inputs/demand/households/households_number/households_number_of_detached_houses_2005_present.ad index 1ee024ff06..5b7505ac04 100644 --- a/inputs/demand/households/households_number/households_number_of_detached_houses_2005_present.ad +++ b/inputs/demand/households/households_number/households_number_of_detached_houses_2005_present.ad @@ -59,16 +59,7 @@ UPDATE(V(households_useful_demand_for_space_heating_detached_houses_2005_present), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_detached_houses_2005_present), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_2005_present)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_detached_houses_2005_present) diff --git a/inputs/demand/households/households_number/households_number_of_detached_houses_before_1945.ad b/inputs/demand/households/households_number/households_number_of_detached_houses_before_1945.ad index df01601422..22d1fd7f8d 100644 --- a/inputs/demand/households/households_number/households_number_of_detached_houses_before_1945.ad +++ b/inputs/demand/households/households_number/households_number_of_detached_houses_before_1945.ad @@ -59,16 +59,7 @@ UPDATE(V(households_useful_demand_for_space_heating_detached_houses_before_1945), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_detached_houses_before_1945), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_before_1945)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_detached_houses_before_1945) diff --git a/inputs/demand/households/households_number/households_number_of_detached_houses_future.ad b/inputs/demand/households/households_number/households_number_of_detached_houses_future.ad index 473427dab1..aa710c1519 100644 --- a/inputs/demand/households/households_number/households_number_of_detached_houses_future.ad +++ b/inputs/demand/households/households_number/households_number_of_detached_houses_future.ad @@ -55,16 +55,7 @@ UPDATE(V(households_useful_demand_for_space_heating_detached_houses_future), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_detached_houses_future), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_detached_houses_future)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(QUERY_FUTURE(-> { Q(number_of_residences)}), DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, QUERY_FUTURE(-> { Q(number_of_residences)})), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, QUERY_FUTURE(-> { Q(number_of_residences)})) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_residences) diff --git a/inputs/demand/households/households_number/households_number_of_semi_detached_houses_1945_1964.ad b/inputs/demand/households/households_number/households_number_of_semi_detached_houses_1945_1964.ad index 36ebb01e51..f0e2537565 100644 --- a/inputs/demand/households/households_number/households_number_of_semi_detached_houses_1945_1964.ad +++ b/inputs/demand/households/households_number/households_number_of_semi_detached_houses_1945_1964.ad @@ -59,16 +59,7 @@ UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1945_1964), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_1945_1964)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_semi_detached_houses_1945_1964) diff --git a/inputs/demand/households/households_number/households_number_of_semi_detached_houses_1965_1984.ad b/inputs/demand/households/households_number/households_number_of_semi_detached_houses_1965_1984.ad index 0622ec7e9d..6fbd47da6e 100644 --- a/inputs/demand/households/households_number/households_number_of_semi_detached_houses_1965_1984.ad +++ b/inputs/demand/households/households_number/households_number_of_semi_detached_houses_1965_1984.ad @@ -59,16 +59,7 @@ UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1965_1984), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_1965_1984)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_semi_detached_houses_1965_1984) diff --git a/inputs/demand/households/households_number/households_number_of_semi_detached_houses_1985_2004.ad b/inputs/demand/households/households_number/households_number_of_semi_detached_houses_1985_2004.ad index 0bf4ac9831..aa31ac7c34 100644 --- a/inputs/demand/households/households_number/households_number_of_semi_detached_houses_1985_2004.ad +++ b/inputs/demand/households/households_number/households_number_of_semi_detached_houses_1985_2004.ad @@ -59,16 +59,7 @@ UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_1985_2004), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_1985_2004)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_semi_detached_houses_1985_2004) diff --git a/inputs/demand/households/households_number/households_number_of_semi_detached_houses_2005_present.ad b/inputs/demand/households/households_number/households_number_of_semi_detached_houses_2005_present.ad index 3f01140342..cc7edce138 100644 --- a/inputs/demand/households/households_number/households_number_of_semi_detached_houses_2005_present.ad +++ b/inputs/demand/households/households_number/households_number_of_semi_detached_houses_2005_present.ad @@ -59,16 +59,7 @@ UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_2005_present), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_2005_present)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_semi_detached_houses_2005_present) diff --git a/inputs/demand/households/households_number/households_number_of_semi_detached_houses_before_1945.ad b/inputs/demand/households/households_number/households_number_of_semi_detached_houses_before_1945.ad index 5a9f3f9857..7465347777 100644 --- a/inputs/demand/households/households_number/households_number_of_semi_detached_houses_before_1945.ad +++ b/inputs/demand/households/households_number/households_number_of_semi_detached_houses_before_1945.ad @@ -59,16 +59,7 @@ UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_before_1945), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_before_1945)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_semi_detached_houses_before_1945) diff --git a/inputs/demand/households/households_number/households_number_of_semi_detached_houses_future.ad b/inputs/demand/households/households_number/households_number_of_semi_detached_houses_future.ad index 39c52bedf2..2e01e4e102 100644 --- a/inputs/demand/households/households_number/households_number_of_semi_detached_houses_future.ad +++ b/inputs/demand/households/households_number/households_number_of_semi_detached_houses_future.ad @@ -55,16 +55,7 @@ UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_future), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_semi_detached_houses_future), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_semi_detached_houses_future)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(QUERY_FUTURE(-> { Q(number_of_residences)}), DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, QUERY_FUTURE(-> { Q(number_of_residences)})), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, QUERY_FUTURE(-> { Q(number_of_residences)})) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_residences) diff --git a/inputs/demand/households/households_number/households_number_of_terraced_houses_1945_1964.ad b/inputs/demand/households/households_number/households_number_of_terraced_houses_1945_1964.ad index 6bef566462..bb62e269bc 100644 --- a/inputs/demand/households/households_number/households_number_of_terraced_houses_1945_1964.ad +++ b/inputs/demand/households/households_number/households_number_of_terraced_houses_1945_1964.ad @@ -59,16 +59,7 @@ UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1945_1964), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1945_1964), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_1945_1964)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_terraced_houses_1945_1964) diff --git a/inputs/demand/households/households_number/households_number_of_terraced_houses_1965_1984.ad b/inputs/demand/households/households_number/households_number_of_terraced_houses_1965_1984.ad index 031fb77800..5e9f1a4fd8 100644 --- a/inputs/demand/households/households_number/households_number_of_terraced_houses_1965_1984.ad +++ b/inputs/demand/households/households_number/households_number_of_terraced_houses_1965_1984.ad @@ -59,16 +59,7 @@ UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1965_1984), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1965_1984), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_1965_1984)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_terraced_houses_1965_1984) diff --git a/inputs/demand/households/households_number/households_number_of_terraced_houses_1985_2004.ad b/inputs/demand/households/households_number/households_number_of_terraced_houses_1985_2004.ad index 2f79e4ee34..cf384adfb5 100644 --- a/inputs/demand/households/households_number/households_number_of_terraced_houses_1985_2004.ad +++ b/inputs/demand/households/households_number/households_number_of_terraced_houses_1985_2004.ad @@ -59,16 +59,7 @@ UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1985_2004), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_1985_2004), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_1985_2004)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_terraced_houses_1985_2004) diff --git a/inputs/demand/households/households_number/households_number_of_terraced_houses_2005_present.ad b/inputs/demand/households/households_number/households_number_of_terraced_houses_2005_present.ad index a1cdaa43a6..c426069682 100644 --- a/inputs/demand/households/households_number/households_number_of_terraced_houses_2005_present.ad +++ b/inputs/demand/households/households_number/households_number_of_terraced_houses_2005_present.ad @@ -59,16 +59,7 @@ UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_2005_present), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_2005_present), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_2005_present)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_terraced_houses_2005_present) diff --git a/inputs/demand/households/households_number/households_number_of_terraced_houses_before_1945.ad b/inputs/demand/households/households_number/households_number_of_terraced_houses_before_1945.ad index e4796f0086..8708ec0bb3 100644 --- a/inputs/demand/households/households_number/households_number_of_terraced_houses_before_1945.ad +++ b/inputs/demand/households/households_number/households_number_of_terraced_houses_before_1945.ad @@ -59,16 +59,7 @@ UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_before_1945), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_before_1945), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_before_1945)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(total_number_of_units_future, DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, total_number_of_units_future) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_terraced_houses_before_1945) diff --git a/inputs/demand/households/households_number/households_number_of_terraced_houses_future.ad b/inputs/demand/households/households_number/households_number_of_terraced_houses_future.ad index 8b9359324b..0d81cc6969 100644 --- a/inputs/demand/households/households_number/households_number_of_terraced_houses_future.ad +++ b/inputs/demand/households/households_number/households_number_of_terraced_houses_future.ad @@ -55,16 +55,7 @@ UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_future), number_of_units, USER_INPUT()), UPDATE(V(households_useful_demand_for_space_heating_terraced_houses_future), initial_investment, QUERY_FUTURE(-> { Q(costs_of_insulation_terraced_houses_future)})), UPDATE(V(households_flexibility_p2p_electricity), number_of_units, PRODUCT(QUERY_FUTURE(-> { Q(number_of_residences)}), DIVIDE(INPUT_VALUE(households_flexibility_p2p_electricity_market_penetration),100.0))), - UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, QUERY_FUTURE(-> { Q(number_of_residences)})), - UPDATE( - V(OUTPUT_SLOTS(LOOKUP(households_solar_pv_solar_radiation),electricity), "edges.detect{|l| !l.flexible? }"), - share, - ( - (INPUT_VALUE(households_solar_pv_solar_radiation_market_penetration) / 100.0) * - (QUERY_FUTURE(-> { AREA(residences_roof_surface_available_for_pv) }) / V(households_solar_pv_solar_radiation, land_use_per_unit)) * - V(households_solar_pv_solar_radiation, typical_electricity_production_per_unit) - ) - ) + UPDATE(V(households_useful_demand_for_hot_water_after_solar_heater), number_of_units, QUERY_FUTURE(-> { Q(number_of_residences)})) ) - priority = 1 - max_value_gql = present:AREA(present_number_of_residences) diff --git a/inputs/demand/industry/industry_other_metals_process_electricity_efficiency.ad b/inputs/demand/industry/industry_other_metals_process_electricity_efficiency.ad index a97cbf7ed7..c04769bc9d 100644 --- a/inputs/demand/industry/industry_other_metals_process_electricity_efficiency.ad +++ b/inputs/demand/industry/industry_other_metals_process_electricity_efficiency.ad @@ -1,9 +1,9 @@ - query = UPDATE( OUTPUT_SLOTS(V(industry_other_metals_process_electricity),not_defined), conversion, USER_INPUT()) - priority = 0 -- max_value = 2.0 +- max_value = 100.0 - min_value = 0.0 - start_value = 0.0 - step_value = 0.1 - unit = % - update_period = future -- update_type = %y +- update_type = % diff --git a/inputs/demand/industry/industry_other_metals_process_heat_useable_heat_efficiency.ad b/inputs/demand/industry/industry_other_metals_process_heat_useable_heat_efficiency.ad index 4ba74a803f..6716ee2501 100644 --- a/inputs/demand/industry/industry_other_metals_process_heat_useable_heat_efficiency.ad +++ b/inputs/demand/industry/industry_other_metals_process_heat_useable_heat_efficiency.ad @@ -1,9 +1,9 @@ - query = UPDATE( OUTPUT_SLOTS(V(industry_other_metals_process_heat_useable_heat),not_defined), conversion, USER_INPUT()) - priority = 0 -- max_value = 2.0 +- max_value = 100.0 - min_value = 0.0 - start_value = 0.0 - step_value = 0.1 - unit = % - update_period = future -- update_type = %y +- update_type = % diff --git a/inputs/demand/industry/industry_useful_demand_for_aggregated_other_electricity_efficiency.ad b/inputs/demand/industry/industry_useful_demand_for_aggregated_other_electricity_efficiency.ad new file mode 100644 index 0000000000..14a38bb3f5 --- /dev/null +++ b/inputs/demand/industry/industry_useful_demand_for_aggregated_other_electricity_efficiency.ad @@ -0,0 +1,10 @@ +- query = + UPDATE(V(industry_useful_demand_for_other_non_specified_electricity), preset_demand, NEG(USER_INPUT())) +- priority = 0 +- max_value = 100.0 +- min_value = 0.0 +- start_value = 0.0 +- step_value = 0.1 +- unit = % +- update_period = future +- update_type = % diff --git a/inputs/demand/industry/industry_useful_demand_for_aggregated_other_useable_heat_efficiency.ad b/inputs/demand/industry/industry_useful_demand_for_aggregated_other_useable_heat_efficiency.ad new file mode 100644 index 0000000000..890c52170e --- /dev/null +++ b/inputs/demand/industry/industry_useful_demand_for_aggregated_other_useable_heat_efficiency.ad @@ -0,0 +1,10 @@ +- query = + UPDATE(V(industry_useful_demand_for_other_non_specified_useable_heat), preset_demand, NEG(USER_INPUT())) +- priority = 0 +- max_value = 100.0 +- min_value = 0.0 +- start_value = 0.0 +- step_value = 0.1 +- unit = % +- update_period = future +- update_type = % diff --git a/inputs/demand/industry/industry_useful_demand_for_chemical_fertilizers_electricity_efficiency.ad b/inputs/demand/industry/industry_useful_demand_for_chemical_fertilizers_electricity_efficiency.ad index 660059d46e..c533bd0dce 100644 --- a/inputs/demand/industry/industry_useful_demand_for_chemical_fertilizers_electricity_efficiency.ad +++ b/inputs/demand/industry/industry_useful_demand_for_chemical_fertilizers_electricity_efficiency.ad @@ -1,10 +1,10 @@ - query = UPDATE(V(industry_useful_demand_for_chemical_fertilizers_electricity), preset_demand, NEG(USER_INPUT())) - priority = 0 -- max_value = 5.0 +- max_value = 100.0 - min_value = 0.0 - start_value = 0.0 - step_value = 0.1 - unit = % - update_period = future -- update_type = %y +- update_type = % - disabled_by = external_coupling_industry_chemical_fertilizers_total_excluding_electricity diff --git a/inputs/demand/industry/industry_useful_demand_for_chemical_fertilizers_useable_heat_efficiency.ad b/inputs/demand/industry/industry_useful_demand_for_chemical_fertilizers_useable_heat_efficiency.ad index b3375bc2b6..6201134003 100644 --- a/inputs/demand/industry/industry_useful_demand_for_chemical_fertilizers_useable_heat_efficiency.ad +++ b/inputs/demand/industry/industry_useful_demand_for_chemical_fertilizers_useable_heat_efficiency.ad @@ -1,10 +1,10 @@ - query = UPDATE(OUTPUT_SLOTS(V(industry_useful_demand_for_chemical_fertilizers_useable_heat), useable_heat), conversion, USER_INPUT()) - priority = 0 -- max_value = 5.0 +- max_value = 100.0 - min_value = 0.0 - start_value = 0.0 - step_value = 0.1 - unit = % - update_period = future -- update_type = %y +- update_type = % - disabled_by = external_coupling_industry_chemical_fertilizers_total_excluding_electricity diff --git a/inputs/demand/industry/industry_useful_demand_for_chemical_other_electricity_efficiency.ad b/inputs/demand/industry/industry_useful_demand_for_chemical_other_electricity_efficiency.ad index 45cb9aa929..c556049d97 100644 --- a/inputs/demand/industry/industry_useful_demand_for_chemical_other_electricity_efficiency.ad +++ b/inputs/demand/industry/industry_useful_demand_for_chemical_other_electricity_efficiency.ad @@ -1,10 +1,10 @@ - query = UPDATE(V(industry_useful_demand_for_chemical_other_electricity), preset_demand, NEG(USER_INPUT())) - priority = 0 -- max_value = 10.0 -- min_value = -10.0 +- max_value = 100.0 +- min_value = 0.0 - start_value = 0.0 - step_value = 0.1 - unit = % - update_period = future -- update_type = %y +- update_type = % - disabled_by = external_coupling_industry_chemical_other_useable_heat \ No newline at end of file diff --git a/inputs/demand/industry/industry_useful_demand_for_chemical_other_useable_heat_efficiency.ad b/inputs/demand/industry/industry_useful_demand_for_chemical_other_useable_heat_efficiency.ad index 1de9f73627..e139e1ec11 100644 --- a/inputs/demand/industry/industry_useful_demand_for_chemical_other_useable_heat_efficiency.ad +++ b/inputs/demand/industry/industry_useful_demand_for_chemical_other_useable_heat_efficiency.ad @@ -1,10 +1,10 @@ - query = UPDATE(V(industry_useful_demand_for_chemical_other_useable_heat), preset_demand, NEG(USER_INPUT())) - priority = 0 -- max_value = 10.0 -- min_value = -10.0 +- max_value = 100.0 +- min_value = 0.0 - start_value = 0.0 - step_value = 0.1 - unit = % - update_period = future -- update_type = %y +- update_type = % - disabled_by = external_coupling_industry_chemical_other_useable_heat \ No newline at end of file diff --git a/inputs/demand/industry/industry_useful_demand_for_chemical_refineries_electricity_efficiency.ad b/inputs/demand/industry/industry_useful_demand_for_chemical_refineries_electricity_efficiency.ad index 899f96d6ec..d869185e33 100644 --- a/inputs/demand/industry/industry_useful_demand_for_chemical_refineries_electricity_efficiency.ad +++ b/inputs/demand/industry/industry_useful_demand_for_chemical_refineries_electricity_efficiency.ad @@ -1,10 +1,10 @@ - query = UPDATE(V(industry_useful_demand_for_chemical_refineries_electricity), preset_demand, NEG(USER_INPUT())) - priority = 0 -- max_value = 5.0 +- max_value = 100.0 - min_value = 0.0 - start_value = 0.0 - step_value = 0.1 - unit = % - update_period = future -- update_type = %y +- update_type = % - disabled_by = external_coupling_industry_chemical_refineries_useable_heat diff --git a/inputs/demand/industry/industry_useful_demand_for_chemical_refineries_useable_heat_efficiency.ad b/inputs/demand/industry/industry_useful_demand_for_chemical_refineries_useable_heat_efficiency.ad index 67198cc43d..223cb352ee 100644 --- a/inputs/demand/industry/industry_useful_demand_for_chemical_refineries_useable_heat_efficiency.ad +++ b/inputs/demand/industry/industry_useful_demand_for_chemical_refineries_useable_heat_efficiency.ad @@ -1,10 +1,10 @@ - query = UPDATE(V(industry_useful_demand_for_chemical_refineries_useable_heat), preset_demand, NEG(USER_INPUT())) - priority = 0 -- max_value = 5.0 +- max_value = 100.0 - min_value = 0.0 - start_value = 0.0 - step_value = 0.1 - unit = % - update_period = future -- update_type = %y +- update_type = % - disabled_by = external_coupling_industry_chemical_refineries_useable_heat diff --git a/inputs/demand/industry/industry_useful_demand_for_other_food_efficiency.ad b/inputs/demand/industry/industry_useful_demand_for_other_food_efficiency.ad deleted file mode 100644 index 7150a64f60..0000000000 --- a/inputs/demand/industry/industry_useful_demand_for_other_food_efficiency.ad +++ /dev/null @@ -1,12 +0,0 @@ -- query = - EACH( - UPDATE(V(industry_useful_demand_for_other_food_electricity), preset_demand, NEG(USER_INPUT())), - UPDATE(V(industry_useful_demand_for_other_food_useable_heat), preset_demand, NEG(USER_INPUT()))) -- priority = 0 -- max_value = 5.0 -- min_value = 0.0 -- start_value = 0.0 -- step_value = 0.1 -- unit = % -- update_period = future -- update_type = %y diff --git a/inputs/demand/industry/industry_useful_demand_for_other_food_electricity_efficiency.ad b/inputs/demand/industry/industry_useful_demand_for_other_food_electricity_efficiency.ad new file mode 100644 index 0000000000..120e8e2b17 --- /dev/null +++ b/inputs/demand/industry/industry_useful_demand_for_other_food_electricity_efficiency.ad @@ -0,0 +1,10 @@ +- query = + UPDATE(V(industry_useful_demand_for_other_food_electricity), preset_demand, NEG(USER_INPUT())) +- priority = 0 +- max_value = 100.0 +- min_value = 0.0 +- start_value = 0.0 +- step_value = 0.1 +- unit = % +- update_period = future +- update_type = % diff --git a/inputs/demand/industry/industry_useful_demand_for_other_food_useable_heat_efficiency.ad b/inputs/demand/industry/industry_useful_demand_for_other_food_useable_heat_efficiency.ad new file mode 100644 index 0000000000..b291c43ccb --- /dev/null +++ b/inputs/demand/industry/industry_useful_demand_for_other_food_useable_heat_efficiency.ad @@ -0,0 +1,10 @@ +- query = + UPDATE(V(industry_useful_demand_for_other_food_useable_heat), preset_demand, NEG(USER_INPUT())) +- priority = 0 +- max_value = 100.0 +- min_value = 0.0 +- start_value = 0.0 +- step_value = 0.1 +- unit = % +- update_period = future +- update_type = % diff --git a/inputs/demand/industry/industry_useful_demand_for_other_ict_efficiency.ad b/inputs/demand/industry/industry_useful_demand_for_other_ict_efficiency.ad index 83c1908ff2..78fa0d8012 100644 --- a/inputs/demand/industry/industry_useful_demand_for_other_ict_efficiency.ad +++ b/inputs/demand/industry/industry_useful_demand_for_other_ict_efficiency.ad @@ -1,9 +1,9 @@ - query = UPDATE(V(industry_useful_demand_for_other_ict_electricity), preset_demand, NEG(USER_INPUT())) - priority = 0 -- max_value = 5.0 +- max_value = 100.0 - min_value = 0.0 - start_value = 0.0 - step_value = 0.1 - unit = % - update_period = future -- update_type = %y +- update_type = % diff --git a/inputs/demand/industry/industry_useful_demand_for_other_paper_efficiency.ad b/inputs/demand/industry/industry_useful_demand_for_other_paper_efficiency.ad deleted file mode 100644 index fe4a46dc3a..0000000000 --- a/inputs/demand/industry/industry_useful_demand_for_other_paper_efficiency.ad +++ /dev/null @@ -1,12 +0,0 @@ -- query = - EACH( - UPDATE(V(industry_useful_demand_for_other_paper_electricity), preset_demand, NEG(USER_INPUT())), - UPDATE(V(industry_useful_demand_for_other_paper_useable_heat), preset_demand, NEG(USER_INPUT()))) -- priority = 0 -- max_value = 5.0 -- min_value = 0.0 -- start_value = 0.0 -- step_value = 0.1 -- unit = % -- update_period = future -- update_type = %y diff --git a/inputs/demand/industry/industry_useful_demand_for_other_paper_electricity_efficiency.ad b/inputs/demand/industry/industry_useful_demand_for_other_paper_electricity_efficiency.ad new file mode 100644 index 0000000000..ce804f13f4 --- /dev/null +++ b/inputs/demand/industry/industry_useful_demand_for_other_paper_electricity_efficiency.ad @@ -0,0 +1,10 @@ +- query = + UPDATE(V(industry_useful_demand_for_other_paper_electricity), preset_demand, NEG(USER_INPUT())) +- priority = 0 +- max_value = 100.0 +- min_value = 0.0 +- start_value = 0.0 +- step_value = 0.1 +- unit = % +- update_period = future +- update_type = % diff --git a/inputs/demand/industry/industry_useful_demand_for_other_paper_useable_heat_efficiency.ad b/inputs/demand/industry/industry_useful_demand_for_other_paper_useable_heat_efficiency.ad new file mode 100644 index 0000000000..b8d35fe1c1 --- /dev/null +++ b/inputs/demand/industry/industry_useful_demand_for_other_paper_useable_heat_efficiency.ad @@ -0,0 +1,10 @@ +- query = + UPDATE(V(industry_useful_demand_for_other_paper_useable_heat), preset_demand, NEG(USER_INPUT())) +- priority = 0 +- max_value = 100.0 +- min_value = 0.0 +- start_value = 0.0 +- step_value = 0.1 +- unit = % +- update_period = future +- update_type = % diff --git a/inputs/misc/land_use_impact_visual_wind_inland_large_scale.ad b/inputs/misc/land_use_impact_visual_wind_inland_large_scale.ad new file mode 100644 index 0000000000..dfd27020ba --- /dev/null +++ b/inputs/misc/land_use_impact_visual_wind_inland_large_scale.ad @@ -0,0 +1,12 @@ +# Set the capacity share of large-scale inland wind turbines within total inland wind turbine capacity. +# This is for the solar and wind land use chart and table only and does not affect the rest of the graph. + +- query = UPDATE() +- share_group = wind_turbines_inland_scale +- priority = 0 +- max_value = 100.0 +- min_value = 0.0 +- start_value = 100.0 +- step_value = 0.1 +- unit = % +- update_period = future \ No newline at end of file diff --git a/inputs/misc/land_use_impact_visual_wind_inland_small_scale.ad b/inputs/misc/land_use_impact_visual_wind_inland_small_scale.ad new file mode 100644 index 0000000000..2a8bc4e287 --- /dev/null +++ b/inputs/misc/land_use_impact_visual_wind_inland_small_scale.ad @@ -0,0 +1,12 @@ +# Set the capacity share of small-scale inland wind turbines within total inland wind turbine capacity. +# This is for the solar and wind land use chart and table only and does not affect the rest of the graph. + +- query = UPDATE() +- share_group = wind_turbines_inland_scale +- priority = 0 +- max_value = 100.0 +- min_value = 0.0 +- start_value = 0.0 +- step_value = 0.1 +- unit = % +- update_period = future \ No newline at end of file diff --git a/inputs/supply/renewable_electricity/solar_power/capacity_of_buildings_solar_pv_solar_radiation.ad b/inputs/supply/renewable_electricity/solar_power/capacity_of_buildings_solar_pv_solar_radiation.ad new file mode 100644 index 0000000000..dedf59a73a --- /dev/null +++ b/inputs/supply/renewable_electricity/solar_power/capacity_of_buildings_solar_pv_solar_radiation.ad @@ -0,0 +1,22 @@ +# Set the total output capacity of PV installations on buildings +# Maximum value is set at twice the maximum amount of solar panels that can fit on the total roof surface area +- query = + EACH( + UPDATE( + V(buildings_solar_pv_solar_radiation), + number_of_units, + USER_INPUT() / V(buildings_solar_pv_solar_radiation, electricity_output_capacity) + ), + UPDATE( + V(buildings_solar_pv_solar_radiation), + preset_demand, + V(buildings_solar_pv_solar_radiation, production_based_on_number_of_units) + ) + ) +- priority = 0 +- max_value_gql = present:MAX(1.0,PRODUCT(DIVIDE(AREA(buildings_roof_surface_available_for_pv)*2,V(buildings_solar_pv_solar_radiation, land_use_per_unit)),V(buildings_solar_pv_solar_radiation, electricity_output_capacity))) +- min_value = 0.0 +- start_value_gql = present:PRODUCT(V(buildings_solar_pv_solar_radiation, number_of_units), V(buildings_solar_pv_solar_radiation, electricity_output_capacity)) +- step_value = 1.0 +- unit = MW +- update_period = future diff --git a/inputs/supply/renewable_electricity/solar_power/capacity_of_households_solar_pv_solar_radiation.ad b/inputs/supply/renewable_electricity/solar_power/capacity_of_households_solar_pv_solar_radiation.ad new file mode 100644 index 0000000000..224062fff4 --- /dev/null +++ b/inputs/supply/renewable_electricity/solar_power/capacity_of_households_solar_pv_solar_radiation.ad @@ -0,0 +1,22 @@ +# Set the total output capacity of small-scale PV installations on household rooftops +# Maximum value is set at twice the maximum amount of solar panels that can fit on the total roof surface area +- query = + EACH( + UPDATE( + V(households_solar_pv_solar_radiation), + number_of_units, + USER_INPUT() / V(households_solar_pv_solar_radiation, electricity_output_capacity) + ), + UPDATE( + V(households_solar_pv_solar_radiation), + preset_demand, + V(households_solar_pv_solar_radiation, production_based_on_number_of_units) + ) + ) +- priority = 0 +- max_value_gql = present:MAX(1.0,PRODUCT(DIVIDE(AREA(residences_roof_surface_available_for_pv)*2,V(households_solar_pv_solar_radiation, land_use_per_unit)),V(households_solar_pv_solar_radiation, electricity_output_capacity))) +- min_value = 0.0 +- start_value_gql = present:PRODUCT(V(households_solar_pv_solar_radiation, number_of_units), V(households_solar_pv_solar_radiation, electricity_output_capacity)) +- step_value = 1.0 +- unit = MW +- update_period = future