Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
72d14c7
Bump Atlas to quintel/atlas@267acc8
mabijkerk Jul 21, 2025
4df24be
Add residence equivalent attribute to nl2019
mabijkerk Jul 21, 2025
e66923a
Add WEQ attribute to area files full and mimick datasets
kndehaan Jul 21, 2025
2c6c071
Add WEQ attribute to area files international datasets
kndehaan Jul 21, 2025
b38e555
Add WEQ attribute to area files provincial datasets
kndehaan Jul 21, 2025
83eec57
Add WEQ attribute to area files municipal datasets
kndehaan Jul 21, 2025
b5b68cd
Replace hard-coded value with area attribute residence equivalents
kndehaan Jul 21, 2025
4d09d2e
First import of base data for nl2023 from ETDataset
mabijkerk Jul 22, 2025
645c530
Duplicate nl2019 carriers and curves as first setup for nl2023
mabijkerk Jul 22, 2025
9be2f1d
Update default nl2019 carriers with nl2023 data from ETDataset
mabijkerk Jul 23, 2025
44345af
Update hydrogen carriers costs in nl2023
mabijkerk Jul 24, 2025
ba74faa
Update hydrogen dedicated solar PV attributes
kndehaan Jul 25, 2025
64efbcb
Update area file built environment values
kndehaan Jul 30, 2025
4710638
Update commodity prices for nl2023
mabijkerk Jul 31, 2025
4592a5c
Update nl2023 with changes for naphtha
kndehaan Aug 1, 2025
e40b807
Add naphtha to carrriers of nl2023
kndehaan Aug 1, 2025
aa70863
Update maximum value of FLH for solar PV
mabijkerk Aug 4, 2025
7d5b92c
Update share of free allowances in EU ETS for nl2023
mabijkerk Aug 4, 2025
77a1960
Add present demand incl export to electricity production chart
mabijkerk Aug 5, 2025
7a094e2
Syntax change for naphtha in carrier files
mabijkerk Aug 5, 2025
391f149
Import curves for nl2023 from ETDataset
mabijkerk Aug 12, 2025
be3757e
Update buildings_cooling curve with more distributed curve
kndehaan Aug 13, 2025
9b48db6
Update industry_ict curve with profile from Liander
kndehaan Aug 13, 2025
75a0ccf
Change typical useful heat demand for buildings in nl2023
mabijkerk Aug 14, 2025
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
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: '8e854b1', github: 'quintel/atlas'
gem 'atlas', ref: '267acc8', github: 'quintel/atlas'
end

