Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Gemfile
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addition is fine

Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ gem 'rake'

group :development, :test do
gem 'roo'
gem 'atlas', ref: '311b2a6', github: 'quintel/atlas'
gem 'atlas', ref: 'd8b096b', github: 'quintel/atlas'
end

group :test do
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addition is fine.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GIT
remote: https://github.com/quintel/atlas.git
revision: 311b2a6f7be43e4b57e76963c32316dc84ba39a4
ref: 311b2a6
revision: d8b096b4ee9d94e81ff3e8e5bbbd753e72e0e32a
ref: d8b096b
specs:
atlas (1.0.0)
activemodel (>= 7)
Expand Down
13 changes: 0 additions & 13 deletions datasets/AT_austria/AT_austria.derived.ad
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,16 @@
- enabled.etmodel = true
- analysis_year = 2019
- has_agriculture = true
- has_buildings = true
- has_semi_detached_houses = true
- has_coastline = false
- has_cold_network = false
- has_electricity_storage = true
- has_employment = false
- has_industry = true
- has_lignite = false
- has_merit_order = true
- has_metal = true
- has_mountains = true
- has_old_technologies = true
- has_other = true
- has_solar_csp = true
- has_offshore_solar = false
- has_other_emissions_section = true
- has_import_export = true
- use_network_calculations = true
- use_merit_order_demands = true
- has_weather_curves = false
- has_aggregated_chemical_industry = false
- has_detailed_chemical_industry = true
- has_coal_oil_for_heating_built_environment = true
- has_aquathermal_potential_for_surface_water = false
- has_aquathermal_potential_for_waste_water = false
Expand Down Expand Up @@ -221,4 +209,3 @@
- scaling.area_attribute = number_of_inhabitants
- scaling.base_value = 500700753
- scaling.value = 8858775
- uses_deprecated_initializer_inputs = false
13 changes: 0 additions & 13 deletions datasets/BEGM11002_antwerpen/BEGM11002_antwerpen.derived.ad
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,16 @@
- enabled.etmodel = true
- analysis_year = 2022
- has_agriculture = true
- has_buildings = true
- has_semi_detached_houses = true
- has_coastline = false
- has_cold_network = false
- has_electricity_storage = true
- has_employment = false
- has_industry = true
- has_lignite = false
- has_merit_order = true
- has_metal = true
- has_mountains = true
- has_old_technologies = true
- has_other = true
- has_solar_csp = true
- has_offshore_solar = false
- has_other_emissions_section = true
- has_import_export = true
- use_network_calculations = true
- use_merit_order_demands = true
- has_weather_curves = false
- has_aggregated_chemical_industry = false
- has_detailed_chemical_industry = true
- has_coal_oil_for_heating_built_environment = true
- has_aquathermal_potential_for_surface_water = false
- has_aquathermal_potential_for_waste_water = false
Expand Down Expand Up @@ -221,4 +209,3 @@
- scaling.area_attribute = number_of_inhabitants
- scaling.base_value = 500700753
- scaling.value = 541856
- uses_deprecated_initializer_inputs = false
13 changes: 0 additions & 13 deletions datasets/BEGM13040_turnhout/BEGM13040_turnhout.derived.ad
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,16 @@
- enabled.etmodel = true
- analysis_year = 2018
- has_agriculture = true
- has_buildings = true
- has_semi_detached_houses = true
- has_coastline = false
- has_cold_network = false
- has_electricity_storage = true
- has_employment = false
- has_industry = true
- has_lignite = false
- has_merit_order = true
- has_metal = true
- has_mountains = true
- has_old_technologies = true
- has_other = true
- has_solar_csp = true
- has_offshore_solar = false
- has_other_emissions_section = true
- has_import_export = true
- use_network_calculations = true
- use_merit_order_demands = true
- has_weather_curves = false
- has_aggregated_chemical_industry = false
- has_detailed_chemical_industry = true
- has_coal_oil_for_heating_built_environment = true
- has_aquathermal_potential_for_surface_water = false
- has_aquathermal_potential_for_waste_water = false
Expand Down Expand Up @@ -221,4 +209,3 @@
- scaling.area_attribute = number_of_inhabitants
- scaling.base_value = 500700753
- scaling.value = 44136
- uses_deprecated_initializer_inputs = false
13 changes: 0 additions & 13 deletions datasets/BEGM35013_oostende/BEGM35013_oostende.derived.ad
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,16 @@
- enabled.etmodel = true
- analysis_year = 2017
- has_agriculture = true
- has_buildings = true
- has_semi_detached_houses = true
- has_coastline = false
- has_cold_network = false
- has_electricity_storage = true
- has_employment = false
- has_industry = true
- has_lignite = false
- has_merit_order = true
- has_metal = true
- has_mountains = true
- has_old_technologies = true
- has_other = true
- has_solar_csp = true
- has_offshore_solar = false
- has_other_emissions_section = true
- has_import_export = true
- use_network_calculations = true
- use_merit_order_demands = true
- has_weather_curves = false
- has_aggregated_chemical_industry = false
- has_detailed_chemical_industry = true
- has_coal_oil_for_heating_built_environment = true
- has_aquathermal_potential_for_surface_water = false
- has_aquathermal_potential_for_waste_water = false
Expand Down Expand Up @@ -221,4 +209,3 @@
- scaling.area_attribute = number_of_inhabitants
- scaling.base_value = 500700753
- scaling.value = 70994
- uses_deprecated_initializer_inputs = false
13 changes: 0 additions & 13 deletions datasets/BE_belgium/BE_belgium.derived.ad
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,16 @@
- enabled.etmodel = true
- analysis_year = 2019
- has_agriculture = true
- has_buildings = true
- has_semi_detached_houses = true
- has_coastline = true
- has_cold_network = false
- has_electricity_storage = true
- has_employment = false
- has_industry = true
- has_lignite = false
- has_merit_order = true
- has_metal = true
- has_mountains = true
- has_old_technologies = true
- has_other = true
- has_solar_csp = true
- has_offshore_solar = false
- has_other_emissions_section = true
- has_import_export = true
- use_network_calculations = true
- use_merit_order_demands = true
- has_weather_curves = false
- has_aggregated_chemical_industry = false
- has_detailed_chemical_industry = true
- has_coal_oil_for_heating_built_environment = true
- has_aquathermal_potential_for_surface_water = false
- has_aquathermal_potential_for_waste_water = false
Expand Down Expand Up @@ -221,4 +209,3 @@
- scaling.area_attribute = number_of_inhabitants
- scaling.base_value = 500700753
- scaling.value = 11455519
- uses_deprecated_initializer_inputs = false
13 changes: 0 additions & 13 deletions datasets/BG_bulgaria/BG_bulgaria.derived.ad
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,16 @@
- enabled.etmodel = true
- analysis_year = 2019
- has_agriculture = true
- has_buildings = true
- has_semi_detached_houses = true
- has_coastline = true
- has_cold_network = false
- has_electricity_storage = true
- has_employment = false
- has_industry = true
- has_lignite = true
- has_merit_order = true
- has_metal = true
- has_mountains = true
- has_old_technologies = true
- has_other = true
- has_solar_csp = true
- has_offshore_solar = false
- has_other_emissions_section = true
- has_import_export = true
- use_network_calculations = true
- use_merit_order_demands = true
- has_weather_curves = false
- has_aggregated_chemical_industry = false
- has_detailed_chemical_industry = true
- has_coal_oil_for_heating_built_environment = true
- has_aquathermal_potential_for_surface_water = false
- has_aquathermal_potential_for_waste_water = false
Expand Down Expand Up @@ -221,4 +209,3 @@
- scaling.area_attribute = number_of_inhabitants
- scaling.base_value = 500700753
- scaling.value = 7000039
- uses_deprecated_initializer_inputs = false
13 changes: 0 additions & 13 deletions datasets/CH_switzerland/CH_switzerland.derived.ad
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,16 @@
- enabled.etmodel = true
- analysis_year = 2019
- has_agriculture = true
- has_buildings = true
- has_semi_detached_houses = false
- has_coastline = false
- has_cold_network = false
- has_electricity_storage = true
- has_employment = false
- has_industry = true
- has_lignite = false
- has_merit_order = true
- has_metal = true
- has_mountains = true
- has_old_technologies = true
- has_other = true
- has_solar_csp = true
- has_offshore_solar = false
- has_other_emissions_section = true
- has_import_export = true
- use_network_calculations = true
- use_merit_order_demands = true
- has_weather_curves = false
- has_aggregated_chemical_industry = false
- has_detailed_chemical_industry = true
- has_coal_oil_for_heating_built_environment = true
- has_aquathermal_potential_for_surface_water = false
- has_aquathermal_potential_for_waste_water = false
Expand Down Expand Up @@ -221,4 +209,3 @@
- scaling.area_attribute = number_of_inhabitants
- scaling.base_value = 500700753
- scaling.value = 8544527
- uses_deprecated_initializer_inputs = false
13 changes: 0 additions & 13 deletions datasets/CY_cyprus/CY_cyprus.derived.ad
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,16 @@
- enabled.etmodel = true
- analysis_year = 2019
- has_agriculture = true
- has_buildings = true
- has_semi_detached_houses = true
- has_coastline = true
- has_cold_network = false
- has_electricity_storage = true
- has_employment = false
- has_industry = true
- has_lignite = false
- has_merit_order = true
- has_metal = true
- has_mountains = true
- has_old_technologies = true
- has_other = true
- has_solar_csp = true
- has_offshore_solar = false
- has_other_emissions_section = true
- has_import_export = true
- use_network_calculations = true
- use_merit_order_demands = true
- has_weather_curves = false
- has_aggregated_chemical_industry = false
- has_detailed_chemical_industry = true
- has_coal_oil_for_heating_built_environment = true
- has_aquathermal_potential_for_surface_water = false
- has_aquathermal_potential_for_waste_water = false
Expand Down Expand Up @@ -221,4 +209,3 @@
- scaling.area_attribute = number_of_inhabitants
- scaling.base_value = 500700753
- scaling.value = 875899
- uses_deprecated_initializer_inputs = false
13 changes: 0 additions & 13 deletions datasets/CZ_czechia/CZ_czechia.derived.ad
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,16 @@
- enabled.etmodel = true
- analysis_year = 2019
- has_agriculture = true
- has_buildings = true
- has_semi_detached_houses = true
- has_coastline = false
- has_cold_network = false
- has_electricity_storage = true
- has_employment = false
- has_industry = true
- has_lignite = true
- has_merit_order = true
- has_metal = true
- has_mountains = true
- has_old_technologies = true
- has_other = true
- has_solar_csp = true
- has_offshore_solar = false
- has_other_emissions_section = true
- has_import_export = true
- use_network_calculations = true
- use_merit_order_demands = true
- has_weather_curves = false
- has_aggregated_chemical_industry = false
- has_detailed_chemical_industry = true
- has_coal_oil_for_heating_built_environment = true
- has_aquathermal_potential_for_surface_water = false
- has_aquathermal_potential_for_waste_water = false
Expand Down Expand Up @@ -221,4 +209,3 @@
- scaling.area_attribute = number_of_inhabitants
- scaling.base_value = 500700753
- scaling.value = 10649800
- uses_deprecated_initializer_inputs = false
13 changes: 0 additions & 13 deletions datasets/DE_germany/DE_germany.derived.ad
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,16 @@
- enabled.etmodel = true
- analysis_year = 2019
- has_agriculture = true
- has_buildings = true
- has_semi_detached_houses = true
- has_coastline = true
- has_cold_network = false
- has_electricity_storage = true
- has_employment = false
- has_industry = true
- has_lignite = true
- has_merit_order = true
- has_metal = true
- has_mountains = true
- has_old_technologies = true
- has_other = true
- has_solar_csp = true
- has_offshore_solar = false
- has_other_emissions_section = true
- has_import_export = true
- use_network_calculations = true
- use_merit_order_demands = true
- has_weather_curves = false
- has_aggregated_chemical_industry = false
- has_detailed_chemical_industry = true
- has_coal_oil_for_heating_built_environment = true
- has_aquathermal_potential_for_surface_water = false
- has_aquathermal_potential_for_waste_water = false
Expand Down Expand Up @@ -221,4 +209,3 @@
- scaling.area_attribute = number_of_inhabitants
- scaling.base_value = 500700753
- scaling.value = 83019213
- uses_deprecated_initializer_inputs = false
13 changes: 0 additions & 13 deletions datasets/DK_denmark/DK_denmark.derived.ad
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,16 @@
- enabled.etmodel = true
- analysis_year = 2019
- has_agriculture = true
- has_buildings = true
- has_semi_detached_houses = true
- has_coastline = true
- has_cold_network = false
- has_electricity_storage = true
- has_employment = false
- has_industry = true
- has_lignite = false
- has_merit_order = true
- has_metal = true
- has_mountains = true
- has_old_technologies = true
- has_other = true
- has_solar_csp = true
- has_offshore_solar = false
- has_other_emissions_section = true
- has_import_export = true
- use_network_calculations = true
- use_merit_order_demands = true
- has_weather_curves = false
- has_aggregated_chemical_industry = false
- has_detailed_chemical_industry = true
- has_coal_oil_for_heating_built_environment = true
- has_aquathermal_potential_for_surface_water = false
- has_aquathermal_potential_for_waste_water = false
Expand Down Expand Up @@ -221,4 +209,3 @@
- scaling.area_attribute = number_of_inhabitants
- scaling.base_value = 500700753
- scaling.value = 5806081
- uses_deprecated_initializer_inputs = false
Loading