quintel / etsource

Data source for the Energy Transition Model
https://energytransitionmodel.com/
MIT License
12 stars 8 forks source link

Pull requests for Input Cleanup need to be validated/merged and DBs need to be updated accordingly #288

Closed ChaelKruip closed 11 years ago

ChaelKruip commented 11 years ago

After the merging of "Input cleanup" pull requests for

the databases for

need to be updated accordingly. Please ask @chaelkruip to help/advise. This can be done using the following re-naming prescription (format: old_name,new_name):

transport_trucks,transport_useful_demand_truck_kms
transport_trucks_gasoline_share,transport_truck_using_gasoline_mix_share
transport_trucks_electric_share,transport_truck_using_electricity_share
transport_trucks_diesel_share,transport_truck_using_diesel_mix_share
transport_trucks_compressed_gas_share,transport_truck_using_compressed_natural_gas_share
transport_trains_electric_share,transport_train_using_electricity_share
transport_trains_diesel_share,transport_train_using_diesel_share
transport_trains_coal_share,transport_train_using_coal_share
transport_trains,transport_useful_demand_trains
transport_rail_diesel_mix_diesel_share,transport_rail_mixer_diesel_diesel_share
transport_rail_diesel_mix_biodiesel_share,transport_rail_mixer_diesel_biodiesel_share
transport_planes_kerosene_share,transport_plane_using_kerosene_share
transport_planes_gasoline_share,transport_plane_using_gasoline_share
transport_planes_bio_ethanol_share,transport_plane_using_bio_ethanol_share
transport_domestic_flights,transport_useful_demand_planes
transport_ships_heavy_fuel_oil_share,transport_ship_using_heavy_fuel_oil_share
transport_ships_diesel_share,transport_ship_using_diesel_share
transport_ships_bio_diesel_share,transport_ship_using_biodiesel_share
transport_inland_navigation,transport_useful_demand_ships
transport_gasoline_share,transport_road_mixer_gasoline_gasoline_share
transport_bio_ethanol_share,transport_road_mixer_gasoline_ethanol_share
transport_efficiency_trains,transport_useful_demand_trains_efficiency
transport_efficiency_ships,transport_useful_demand_ships_efficiency
transport_efficiency_electric_vehicles,transport_car_using_electricity_efficiency
transport_efficiency_combustion_engine_trucks,transport_truck_using_compressed_natural_gas_efficiency
transport_efficiency_combustion_engine_cars,transport_car_using_diesel_mix_efficiency
transport_efficiency_airplanes,transport_useful_demand_planes_efficiency
transport_diesel_share,transport_road_mixer_diesel_diesel_share
transport_biodiesel_share,transport_road_mixer_diesel_biodiesel_share
transport_cars_lpg_share,transport_car_using_lpg_share
transport_cars_gasoline_share,transport_car_using_gasoline_mix_share
transport_cars_electric_share,transport_car_using_electricity_share
transport_cars_diesel_share,transport_car_using_diesel_mix_share
transport_cars_compressed_gas_share,transport_car_using_compressed_natural_gas_share
transport_cars,transport_useful_demand_car_kms
other_number_of_small_gas_chp,number_of_other_chp_engine_network_gas
other_heat_demand,other_useful_demand_useable_heat
other_electricity_demand,other_useful_demand_electricity
number_of_other_chp_engine_biogas,number_of_other_chp_engine_biogas
number_of_wind_onshore_land,number_of_energy_power_wind_turbine_inland
number_of_wind_onshore_coast,number_of_energy_power_wind_turbine_coastal
number_of_wind_offshore,number_of_energy_power_wind_turbine_offshore
number_of_waste_incinerator,number_of_energy_power_supercritical_waste_mix
number_of_waste_fired_heater_district,number_of_energy_heater_for_heat_network_waste_mix
number_of_solar_pv_plants,number_of_energy_power_solar_pv_solar_radiation
number_of_pulverized_coal_ccs,number_of_energy_power_ultra_supercritical_ccs_coal
number_of_pulverized_coal,number_of_energy_power_ultra_supercritical_coal
number_of_oil_fired_plant,number_of_energy_power_ultra_supercritical_crude_oil
number_of_nuclear_conventional,number_of_energy_power_nuclear_gen2_uranium_oxide
number_of_nuclear_3rd_gen,number_of_energy_power_nuclear_gen3_uranium_oxide
number_of_lignite_chp,number_of_energy_chp_ultra_supercritical_lignite
number_of_large_gas_chp,number_of_energy_chp_combined_cycle_network_gas
number_of_hydro_river,number_of_energy_power_hydro_river
number_of_hydro_mountain,number_of_energy_power_hydro_mountain
number_of_geothermal_electric,number_of_energy_power_geothermal
number_of_gas_turbines,number_of_energy_power_turbine_network_gas
number_of_gas_fired_heater_district,number_of_energy_heater_for_heat_network_network_gas
number_of_gas_conventional,number_of_energy_power_ultra_supercritical_network_gas
number_of_gas_ccgt_ccs,number_of_energy_power_combined_cycle_ccs_network_gas
number_of_gas_ccgt,number_of_energy_power_combined_cycle_network_gas
number_of_energy_chp_supercritical_waste_mix,number_of_energy_chp_supercritical_waste_mix
number_of_diesel_generators,number_of_energy_power_engine_diesel
number_of_concentrated_solar_power,number_of_energy_power_solar_csp_solar_radiation
number_of_coal_oxyfuel_ccs,number_of_energy_power_ultra_supercritical_oxyfuel_ccs_lignite
number_of_coal_lignite,number_of_energy_power_ultra_supercritical_lignite
number_of_coal_iggc,number_of_energy_power_combined_cycle_coal
number_of_coal_igcc_ccs,number_of_energy_power_combined_cycle_ccs_coal
number_of_coal_fired_heater_district,number_of_energy_heater_for_heat_network_coal
number_of_coal_conventional,number_of_energy_power_supercritical_coal
number_of_central_coal_chp,number_of_energy_chp_ultra_supercritical_coal
number_of_biomass_fired_heater_district,number_of_energy_heater_for_heat_network_wood_pellets
pj_of_heat_import,energy_import_steam_hot_water_preset_demands
buildings_lighting_led_tube_share,buildings_lighting_led_electricity_share
buildings_lighting_fluorescent_tube_high_performance_share,buildings_lighting_efficient_fluorescent_electricity_share
buildings_lighting_fluorescent_tube_conventional_share,buildings_lighting_standard_fluorescent_electricity_share
number_of_industry_chp_turbine_gas_power_fuelmix,number_of_industry_chp_turbine_gas_power_fuelmix
number_of_industry_chp_engine_gas_power_fuelmix,number_of_industry_chp_engine_gas_power_fuelmix
industry_steel_production,industry_steel_production
industry_steel_hisarna_share,industry_steel_hisarna_consumption_useable_heat_share
industry_steel_electricfurnace_share,industry_steel_electricfurnace_electricity_share
industry_steel_blastfurnace_current_share,industry_steel_blastfurnace_current_consumption_useable_heat_share
industry_steel_blastfurnace_bat_share,industry_steel_blastfurnace_bat_consumption_useable_heat_share
industry_steel_biofeedstock_for_hisarna_share,energy_steel_hisarna_transformation_coal_woodpellets_share
industry_other_metals_production,industry_other_metals_production
industry_other_metals_process_heat_efficiency,industry_other_metals_process_heat_useable_heat_efficiency
industry_other_metals_process_electricity_efficiency,industry_other_metals_process_electricity_efficiency
industry_number_of_gas_chp,number_of_industry_chp_combined_cycle_gas_power_fuelmix
industry_non_energetic_other_demand,industry_useful_demand_network_gas_non_energetic
industry_non_energetic_oil_demand,industry_useful_demand_crude_oil_non_energetic
industry_heating_oil_fired_heater_share,industry_burner_crude_oil_share
industry_heating_gas_fired_heater_share,industry_burner_network_gas_share
industry_heating_combined_heat_power_share,industry_final_demand_steam_hot_water_share
industry_heating_coal_fired_heater_share,industry_burner_coal_share
industry_heating_biomass_fired_heater_share,industry_burner_wood_pellets_share
industry_heat_from_fuels,industry_useful_demand_useable_heat_efficiencty
industry_heat_demand,industry_useful_demand_useable_heat
industry_electricity_demand,industry_useful_demand_electricity
industry_efficiency_electricity,industry_useful_demand_electricity_efficiency
industry_aluminium_smeltoven_share,industry_aluminium_smeltoven_electricity_share
industry_aluminium_production,industry_aluminium_production
industry_aluminium_electrolysis_current_share,industry_aluminium_electrolysis_current_electricity_share
industry_aluminium_electrolysis_bat_share,industry_aluminium_electrolysis_bat_electricity_share
industry_aluminium_carbothermalreduction_share,industry_aluminium_carbothermalreduction_electricity_share
households_replacement_of_existing_houses,households_replacement_of_existing_houses
households_number_of_inhabitants,households_number_of_inhabitants
households_market_penetration_solar_panels,households_solar_pv_solar_radiation_market_penetration
households_insulation_level_old_houses,households_insulation_level_old_houses
households_insulation_level_new_houses,households_insulation_level_new_houses
households_heat_demand_per_person,households_useful_demand_heat_per_person
households_electricity_demand_per_person,households_useful_demand_electricity_per_person
households_behavior_turn_off_the_light,households_behavior_turn_off_the_light
households_behavior_standby_killer_turn_off_appliances,households_behavior_standby_killer_turn_off_appliances
households_behavior_low_temperature_washing,households_behavior_low_temperature_washing
households_behavior_close_windows_turn_off_heating,households_behavior_close_windows_turn_off_heating
households_lighting_low_energy_light_bulb_share,households_lighting_efficient_fluorescent_electricity_share
households_lighting_light_emitting_diode_share,households_lighting_led_electricity_share
households_lighting_incandescent_share,households_lighting_incandescent_electricity_share
households_water_heater_heatpump_ground_water_electricity_share,households_water_heater_heatpump_ground_water_electricity_share
households_water_heater_heatpump_air_water_electricity_share,households_water_heater_heatpump_air_water_electricity_share
households_hot_water_solar_water_heater_share,households_water_heater_solar_thermal_share
households_hot_water_oil_fired_heater_share,households_water_heater_crude_oil_share
households_hot_water_micro_chp_share,households_water_heater_micro_chp_network_gas_share
households_hot_water_heat_network_share,households_water_heater_district_heating_steam_hot_water_share
households_hot_water_gas_water_heater_share,households_water_heater_network_gas_share
households_hot_water_gas_fired_heater_share,households_water_heater_combined_network_gas_share
households_hot_water_fuel_cell_share,households_water_heater_fuel_cell_chp_network_gas_share
households_hot_water_electric_boiler_share,households_water_heater_resistive_electricity_share
households_hot_water_demand_per_person,households_useful_demand_hot_water_share
households_hot_water_coal_fired_heater_hotwater_share,households_water_heater_coal_share
households_hot_water_biomass_heater_share,households_water_heater_wood_pellets_share
households_space_heater_heatpump_air_water_electricity_share,households_space_heater_heatpump_air_water_electricity_share
households_heating_pellet_stove_share,households_space_heater_wood_pellets_share
households_heating_oil_fired_heater_share,households_space_heater_crude_oil_share
households_heating_micro_chp_share,households_space_heater_micro_chp_network_gas_share
households_heating_heat_pump_ground_share,households_space_heater_heatpump_ground_water_electricity_share
households_heating_heat_pump_add_on_share,households_space_heater_heatpump_add_on_electricity_share
households_heating_gas_fired_heater_share,households_space_heater_network_gas_share
households_heating_gas_combi_heater_share,households_space_heater_combined_network_gas_share
households_heating_electric_heater_share,households_space_heater_electricity_share
households_heating_district_heating_network_share,households_space_heater_district_heating_steam_hot_water_share
households_heating_coal_fired_heater_share,households_space_heater_coal_share
households_efficiency_washing_machine,households_appliances_washing_machine_electricity_efficiency
households_efficiency_vacuum_cleaner,households_appliances_vacuum_cleaner_electricity_efficiency
households_efficiency_television,households_appliances_television_electricity_efficiency
households_efficiency_other,households_appliances_other_electricity_efficiency
households_efficiency_fridge_freezer,households_appliances_fridge_freezer_electricity_efficiency
households_efficiency_dryer,households_appliances_clothes_dryer_electricity_efficiency
households_efficiency_dish_washer,households_appliances_dishwasher_electricity_efficiency
households_efficiency_computer_media,households_appliances_computer_media_electricity_efficiency
households_heating_small_gas_chp_share,households_collective_chp_network_gas_share
households_heating_heat_network_share,households_heat_network_connection_steam_hot_water_share
households_heating_geothermal_share,households_collective_geothermal_share
households_heating_biomass_chp_share,households_collective_chp_wood_pellets_share
households_collective_chp_biogas_share,households_collective_chp_biogas_share
households_cooling_heatpump_air_water_electricity_share,households_cooling_heatpump_air_water_electricity_share
households_cooling_heat_pump_ground_share,households_cooling_heatpump_ground_water_electricity_share
households_cooling_demand_per_person,households_useful_demand_for_cooling
households_cooling_airconditioning_share,households_cooling_airconditioning_electricity_share
households_cooking_induction_share,households_cooker_induction_electricity_share
households_cooking_halogen_share,households_cooker_halogen_electricity_share
households_cooking_gas_share,households_cooker_network_gas_share
households_cooking_electric_share,households_cooker_resistive_electricity_share
households_cooking_biomass_share,households_cooker_wood_pellets_share
households_climate_influence,households_climate_influence
gas_from_russia_share,gas_from_russia_share
gas_from_norway_share,gas_from_norway_share
gas_from_nederlands_share,gas_from_nederlands_share
gas_from_middle_east_share,gas_from_middle_east_share
gas_from_algeria_share,gas_from_algeria_share
natural_gas_total_share,natural_gas_total_share
green_gas_total_share,green_gas_total_share
electricity_oil_share_in_gas_production,energy_mixer_for_gas_power_fuel_crude_oil_share
electricity_natural_gas_share,energy_mixer_for_gas_power_fuel_natural_gas_share
electricity_bio_oil_share_in_gas_production,energy_mixer_for_gas_power_fuel_bio_oil_share
employment_local_fraction,employment_local_fraction
employment_fraction_production,employment_fraction_production
economic_multiplier,employment_economic_multiplier
om_costs_wind_onshore,om_costs_wind_onshore
om_costs_wind_offshore,om_costs_wind_offshore
om_costs_water_river,om_costs_water_river
om_costs_water_mountains,om_costs_water_mountains
om_costs_nuclear_nuclear_plant,om_costs_nuclear_nuclear_plant
om_costs_earth_geothermal_electricity,om_costs_earth_geothermal_electricity
om_costs_combustion_waste_incinerator,om_costs_combustion_waste_incinerator
om_costs_combustion_oil_plant,om_costs_combustion_oil_plant
om_costs_combustion_gas_plant,om_costs_combustion_gas_plant
om_costs_combustion_coal_plant,om_costs_combustion_coal_plant
om_costs_combustion_biomass_plant,om_costs_combustion_biomass_plant
om_costs_co2_ccs,om_costs_co2_ccs
investment_costs_wind_onshore,investment_costs_wind_onshore
investment_costs_wind_offshore,investment_costs_wind_offshore
investment_costs_water_river,investment_costs_water_river
investment_costs_water_mountains,investment_costs_water_mountains
investment_costs_solar_solar_panels,investment_costs_solar_solar_panels
investment_costs_nuclear_nuclear_plant,investment_costs_nuclear_nuclear_plant
investment_costs_micro_chp,investment_costs_micro_chp
investment_costs_gas_heat_pumps,investment_costs_gas_heat_pumps
investment_costs_fuel_cell,investment_costs_fuel_cell
investment_costs_electric_heat_pumps,investment_costs_electric_heat_pumps
investment_costs_earth_geothermal_electricity,investment_costs_earth_geothermal_electricity
investment_costs_combustion_waste_incinerator,investment_costs_combustion_waste_incinerator
investment_costs_combustion_oil_plant,investment_costs_combustion_oil_plant
investment_costs_combustion_gas_plant,investment_costs_combustion_gas_plant
investment_costs_combustion_coal_plant,investment_costs_combustion_coal_plant
investment_costs_combustion_biomass_plant,agriculture_chp_supercritical_wood_pellets
investment_costs_co2_ccs,investment_costs_co2_ccs
costs_uranium,costs_uranium
costs_oil,costs_oil
costs_gas,costs_gas
costs_coal,costs_coal
costs_co2_free_allocation,costs_co2_free_allocation
costs_co2,costs_co2
costs_biomass,costs_biomass
share_of_wood_pellets_co_firing_coal,co_firing_wood_pellets_share
share_coal_co_firing_coal,co_firing_coal_share
share_biocoal_co_firing_coal,co_firing_biocoal_share
buildings_waste_heat_recovery,buildings_waste_heat_recovery
buildings_ventilation_rate,buildings_ventilation_rate
buildings_recirculation,buildings_recirculation
buildings_number_of_buildings,number_of_buildings
buildings_market_penetration_solar_panels,buildings_solar_pv_solar_radiation_market_penetration
buildings_lighting_motion_detection,buildings_lighting_savings_from_motion_detection_light
buildings_lighting_daylight_dependent_control,buildings_lighting_savings_from_daylight_control_light
buildings_insulation_level,buildings_insulation_level
buildings_heat_per_employee_student,buildings_useful_demand_for_space_heating
buildings_electricity_per_student_employee,buildings_useful_demand_cooling_electricity
buildings_cooling_per_student_employee,buildings_useful_demand_cooling
buildings_appliances_efficiency,buildings_useful_demand_for_appliances
buildings_heating_solar_thermal_panels_share,buildings_space_heater_solar_thermal_share
buildings_heating_oil_fired_heater_share,buildings_space_heater_crude_oil_share
buildings_heating_heat_pump_with_ts_share,buildings_space_heater_collective_heatpump_water_water_ts_electricity_share
buildings_heating_gas_fired_heater_share,buildings_space_heater_network_gas_share
buildings_heating_gas_fired_heat_pump_share,buildings_space_heater_heatpump_air_water_network_gas_share
buildings_heating_electric_heater_share,buildings_space_heater_electricity_share
buildings_heating_district_heating_network_share,buildings_space_heater_district_heating_steam_hot_water_share
buildings_heating_coal_fired_heater_share,buildings_space_heater_coal_share
buildings_heating_biomass_fired_heater_share,buildings_space_heater_wood_pellets_share
buildings_heating_small_gas_chp_share,buildings_collective_chp_network_gas_share
buildings_heating_heat_network_share,buildings_heat_network_connection_steam_hot_water_share
buildings_heating_geothermal_share,buildings_collective_geothermal_share
buildings_heating_biomass_chp_share,buildings_collective_chp_wood_pellets_share
buildings_cooling_heat_pump_with_ts_share,buildings_cooling_collective_heatpump_water_water_ts_electricity_share
buildings_cooling_gas_fired_heat_pump_share,buildings_cooling_heatpump_air_water_network_gas_share
buildings_cooling_cooling_network_share,buildings_cooling_collective_cooling_network_electricity_share
buildings_cooling_airconditioning_share,buildings_cooling_airconditioning_share
biodiesel_from_waste_fats_share,biodiesel_from_waste_fats_share
biodiesel_from_palm_oil_share,biodiesel_from_palm_oil_share
bio_ethanol_from_cane_sugar_share,bio_ethanol_from_cane_sugar_share
bio_ethanol_from_beet_sugar_share,bio_ethanol_from_beet_sugar_share
number_of_agriculture_chp_supercritical_wood_pellets,number_of_agriculture_chp_supercritical_wood_pellets
number_of_agriculture_chp_engine_biogas,number_of_agriculture_chp_engine_biogas
agriculture_number_of_small_gas_chp,number_of_agriculture_chp_engine_network_gas
agriculture_heating_oil_fired_heater_share,agriculture_burner_crude_oil_share
agriculture_heating_heat_pump_with_ts_share,agriculture_heatpump_water_water_ts_electricity_share
agriculture_heating_geothermal_share,agriculture_geothermal_share
agriculture_heating_gas_fired_heater_share,agriculture_burner_network_gas_share
agriculture_heating_combined_heat_power_share,agriculture_final_demand_steam_hot_water_share

with the 'renaming' rake task developed by @fvancamp

ChaelKruip commented 11 years ago

I will remove the old branches after the above actions have been performed.

dennisquintel commented 11 years ago

The guy that does the merge will also by default delete the old branch. (it can be undone later).

ChaelKruip commented 11 years ago

Closing.