group :test do
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GIT
remote: https://github.com/quintel/atlas.git
revision: 8e854b122c40dcb1669d990065bbc47f2c1364f6
ref: 8e854b1
revision: 267acc89ff2c6faf441d017e63a97f657a89b26c
ref: 267acc8
specs:
atlas (1.0.0)
activemodel (>= 7)
Expand Down
5 changes: 3 additions & 2 deletions datasets/AT_austria/AT_austria.derived.ad
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = AT_austria
- id = 122105
- parent_id = 122105
- id = 122050
- parent_id = 122050
- group = country
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
5 changes: 3 additions & 2 deletions datasets/BEGM11002_antwerpen/BEGM11002_antwerpen.derived.ad
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = BEGM11002_antwerpen
- id = 122136
- parent_id = 122136
- id = 122045
- parent_id = 122045
- group = municipality
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
5 changes: 3 additions & 2 deletions datasets/BEGM13040_turnhout/BEGM13040_turnhout.derived.ad
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = BEGM13040_turnhout
- id = 122139
- parent_id = 122139
- id = 122048
- parent_id = 122048
- group = municipality
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
5 changes: 3 additions & 2 deletions datasets/BEGM35013_oostende/BEGM35013_oostende.derived.ad
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = BEGM35013_oostende
- id = 122137
- parent_id = 122137
- id = 122046
- parent_id = 122046
- group = municipality
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
5 changes: 3 additions & 2 deletions datasets/BE_belgium/BE_belgium.derived.ad
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = BE_belgium
- id = 122106
- parent_id = 122106
- id = 122051
- parent_id = 122051
- group = country
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
5 changes: 3 additions & 2 deletions datasets/BG_bulgaria/BG_bulgaria.derived.ad
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = BG_bulgaria
- id = 122107
- parent_id = 122107
- id = 122052
- parent_id = 122052
- group = country
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
5 changes: 3 additions & 2 deletions datasets/CH_switzerland/CH_switzerland.derived.ad
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = CH_switzerland
- id = 122134
- parent_id = 122134
- id = 122082
- parent_id = 122082
- group = country
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
5 changes: 3 additions & 2 deletions datasets/CY_cyprus/CY_cyprus.derived.ad
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = CY_cyprus
- id = 122108
- parent_id = 122108
- id = 122053
- parent_id = 122053
- group = country
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
5 changes: 3 additions & 2 deletions datasets/CZ_czechia/CZ_czechia.derived.ad
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = CZ_czechia
- id = 122109
- parent_id = 122109
- id = 122054
- parent_id = 122054
- group = country
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
5 changes: 3 additions & 2 deletions datasets/DE_germany/DE_germany.derived.ad
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = DE_germany
- id = 122110
- parent_id = 122110
- id = 122055
- parent_id = 122055
- group = country
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
5 changes: 3 additions & 2 deletions datasets/DK_denmark/DK_denmark.derived.ad
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = DK_denmark
- id = 122111
- parent_id = 122111
- id = 122056
- parent_id = 122056
- group = country
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
5 changes: 3 additions & 2 deletions datasets/EE_estonia/EE_estonia.derived.ad
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = EE_estonia
- id = 122113
- parent_id = 122113
- id = 122058
- parent_id = 122058
- group = country
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
5 changes: 3 additions & 2 deletions datasets/EL_greece/EL_greece.derived.ad
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = EL_greece
- id = 122117
- parent_id = 122117
- id = 122062
- parent_id = 122062
- group = country
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
5 changes: 3 additions & 2 deletions datasets/ES_spain/ES_spain.derived.ad
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = ES_spain
- id = 122112
- parent_id = 122112
- id = 122057
- parent_id = 122057
- group = country
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = EU27_european_union_27_countries
- id = 122131
- parent_id = 122131
- id = 122076
- parent_id = 122076
- group = country
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
5 changes: 3 additions & 2 deletions datasets/FI_finland/FI_finland.derived.ad
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = FI_finland
- id = 122114
- parent_id = 122114
- id = 122059
- parent_id = 122059
- group = country
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
5 changes: 3 additions & 2 deletions datasets/FR_france/FR_france.derived.ad
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = FR_france
- id = 122115
- parent_id = 122115
- id = 122060
- parent_id = 122060
- group = country
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
5 changes: 3 additions & 2 deletions datasets/GB_great_britain/GB_great_britain.derived.ad
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = GB_great_britain
- id = 122141
- parent_id = 122141
- id = 122079
- parent_id = 122079
- group = country
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
5 changes: 3 additions & 2 deletions datasets/GM0014_groningen/GM0014_groningen.derived.ad
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = GM0014_groningen
- id = 123024
- parent_id = 123024
- id = 122234
- parent_id = 122234
- group = municipality
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
5 changes: 3 additions & 2 deletions datasets/GM0034_almere/GM0034_almere.derived.ad
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = GM0034_almere
- id = 122924
- parent_id = 122924
- id = 122134
- parent_id = 122134
- group = municipality
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
5 changes: 3 additions & 2 deletions datasets/GM0037_stadskanaal/GM0037_stadskanaal.derived.ad
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = GM0037_stadskanaal
- id = 123175
- parent_id = 123175
- id = 122385
- parent_id = 122385
- group = municipality
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
5 changes: 3 additions & 2 deletions datasets/GM0047_veendam/GM0047_veendam.derived.ad
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- area = GM0047_veendam
- id = 123203
- parent_id = 123203
- id = 122413
- parent_id = 122413
- group = municipality
- enabled.etengine = true
- enabled.etmodel = true
Expand Down Expand Up @@ -154,6 +154,7 @@
- aquathermal_potential_for_surface_water = 0.0
- aquathermal_potential_for_waste_water = 0.0
- aquathermal_potential_for_drink_water = 0.0
- area_per_building_residence_equivalent = 293.627703981492
- electric_vehicle_profile_1_share = 0.24
- electric_vehicle_profile_2_share = 0.56
- electric_vehicle_profile_3_share = 0.08
Expand Down
Loading