From d1c2ca05c295470c12c2f2c8842b24d098f9f9b1 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Fri, 21 Aug 2026 13:15:00 +0200 Subject: [PATCH 1/6] Heat pump update for municipalities --- .../GM0014_groningen.derived.ad | 4 +- datasets/GM0014_groningen/graph_values.yml | 54 +++++++++---------- .../GM0034_almere/GM0034_almere.derived.ad | 4 +- datasets/GM0034_almere/graph_values.yml | 54 +++++++++---------- .../GM0037_stadskanaal.derived.ad | 4 +- datasets/GM0037_stadskanaal/graph_values.yml | 54 +++++++++---------- .../GM0047_veendam/GM0047_veendam.derived.ad | 4 +- datasets/GM0047_veendam/graph_values.yml | 54 +++++++++---------- .../GM0050_zeewolde.derived.ad | 4 +- datasets/GM0050_zeewolde/graph_values.yml | 54 +++++++++---------- .../GM0059_achtkarspelen.derived.ad | 4 +- .../GM0059_achtkarspelen/graph_values.yml | 54 +++++++++---------- .../GM0060_ameland/GM0060_ameland.derived.ad | 4 +- datasets/GM0060_ameland/graph_values.yml | 54 +++++++++---------- .../GM0072_harlingen.derived.ad | 4 +- datasets/GM0072_harlingen/graph_values.yml | 54 +++++++++---------- .../GM0074_heerenveen.derived.ad | 4 +- datasets/GM0074_heerenveen/graph_values.yml | 54 +++++++++---------- .../GM0080_leeuwarden.derived.ad | 4 +- datasets/GM0080_leeuwarden/graph_values.yml | 54 +++++++++---------- .../GM0085_ooststellingwerf.derived.ad | 4 +- .../GM0085_ooststellingwerf/graph_values.yml | 54 +++++++++---------- .../GM0086_opsterland.derived.ad | 4 +- datasets/GM0086_opsterland/graph_values.yml | 54 +++++++++---------- .../GM0088_schiermonnikoog.derived.ad | 4 +- .../GM0088_schiermonnikoog/graph_values.yml | 54 +++++++++---------- .../GM0090_smallingerland.derived.ad | 4 +- .../GM0090_smallingerland/graph_values.yml | 54 +++++++++---------- .../GM0093_terschelling.derived.ad | 4 +- datasets/GM0093_terschelling/graph_values.yml | 54 +++++++++---------- .../GM0096_vlieland.derived.ad | 4 +- datasets/GM0096_vlieland/graph_values.yml | 54 +++++++++---------- .../GM0098_weststellingwerf.derived.ad | 4 +- .../GM0098_weststellingwerf/graph_values.yml | 54 +++++++++---------- datasets/GM0106_assen/GM0106_assen.derived.ad | 4 +- datasets/GM0106_assen/graph_values.yml | 54 +++++++++---------- .../GM0109_coevorden.derived.ad | 4 +- datasets/GM0109_coevorden/graph_values.yml | 54 +++++++++---------- datasets/GM0114_emmen/GM0114_emmen.derived.ad | 4 +- datasets/GM0114_emmen/graph_values.yml | 54 +++++++++---------- .../GM0118_hoogeveen.derived.ad | 4 +- datasets/GM0118_hoogeveen/graph_values.yml | 54 +++++++++---------- .../GM0119_meppel/GM0119_meppel.derived.ad | 4 +- datasets/GM0119_meppel/graph_values.yml | 54 +++++++++---------- .../GM0141_almelo/GM0141_almelo.derived.ad | 4 +- datasets/GM0141_almelo/graph_values.yml | 54 +++++++++---------- datasets/GM0147_borne/GM0147_borne.derived.ad | 4 +- datasets/GM0147_borne/graph_values.yml | 54 +++++++++---------- .../GM0148_dalfsen/GM0148_dalfsen.derived.ad | 4 +- datasets/GM0148_dalfsen/graph_values.yml | 54 +++++++++---------- .../GM0150_deventer.derived.ad | 4 +- datasets/GM0150_deventer/graph_values.yml | 54 +++++++++---------- .../GM0153_enschede.derived.ad | 4 +- datasets/GM0153_enschede/graph_values.yml | 54 +++++++++---------- .../GM0158_haaksbergen.derived.ad | 4 +- datasets/GM0158_haaksbergen/graph_values.yml | 54 +++++++++---------- .../GM0160_hardenberg.derived.ad | 4 +- datasets/GM0160_hardenberg/graph_values.yml | 54 +++++++++---------- .../GM0163_hellendoorn.derived.ad | 4 +- datasets/GM0163_hellendoorn/graph_values.yml | 54 +++++++++---------- .../GM0164_hengelo/GM0164_hengelo.derived.ad | 4 +- datasets/GM0164_hengelo/graph_values.yml | 54 +++++++++---------- .../GM0166_kampen/GM0166_kampen.derived.ad | 4 +- datasets/GM0166_kampen/graph_values.yml | 54 +++++++++---------- .../GM0168_losser/GM0168_losser.derived.ad | 4 +- datasets/GM0168_losser/graph_values.yml | 54 +++++++++---------- .../GM0171_noordoostpolder.derived.ad | 4 +- .../GM0171_noordoostpolder/graph_values.yml | 54 +++++++++---------- .../GM0173_oldenzaal.derived.ad | 4 +- datasets/GM0173_oldenzaal/graph_values.yml | 54 +++++++++---------- datasets/GM0175_ommen/GM0175_ommen.derived.ad | 4 +- datasets/GM0175_ommen/graph_values.yml | 54 +++++++++---------- .../GM0177_raalte/GM0177_raalte.derived.ad | 4 +- datasets/GM0177_raalte/graph_values.yml | 54 +++++++++---------- .../GM0180_staphorst.derived.ad | 4 +- datasets/GM0180_staphorst/graph_values.yml | 54 +++++++++---------- .../GM0183_tubbergen.derived.ad | 4 +- datasets/GM0183_tubbergen/graph_values.yml | 54 +++++++++---------- datasets/GM0184_urk/GM0184_urk.derived.ad | 4 +- datasets/GM0184_urk/graph_values.yml | 54 +++++++++---------- .../GM0189_wierden/GM0189_wierden.derived.ad | 4 +- datasets/GM0189_wierden/graph_values.yml | 54 +++++++++---------- .../GM0193_zwolle/GM0193_zwolle.derived.ad | 4 +- datasets/GM0193_zwolle/graph_values.yml | 54 +++++++++---------- .../GM0197_aalten/GM0197_aalten.derived.ad | 4 +- datasets/GM0197_aalten/graph_values.yml | 54 +++++++++---------- .../GM0200_apeldoorn.derived.ad | 4 +- datasets/GM0200_apeldoorn/graph_values.yml | 54 +++++++++---------- .../GM0202_arnhem/GM0202_arnhem.derived.ad | 4 +- datasets/GM0202_arnhem/graph_values.yml | 54 +++++++++---------- .../GM0203_barneveld.derived.ad | 4 +- datasets/GM0203_barneveld/graph_values.yml | 54 +++++++++---------- .../GM0209_beuningen.derived.ad | 4 +- datasets/GM0209_beuningen/graph_values.yml | 54 +++++++++---------- .../GM0213_brummen/GM0213_brummen.derived.ad | 4 +- datasets/GM0213_brummen/graph_values.yml | 54 +++++++++---------- datasets/GM0214_buren/GM0214_buren.derived.ad | 4 +- datasets/GM0214_buren/graph_values.yml | 54 +++++++++---------- .../GM0216_culemborg.derived.ad | 4 +- datasets/GM0216_culemborg/graph_values.yml | 54 +++++++++---------- .../GM0221_doesburg.derived.ad | 4 +- datasets/GM0221_doesburg/graph_values.yml | 54 +++++++++---------- .../GM0222_doetinchem.derived.ad | 4 +- datasets/GM0222_doetinchem/graph_values.yml | 54 +++++++++---------- .../GM0225_druten/GM0225_druten.derived.ad | 4 +- datasets/GM0225_druten/graph_values.yml | 54 +++++++++---------- .../GM0226_duiven/GM0226_duiven.derived.ad | 4 +- datasets/GM0226_duiven/graph_values.yml | 54 +++++++++---------- datasets/GM0228_ede/GM0228_ede.derived.ad | 4 +- datasets/GM0228_ede/graph_values.yml | 54 +++++++++---------- .../GM0230_elburg/GM0230_elburg.derived.ad | 4 +- datasets/GM0230_elburg/graph_values.yml | 54 +++++++++---------- datasets/GM0232_epe/GM0232_epe.derived.ad | 4 +- datasets/GM0232_epe/graph_values.yml | 54 +++++++++---------- .../GM0233_ermelo/GM0233_ermelo.derived.ad | 4 +- datasets/GM0233_ermelo/graph_values.yml | 54 +++++++++---------- .../GM0243_harderwijk.derived.ad | 4 +- datasets/GM0243_harderwijk/graph_values.yml | 54 +++++++++---------- .../GM0244_hattem/GM0244_hattem.derived.ad | 4 +- datasets/GM0244_hattem/graph_values.yml | 54 +++++++++---------- .../GM0246_heerde/GM0246_heerde.derived.ad | 4 +- datasets/GM0246_heerde/graph_values.yml | 54 +++++++++---------- .../GM0252_heumen/GM0252_heumen.derived.ad | 4 +- datasets/GM0252_heumen/graph_values.yml | 54 +++++++++---------- .../GM0262_lochem/GM0262_lochem.derived.ad | 4 +- datasets/GM0262_lochem/graph_values.yml | 54 +++++++++---------- .../GM0263_maasdriel.derived.ad | 4 +- datasets/GM0263_maasdriel/graph_values.yml | 54 +++++++++---------- .../GM0267_nijkerk/GM0267_nijkerk.derived.ad | 4 +- datasets/GM0267_nijkerk/graph_values.yml | 54 +++++++++---------- .../GM0268_nijmegen.derived.ad | 4 +- datasets/GM0268_nijmegen/graph_values.yml | 54 +++++++++---------- .../GM0269_oldebroek.derived.ad | 4 +- datasets/GM0269_oldebroek/graph_values.yml | 54 +++++++++---------- .../GM0273_putten/GM0273_putten.derived.ad | 4 +- datasets/GM0273_putten/graph_values.yml | 54 +++++++++---------- .../GM0274_renkum/GM0274_renkum.derived.ad | 4 +- datasets/GM0274_renkum/graph_values.yml | 54 +++++++++---------- .../GM0275_rheden/GM0275_rheden.derived.ad | 4 +- datasets/GM0275_rheden/graph_values.yml | 54 +++++++++---------- .../GM0277_rozendaal.derived.ad | 4 +- datasets/GM0277_rozendaal/graph_values.yml | 54 +++++++++---------- .../GM0279_scherpenzeel.derived.ad | 4 +- datasets/GM0279_scherpenzeel/graph_values.yml | 54 +++++++++---------- datasets/GM0281_tiel/GM0281_tiel.derived.ad | 4 +- datasets/GM0281_tiel/graph_values.yml | 54 +++++++++---------- .../GM0285_voorst/GM0285_voorst.derived.ad | 4 +- datasets/GM0285_voorst/graph_values.yml | 54 +++++++++---------- .../GM0289_wageningen.derived.ad | 4 +- datasets/GM0289_wageningen/graph_values.yml | 54 +++++++++---------- .../GM0293_westervoort.derived.ad | 4 +- datasets/GM0293_westervoort/graph_values.yml | 54 +++++++++---------- .../GM0294_winterswijk.derived.ad | 4 +- datasets/GM0294_winterswijk/graph_values.yml | 54 +++++++++---------- .../GM0296_wijchen/GM0296_wijchen.derived.ad | 4 +- datasets/GM0296_wijchen/graph_values.yml | 54 +++++++++---------- .../GM0297_zaltbommel.derived.ad | 4 +- datasets/GM0297_zaltbommel/graph_values.yml | 54 +++++++++---------- .../GM0299_zevenaar.derived.ad | 4 +- datasets/GM0299_zevenaar/graph_values.yml | 54 +++++++++---------- .../GM0301_zutphen/GM0301_zutphen.derived.ad | 4 +- datasets/GM0301_zutphen/graph_values.yml | 54 +++++++++---------- .../GM0302_nunspeet.derived.ad | 4 +- datasets/GM0302_nunspeet/graph_values.yml | 54 +++++++++---------- .../GM0303_dronten/GM0303_dronten.derived.ad | 4 +- datasets/GM0303_dronten/graph_values.yml | 54 +++++++++---------- .../GM0307_amersfoort.derived.ad | 4 +- datasets/GM0307_amersfoort/graph_values.yml | 54 +++++++++---------- datasets/GM0308_baarn/GM0308_baarn.derived.ad | 4 +- datasets/GM0308_baarn/graph_values.yml | 54 +++++++++---------- .../GM0310_de_bilt/GM0310_de_bilt.derived.ad | 4 +- datasets/GM0310_de_bilt/graph_values.yml | 54 +++++++++---------- .../GM0312_bunnik/GM0312_bunnik.derived.ad | 4 +- datasets/GM0312_bunnik/graph_values.yml | 54 +++++++++---------- .../GM0313_bunschoten.derived.ad | 4 +- datasets/GM0313_bunschoten/graph_values.yml | 54 +++++++++---------- .../GM0317_eemnes/GM0317_eemnes.derived.ad | 4 +- datasets/GM0317_eemnes/graph_values.yml | 54 +++++++++---------- .../GM0321_houten/GM0321_houten.derived.ad | 4 +- datasets/GM0321_houten/graph_values.yml | 54 +++++++++---------- .../GM0327_leusden/GM0327_leusden.derived.ad | 4 +- datasets/GM0327_leusden/graph_values.yml | 54 +++++++++---------- datasets/GM0331_lopik/GM0331_lopik.derived.ad | 4 +- datasets/GM0331_lopik/graph_values.yml | 54 +++++++++---------- .../GM0335_montfoort.derived.ad | 4 +- datasets/GM0335_montfoort/graph_values.yml | 54 +++++++++---------- .../GM0339_renswoude.derived.ad | 4 +- datasets/GM0339_renswoude/graph_values.yml | 54 +++++++++---------- .../GM0340_rhenen/GM0340_rhenen.derived.ad | 4 +- datasets/GM0340_rhenen/graph_values.yml | 54 +++++++++---------- datasets/GM0342_soest/GM0342_soest.derived.ad | 4 +- datasets/GM0342_soest/graph_values.yml | 54 +++++++++---------- .../GM0344_utrecht/GM0344_utrecht.derived.ad | 4 +- datasets/GM0344_utrecht/graph_values.yml | 54 +++++++++---------- .../GM0345_veenendaal.derived.ad | 4 +- datasets/GM0345_veenendaal/graph_values.yml | 54 +++++++++---------- .../GM0351_woudenberg.derived.ad | 4 +- datasets/GM0351_woudenberg/graph_values.yml | 54 +++++++++---------- .../GM0352_wijk_bij_duurstede.derived.ad | 4 +- .../graph_values.yml | 54 +++++++++---------- .../GM0353_ijsselstein.derived.ad | 4 +- datasets/GM0353_ijsselstein/graph_values.yml | 54 +++++++++---------- datasets/GM0355_zeist/GM0355_zeist.derived.ad | 4 +- datasets/GM0355_zeist/graph_values.yml | 54 +++++++++---------- .../GM0356_nieuwegein.derived.ad | 4 +- datasets/GM0356_nieuwegein/graph_values.yml | 54 +++++++++---------- .../GM0358_aalsmeer.derived.ad | 4 +- datasets/GM0358_aalsmeer/graph_values.yml | 54 +++++++++---------- .../GM0361_alkmaar/GM0361_alkmaar.derived.ad | 4 +- datasets/GM0361_alkmaar/graph_values.yml | 54 +++++++++---------- .../GM0362_amstelveen.derived.ad | 4 +- datasets/GM0362_amstelveen/graph_values.yml | 54 +++++++++---------- .../GM0363_amsterdam.derived.ad | 4 +- datasets/GM0363_amsterdam/graph_values.yml | 54 +++++++++---------- .../GM0373_bergen/GM0373_bergen.derived.ad | 4 +- datasets/GM0373_bergen/graph_values.yml | 54 +++++++++---------- .../GM0375_beverwijk.derived.ad | 4 +- datasets/GM0375_beverwijk/graph_values.yml | 54 +++++++++---------- .../GM0376_blaricum.derived.ad | 4 +- datasets/GM0376_blaricum/graph_values.yml | 54 +++++++++---------- .../GM0377_bloemendaal.derived.ad | 4 +- datasets/GM0377_bloemendaal/graph_values.yml | 54 +++++++++---------- .../GM0383_castricum.derived.ad | 4 +- datasets/GM0383_castricum/graph_values.yml | 54 +++++++++---------- .../GM0384_diemen/GM0384_diemen.derived.ad | 4 +- datasets/GM0384_diemen/graph_values.yml | 54 +++++++++---------- .../GM0385_edam_volendam.derived.ad | 4 +- .../GM0385_edam_volendam/graph_values.yml | 54 +++++++++---------- .../GM0388_enkhuizen.derived.ad | 4 +- datasets/GM0388_enkhuizen/graph_values.yml | 54 +++++++++---------- .../GM0392_haarlem/GM0392_haarlem.derived.ad | 4 +- datasets/GM0392_haarlem/graph_values.yml | 54 +++++++++---------- .../GM0394_haarlemmermeer.derived.ad | 4 +- .../GM0394_haarlemmermeer/graph_values.yml | 54 +++++++++---------- .../GM0396_heemskerk.derived.ad | 4 +- datasets/GM0396_heemskerk/graph_values.yml | 54 +++++++++---------- .../GM0397_heemstede.derived.ad | 4 +- datasets/GM0397_heemstede/graph_values.yml | 54 +++++++++---------- .../GM0399_heiloo/GM0399_heiloo.derived.ad | 4 +- datasets/GM0399_heiloo/graph_values.yml | 54 +++++++++---------- .../GM0400_den_helder.derived.ad | 4 +- datasets/GM0400_den_helder/graph_values.yml | 54 +++++++++---------- .../GM0402_hilversum.derived.ad | 4 +- datasets/GM0402_hilversum/graph_values.yml | 54 +++++++++---------- datasets/GM0405_hoorn/GM0405_hoorn.derived.ad | 4 +- datasets/GM0405_hoorn/graph_values.yml | 54 +++++++++---------- .../GM0406_huizen/GM0406_huizen.derived.ad | 4 +- datasets/GM0406_huizen/graph_values.yml | 54 +++++++++---------- .../GM0415_landsmeer.derived.ad | 4 +- datasets/GM0415_landsmeer/graph_values.yml | 54 +++++++++---------- datasets/GM0417_laren/GM0417_laren.derived.ad | 4 +- datasets/GM0417_laren/graph_values.yml | 54 +++++++++---------- .../GM0420_medemblik.derived.ad | 4 +- datasets/GM0420_medemblik/graph_values.yml | 54 +++++++++---------- .../GM0431_oostzaan.derived.ad | 4 +- datasets/GM0431_oostzaan/graph_values.yml | 54 +++++++++---------- .../GM0432_opmeer/GM0432_opmeer.derived.ad | 4 +- datasets/GM0432_opmeer/graph_values.yml | 54 +++++++++---------- .../GM0437_ouder_amstel.derived.ad | 4 +- datasets/GM0437_ouder_amstel/graph_values.yml | 54 +++++++++---------- .../GM0439_purmerend.derived.ad | 4 +- datasets/GM0439_purmerend/graph_values.yml | 54 +++++++++---------- .../GM0441_schagen/GM0441_schagen.derived.ad | 4 +- datasets/GM0441_schagen/graph_values.yml | 54 +++++++++---------- datasets/GM0448_texel/GM0448_texel.derived.ad | 4 +- datasets/GM0448_texel/graph_values.yml | 54 +++++++++---------- .../GM0450_uitgeest.derived.ad | 4 +- datasets/GM0450_uitgeest/graph_values.yml | 54 +++++++++---------- .../GM0451_uithoorn.derived.ad | 4 +- datasets/GM0451_uithoorn/graph_values.yml | 54 +++++++++---------- .../GM0453_velsen/GM0453_velsen.derived.ad | 4 +- datasets/GM0453_velsen/graph_values.yml | 54 +++++++++---------- .../GM0473_zandvoort.derived.ad | 4 +- datasets/GM0473_zandvoort/graph_values.yml | 54 +++++++++---------- .../GM0479_zaanstad.derived.ad | 4 +- datasets/GM0479_zaanstad/graph_values.yml | 54 +++++++++---------- .../GM0482_alblasserdam.derived.ad | 4 +- datasets/GM0482_alblasserdam/graph_values.yml | 54 +++++++++---------- .../GM0484_alphen_aan_den_rijn.derived.ad | 4 +- .../graph_values.yml | 54 +++++++++---------- .../GM0489_barendrecht.derived.ad | 4 +- datasets/GM0489_barendrecht/graph_values.yml | 54 +++++++++---------- .../GM0498_drechterland.derived.ad | 4 +- datasets/GM0498_drechterland/graph_values.yml | 54 +++++++++---------- .../GM0502_capelle_aan_den_ijssel.derived.ad | 4 +- .../graph_values.yml | 54 +++++++++---------- datasets/GM0503_delft/GM0503_delft.derived.ad | 4 +- datasets/GM0503_delft/graph_values.yml | 54 +++++++++---------- .../GM0505_dordrecht.derived.ad | 4 +- datasets/GM0505_dordrecht/graph_values.yml | 54 +++++++++---------- .../GM0512_gorinchem.derived.ad | 4 +- datasets/GM0512_gorinchem/graph_values.yml | 54 +++++++++---------- datasets/GM0513_gouda/GM0513_gouda.derived.ad | 4 +- datasets/GM0513_gouda/graph_values.yml | 54 +++++++++---------- .../GM0518_s_gravenhage.derived.ad | 4 +- datasets/GM0518_s_gravenhage/graph_values.yml | 54 +++++++++---------- .../GM0523_hardinxveld_giessendam.derived.ad | 4 +- .../graph_values.yml | 54 +++++++++---------- .../GM0531_hendrik_ido_ambacht.derived.ad | 4 +- .../graph_values.yml | 54 +++++++++---------- .../GM0532_stede_broec.derived.ad | 4 +- datasets/GM0532_stede_broec/graph_values.yml | 54 +++++++++---------- .../GM0534_hillegom.derived.ad | 4 +- datasets/GM0534_hillegom/graph_values.yml | 54 +++++++++---------- .../GM0537_katwijk/GM0537_katwijk.derived.ad | 4 +- datasets/GM0537_katwijk/graph_values.yml | 54 +++++++++---------- .../GM0542_krimpen_aan_den_ijssel.derived.ad | 4 +- .../graph_values.yml | 54 +++++++++---------- .../GM0546_leiden/GM0546_leiden.derived.ad | 4 +- datasets/GM0546_leiden/graph_values.yml | 54 +++++++++---------- .../GM0547_leiderdorp.derived.ad | 4 +- datasets/GM0547_leiderdorp/graph_values.yml | 54 +++++++++---------- datasets/GM0553_lisse/GM0553_lisse.derived.ad | 4 +- datasets/GM0553_lisse/graph_values.yml | 54 +++++++++---------- .../GM0556_maassluis.derived.ad | 4 +- datasets/GM0556_maassluis/graph_values.yml | 54 +++++++++---------- .../GM0569_nieuwkoop.derived.ad | 4 +- datasets/GM0569_nieuwkoop/graph_values.yml | 54 +++++++++---------- .../GM0575_noordwijk.derived.ad | 4 +- datasets/GM0575_noordwijk/graph_values.yml | 54 +++++++++---------- .../GM0579_oegstgeest.derived.ad | 4 +- datasets/GM0579_oegstgeest/graph_values.yml | 54 +++++++++---------- .../GM0589_oudewater.derived.ad | 4 +- datasets/GM0589_oudewater/graph_values.yml | 54 +++++++++---------- .../GM0590_papendrecht.derived.ad | 4 +- datasets/GM0590_papendrecht/graph_values.yml | 54 +++++++++---------- .../GM0597_ridderkerk.derived.ad | 4 +- datasets/GM0597_ridderkerk/graph_values.yml | 54 +++++++++---------- .../GM0599_rotterdam.derived.ad | 4 +- datasets/GM0599_rotterdam/graph_values.yml | 54 +++++++++---------- .../GM0603_rijswijk.derived.ad | 4 +- datasets/GM0603_rijswijk/graph_values.yml | 54 +++++++++---------- .../GM0606_schiedam.derived.ad | 4 +- datasets/GM0606_schiedam/graph_values.yml | 54 +++++++++---------- .../GM0610_sliedrecht.derived.ad | 4 +- datasets/GM0610_sliedrecht/graph_values.yml | 54 +++++++++---------- .../GM0613_albrandswaard.derived.ad | 4 +- .../GM0613_albrandswaard/graph_values.yml | 54 +++++++++---------- .../GM0622_vlaardingen.derived.ad | 4 +- datasets/GM0622_vlaardingen/graph_values.yml | 54 +++++++++---------- .../GM0626_voorschoten.derived.ad | 4 +- datasets/GM0626_voorschoten/graph_values.yml | 54 +++++++++---------- .../GM0627_waddinxveen.derived.ad | 4 +- datasets/GM0627_waddinxveen/graph_values.yml | 54 +++++++++---------- .../GM0629_wassenaar.derived.ad | 4 +- datasets/GM0629_wassenaar/graph_values.yml | 54 +++++++++---------- .../GM0632_woerden/GM0632_woerden.derived.ad | 4 +- datasets/GM0632_woerden/graph_values.yml | 54 +++++++++---------- .../GM0637_zoetermeer.derived.ad | 4 +- datasets/GM0637_zoetermeer/graph_values.yml | 54 +++++++++---------- .../GM0638_zoeterwoude.derived.ad | 4 +- datasets/GM0638_zoeterwoude/graph_values.yml | 54 +++++++++---------- .../GM0642_zwijndrecht.derived.ad | 4 +- datasets/GM0642_zwijndrecht/graph_values.yml | 54 +++++++++---------- .../GM0654_borsele/GM0654_borsele.derived.ad | 4 +- datasets/GM0654_borsele/graph_values.yml | 54 +++++++++---------- datasets/GM0664_goes/GM0664_goes.derived.ad | 4 +- datasets/GM0664_goes/graph_values.yml | 54 +++++++++---------- .../GM0668_west_maas_en_waal.derived.ad | 4 +- .../GM0668_west_maas_en_waal/graph_values.yml | 54 +++++++++---------- datasets/GM0677_hulst/GM0677_hulst.derived.ad | 4 +- datasets/GM0677_hulst/graph_values.yml | 54 +++++++++---------- .../GM0678_kapelle/GM0678_kapelle.derived.ad | 4 +- datasets/GM0678_kapelle/graph_values.yml | 54 +++++++++---------- .../GM0687_middelburg.derived.ad | 4 +- datasets/GM0687_middelburg/graph_values.yml | 54 +++++++++---------- .../GM0703_reimerswaal.derived.ad | 4 +- datasets/GM0703_reimerswaal/graph_values.yml | 54 +++++++++---------- .../GM0715_terneuzen.derived.ad | 4 +- datasets/GM0715_terneuzen/graph_values.yml | 54 +++++++++---------- .../GM0716_tholen/GM0716_tholen.derived.ad | 4 +- datasets/GM0716_tholen/graph_values.yml | 54 +++++++++---------- datasets/GM0717_veere/GM0717_veere.derived.ad | 4 +- datasets/GM0717_veere/graph_values.yml | 54 +++++++++---------- .../GM0718_vlissingen.derived.ad | 4 +- datasets/GM0718_vlissingen/graph_values.yml | 54 +++++++++---------- .../GM0736_de_ronde_venen.derived.ad | 4 +- .../GM0736_de_ronde_venen/graph_values.yml | 54 +++++++++---------- .../GM0737_tytsjerksteradiel.derived.ad | 4 +- .../GM0737_tytsjerksteradiel/graph_values.yml | 54 +++++++++---------- datasets/GM0743_asten/GM0743_asten.derived.ad | 4 +- datasets/GM0743_asten/graph_values.yml | 54 +++++++++---------- .../GM0744_baarle_nassau.derived.ad | 4 +- .../GM0744_baarle_nassau/graph_values.yml | 54 +++++++++---------- .../GM0748_bergen_op_zoom.derived.ad | 4 +- .../GM0748_bergen_op_zoom/graph_values.yml | 54 +++++++++---------- datasets/GM0753_best/GM0753_best.derived.ad | 4 +- datasets/GM0753_best/graph_values.yml | 54 +++++++++---------- .../GM0755_boekel/GM0755_boekel.derived.ad | 4 +- datasets/GM0755_boekel/graph_values.yml | 54 +++++++++---------- .../GM0757_boxtel/GM0757_boxtel.derived.ad | 4 +- datasets/GM0757_boxtel/graph_values.yml | 54 +++++++++---------- datasets/GM0758_breda/GM0758_breda.derived.ad | 4 +- datasets/GM0758_breda/graph_values.yml | 54 +++++++++---------- .../GM0762_deurne/GM0762_deurne.derived.ad | 4 +- datasets/GM0762_deurne/graph_values.yml | 54 +++++++++---------- .../GM0765_pekela/GM0765_pekela.derived.ad | 4 +- datasets/GM0765_pekela/graph_values.yml | 54 +++++++++---------- .../GM0766_dongen/GM0766_dongen.derived.ad | 4 +- datasets/GM0766_dongen/graph_values.yml | 54 +++++++++---------- .../GM0770_eersel/GM0770_eersel.derived.ad | 4 +- datasets/GM0770_eersel/graph_values.yml | 54 +++++++++---------- .../GM0772_eindhoven.derived.ad | 4 +- datasets/GM0772_eindhoven/graph_values.yml | 54 +++++++++---------- .../GM0777_etten_leur.derived.ad | 4 +- datasets/GM0777_etten_leur/graph_values.yml | 54 +++++++++---------- .../GM0779_geertruidenberg.derived.ad | 4 +- .../GM0779_geertruidenberg/graph_values.yml | 54 +++++++++---------- .../GM0784_gilze_en_rijen.derived.ad | 4 +- .../GM0784_gilze_en_rijen/graph_values.yml | 54 +++++++++---------- .../GM0785_goirle/GM0785_goirle.derived.ad | 4 +- datasets/GM0785_goirle/graph_values.yml | 54 +++++++++---------- .../GM0794_helmond/GM0794_helmond.derived.ad | 4 +- datasets/GM0794_helmond/graph_values.yml | 54 +++++++++---------- .../GM0796_s_hertogenbosch.derived.ad | 4 +- .../GM0796_s_hertogenbosch/graph_values.yml | 54 +++++++++---------- .../GM0797_heusden/GM0797_heusden.derived.ad | 4 +- datasets/GM0797_heusden/graph_values.yml | 54 +++++++++---------- .../GM0798_hilvarenbeek.derived.ad | 4 +- datasets/GM0798_hilvarenbeek/graph_values.yml | 54 +++++++++---------- .../GM0809_loon_op_zand.derived.ad | 4 +- datasets/GM0809_loon_op_zand/graph_values.yml | 54 +++++++++---------- ...20_nuenen_gerwen_en_nederwetten.derived.ad | 4 +- .../graph_values.yml | 54 +++++++++---------- .../GM0823_oirschot.derived.ad | 4 +- datasets/GM0823_oirschot/graph_values.yml | 54 +++++++++---------- .../GM0824_oisterwijk.derived.ad | 4 +- datasets/GM0824_oisterwijk/graph_values.yml | 54 +++++++++---------- .../GM0826_oosterhout.derived.ad | 4 +- datasets/GM0826_oosterhout/graph_values.yml | 54 +++++++++---------- datasets/GM0828_oss/GM0828_oss.derived.ad | 4 +- datasets/GM0828_oss/graph_values.yml | 54 +++++++++---------- .../GM0840_rucphen/GM0840_rucphen.derived.ad | 4 +- datasets/GM0840_rucphen/graph_values.yml | 54 +++++++++---------- .../GM0845_sint_michielsgestel.derived.ad | 4 +- .../graph_values.yml | 54 +++++++++---------- .../GM0847_someren/GM0847_someren.derived.ad | 4 +- datasets/GM0847_someren/graph_values.yml | 54 +++++++++---------- .../GM0848_son_en_breugel.derived.ad | 4 +- .../GM0848_son_en_breugel/graph_values.yml | 54 +++++++++---------- .../GM0851_steenbergen.derived.ad | 4 +- datasets/GM0851_steenbergen/graph_values.yml | 54 +++++++++---------- .../GM0852_waterland.derived.ad | 4 +- datasets/GM0852_waterland/graph_values.yml | 54 +++++++++---------- .../GM0855_tilburg/GM0855_tilburg.derived.ad | 4 +- datasets/GM0855_tilburg/graph_values.yml | 54 +++++++++---------- .../GM0858_valkenswaard.derived.ad | 4 +- datasets/GM0858_valkenswaard/graph_values.yml | 54 +++++++++---------- .../GM0861_veldhoven.derived.ad | 4 +- datasets/GM0861_veldhoven/graph_values.yml | 54 +++++++++---------- datasets/GM0865_vught/GM0865_vught.derived.ad | 4 +- datasets/GM0865_vught/graph_values.yml | 54 +++++++++---------- .../GM0866_waalre/GM0866_waalre.derived.ad | 4 +- datasets/GM0866_waalre/graph_values.yml | 54 +++++++++---------- .../GM0867_waalwijk.derived.ad | 4 +- datasets/GM0867_waalwijk/graph_values.yml | 54 +++++++++---------- .../GM0873_woensdrecht.derived.ad | 4 +- datasets/GM0873_woensdrecht/graph_values.yml | 54 +++++++++---------- .../GM0879_zundert/GM0879_zundert.derived.ad | 4 +- datasets/GM0879_zundert/graph_values.yml | 54 +++++++++---------- .../GM0880_wormerland.derived.ad | 4 +- datasets/GM0880_wormerland/graph_values.yml | 54 +++++++++---------- .../GM0882_landgraaf.derived.ad | 4 +- datasets/GM0882_landgraaf/graph_values.yml | 54 +++++++++---------- datasets/GM0888_beek/GM0888_beek.derived.ad | 4 +- datasets/GM0888_beek/graph_values.yml | 54 +++++++++---------- .../GM0889_beesel/GM0889_beesel.derived.ad | 4 +- datasets/GM0889_beesel/graph_values.yml | 54 +++++++++---------- .../GM0893_bergen/GM0893_bergen.derived.ad | 4 +- datasets/GM0893_bergen/graph_values.yml | 54 +++++++++---------- .../GM0899_brunssum.derived.ad | 4 +- datasets/GM0899_brunssum/graph_values.yml | 54 +++++++++---------- .../GM0907_gennep/GM0907_gennep.derived.ad | 4 +- datasets/GM0907_gennep/graph_values.yml | 54 +++++++++---------- .../GM0917_heerlen/GM0917_heerlen.derived.ad | 4 +- datasets/GM0917_heerlen/graph_values.yml | 54 +++++++++---------- .../GM0928_kerkrade.derived.ad | 4 +- datasets/GM0928_kerkrade/graph_values.yml | 54 +++++++++---------- .../GM0935_maastricht.derived.ad | 4 +- datasets/GM0935_maastricht/graph_values.yml | 54 +++++++++---------- .../GM0938_meerssen.derived.ad | 4 +- datasets/GM0938_meerssen/graph_values.yml | 54 +++++++++---------- .../GM0944_mook_en_middelaar.derived.ad | 4 +- .../GM0944_mook_en_middelaar/graph_values.yml | 54 +++++++++---------- .../GM0946_nederweert.derived.ad | 4 +- datasets/GM0946_nederweert/graph_values.yml | 54 +++++++++---------- .../GM0957_roermond.derived.ad | 4 +- datasets/GM0957_roermond/graph_values.yml | 54 +++++++++---------- .../GM0965_simpelveld.derived.ad | 4 +- datasets/GM0965_simpelveld/graph_values.yml | 54 +++++++++---------- datasets/GM0971_stein/GM0971_stein.derived.ad | 4 +- datasets/GM0971_stein/graph_values.yml | 54 +++++++++---------- datasets/GM0981_vaals/GM0981_vaals.derived.ad | 4 +- datasets/GM0981_vaals/graph_values.yml | 54 +++++++++---------- datasets/GM0983_venlo/GM0983_venlo.derived.ad | 4 +- datasets/GM0983_venlo/graph_values.yml | 54 +++++++++---------- .../GM0984_venray/GM0984_venray.derived.ad | 4 +- datasets/GM0984_venray/graph_values.yml | 54 +++++++++---------- .../GM0986_voerendaal.derived.ad | 4 +- datasets/GM0986_voerendaal/graph_values.yml | 54 +++++++++---------- datasets/GM0988_weert/GM0988_weert.derived.ad | 4 +- datasets/GM0988_weert/graph_values.yml | 54 +++++++++---------- .../GM0994_valkenburg_aan_de_geul.derived.ad | 4 +- .../graph_values.yml | 54 +++++++++---------- .../GM0995_lelystad.derived.ad | 4 +- datasets/GM0995_lelystad/graph_values.yml | 54 +++++++++---------- .../GM1507_horst_aan_de_maas.derived.ad | 4 +- .../GM1507_horst_aan_de_maas/graph_values.yml | 54 +++++++++---------- .../GM1509_oude_ijsselstreek.derived.ad | 4 +- .../GM1509_oude_ijsselstreek/graph_values.yml | 54 +++++++++---------- .../GM1525_teylingen.derived.ad | 4 +- datasets/GM1525_teylingen/graph_values.yml | 54 +++++++++---------- .../GM1581_utrechtse_heuvelrug.derived.ad | 4 +- .../graph_values.yml | 54 +++++++++---------- .../GM1586_oost_gelre.derived.ad | 4 +- datasets/GM1586_oost_gelre/graph_values.yml | 54 +++++++++---------- .../GM1598_koggenland.derived.ad | 4 +- datasets/GM1598_koggenland/graph_values.yml | 54 +++++++++---------- .../GM1621_lansingerland.derived.ad | 4 +- .../GM1621_lansingerland/graph_values.yml | 54 +++++++++---------- .../GM1640_leudal/GM1640_leudal.derived.ad | 4 +- datasets/GM1640_leudal/graph_values.yml | 54 +++++++++---------- .../GM1641_maasgouw.derived.ad | 4 +- datasets/GM1641_maasgouw/graph_values.yml | 54 +++++++++---------- .../GM1652_gemert_bakel.derived.ad | 4 +- datasets/GM1652_gemert_bakel/graph_values.yml | 54 +++++++++---------- .../GM1655_halderberge.derived.ad | 4 +- datasets/GM1655_halderberge/graph_values.yml | 54 +++++++++---------- .../GM1658_heeze_leende.derived.ad | 4 +- datasets/GM1658_heeze_leende/graph_values.yml | 54 +++++++++---------- .../GM1659_laarbeek.derived.ad | 4 +- datasets/GM1659_laarbeek/graph_values.yml | 54 +++++++++---------- .../GM1667_reusel_de_mierden.derived.ad | 4 +- .../GM1667_reusel_de_mierden/graph_values.yml | 54 +++++++++---------- .../GM1669_roerdalen.derived.ad | 4 +- datasets/GM1669_roerdalen/graph_values.yml | 54 +++++++++---------- .../GM1674_roosendaal.derived.ad | 4 +- datasets/GM1674_roosendaal/graph_values.yml | 54 +++++++++---------- .../GM1676_schouwen_duiveland.derived.ad | 4 +- .../graph_values.yml | 54 +++++++++---------- .../GM1680_aa_en_hunze.derived.ad | 4 +- datasets/GM1680_aa_en_hunze/graph_values.yml | 54 +++++++++---------- .../GM1681_borger_odoorn.derived.ad | 4 +- .../GM1681_borger_odoorn/graph_values.yml | 54 +++++++++---------- .../GM1690_de_wolden.derived.ad | 4 +- datasets/GM1690_de_wolden/graph_values.yml | 54 +++++++++---------- .../GM1695_noord_beveland.derived.ad | 4 +- .../GM1695_noord_beveland/graph_values.yml | 54 +++++++++---------- .../GM1696_wijdemeren.derived.ad | 4 +- datasets/GM1696_wijdemeren/graph_values.yml | 54 +++++++++---------- .../GM1699_noordenveld.derived.ad | 4 +- datasets/GM1699_noordenveld/graph_values.yml | 54 +++++++++---------- .../GM1700_twenterand.derived.ad | 4 +- datasets/GM1700_twenterand/graph_values.yml | 54 +++++++++---------- .../GM1701_westerveld.derived.ad | 4 +- datasets/GM1701_westerveld/graph_values.yml | 54 +++++++++---------- .../GM1705_lingewaard.derived.ad | 4 +- datasets/GM1705_lingewaard/graph_values.yml | 54 +++++++++---------- .../GM1706_cranendonck.derived.ad | 4 +- datasets/GM1706_cranendonck/graph_values.yml | 54 +++++++++---------- .../GM1708_steenwijkerland.derived.ad | 4 +- .../GM1708_steenwijkerland/graph_values.yml | 54 +++++++++---------- .../GM1709_moerdijk.derived.ad | 4 +- datasets/GM1709_moerdijk/graph_values.yml | 54 +++++++++---------- .../GM1711_echt_susteren.derived.ad | 4 +- .../GM1711_echt_susteren/graph_values.yml | 54 +++++++++---------- datasets/GM1714_sluis/GM1714_sluis.derived.ad | 4 +- datasets/GM1714_sluis/graph_values.yml | 54 +++++++++---------- .../GM1719_drimmelen.derived.ad | 4 +- datasets/GM1719_drimmelen/graph_values.yml | 54 +++++++++---------- .../GM1721_bernheze.derived.ad | 4 +- datasets/GM1721_bernheze/graph_values.yml | 54 +++++++++---------- .../GM1723_alphen_chaam.derived.ad | 4 +- datasets/GM1723_alphen_chaam/graph_values.yml | 54 +++++++++---------- .../GM1724_bergeijk.derived.ad | 4 +- datasets/GM1724_bergeijk/graph_values.yml | 54 +++++++++---------- .../GM1728_bladel/GM1728_bladel.derived.ad | 4 +- datasets/GM1728_bladel/graph_values.yml | 54 +++++++++---------- .../GM1729_gulpen_wittem.derived.ad | 4 +- .../GM1729_gulpen_wittem/graph_values.yml | 54 +++++++++---------- .../GM1730_tynaarlo.derived.ad | 4 +- datasets/GM1730_tynaarlo/graph_values.yml | 54 +++++++++---------- .../GM1731_midden_drenthe.derived.ad | 4 +- .../GM1731_midden_drenthe/graph_values.yml | 54 +++++++++---------- .../GM1734_overbetuwe.derived.ad | 4 +- datasets/GM1734_overbetuwe/graph_values.yml | 54 +++++++++---------- .../GM1735_hof_van_twente.derived.ad | 4 +- .../GM1735_hof_van_twente/graph_values.yml | 54 +++++++++---------- .../GM1740_neder_betuwe.derived.ad | 4 +- datasets/GM1740_neder_betuwe/graph_values.yml | 54 +++++++++---------- .../GM1742_rijssen_holten.derived.ad | 4 +- .../GM1742_rijssen_holten/graph_values.yml | 54 +++++++++---------- .../GM1771_geldrop_mierlo.derived.ad | 4 +- .../GM1771_geldrop_mierlo/graph_values.yml | 54 +++++++++---------- .../GM1773_olst_wijhe.derived.ad | 4 +- datasets/GM1773_olst_wijhe/graph_values.yml | 54 +++++++++---------- .../GM1774_dinkelland.derived.ad | 4 +- datasets/GM1774_dinkelland/graph_values.yml | 54 +++++++++---------- .../GM1783_westland.derived.ad | 4 +- datasets/GM1783_westland/graph_values.yml | 54 +++++++++---------- .../GM1842_midden_delfland.derived.ad | 4 +- .../GM1842_midden_delfland/graph_values.yml | 54 +++++++++---------- .../GM1859_berkelland.derived.ad | 4 +- datasets/GM1859_berkelland/graph_values.yml | 54 +++++++++---------- .../GM1876_bronckhorst.derived.ad | 4 +- datasets/GM1876_bronckhorst/graph_values.yml | 54 +++++++++---------- .../GM1883_sittard_geleen.derived.ad | 4 +- .../GM1883_sittard_geleen/graph_values.yml | 54 +++++++++---------- .../GM1884_kaag_en_braassem.derived.ad | 4 +- .../GM1884_kaag_en_braassem/graph_values.yml | 54 +++++++++---------- .../GM1891_dantumadiel.derived.ad | 4 +- datasets/GM1891_dantumadiel/graph_values.yml | 54 +++++++++---------- .../GM1892_zuidplas.derived.ad | 4 +- datasets/GM1892_zuidplas/graph_values.yml | 54 +++++++++---------- .../GM1894_peel_en_maas.derived.ad | 4 +- datasets/GM1894_peel_en_maas/graph_values.yml | 54 +++++++++---------- .../GM1895_oldambt/GM1895_oldambt.derived.ad | 4 +- datasets/GM1895_oldambt/graph_values.yml | 54 +++++++++---------- .../GM1896_zwartewaterland.derived.ad | 4 +- .../GM1896_zwartewaterland/graph_values.yml | 54 +++++++++---------- .../GM1900_sudwest_fryslan.derived.ad | 4 +- .../GM1900_sudwest_fryslan/graph_values.yml | 54 +++++++++---------- .../GM1901_bodegraven_reeuwijk.derived.ad | 4 +- .../graph_values.yml | 54 +++++++++---------- .../GM1903_eijsden_margraten.derived.ad | 4 +- .../GM1903_eijsden_margraten/graph_values.yml | 54 +++++++++---------- .../GM1904_stichtse_vecht.derived.ad | 4 +- .../GM1904_stichtse_vecht/graph_values.yml | 54 +++++++++---------- .../GM1911_hollands_kroon.derived.ad | 4 +- .../GM1911_hollands_kroon/graph_values.yml | 54 +++++++++---------- .../GM1916_leidschendam_voorburg.derived.ad | 4 +- .../graph_values.yml | 54 +++++++++---------- .../GM1924_goeree_overflakkee.derived.ad | 4 +- .../graph_values.yml | 54 +++++++++---------- .../GM1926_pijnacker_nootdorp.derived.ad | 4 +- .../graph_values.yml | 54 +++++++++---------- .../GM1930_nissewaard.derived.ad | 4 +- datasets/GM1930_nissewaard/graph_values.yml | 54 +++++++++---------- .../GM1931_krimpenerwaard.derived.ad | 4 +- .../GM1931_krimpenerwaard/graph_values.yml | 54 +++++++++---------- .../GM1940_de_fryske_marren.derived.ad | 4 +- .../GM1940_de_fryske_marren/graph_values.yml | 54 +++++++++---------- .../GM1942_gooise_meren.derived.ad | 4 +- datasets/GM1942_gooise_meren/graph_values.yml | 54 +++++++++---------- .../GM1945_berg_en_dal.derived.ad | 4 +- datasets/GM1945_berg_en_dal/graph_values.yml | 54 +++++++++---------- .../GM1948_meierijstad.derived.ad | 4 +- datasets/GM1948_meierijstad/graph_values.yml | 54 +++++++++---------- .../GM1949_waadhoeke.derived.ad | 4 +- datasets/GM1949_waadhoeke/graph_values.yml | 54 +++++++++---------- .../GM1950_westerwolde.derived.ad | 4 +- datasets/GM1950_westerwolde/graph_values.yml | 54 +++++++++---------- .../GM1952_midden_groningen.derived.ad | 4 +- .../GM1952_midden_groningen/graph_values.yml | 54 +++++++++---------- .../GM1954_beekdaelen.derived.ad | 4 +- datasets/GM1954_beekdaelen/graph_values.yml | 54 +++++++++---------- .../GM1955_montferland.derived.ad | 4 +- datasets/GM1955_montferland/graph_values.yml | 54 +++++++++---------- .../GM1959_altena/GM1959_altena.derived.ad | 4 +- datasets/GM1959_altena/graph_values.yml | 54 +++++++++---------- .../GM1960_west_betuwe.derived.ad | 4 +- datasets/GM1960_west_betuwe/graph_values.yml | 54 +++++++++---------- .../GM1961_vijfheerenlanden.derived.ad | 4 +- .../GM1961_vijfheerenlanden/graph_values.yml | 54 +++++++++---------- .../GM1963_hoeksche_waard.derived.ad | 4 +- .../GM1963_hoeksche_waard/graph_values.yml | 54 +++++++++---------- .../GM1966_het_hogeland.derived.ad | 4 +- datasets/GM1966_het_hogeland/graph_values.yml | 54 +++++++++---------- .../GM1969_westerkwartier.derived.ad | 4 +- .../GM1969_westerkwartier/graph_values.yml | 54 +++++++++---------- .../GM1970_noardeast_fryslan.derived.ad | 4 +- .../GM1970_noardeast_fryslan/graph_values.yml | 54 +++++++++---------- .../GM1978_molenlanden.derived.ad | 4 +- datasets/GM1978_molenlanden/graph_values.yml | 54 +++++++++---------- .../GM1979_eemsdelta.derived.ad | 4 +- datasets/GM1979_eemsdelta/graph_values.yml | 54 +++++++++---------- .../GM1980_dijk_en_waard.derived.ad | 4 +- .../GM1980_dijk_en_waard/graph_values.yml | 54 +++++++++---------- .../GM1982_land_van_cuijk.derived.ad | 4 +- .../GM1982_land_van_cuijk/graph_values.yml | 54 +++++++++---------- .../GM1991_maashorst.derived.ad | 4 +- datasets/GM1991_maashorst/graph_values.yml | 54 +++++++++---------- .../GM1992_voorne_aan_zee.derived.ad | 4 +- .../GM1992_voorne_aan_zee/graph_values.yml | 54 +++++++++---------- 684 files changed, 9918 insertions(+), 9918 deletions(-) diff --git a/datasets/GM0014_groningen/GM0014_groningen.derived.ad b/datasets/GM0014_groningen/GM0014_groningen.derived.ad index 12f3e4e463..78fa0e546e 100644 --- a/datasets/GM0014_groningen/GM0014_groningen.derived.ad +++ b/datasets/GM0014_groningen/GM0014_groningen.derived.ad @@ -1,6 +1,6 @@ - area = GM0014_groningen -- id = 128616 -- parent_id = 128616 +- id = 128958 +- parent_id = 128958 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0014_groningen/graph_values.yml b/datasets/GM0014_groningen/graph_values.yml index a88b15b491..9428452f30 100644 --- a/datasets/GM0014_groningen/graph_values.yml +++ b/datasets/GM0014_groningen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15019705220995302 - :network_gas: 0.17391621284525827 - :ambient_heat: 0.6758867349447886 + :electricity: 0.15359734259352323 + :network_gas: 0.15521461573562229 + :ambient_heat: 0.6911880416708545 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 118786.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 6253.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2094331710889209 - :network_gas: 0.16226731564431426 - :ambient_heat: 0.6282995132667649 + :electricity: 0.16033703950631645 + :network_gas: 0.3586518419747325 + :ambient_heat: 0.48101111851895106 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0034_almere/GM0034_almere.derived.ad b/datasets/GM0034_almere/GM0034_almere.derived.ad index a25dced0cf..7079040541 100644 --- a/datasets/GM0034_almere/GM0034_almere.derived.ad +++ b/datasets/GM0034_almere/GM0034_almere.derived.ad @@ -1,6 +1,6 @@ - area = GM0034_almere -- id = 128521 -- parent_id = 128521 +- id = 128863 +- parent_id = 128863 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0034_almere/graph_values.yml b/datasets/GM0034_almere/graph_values.yml index 62b9ca3275..3d7d0c04c1 100644 --- a/datasets/GM0034_almere/graph_values.yml +++ b/datasets/GM0034_almere/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17109387622439878 - :network_gas: 0.05898368076580681 - :ambient_heat: 0.7699224430097944 + :electricity: 0.1723881661044069 + :network_gas: 0.05186508642576184 + :ambient_heat: 0.7757467474698312 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 85128.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 0.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.23636878823013552 - :network_gas: 0.05452484707945555 - :ambient_heat: 0.709106364690409 + :electricity: 0.2143174775817544 + :network_gas: 0.1427300896729801 + :ambient_heat: 0.6429524327452655 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0037_stadskanaal/GM0037_stadskanaal.derived.ad b/datasets/GM0037_stadskanaal/GM0037_stadskanaal.derived.ad index 9edaea4203..4b85833a57 100644 --- a/datasets/GM0037_stadskanaal/GM0037_stadskanaal.derived.ad +++ b/datasets/GM0037_stadskanaal/GM0037_stadskanaal.derived.ad @@ -1,6 +1,6 @@ - area = GM0037_stadskanaal -- id = 128761 -- parent_id = 128761 +- id = 129103 +- parent_id = 129103 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0037_stadskanaal/graph_values.yml b/datasets/GM0037_stadskanaal/graph_values.yml index 592d327818..3e6d808d99 100644 --- a/datasets/GM0037_stadskanaal/graph_values.yml +++ b/datasets/GM0037_stadskanaal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.14834373772278286 - :network_gas: 0.1841094425246942 - :ambient_heat: 0.667546819752523 + :electricity: 0.15190362659467835 + :network_gas: 0.16453005372926902 + :ambient_heat: 0.6835663196760525 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15182.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 21.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20702002704604286 - :network_gas: 0.17191989181582618 - :ambient_heat: 0.6210600811381308 + :electricity: 0.15630987550389877 + :network_gas: 0.37476049798440336 + :ambient_heat: 0.46892962651169795 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0047_veendam/GM0047_veendam.derived.ad b/datasets/GM0047_veendam/GM0047_veendam.derived.ad index 9d394cfd14..4fd3bf5621 100644 --- a/datasets/GM0047_veendam/GM0047_veendam.derived.ad +++ b/datasets/GM0047_veendam/GM0047_veendam.derived.ad @@ -1,6 +1,6 @@ - area = GM0047_veendam -- id = 128788 -- parent_id = 128788 +- id = 129130 +- parent_id = 129130 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0047_veendam/graph_values.yml b/datasets/GM0047_veendam/graph_values.yml index 1b433e311e..0453a5a156 100644 --- a/datasets/GM0047_veendam/graph_values.yml +++ b/datasets/GM0047_veendam/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1487848263731086 - :network_gas: 0.1816834549479024 - :ambient_heat: 0.6695317186789889 + :electricity: 0.1523071388010245 + :network_gas: 0.1623107365943652 + :ambient_heat: 0.6853821246046103 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12890.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 98.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2075947169980214 - :network_gas: 0.16962113200791207 - :ambient_heat: 0.6227841509940665 + :electricity: 0.15725886217803972 + :network_gas: 0.3709645512878395 + :ambient_heat: 0.47177658653412086 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0050_zeewolde/GM0050_zeewolde.derived.ad b/datasets/GM0050_zeewolde/GM0050_zeewolde.derived.ad index 91c15c65b7..b38757f660 100644 --- a/datasets/GM0050_zeewolde/GM0050_zeewolde.derived.ad +++ b/datasets/GM0050_zeewolde/GM0050_zeewolde.derived.ad @@ -1,6 +1,6 @@ - area = GM0050_zeewolde -- id = 128826 -- parent_id = 128826 +- id = 129168 +- parent_id = 129168 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0050_zeewolde/graph_values.yml b/datasets/GM0050_zeewolde/graph_values.yml index 4584d43950..7fc1e10c9b 100644 --- a/datasets/GM0050_zeewolde/graph_values.yml +++ b/datasets/GM0050_zeewolde/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.160958893706962 - :network_gas: 0.114726084611709 - :ambient_heat: 0.7243150216813291 + :electricity: 0.16334427787748151 + :network_gas: 0.10160647167385183 + :ambient_heat: 0.7350492504486668 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8836.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 0.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.22336738094554506 - :network_gas: 0.10653047621781739 - :ambient_heat: 0.6701021428366376 + :electricity: 0.18598018416060721 + :network_gas: 0.2560792633575693 + :ambient_heat: 0.5579405524818236 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0059_achtkarspelen/GM0059_achtkarspelen.derived.ad b/datasets/GM0059_achtkarspelen/GM0059_achtkarspelen.derived.ad index 4fc7310781..ff402715a8 100644 --- a/datasets/GM0059_achtkarspelen/GM0059_achtkarspelen.derived.ad +++ b/datasets/GM0059_achtkarspelen/GM0059_achtkarspelen.derived.ad @@ -1,6 +1,6 @@ - area = GM0059_achtkarspelen -- id = 128516 -- parent_id = 128516 +- id = 128858 +- parent_id = 128858 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0059_achtkarspelen/graph_values.yml b/datasets/GM0059_achtkarspelen/graph_values.yml index 34b533d0d2..169df1114a 100644 --- a/datasets/GM0059_achtkarspelen/graph_values.yml +++ b/datasets/GM0059_achtkarspelen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1506233467278647 - :network_gas: 0.17157159299674402 - :ambient_heat: 0.6778050602753912 + :electricity: 0.1539862910546704 + :network_gas: 0.15307539919931296 + :ambient_heat: 0.6929383097460168 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12144.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 16.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20998767196346685 - :network_gas: 0.16004931214613038 - :ambient_heat: 0.6299630158904028 + :electricity: 0.16127833609490216 + :network_gas: 0.3548866556203897 + :ambient_heat: 0.4838350082847082 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0060_ameland/GM0060_ameland.derived.ad b/datasets/GM0060_ameland/GM0060_ameland.derived.ad index 216c7e9980..9d2e62651b 100644 --- a/datasets/GM0060_ameland/GM0060_ameland.derived.ad +++ b/datasets/GM0060_ameland/GM0060_ameland.derived.ad @@ -1,6 +1,6 @@ - area = GM0060_ameland -- id = 128524 -- parent_id = 128524 +- id = 128866 +- parent_id = 128866 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0060_ameland/graph_values.yml b/datasets/GM0060_ameland/graph_values.yml index a620fea366..1c466e038d 100644 --- a/datasets/GM0060_ameland/graph_values.yml +++ b/datasets/GM0060_ameland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.14894514981217385 - :network_gas: 0.18080167603304376 - :ambient_heat: 0.6702531741547824 + :electricity: 0.1524537410420842 + :network_gas: 0.16150442426853698 + :ambient_heat: 0.686041834689379 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 1748.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 13.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20780354473563287 - :network_gas: 0.16878582105746626 - :ambient_heat: 0.6234106342069009 + :electricity: 0.15760524660365682 + :network_gas: 0.36957901358537093 + :ambient_heat: 0.4728157398109722 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0072_harlingen/GM0072_harlingen.derived.ad b/datasets/GM0072_harlingen/GM0072_harlingen.derived.ad index c05e1727d6..c23f36c53d 100644 --- a/datasets/GM0072_harlingen/GM0072_harlingen.derived.ad +++ b/datasets/GM0072_harlingen/GM0072_harlingen.derived.ad @@ -1,6 +1,6 @@ - area = GM0072_harlingen -- id = 128625 -- parent_id = 128625 +- id = 128967 +- parent_id = 128967 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0072_harlingen/graph_values.yml b/datasets/GM0072_harlingen/graph_values.yml index 709e442ac1..6160ebd1e5 100644 --- a/datasets/GM0072_harlingen/graph_values.yml +++ b/datasets/GM0072_harlingen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15255911608898823 - :network_gas: 0.16092486151056473 - :ambient_heat: 0.6865160224004471 + :electricity: 0.15574949320637235 + :network_gas: 0.14337778736495219 + :ambient_heat: 0.7008727194286756 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7885.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 893.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21250296665173254 - :network_gas: 0.14998813339306755 - :ambient_heat: 0.6375088999551999 + :electricity: 0.16562530388094038 + :network_gas: 0.3374987844762367 + :ambient_heat: 0.4968759116428229 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0074_heerenveen/GM0074_heerenveen.derived.ad b/datasets/GM0074_heerenveen/GM0074_heerenveen.derived.ad index 7c29fd7ae4..0eb757a496 100644 --- a/datasets/GM0074_heerenveen/GM0074_heerenveen.derived.ad +++ b/datasets/GM0074_heerenveen/GM0074_heerenveen.derived.ad @@ -1,6 +1,6 @@ - area = GM0074_heerenveen -- id = 128630 -- parent_id = 128630 +- id = 128972 +- parent_id = 128972 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0074_heerenveen/graph_values.yml b/datasets/GM0074_heerenveen/graph_values.yml index 513f669e45..89bdb4fa8a 100644 --- a/datasets/GM0074_heerenveen/graph_values.yml +++ b/datasets/GM0074_heerenveen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1523083200991893 - :network_gas: 0.1623042394544588 - :ambient_heat: 0.6853874404463518 + :electricity: 0.15552132997898807 + :network_gas: 0.1446326851155656 + :ambient_heat: 0.6998459849054464 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 23643.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 228.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2121773326834904 - :network_gas: 0.1512906692660361 - :ambient_heat: 0.6365319980504734 + :electricity: 0.16505530302078164 + :network_gas: 0.3397787879168716 + :ambient_heat: 0.4951659090623467 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0080_leeuwarden/GM0080_leeuwarden.derived.ad b/datasets/GM0080_leeuwarden/GM0080_leeuwarden.derived.ad index 1c71e3307c..ee8538da42 100644 --- a/datasets/GM0080_leeuwarden/GM0080_leeuwarden.derived.ad +++ b/datasets/GM0080_leeuwarden/GM0080_leeuwarden.derived.ad @@ -1,6 +1,6 @@ - area = GM0080_leeuwarden -- id = 128665 -- parent_id = 128665 +- id = 129007 +- parent_id = 129007 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0080_leeuwarden/graph_values.yml b/datasets/GM0080_leeuwarden/graph_values.yml index 5b7f8358d4..5f04716572 100644 --- a/datasets/GM0080_leeuwarden/graph_values.yml +++ b/datasets/GM0080_leeuwarden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15199768551292586 - :network_gas: 0.16401272967890768 - :ambient_heat: 0.6839895848081664 + :electricity: 0.1552386147666675 + :network_gas: 0.14618761878332862 + :ambient_heat: 0.6985737664500038 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 62935.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 8069.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21177390327335238 - :network_gas: 0.1529043869065883 - :ambient_heat: 0.6353217098200594 + :electricity: 0.16435214230099926 + :network_gas: 0.34259143079600124 + :ambient_heat: 0.4930564269029995 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0085_ooststellingwerf/GM0085_ooststellingwerf.derived.ad b/datasets/GM0085_ooststellingwerf/GM0085_ooststellingwerf.derived.ad index e6d49500df..909859d503 100644 --- a/datasets/GM0085_ooststellingwerf/GM0085_ooststellingwerf.derived.ad +++ b/datasets/GM0085_ooststellingwerf/GM0085_ooststellingwerf.derived.ad @@ -1,6 +1,6 @@ - area = GM0085_ooststellingwerf -- id = 128715 -- parent_id = 128715 +- id = 129057 +- parent_id = 129057 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0085_ooststellingwerf/graph_values.yml b/datasets/GM0085_ooststellingwerf/graph_values.yml index 9b1c29c0cf..9dfc823997 100644 --- a/datasets/GM0085_ooststellingwerf/graph_values.yml +++ b/datasets/GM0085_ooststellingwerf/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.14998955085653634 - :network_gas: 0.17505747028905003 - :ambient_heat: 0.6749529788544136 + :electricity: 0.15340793373194986 + :network_gas: 0.1562563644742758 + :ambient_heat: 0.6903357017937743 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11388.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 11.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20916318824721178 - :network_gas: 0.16334724701115064 - :ambient_heat: 0.6274895647416376 + :electricity: 0.15988090856577747 + :network_gas: 0.36047636573688846 + :ambient_heat: 0.47964272569733407 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0086_opsterland/GM0086_opsterland.derived.ad b/datasets/GM0086_opsterland/GM0086_opsterland.derived.ad index a06eec01c0..c977037aef 100644 --- a/datasets/GM0086_opsterland/GM0086_opsterland.derived.ad +++ b/datasets/GM0086_opsterland/GM0086_opsterland.derived.ad @@ -1,6 +1,6 @@ - area = GM0086_opsterland -- id = 128718 -- parent_id = 128718 +- id = 129060 +- parent_id = 129060 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0086_opsterland/graph_values.yml b/datasets/GM0086_opsterland/graph_values.yml index d430a94bca..7d2332ec95 100644 --- a/datasets/GM0086_opsterland/graph_values.yml +++ b/datasets/GM0086_opsterland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15203369682146184 - :network_gas: 0.1638146674819598 - :ambient_heat: 0.6841516356965782 + :electricity: 0.1552713958679266 + :network_gas: 0.14600732272640365 + :ambient_heat: 0.6987212814056698 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13088.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 64.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21182067784179104 - :network_gas: 0.1527172886328335 - :ambient_heat: 0.6354620335253754 + :electricity: 0.16443349805634155 + :network_gas: 0.34226600777463195 + :ambient_heat: 0.49330049416902644 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0088_schiermonnikoog/GM0088_schiermonnikoog.derived.ad b/datasets/GM0088_schiermonnikoog/GM0088_schiermonnikoog.derived.ad index 3c532839f7..10a47736c1 100644 --- a/datasets/GM0088_schiermonnikoog/GM0088_schiermonnikoog.derived.ad +++ b/datasets/GM0088_schiermonnikoog/GM0088_schiermonnikoog.derived.ad @@ -1,6 +1,6 @@ - area = GM0088_schiermonnikoog -- id = 128749 -- parent_id = 128749 +- id = 129091 +- parent_id = 129091 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0088_schiermonnikoog/graph_values.yml b/datasets/GM0088_schiermonnikoog/graph_values.yml index 98eccb9fb0..435a099c5a 100644 --- a/datasets/GM0088_schiermonnikoog/graph_values.yml +++ b/datasets/GM0088_schiermonnikoog/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.14718312625434485 - :network_gas: 0.19049280560110332 - :ambient_heat: 0.6623240681445518 + :electricity: 0.1508406677324896 + :network_gas: 0.17037632747130715 + :ambient_heat: 0.6787830047962033 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 586.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 26.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20550679653264836 - :network_gas: 0.17797281386940433 - :ambient_heat: 0.6165203895979473 + :electricity: 0.15384055525655851 + :network_gas: 0.38463777897376433 + :ambient_heat: 0.4615216657696772 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0090_smallingerland/GM0090_smallingerland.derived.ad b/datasets/GM0090_smallingerland/GM0090_smallingerland.derived.ad index 664d54c751..22a39229ab 100644 --- a/datasets/GM0090_smallingerland/GM0090_smallingerland.derived.ad +++ b/datasets/GM0090_smallingerland/GM0090_smallingerland.derived.ad @@ -1,6 +1,6 @@ - area = GM0090_smallingerland -- id = 128757 -- parent_id = 128757 +- id = 129099 +- parent_id = 129099 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0090_smallingerland/graph_values.yml b/datasets/GM0090_smallingerland/graph_values.yml index b0bbfaa9eb..682567ada6 100644 --- a/datasets/GM0090_smallingerland/graph_values.yml +++ b/datasets/GM0090_smallingerland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15170388868677714 - :network_gas: 0.1656286122227256 - :ambient_heat: 0.6826674990904972 + :electricity: 0.1549711083764035 + :network_gas: 0.14765890392978068 + :ambient_heat: 0.6973699876938158 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 25777.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 159.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2113922387319227 - :network_gas: 0.15443104507230698 - :ambient_heat: 0.6341767161957703 + :electricity: 0.16368996941585395 + :network_gas: 0.34524012233658247 + :ambient_heat: 0.4910699082475636 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0093_terschelling/GM0093_terschelling.derived.ad b/datasets/GM0093_terschelling/GM0093_terschelling.derived.ad index f8f618f1ee..816d362ccd 100644 --- a/datasets/GM0093_terschelling/GM0093_terschelling.derived.ad +++ b/datasets/GM0093_terschelling/GM0093_terschelling.derived.ad @@ -1,6 +1,6 @@ - area = GM0093_terschelling -- id = 128770 -- parent_id = 128770 +- id = 129112 +- parent_id = 129112 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0093_terschelling/graph_values.yml b/datasets/GM0093_terschelling/graph_values.yml index d2df5ec354..0330477506 100644 --- a/datasets/GM0093_terschelling/graph_values.yml +++ b/datasets/GM0093_terschelling/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.14788326233884436 - :network_gas: 0.1866420571363559 - :ambient_heat: 0.6654746805247997 + :electricity: 0.15148210686274377 + :network_gas: 0.16684841225490912 + :ambient_heat: 0.681669480882347 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 2281.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 171.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20641983685600487 - :network_gas: 0.1743206525759784 - :ambient_heat: 0.6192595105680168 + :electricity: 0.15532539390276967 + :network_gas: 0.3786984243889196 + :ambient_heat: 0.4659761817083107 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0096_vlieland/GM0096_vlieland.derived.ad b/datasets/GM0096_vlieland/GM0096_vlieland.derived.ad index b063d39ff6..240e70fcb1 100644 --- a/datasets/GM0096_vlieland/GM0096_vlieland.derived.ad +++ b/datasets/GM0096_vlieland/GM0096_vlieland.derived.ad @@ -1,6 +1,6 @@ - area = GM0096_vlieland -- id = 128796 -- parent_id = 128796 +- id = 129138 +- parent_id = 129138 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0096_vlieland/graph_values.yml b/datasets/GM0096_vlieland/graph_values.yml index 9fca860d1b..d5280e590c 100644 --- a/datasets/GM0096_vlieland/graph_values.yml +++ b/datasets/GM0096_vlieland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15311187431156467 - :network_gas: 0.15788469128639437 - :ambient_heat: 0.6890034344020409 + :electricity: 0.15625207977179675 + :network_gas: 0.14061356125511776 + :ambient_heat: 0.7031343589730854 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 600.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 45.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21322041208146705 - :network_gas: 0.14711835167412954 - :ambient_heat: 0.6396612362444034 + :electricity: 0.16688888409982539 + :network_gas: 0.3324444636006967 + :ambient_heat: 0.5006666522994779 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0098_weststellingwerf/GM0098_weststellingwerf.derived.ad b/datasets/GM0098_weststellingwerf/GM0098_weststellingwerf.derived.ad index 4759fcddae..13c611076f 100644 --- a/datasets/GM0098_weststellingwerf/GM0098_weststellingwerf.derived.ad +++ b/datasets/GM0098_weststellingwerf/GM0098_weststellingwerf.derived.ad @@ -1,6 +1,6 @@ - area = GM0098_weststellingwerf -- id = 128813 -- parent_id = 128813 +- id = 129155 +- parent_id = 129155 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0098_weststellingwerf/graph_values.yml b/datasets/GM0098_weststellingwerf/graph_values.yml index b0a38b4ded..8ab1c98b5f 100644 --- a/datasets/GM0098_weststellingwerf/graph_values.yml +++ b/datasets/GM0098_weststellingwerf/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1525745025712722 - :network_gas: 0.16084023585800308 - :ambient_heat: 0.6865852615707249 + :electricity: 0.15576348849222865 + :network_gas: 0.1433008132927422 + :ambient_heat: 0.700935698215029 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11666.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 41.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21252294211932632 - :network_gas: 0.1499082315226923 - :ambient_heat: 0.6375688263579813 + :electricity: 0.16566034072640523 + :network_gas: 0.33735863709437725 + :ambient_heat: 0.4969810221792175 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0106_assen/GM0106_assen.derived.ad b/datasets/GM0106_assen/GM0106_assen.derived.ad index e89c26d2b9..c3f3953cf5 100644 --- a/datasets/GM0106_assen/GM0106_assen.derived.ad +++ b/datasets/GM0106_assen/GM0106_assen.derived.ad @@ -1,6 +1,6 @@ - area = GM0106_assen -- id = 128530 -- parent_id = 128530 +- id = 128872 +- parent_id = 128872 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0106_assen/graph_values.yml b/datasets/GM0106_assen/graph_values.yml index 16f337f8ed..b091ee1f19 100644 --- a/datasets/GM0106_assen/graph_values.yml +++ b/datasets/GM0106_assen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1531143790114858 - :network_gas: 0.15787091543682813 - :ambient_heat: 0.6890147055516862 + :electricity: 0.1562543562266615 + :network_gas: 0.14060104075336166 + :ambient_heat: 0.7031446030199767 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 32515.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 222.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21322366222058808 - :network_gas: 0.1471053511176455 - :ambient_heat: 0.6396709866617665 + :electricity: 0.16689463268773744 + :network_gas: 0.3324214692490485 + :ambient_heat: 0.500683898063214 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0109_coevorden/GM0109_coevorden.derived.ad b/datasets/GM0109_coevorden/GM0109_coevorden.derived.ad index c25d0329a3..185ba26d22 100644 --- a/datasets/GM0109_coevorden/GM0109_coevorden.derived.ad +++ b/datasets/GM0109_coevorden/GM0109_coevorden.derived.ad @@ -1,6 +1,6 @@ - area = GM0109_coevorden -- id = 128566 -- parent_id = 128566 +- id = 128908 +- parent_id = 128908 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0109_coevorden/graph_values.yml b/datasets/GM0109_coevorden/graph_values.yml index 80ca7bb400..8b97908898 100644 --- a/datasets/GM0109_coevorden/graph_values.yml +++ b/datasets/GM0109_coevorden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15099366759303254 - :network_gas: 0.16953482823832106 - :ambient_heat: 0.6794715041686464 + :electricity: 0.15432397691168762 + :network_gas: 0.15121812698571793 + :ambient_heat: 0.6944578961025943 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15491.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 119.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21046919427501 - :network_gas: 0.15812322289995773 - :ambient_heat: 0.6314075828250323 + :electricity: 0.1621006706608352 + :network_gas: 0.3515973173566575 + :ambient_heat: 0.4863020119825074 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0114_emmen/GM0114_emmen.derived.ad b/datasets/GM0114_emmen/GM0114_emmen.derived.ad index 9593238300..49dab1c6ad 100644 --- a/datasets/GM0114_emmen/GM0114_emmen.derived.ad +++ b/datasets/GM0114_emmen/GM0114_emmen.derived.ad @@ -1,6 +1,6 @@ - area = GM0114_emmen -- id = 128599 -- parent_id = 128599 +- id = 128941 +- parent_id = 128941 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0114_emmen/graph_values.yml b/datasets/GM0114_emmen/graph_values.yml index d11821583c..d62dcf885f 100644 --- a/datasets/GM0114_emmen/graph_values.yml +++ b/datasets/GM0114_emmen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1513182484350507 - :network_gas: 0.16774963360722112 - :ambient_heat: 0.6809321179577282 + :electricity: 0.15461980651175164 + :network_gas: 0.14959106418536597 + :ambient_heat: 0.6957891293028824 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 49357.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 69.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2108911108417349 - :network_gas: 0.15643555663305828 - :ambient_heat: 0.632673332525207 + :electricity: 0.16282500537647762 + :network_gas: 0.34869997849408785 + :ambient_heat: 0.4884750161294346 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0118_hoogeveen/GM0118_hoogeveen.derived.ad b/datasets/GM0118_hoogeveen/GM0118_hoogeveen.derived.ad index b53d2e6d0c..53a0263efe 100644 --- a/datasets/GM0118_hoogeveen/GM0118_hoogeveen.derived.ad +++ b/datasets/GM0118_hoogeveen/GM0118_hoogeveen.derived.ad @@ -1,6 +1,6 @@ - area = GM0118_hoogeveen -- id = 128645 -- parent_id = 128645 +- id = 128987 +- parent_id = 128987 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0118_hoogeveen/graph_values.yml b/datasets/GM0118_hoogeveen/graph_values.yml index 1e3a8a03ca..f6da151a55 100644 --- a/datasets/GM0118_hoogeveen/graph_values.yml +++ b/datasets/GM0118_hoogeveen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15103361743348642 - :network_gas: 0.1693151041158248 - :ambient_heat: 0.6796512784506888 + :electricity: 0.15436039542653152 + :network_gas: 0.1510178251540767 + :ambient_heat: 0.6946217794193918 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 25464.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 168.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2105211309145774 - :network_gas: 0.1579154763416882 - :ambient_heat: 0.6315633927437343 + :electricity: 0.1621896422121024 + :network_gas: 0.3512414311515887 + :ambient_heat: 0.48656892663630896 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0119_meppel/GM0119_meppel.derived.ad b/datasets/GM0119_meppel/GM0119_meppel.derived.ad index ab0f7f9a8b..28f87253f8 100644 --- a/datasets/GM0119_meppel/GM0119_meppel.derived.ad +++ b/datasets/GM0119_meppel/GM0119_meppel.derived.ad @@ -1,6 +1,6 @@ - area = GM0119_meppel -- id = 128684 -- parent_id = 128684 +- id = 129026 +- parent_id = 129026 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0119_meppel/graph_values.yml b/datasets/GM0119_meppel/graph_values.yml index 52ab6e1f1d..9d81e59f23 100644 --- a/datasets/GM0119_meppel/graph_values.yml +++ b/datasets/GM0119_meppel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15401295638805543 - :network_gas: 0.15292873986569505 - :ambient_heat: 0.6930583037462493 + :electricity: 0.15707052377491665 + :network_gas: 0.13611211923795838 + :ambient_heat: 0.706817356987125 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16069.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 709.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21438920300827052 - :network_gas: 0.14244318796691546 - :ambient_heat: 0.6431676090248138 + :electricity: 0.16897048286367103 + :network_gas: 0.32411806854531405 + :ambient_heat: 0.5069114485910149 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0141_almelo/GM0141_almelo.derived.ad b/datasets/GM0141_almelo/GM0141_almelo.derived.ad index d0f2fd6941..54c0caa1b6 100644 --- a/datasets/GM0141_almelo/GM0141_almelo.derived.ad +++ b/datasets/GM0141_almelo/GM0141_almelo.derived.ad @@ -1,6 +1,6 @@ - area = GM0141_almelo -- id = 128520 -- parent_id = 128520 +- id = 128862 +- parent_id = 128862 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0141_almelo/graph_values.yml b/datasets/GM0141_almelo/graph_values.yml index e89583bf90..3ffbd35e3c 100644 --- a/datasets/GM0141_almelo/graph_values.yml +++ b/datasets/GM0141_almelo/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15251660297449546 - :network_gas: 0.16115868364027505 - :ambient_heat: 0.6863247133852295 + :electricity: 0.15571082239118816 + :network_gas: 0.1435904768484651 + :ambient_heat: 0.7006987007603468 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 33783.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1759.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21244777266850037 - :network_gas: 0.1502089093259961 - :ambient_heat: 0.6373433180055034 + :electricity: 0.1655285367769656 + :network_gas: 0.33788585289213585 + :ambient_heat: 0.4965856103308986 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0147_borne/GM0147_borne.derived.ad b/datasets/GM0147_borne/GM0147_borne.derived.ad index 46647399d6..67e4704a9f 100644 --- a/datasets/GM0147_borne/GM0147_borne.derived.ad +++ b/datasets/GM0147_borne/GM0147_borne.derived.ad @@ -1,6 +1,6 @@ - area = GM0147_borne -- id = 128554 -- parent_id = 128554 +- id = 128896 +- parent_id = 128896 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0147_borne/graph_values.yml b/datasets/GM0147_borne/graph_values.yml index 43ca6b1f27..65d67aced9 100644 --- a/datasets/GM0147_borne/graph_values.yml +++ b/datasets/GM0147_borne/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15638825488632585 - :network_gas: 0.13986459812520774 - :ambient_heat: 0.7037471469884664 + :electricity: 0.1592229456687421 + :network_gas: 0.12427379882191854 + :ambient_heat: 0.7165032555093395 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10095.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 172.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21746570652489663 - :network_gas: 0.13013717390041113 - :ambient_heat: 0.6523971195746923 + :electricity: 0.17459064924801965 + :network_gas: 0.3016374030079196 + :ambient_heat: 0.5237719477440609 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0148_dalfsen/GM0148_dalfsen.derived.ad b/datasets/GM0148_dalfsen/GM0148_dalfsen.derived.ad index ebb54f6ec6..ea83012035 100644 --- a/datasets/GM0148_dalfsen/GM0148_dalfsen.derived.ad +++ b/datasets/GM0148_dalfsen/GM0148_dalfsen.derived.ad @@ -1,6 +1,6 @@ - area = GM0148_dalfsen -- id = 128569 -- parent_id = 128569 +- id = 128911 +- parent_id = 128911 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0148_dalfsen/graph_values.yml b/datasets/GM0148_dalfsen/graph_values.yml index c75c019777..2ee5f49d45 100644 --- a/datasets/GM0148_dalfsen/graph_values.yml +++ b/datasets/GM0148_dalfsen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15480743489549723 - :network_gas: 0.14855910807476538 - :ambient_heat: 0.6966334570297374 + :electricity: 0.1577912676985517 + :network_gas: 0.1321480276579657 + :ambient_heat: 0.7100607046434826 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12044.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 19.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21541894115190796 - :network_gas: 0.1383242353923659 - :ambient_heat: 0.6462568234557262 + :electricity: 0.17082856523954768 + :network_gas: 0.31668573904180736 + :ambient_heat: 0.5124856957186449 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0150_deventer/GM0150_deventer.derived.ad b/datasets/GM0150_deventer/GM0150_deventer.derived.ad index a89da6abc9..7c159dbce0 100644 --- a/datasets/GM0150_deventer/GM0150_deventer.derived.ad +++ b/datasets/GM0150_deventer/GM0150_deventer.derived.ad @@ -1,6 +1,6 @@ - area = GM0150_deventer -- id = 128579 -- parent_id = 128579 +- id = 128921 +- parent_id = 128921 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0150_deventer/graph_values.yml b/datasets/GM0150_deventer/graph_values.yml index 772a34dcd5..f67e299a55 100644 --- a/datasets/GM0150_deventer/graph_values.yml +++ b/datasets/GM0150_deventer/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15454185246175522 - :network_gas: 0.15001981146034626 - :ambient_heat: 0.6954383360778986 + :electricity: 0.15755042459619686 + :network_gas: 0.1334726647209173 + :ambient_heat: 0.7089769106828858 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 46167.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 4299.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2150747959277229 - :network_gas: 0.13970081628910622 - :ambient_heat: 0.6452243877831709 + :electricity: 0.17020503880679166 + :network_gas: 0.3191798447728315 + :ambient_heat: 0.5106151164203768 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0153_enschede/GM0153_enschede.derived.ad b/datasets/GM0153_enschede/GM0153_enschede.derived.ad index 7e6f3657a2..4fd893e02b 100644 --- a/datasets/GM0153_enschede/GM0153_enschede.derived.ad +++ b/datasets/GM0153_enschede/GM0153_enschede.derived.ad @@ -1,6 +1,6 @@ - area = GM0153_enschede -- id = 128601 -- parent_id = 128601 +- id = 128943 +- parent_id = 128943 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0153_enschede/graph_values.yml b/datasets/GM0153_enschede/graph_values.yml index 5b7b95a913..0badb194fd 100644 --- a/datasets/GM0153_enschede/graph_values.yml +++ b/datasets/GM0153_enschede/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15639026211737103 - :network_gas: 0.13985355835445937 - :ambient_heat: 0.7037561795281697 + :electricity: 0.15922476147721049 + :network_gas: 0.1242638118753423 + :ambient_heat: 0.7165114266474472 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 75890.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 3122.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21746830355625674 - :network_gas: 0.13012678577497075 - :ambient_heat: 0.6524049106687725 + :electricity: 0.17459548203942638 + :network_gas: 0.30161807184229267 + :ambient_heat: 0.523786446118281 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0158_haaksbergen/GM0158_haaksbergen.derived.ad b/datasets/GM0158_haaksbergen/GM0158_haaksbergen.derived.ad index dbcb344733..e17ff1c7fd 100644 --- a/datasets/GM0158_haaksbergen/GM0158_haaksbergen.derived.ad +++ b/datasets/GM0158_haaksbergen/GM0158_haaksbergen.derived.ad @@ -1,6 +1,6 @@ - area = GM0158_haaksbergen -- id = 128618 -- parent_id = 128618 +- id = 128960 +- parent_id = 128960 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0158_haaksbergen/graph_values.yml b/datasets/GM0158_haaksbergen/graph_values.yml index 27949eabf3..328d52fe10 100644 --- a/datasets/GM0158_haaksbergen/graph_values.yml +++ b/datasets/GM0158_haaksbergen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15522090155281631 - :network_gas: 0.14628504145951035 - :ambient_heat: 0.6984940569876734 + :electricity: 0.1581660377937043 + :network_gas: 0.13008679213462632 + :ambient_heat: 0.7117471700716693 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10563.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 30.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21595455482468995 - :network_gas: 0.13618178070123785 - :ambient_heat: 0.6478636644740722 + :electricity: 0.17180412324569683 + :network_gas: 0.31278350701721086 + :ambient_heat: 0.5154123697370923 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0160_hardenberg/GM0160_hardenberg.derived.ad b/datasets/GM0160_hardenberg/GM0160_hardenberg.derived.ad index 95573cbfa0..73cf560ba7 100644 --- a/datasets/GM0160_hardenberg/GM0160_hardenberg.derived.ad +++ b/datasets/GM0160_hardenberg/GM0160_hardenberg.derived.ad @@ -1,6 +1,6 @@ - area = GM0160_hardenberg -- id = 128622 -- parent_id = 128622 +- id = 128964 +- parent_id = 128964 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0160_hardenberg/graph_values.yml b/datasets/GM0160_hardenberg/graph_values.yml index 0e5545bd58..3c876000d8 100644 --- a/datasets/GM0160_hardenberg/graph_values.yml +++ b/datasets/GM0160_hardenberg/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15390486099074516 - :network_gas: 0.15352326455090168 - :ambient_heat: 0.6925718744583533 + :electricity: 0.156972397380282 + :network_gas: 0.13665181440844884 + :ambient_heat: 0.7063757882112691 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 25102.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 90.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2142490422851791 - :network_gas: 0.1430038308592813 - :ambient_heat: 0.6427471268555396 + :electricity: 0.16871933248000362 + :network_gas: 0.32512267007998374 + :ambient_heat: 0.5061579974400127 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0163_hellendoorn/GM0163_hellendoorn.derived.ad b/datasets/GM0163_hellendoorn/GM0163_hellendoorn.derived.ad index 0f0bdffa0d..b04e37afcb 100644 --- a/datasets/GM0163_hellendoorn/GM0163_hellendoorn.derived.ad +++ b/datasets/GM0163_hellendoorn/GM0163_hellendoorn.derived.ad @@ -1,6 +1,6 @@ - area = GM0163_hellendoorn -- id = 128634 -- parent_id = 128634 +- id = 128976 +- parent_id = 128976 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0163_hellendoorn/graph_values.yml b/datasets/GM0163_hellendoorn/graph_values.yml index a8b82f4ea0..0d9a65b9c1 100644 --- a/datasets/GM0163_hellendoorn/graph_values.yml +++ b/datasets/GM0163_hellendoorn/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15501556506619457 - :network_gas: 0.14741439213592988 - :ambient_heat: 0.6975700427978756 + :electricity: 0.15797994649502028 + :network_gas: 0.1311102942773884 + :ambient_heat: 0.7109097592275913 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14923.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 116.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21568858212337885 - :network_gas: 0.13724567150648226 - :ambient_heat: 0.6470657463701388 + :electricity: 0.17131890175648606 + :network_gas: 0.31472439297405397 + :ambient_heat: 0.51395670526946 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0164_hengelo/GM0164_hengelo.derived.ad b/datasets/GM0164_hengelo/GM0164_hengelo.derived.ad index f6f67717fd..45d4131bfc 100644 --- a/datasets/GM0164_hengelo/GM0164_hengelo.derived.ad +++ b/datasets/GM0164_hengelo/GM0164_hengelo.derived.ad @@ -1,6 +1,6 @@ - area = GM0164_hengelo -- id = 128637 -- parent_id = 128637 +- id = 128979 +- parent_id = 128979 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0164_hengelo/graph_values.yml b/datasets/GM0164_hengelo/graph_values.yml index b2766626c7..afa7e3b962 100644 --- a/datasets/GM0164_hengelo/graph_values.yml +++ b/datasets/GM0164_hengelo/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15373294256402936 - :network_gas: 0.1544688158978385 - :ambient_heat: 0.6917982415381321 + :electricity: 0.15681630277128183 + :network_gas: 0.13751033475795005 + :ambient_heat: 0.7056733624707683 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 38880.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1568.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2140260983320579 - :network_gas: 0.143895606671766 - :ambient_heat: 0.642078294996176 + :electricity: 0.16832070605154298 + :network_gas: 0.3267171757938262 + :ambient_heat: 0.5049621181546308 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0166_kampen/GM0166_kampen.derived.ad b/datasets/GM0166_kampen/GM0166_kampen.derived.ad index 135d87b47f..954f74cad6 100644 --- a/datasets/GM0166_kampen/GM0166_kampen.derived.ad +++ b/datasets/GM0166_kampen/GM0166_kampen.derived.ad @@ -1,6 +1,6 @@ - area = GM0166_kampen -- id = 128653 -- parent_id = 128653 +- id = 128995 +- parent_id = 128995 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0166_kampen/graph_values.yml b/datasets/GM0166_kampen/graph_values.yml index 1e7fe06542..9b90f08a90 100644 --- a/datasets/GM0166_kampen/graph_values.yml +++ b/datasets/GM0166_kampen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1534591627052825 - :network_gas: 0.15597460512094638 - :ambient_heat: 0.6905662321737712 + :electricity: 0.15656764318491623 + :network_gas: 0.1388779624829608 + :ambient_heat: 0.7045543943321231 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22766.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2705.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21367098992842298 - :network_gas: 0.14531604028630582 - :ambient_heat: 0.6410129697852712 + :electricity: 0.1676879422086138 + :network_gas: 0.329248231165543 + :ambient_heat: 0.5030638266258431 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0168_losser/GM0168_losser.derived.ad b/datasets/GM0168_losser/GM0168_losser.derived.ad index 37727218ba..cf64c05b5f 100644 --- a/datasets/GM0168_losser/GM0168_losser.derived.ad +++ b/datasets/GM0168_losser/GM0168_losser.derived.ad @@ -1,6 +1,6 @@ - area = GM0168_losser -- id = 128677 -- parent_id = 128677 +- id = 129019 +- parent_id = 129019 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0168_losser/graph_values.yml b/datasets/GM0168_losser/graph_values.yml index 0e3ca7a551..363e388d6a 100644 --- a/datasets/GM0168_losser/graph_values.yml +++ b/datasets/GM0168_losser/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15369408300641318 - :network_gas: 0.15468254346472754 - :ambient_heat: 0.6916233735288593 + :electricity: 0.15678101463705393 + :network_gas: 0.13770441949620318 + :ambient_heat: 0.7055145658667428 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9852.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 60.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2139757004973277 - :network_gas: 0.14409719801068696 - :ambient_heat: 0.6419271014919854 + :electricity: 0.1682307403006722 + :network_gas: 0.3270770387973093 + :ambient_heat: 0.5046922209020184 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0171_noordoostpolder/GM0171_noordoostpolder.derived.ad b/datasets/GM0171_noordoostpolder/GM0171_noordoostpolder.derived.ad index c34c8b1f19..8243ddc45f 100644 --- a/datasets/GM0171_noordoostpolder/GM0171_noordoostpolder.derived.ad +++ b/datasets/GM0171_noordoostpolder/GM0171_noordoostpolder.derived.ad @@ -1,6 +1,6 @@ - area = GM0171_noordoostpolder -- id = 128701 -- parent_id = 128701 +- id = 129043 +- parent_id = 129043 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0171_noordoostpolder/graph_values.yml b/datasets/GM0171_noordoostpolder/graph_values.yml index 00f61ba6e6..e4eb0cc995 100644 --- a/datasets/GM0171_noordoostpolder/graph_values.yml +++ b/datasets/GM0171_noordoostpolder/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15595144477259038 - :network_gas: 0.14226705375075283 - :ambient_heat: 0.7017815014766567 + :electricity: 0.15882766896694975 + :network_gas: 0.12644782068177646 + :ambient_heat: 0.7147245103512738 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19904.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 90.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21690043478393967 - :network_gas: 0.13239826086423903 - :ambient_heat: 0.6507013043518213 + :electricity: 0.17354234790345224 + :network_gas: 0.3058306083861892 + :ambient_heat: 0.5206270437103586 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0173_oldenzaal/GM0173_oldenzaal.derived.ad b/datasets/GM0173_oldenzaal/GM0173_oldenzaal.derived.ad index 6c50af95a3..d4d527f0da 100644 --- a/datasets/GM0173_oldenzaal/GM0173_oldenzaal.derived.ad +++ b/datasets/GM0173_oldenzaal/GM0173_oldenzaal.derived.ad @@ -1,6 +1,6 @@ - area = GM0173_oldenzaal -- id = 128710 -- parent_id = 128710 +- id = 129052 +- parent_id = 129052 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0173_oldenzaal/graph_values.yml b/datasets/GM0173_oldenzaal/graph_values.yml index a4ba0ee3ae..ebf56c05c9 100644 --- a/datasets/GM0173_oldenzaal/graph_values.yml +++ b/datasets/GM0173_oldenzaal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15400544204843397 - :network_gas: 0.1529700687336133 - :ambient_heat: 0.6930244892179528 + :electricity: 0.15706370292850846 + :network_gas: 0.1361496338932034 + :ambient_heat: 0.706786663178288 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14655.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 254.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2143794600576874 - :network_gas: 0.14248215976924802 - :ambient_heat: 0.6431383801730645 + :electricity: 0.16895301117747744 + :network_gas: 0.3241879552900884 + :ambient_heat: 0.5068590335324342 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0175_ommen/GM0175_ommen.derived.ad b/datasets/GM0175_ommen/GM0175_ommen.derived.ad index ab7ebbd5d0..a6d6f35805 100644 --- a/datasets/GM0175_ommen/GM0175_ommen.derived.ad +++ b/datasets/GM0175_ommen/GM0175_ommen.derived.ad @@ -1,6 +1,6 @@ - area = GM0175_ommen -- id = 128712 -- parent_id = 128712 +- id = 129054 +- parent_id = 129054 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0175_ommen/graph_values.yml b/datasets/GM0175_ommen/graph_values.yml index 07686601f1..3d62cab809 100644 --- a/datasets/GM0175_ommen/graph_values.yml +++ b/datasets/GM0175_ommen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1541526898188033 - :network_gas: 0.15216020599658198 - :ambient_heat: 0.6936871041846149 + :electricity: 0.15719734797031654 + :network_gas: 0.13541458616325897 + :ambient_heat: 0.7073880658664244 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7575.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 28.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2145703668549414 - :network_gas: 0.141718532580232 - :ambient_heat: 0.6437111005648265 + :electricity: 0.16929572690114056 + :network_gas: 0.3228170923954359 + :ambient_heat: 0.5078871807034235 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0177_raalte/GM0177_raalte.derived.ad b/datasets/GM0177_raalte/GM0177_raalte.derived.ad index 8287e762af..2af00f9174 100644 --- a/datasets/GM0177_raalte/GM0177_raalte.derived.ad +++ b/datasets/GM0177_raalte/GM0177_raalte.derived.ad @@ -1,6 +1,6 @@ - area = GM0177_raalte -- id = 128730 -- parent_id = 128730 +- id = 129072 +- parent_id = 129072 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0177_raalte/graph_values.yml b/datasets/GM0177_raalte/graph_values.yml index 7a2b1854ae..6d1be62185 100644 --- a/datasets/GM0177_raalte/graph_values.yml +++ b/datasets/GM0177_raalte/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1548782675729321 - :network_gas: 0.14816952834887345 - :ambient_heat: 0.6969522040781945 + :electricity: 0.15785548680526415 + :network_gas: 0.13179482257104735 + :ambient_heat: 0.7103496906236886 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16027.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 43.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21551071332920324 - :network_gas: 0.13795714668318473 - :ambient_heat: 0.646532139987612 + :electricity: 0.17099527326403385 + :network_gas: 0.31601890694386275 + :ambient_heat: 0.5129858197921033 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0180_staphorst/GM0180_staphorst.derived.ad b/datasets/GM0180_staphorst/GM0180_staphorst.derived.ad index c407824962..16903d529b 100644 --- a/datasets/GM0180_staphorst/GM0180_staphorst.derived.ad +++ b/datasets/GM0180_staphorst/GM0180_staphorst.derived.ad @@ -1,6 +1,6 @@ - area = GM0180_staphorst -- id = 128762 -- parent_id = 128762 +- id = 129104 +- parent_id = 129104 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0180_staphorst/graph_values.yml b/datasets/GM0180_staphorst/graph_values.yml index 0f39653fba..ddb3bf2541 100644 --- a/datasets/GM0180_staphorst/graph_values.yml +++ b/datasets/GM0180_staphorst/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1530377740416969 - :network_gas: 0.15829224277066692 - :ambient_heat: 0.6886699831876362 + :electricity: 0.15618472832935973 + :network_gas: 0.14098399418852156 + :ambient_heat: 0.7028312774821188 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5945.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 25.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21312425509239127 - :network_gas: 0.14750297963043268 - :ambient_heat: 0.6393727652771761 + :electricity: 0.1667189090833969 + :network_gas: 0.3331243636664107 + :ambient_heat: 0.5001567272501924 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0183_tubbergen/GM0183_tubbergen.derived.ad b/datasets/GM0183_tubbergen/GM0183_tubbergen.derived.ad index e22dde9fb3..bda26df3c8 100644 --- a/datasets/GM0183_tubbergen/GM0183_tubbergen.derived.ad +++ b/datasets/GM0183_tubbergen/GM0183_tubbergen.derived.ad @@ -1,6 +1,6 @@ - area = GM0183_tubbergen -- id = 128776 -- parent_id = 128776 +- id = 129118 +- parent_id = 129118 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0183_tubbergen/graph_values.yml b/datasets/GM0183_tubbergen/graph_values.yml index 22ae7ca57a..c0961d215f 100644 --- a/datasets/GM0183_tubbergen/graph_values.yml +++ b/datasets/GM0183_tubbergen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1547819021617863 - :network_gas: 0.14869953811017556 - :ambient_heat: 0.6965185597280383 + :electricity: 0.1577681173368053 + :network_gas: 0.132275354647571 + :ambient_heat: 0.7099565280156237 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8606.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 15.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21538585903302582 - :network_gas: 0.13845656386789437 - :ambient_heat: 0.6461575770990797 + :electricity: 0.1707685150805339 + :network_gas: 0.31692593967786264 + :ambient_heat: 0.5123055452416035 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0184_urk/GM0184_urk.derived.ad b/datasets/GM0184_urk/GM0184_urk.derived.ad index 7915def4ef..f9c2e18700 100644 --- a/datasets/GM0184_urk/GM0184_urk.derived.ad +++ b/datasets/GM0184_urk/GM0184_urk.derived.ad @@ -1,6 +1,6 @@ - area = GM0184_urk -- id = 128782 -- parent_id = 128782 +- id = 129124 +- parent_id = 129124 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0184_urk/graph_values.yml b/datasets/GM0184_urk/graph_values.yml index cfcb061234..60c5500a3d 100644 --- a/datasets/GM0184_urk/graph_values.yml +++ b/datasets/GM0184_urk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15759412227801017 - :network_gas: 0.133232327470944 - :ambient_heat: 0.7091735502510458 + :electricity: 0.16031287846312342 + :network_gas: 0.11827916845282123 + :ambient_heat: 0.7214079530840554 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6753.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 258.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.219025068464226 - :network_gas: 0.12389972614309368 - :ambient_heat: 0.6570752053926803 + :electricity: 0.17752008806202696 + :network_gas: 0.28991964775189016 + :ambient_heat: 0.5325602641860828 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0189_wierden/GM0189_wierden.derived.ad b/datasets/GM0189_wierden/GM0189_wierden.derived.ad index fa08524e75..03bbff226c 100644 --- a/datasets/GM0189_wierden/GM0189_wierden.derived.ad +++ b/datasets/GM0189_wierden/GM0189_wierden.derived.ad @@ -1,6 +1,6 @@ - area = GM0189_wierden -- id = 128814 -- parent_id = 128814 +- id = 129156 +- parent_id = 129156 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0189_wierden/graph_values.yml b/datasets/GM0189_wierden/graph_values.yml index 5c2a3066e8..6de749852a 100644 --- a/datasets/GM0189_wierden/graph_values.yml +++ b/datasets/GM0189_wierden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15624611517308687 - :network_gas: 0.14064636654802212 - :ambient_heat: 0.703107518278891 + :electricity: 0.1590943481080842 + :network_gas: 0.12498108540553683 + :ambient_heat: 0.7159245664863788 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9929.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 30.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2172817890038148 - :network_gas: 0.13087284398473847 - :ambient_heat: 0.6518453670114467 + :electricity: 0.17424878525790416 + :network_gas: 0.3030048589683814 + :ambient_heat: 0.5227463557737143 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0193_zwolle/GM0193_zwolle.derived.ad b/datasets/GM0193_zwolle/GM0193_zwolle.derived.ad index 80476b2d3f..7cd6b97259 100644 --- a/datasets/GM0193_zwolle/GM0193_zwolle.derived.ad +++ b/datasets/GM0193_zwolle/GM0193_zwolle.derived.ad @@ -1,6 +1,6 @@ - area = GM0193_zwolle -- id = 128836 -- parent_id = 128836 +- id = 129178 +- parent_id = 129178 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0193_zwolle/graph_values.yml b/datasets/GM0193_zwolle/graph_values.yml index 83f8ee1f01..76f330b085 100644 --- a/datasets/GM0193_zwolle/graph_values.yml +++ b/datasets/GM0193_zwolle/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15511241250600608 - :network_gas: 0.14688173121696674 - :ambient_heat: 0.6980058562770274 + :electricity: 0.15806772368977465 + :network_gas: 0.13062751970623945 + :ambient_heat: 0.7113047566039858 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 59462.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 4931.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2158140348332163 - :network_gas: 0.1367438606671325 - :ambient_heat: 0.6474421044996512 + :electricity: 0.1715475757075047 + :network_gas: 0.3138096971699794 + :ambient_heat: 0.5146427271225159 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0197_aalten/GM0197_aalten.derived.ad b/datasets/GM0197_aalten/GM0197_aalten.derived.ad index ee594757ce..ca6bb99ac5 100644 --- a/datasets/GM0197_aalten/GM0197_aalten.derived.ad +++ b/datasets/GM0197_aalten/GM0197_aalten.derived.ad @@ -1,6 +1,6 @@ - area = GM0197_aalten -- id = 128515 -- parent_id = 128515 +- id = 128857 +- parent_id = 128857 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0197_aalten/graph_values.yml b/datasets/GM0197_aalten/graph_values.yml index e424daa696..dacb38f7d6 100644 --- a/datasets/GM0197_aalten/graph_values.yml +++ b/datasets/GM0197_aalten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15448905980557054 - :network_gas: 0.15031017106936193 - :ambient_heat: 0.6952007691250675 + :electricity: 0.157502538761992 + :network_gas: 0.13373603680904422 + :ambient_heat: 0.708761424428964 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12023.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 102.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21500637681269735 - :network_gas: 0.13997449274920828 - :ambient_heat: 0.6450191304380944 + :electricity: 0.17008138160856218 + :network_gas: 0.3196744735657494 + :ambient_heat: 0.5102441448256884 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0200_apeldoorn/GM0200_apeldoorn.derived.ad b/datasets/GM0200_apeldoorn/GM0200_apeldoorn.derived.ad index e64f528841..93edbf7b3d 100644 --- a/datasets/GM0200_apeldoorn/GM0200_apeldoorn.derived.ad +++ b/datasets/GM0200_apeldoorn/GM0200_apeldoorn.derived.ad @@ -1,6 +1,6 @@ - area = GM0200_apeldoorn -- id = 128528 -- parent_id = 128528 +- id = 128870 +- parent_id = 128870 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0200_apeldoorn/graph_values.yml b/datasets/GM0200_apeldoorn/graph_values.yml index e8c72991a7..130038b014 100644 --- a/datasets/GM0200_apeldoorn/graph_values.yml +++ b/datasets/GM0200_apeldoorn/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15315063143038715 - :network_gas: 0.15767152713287066 - :ambient_heat: 0.6891778414367422 + :electricity: 0.15628730416967035 + :network_gas: 0.14041982706681314 + :ambient_heat: 0.7032928687635165 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 73999.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 532.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21327070313360816 - :network_gas: 0.14691718746556498 - :ambient_heat: 0.6398121094008268 + :electricity: 0.16697785964651513 + :network_gas: 0.3320885614139377 + :ambient_heat: 0.5009335789395472 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0202_arnhem/GM0202_arnhem.derived.ad b/datasets/GM0202_arnhem/GM0202_arnhem.derived.ad index 906fee923c..e3b92c4fb4 100644 --- a/datasets/GM0202_arnhem/GM0202_arnhem.derived.ad +++ b/datasets/GM0202_arnhem/GM0202_arnhem.derived.ad @@ -1,6 +1,6 @@ - area = GM0202_arnhem -- id = 128529 -- parent_id = 128529 +- id = 128871 +- parent_id = 128871 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0202_arnhem/graph_values.yml b/datasets/GM0202_arnhem/graph_values.yml index 78d070927f..a0d4c814aa 100644 --- a/datasets/GM0202_arnhem/graph_values.yml +++ b/datasets/GM0202_arnhem/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15481842838941792 - :network_gas: 0.14849864385820133 - :ambient_heat: 0.6966829277523806 + :electricity: 0.15780123516739109 + :network_gas: 0.13209320657934903 + :ambient_heat: 0.7101055582532598 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 77777.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 5344.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2154331849130769 - :network_gas: 0.13826726034769002 - :ambient_heat: 0.646299554739233 + :electricity: 0.1708544276230481 + :network_gas: 0.31658228950780576 + :ambient_heat: 0.512563282869146 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0203_barneveld/GM0203_barneveld.derived.ad b/datasets/GM0203_barneveld/GM0203_barneveld.derived.ad index 7189a9f6cb..ae2c97d593 100644 --- a/datasets/GM0203_barneveld/GM0203_barneveld.derived.ad +++ b/datasets/GM0203_barneveld/GM0203_barneveld.derived.ad @@ -1,6 +1,6 @@ - area = GM0203_barneveld -- id = 128535 -- parent_id = 128535 +- id = 128877 +- parent_id = 128877 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0203_barneveld/graph_values.yml b/datasets/GM0203_barneveld/graph_values.yml index faf620de99..1e437f9163 100644 --- a/datasets/GM0203_barneveld/graph_values.yml +++ b/datasets/GM0203_barneveld/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15590873201385183 - :network_gas: 0.14250197392381492 - :ambient_heat: 0.7015892940623333 + :electricity: 0.15878900426920353 + :network_gas: 0.1266604765193806 + :ambient_heat: 0.7145505192114159 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 23121.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 63.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21684514882630962 - :network_gas: 0.13261940469475914 - :ambient_heat: 0.6505354464789311 + :electricity: 0.17344020373690416 + :network_gas: 0.3062391850523814 + :ambient_heat: 0.5203206112107144 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0209_beuningen/GM0209_beuningen.derived.ad b/datasets/GM0209_beuningen/GM0209_beuningen.derived.ad index 29f3f7ca24..ed8f62c06a 100644 --- a/datasets/GM0209_beuningen/GM0209_beuningen.derived.ad +++ b/datasets/GM0209_beuningen/GM0209_beuningen.derived.ad @@ -1,6 +1,6 @@ - area = GM0209_beuningen -- id = 128546 -- parent_id = 128546 +- id = 128888 +- parent_id = 128888 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0209_beuningen/graph_values.yml b/datasets/GM0209_beuningen/graph_values.yml index eeeaf793c9..c33b227a18 100644 --- a/datasets/GM0209_beuningen/graph_values.yml +++ b/datasets/GM0209_beuningen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15504299944558594 - :network_gas: 0.1472635030492772 - :ambient_heat: 0.6976934975051369 + :electricity: 0.15800481273956404 + :network_gas: 0.13097352993239778 + :ambient_heat: 0.7110216573280381 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11232.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 13.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.215724120734943 - :network_gas: 0.13710351706022572 - :ambient_heat: 0.6471723622048312 + :electricity: 0.17138364625563587 + :network_gas: 0.31446541497745456 + :ambient_heat: 0.5141509387669095 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0213_brummen/GM0213_brummen.derived.ad b/datasets/GM0213_brummen/GM0213_brummen.derived.ad index c0bd71e557..0daeaaa9da 100644 --- a/datasets/GM0213_brummen/GM0213_brummen.derived.ad +++ b/datasets/GM0213_brummen/GM0213_brummen.derived.ad @@ -1,6 +1,6 @@ - area = GM0213_brummen -- id = 128559 -- parent_id = 128559 +- id = 128901 +- parent_id = 128901 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0213_brummen/graph_values.yml b/datasets/GM0213_brummen/graph_values.yml index 068657b139..7d764d2aaf 100644 --- a/datasets/GM0213_brummen/graph_values.yml +++ b/datasets/GM0213_brummen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1499776586617623 - :network_gas: 0.1751228773603074 - :ambient_heat: 0.6748994639779303 + :electricity: 0.15339707673802297 + :network_gas: 0.1563160779408737 + :ambient_heat: 0.6902868453211034 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9407.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 34.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20914771363635168 - :network_gas: 0.1634091454545911 - :ambient_heat: 0.6274431409090573 + :electricity: 0.15985480755693496 + :network_gas: 0.3605807697722584 + :ambient_heat: 0.47956442267080657 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0214_buren/GM0214_buren.derived.ad b/datasets/GM0214_buren/GM0214_buren.derived.ad index 4120e8cf52..b628bb2f43 100644 --- a/datasets/GM0214_buren/GM0214_buren.derived.ad +++ b/datasets/GM0214_buren/GM0214_buren.derived.ad @@ -1,6 +1,6 @@ - area = GM0214_buren -- id = 128563 -- parent_id = 128563 +- id = 128905 +- parent_id = 128905 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0214_buren/graph_values.yml b/datasets/GM0214_buren/graph_values.yml index 08b2d7a74e..6d2084760b 100644 --- a/datasets/GM0214_buren/graph_values.yml +++ b/datasets/GM0214_buren/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15633516869703032 - :network_gas: 0.14015657216633312 - :ambient_heat: 0.7035082591366364 + :electricity: 0.15917492023698201 + :network_gas: 0.12453793869659895 + :ambient_heat: 0.7162871410664191 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10903.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 99.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21739701992467608 - :network_gas: 0.1304119203012933 - :ambient_heat: 0.6521910597740306 + :electricity: 0.17446288618686454 + :network_gas: 0.30214845525254014 + :ambient_heat: 0.5233886585605955 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0216_culemborg/GM0216_culemborg.derived.ad b/datasets/GM0216_culemborg/GM0216_culemborg.derived.ad index 184894c9db..4d90669e05 100644 --- a/datasets/GM0216_culemborg/GM0216_culemborg.derived.ad +++ b/datasets/GM0216_culemborg/GM0216_culemborg.derived.ad @@ -1,6 +1,6 @@ - area = GM0216_culemborg -- id = 128568 -- parent_id = 128568 +- id = 128910 +- parent_id = 128910 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0216_culemborg/graph_values.yml b/datasets/GM0216_culemborg/graph_values.yml index 0c5bc57111..2ba1f88c68 100644 --- a/datasets/GM0216_culemborg/graph_values.yml +++ b/datasets/GM0216_culemborg/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15805370936614216 - :network_gas: 0.13070459848621804 - :ambient_heat: 0.7112416921476397 + :electricity: 0.16072778735289303 + :network_gas: 0.11599716955908834 + :ambient_heat: 0.7232750430880186 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12720.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 713.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2196189415615075 - :network_gas: 0.12152423375396754 - :ambient_heat: 0.6588568246845249 + :electricity: 0.17865049649101483 + :network_gas: 0.28539801403593873 + :ambient_heat: 0.5359514894730464 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0221_doesburg/GM0221_doesburg.derived.ad b/datasets/GM0221_doesburg/GM0221_doesburg.derived.ad index 9d32fa8f67..32db19bb64 100644 --- a/datasets/GM0221_doesburg/GM0221_doesburg.derived.ad +++ b/datasets/GM0221_doesburg/GM0221_doesburg.derived.ad @@ -1,6 +1,6 @@ - area = GM0221_doesburg -- id = 128582 -- parent_id = 128582 +- id = 128924 +- parent_id = 128924 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0221_doesburg/graph_values.yml b/datasets/GM0221_doesburg/graph_values.yml index 6c4eb92eda..60303a0371 100644 --- a/datasets/GM0221_doesburg/graph_values.yml +++ b/datasets/GM0221_doesburg/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15452489726223206 - :network_gas: 0.15011306505772368 - :ambient_heat: 0.6953620376800443 + :electricity: 0.15753504569381505 + :network_gas: 0.13355724868401733 + :ambient_heat: 0.7089077056221678 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5307.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 362.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21505282239340234 - :network_gas: 0.13978871042638835 - :ambient_heat: 0.6451584671802093 + :electricity: 0.17016531395144519 + :network_gas: 0.31933874419421754 + :ambient_heat: 0.5104959418543373 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0222_doetinchem/GM0222_doetinchem.derived.ad b/datasets/GM0222_doetinchem/GM0222_doetinchem.derived.ad index e2eed5bc94..2bc52a5194 100644 --- a/datasets/GM0222_doetinchem/GM0222_doetinchem.derived.ad +++ b/datasets/GM0222_doetinchem/GM0222_doetinchem.derived.ad @@ -1,6 +1,6 @@ - area = GM0222_doetinchem -- id = 128583 -- parent_id = 128583 +- id = 128925 +- parent_id = 128925 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0222_doetinchem/graph_values.yml b/datasets/GM0222_doetinchem/graph_values.yml index 1235b3cef7..79e4d77926 100644 --- a/datasets/GM0222_doetinchem/graph_values.yml +++ b/datasets/GM0222_doetinchem/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15545691098416334 - :network_gas: 0.14498698958710154 - :ambient_heat: 0.6995560994287351 + :electricity: 0.15837985988080597 + :network_gas: 0.12891077065556722 + :ambient_heat: 0.7127093694636268 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 26492.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 156.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2162601982168071 - :network_gas: 0.1349592071327692 - :ambient_heat: 0.6487805946504236 + :electricity: 0.17236363458648216 + :network_gas: 0.3105454616540696 + :ambient_heat: 0.5170909037594483 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0225_druten/GM0225_druten.derived.ad b/datasets/GM0225_druten/GM0225_druten.derived.ad index d6f2a4ba4c..1baff70c3e 100644 --- a/datasets/GM0225_druten/GM0225_druten.derived.ad +++ b/datasets/GM0225_druten/GM0225_druten.derived.ad @@ -1,6 +1,6 @@ - area = GM0225_druten -- id = 128589 -- parent_id = 128589 +- id = 128931 +- parent_id = 128931 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0225_druten/graph_values.yml b/datasets/GM0225_druten/graph_values.yml index b4470f8f25..58d9892394 100644 --- a/datasets/GM0225_druten/graph_values.yml +++ b/datasets/GM0225_druten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15673993273283118 - :network_gas: 0.13793036996942865 - :ambient_heat: 0.7053296972977402 + :electricity: 0.15954100596103696 + :network_gas: 0.1225244672142968 + :ambient_heat: 0.7179345268246663 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8189.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 21.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2179206498631967 - :network_gas: 0.1283174005472108 - :ambient_heat: 0.6537619495895924 + :electricity: 0.17543957618854558 + :network_gas: 0.29824169524581595 + :ambient_heat: 0.5263187285656385 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0226_duiven/GM0226_duiven.derived.ad b/datasets/GM0226_duiven/GM0226_duiven.derived.ad index 7c933bb6fa..2abad03c4c 100644 --- a/datasets/GM0226_duiven/GM0226_duiven.derived.ad +++ b/datasets/GM0226_duiven/GM0226_duiven.derived.ad @@ -1,6 +1,6 @@ - area = GM0226_duiven -- id = 128590 -- parent_id = 128590 +- id = 128932 +- parent_id = 128932 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0226_duiven/graph_values.yml b/datasets/GM0226_duiven/graph_values.yml index 2b9d19313e..301d6087ac 100644 --- a/datasets/GM0226_duiven/graph_values.yml +++ b/datasets/GM0226_duiven/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16945907791798914 - :network_gas: 0.06797507145105981 - :ambient_heat: 0.7625658506309511 + :electricity: 0.17093812103285083 + :network_gas: 0.059840334319320385 + :ambient_heat: 0.7692215446478288 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10750.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.23427951021924712 - :network_gas: 0.0628819591230091 - :ambient_heat: 0.7028385306577438 + :electricity: 0.20942849180700523 + :network_gas: 0.1622860327719768 + :ambient_heat: 0.628285475421018 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0228_ede/GM0228_ede.derived.ad b/datasets/GM0228_ede/GM0228_ede.derived.ad index 8a3b47f56a..b3755f7e3e 100644 --- a/datasets/GM0228_ede/GM0228_ede.derived.ad +++ b/datasets/GM0228_ede/GM0228_ede.derived.ad @@ -1,6 +1,6 @@ - area = GM0228_ede -- id = 128593 -- parent_id = 128593 +- id = 128935 +- parent_id = 128935 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0228_ede/graph_values.yml b/datasets/GM0228_ede/graph_values.yml index c78dd93e7f..bcb92bd1ad 100644 --- a/datasets/GM0228_ede/graph_values.yml +++ b/datasets/GM0228_ede/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15705656136390492 - :network_gas: 0.13618891249852297 - :ambient_heat: 0.7067545261375721 + :electricity: 0.15982723111384567 + :network_gas: 0.12095022887384888 + :ambient_heat: 0.7192225400123055 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 49897.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 203.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21833013055190587 - :network_gas: 0.12667947779237418 - :ambient_heat: 0.65499039165572 + :electricity: 0.17620769326922928 + :network_gas: 0.29516922692308106 + :ambient_heat: 0.5286230798076896 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0230_elburg/GM0230_elburg.derived.ad b/datasets/GM0230_elburg/GM0230_elburg.derived.ad index fc9f4d58c4..ab8fa12243 100644 --- a/datasets/GM0230_elburg/GM0230_elburg.derived.ad +++ b/datasets/GM0230_elburg/GM0230_elburg.derived.ad @@ -1,6 +1,6 @@ - area = GM0230_elburg -- id = 128598 -- parent_id = 128598 +- id = 128940 +- parent_id = 128940 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0230_elburg/graph_values.yml b/datasets/GM0230_elburg/graph_values.yml index deb3f88ae1..c871ea3b5c 100644 --- a/datasets/GM0230_elburg/graph_values.yml +++ b/datasets/GM0230_elburg/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15526817291625103 - :network_gas: 0.14602504896061935 - :ambient_heat: 0.6987067781231296 + :electricity: 0.15820887092283925 + :network_gas: 0.12985120992438418 + :ambient_heat: 0.7119399191527767 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9583.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 304.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21601577862030946 - :network_gas: 0.13593688551875996 - :ambient_heat: 0.6480473358609307 + :electricity: 0.17191603507588826 + :network_gas: 0.3123358596964452 + :ambient_heat: 0.5157481052276666 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0232_epe/GM0232_epe.derived.ad b/datasets/GM0232_epe/GM0232_epe.derived.ad index fa9b9a0c45..a52c2838b1 100644 --- a/datasets/GM0232_epe/GM0232_epe.derived.ad +++ b/datasets/GM0232_epe/GM0232_epe.derived.ad @@ -1,6 +1,6 @@ - area = GM0232_epe -- id = 128602 -- parent_id = 128602 +- id = 128944 +- parent_id = 128944 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0232_epe/graph_values.yml b/datasets/GM0232_epe/graph_values.yml index 72b105a11d..0818f3bfa4 100644 --- a/datasets/GM0232_epe/graph_values.yml +++ b/datasets/GM0232_epe/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1526932322389113 - :network_gas: 0.16018722268598795 - :ambient_heat: 0.6871195450751008 + :electricity: 0.15587147265269397 + :network_gas: 0.14270690041018322 + :ambient_heat: 0.7014216269371228 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14683.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 26.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21267707344675765 - :network_gas: 0.14929170621296706 - :ambient_heat: 0.6380312203402753 + :electricity: 0.1659309633065527 + :network_gas: 0.3362761467737876 + :ambient_heat: 0.49779288991965986 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0233_ermelo/GM0233_ermelo.derived.ad b/datasets/GM0233_ermelo/GM0233_ermelo.derived.ad index 00cb3c5432..8f27150793 100644 --- a/datasets/GM0233_ermelo/GM0233_ermelo.derived.ad +++ b/datasets/GM0233_ermelo/GM0233_ermelo.derived.ad @@ -1,6 +1,6 @@ - area = GM0233_ermelo -- id = 128603 -- parent_id = 128603 +- id = 128945 +- parent_id = 128945 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0233_ermelo/graph_values.yml b/datasets/GM0233_ermelo/graph_values.yml index 8563faabcc..ec98e8f629 100644 --- a/datasets/GM0233_ermelo/graph_values.yml +++ b/datasets/GM0233_ermelo/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15264414565553097 - :network_gas: 0.16045719889457957 - :ambient_heat: 0.6868986554498894 + :electricity: 0.15582683082242815 + :network_gas: 0.14295243047664521 + :ambient_heat: 0.7012207387009267 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11332.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 27.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21261335267931494 - :network_gas: 0.149546589282738 - :ambient_heat: 0.6378400580379472 + :electricity: 0.16581902333412424 + :network_gas: 0.3367239066635013 + :ambient_heat: 0.4974570700023745 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0243_harderwijk/GM0243_harderwijk.derived.ad b/datasets/GM0243_harderwijk/GM0243_harderwijk.derived.ad index 76d836a7de..3ddadbaebd 100644 --- a/datasets/GM0243_harderwijk/GM0243_harderwijk.derived.ad +++ b/datasets/GM0243_harderwijk/GM0243_harderwijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0243_harderwijk -- id = 128623 -- parent_id = 128623 +- id = 128965 +- parent_id = 128965 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0243_harderwijk/graph_values.yml b/datasets/GM0243_harderwijk/graph_values.yml index 98a0cc8b59..92b1961d68 100644 --- a/datasets/GM0243_harderwijk/graph_values.yml +++ b/datasets/GM0243_harderwijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1547546617687888 - :network_gas: 0.14884936027166168 - :ambient_heat: 0.6963959779595496 + :electricity: 0.15774341772147205 + :network_gas: 0.1324112025319037 + :ambient_heat: 0.7098453797466242 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20668.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 428.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2153505635141489 - :network_gas: 0.13859774594340216 - :ambient_heat: 0.6460516905424489 + :electricity: 0.17070447340324937 + :network_gas: 0.31718210638700084 + :ambient_heat: 0.5121134202097499 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0244_hattem/GM0244_hattem.derived.ad b/datasets/GM0244_hattem/GM0244_hattem.derived.ad index c8bb27a2a8..e47278af20 100644 --- a/datasets/GM0244_hattem/GM0244_hattem.derived.ad +++ b/datasets/GM0244_hattem/GM0244_hattem.derived.ad @@ -1,6 +1,6 @@ - area = GM0244_hattem -- id = 128626 -- parent_id = 128626 +- id = 128968 +- parent_id = 128968 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0244_hattem/graph_values.yml b/datasets/GM0244_hattem/graph_values.yml index 6f5629ef41..e9bd744716 100644 --- a/datasets/GM0244_hattem/graph_values.yml +++ b/datasets/GM0244_hattem/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15393733585371644 - :network_gas: 0.15334465280455947 - :ambient_heat: 0.6927180113417241 + :electricity: 0.15700187886943337 + :network_gas: 0.13648966621811637 + :ambient_heat: 0.7065084549124502 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5259.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 226.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21429115188123868 - :network_gas: 0.14283539247504293 - :ambient_heat: 0.6428734556437183 + :electricity: 0.1687947435903823 + :network_gas: 0.32482102563846904 + :ambient_heat: 0.5063842307711487 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0246_heerde/GM0246_heerde.derived.ad b/datasets/GM0246_heerde/GM0246_heerde.derived.ad index 58207b734d..67f519d485 100644 --- a/datasets/GM0246_heerde/GM0246_heerde.derived.ad +++ b/datasets/GM0246_heerde/GM0246_heerde.derived.ad @@ -1,6 +1,6 @@ - area = GM0246_heerde -- id = 128629 -- parent_id = 128629 +- id = 128971 +- parent_id = 128971 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0246_heerde/graph_values.yml b/datasets/GM0246_heerde/graph_values.yml index f83720a068..9f959b1f00 100644 --- a/datasets/GM0246_heerde/graph_values.yml +++ b/datasets/GM0246_heerde/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1544312994273947 - :network_gas: 0.1506278531493292 - :ambient_heat: 0.6949408474232761 + :electricity: 0.15745014279726938 + :network_gas: 0.13402421461501823 + :ambient_heat: 0.7085256425877123 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8005.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 11.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2149315158621545 - :network_gas: 0.14027393655137974 - :ambient_heat: 0.6447945475864657 + :electricity: 0.16994619746822595 + :network_gas: 0.32021521012709436 + :ambient_heat: 0.5098385924046797 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0252_heumen/GM0252_heumen.derived.ad b/datasets/GM0252_heumen/GM0252_heumen.derived.ad index a516cd00f5..80c57dc44a 100644 --- a/datasets/GM0252_heumen/GM0252_heumen.derived.ad +++ b/datasets/GM0252_heumen/GM0252_heumen.derived.ad @@ -1,6 +1,6 @@ - area = GM0252_heumen -- id = 128638 -- parent_id = 128638 +- id = 128980 +- parent_id = 128980 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0252_heumen/graph_values.yml b/datasets/GM0252_heumen/graph_values.yml index abe78223cc..fabe161599 100644 --- a/datasets/GM0252_heumen/graph_values.yml +++ b/datasets/GM0252_heumen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15567626871158613 - :network_gas: 0.14378052208627629 - :ambient_heat: 0.7005432092021376 + :electricity: 0.15857853115966733 + :network_gas: 0.12781807862182976 + :ambient_heat: 0.7136033902185028 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7265.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 7.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21654421931649798 - :network_gas: 0.13382312273400584 - :ambient_heat: 0.6496326579494963 + :electricity: 0.1728854117013979 + :network_gas: 0.3084583531944066 + :ambient_heat: 0.5186562351041955 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0262_lochem/GM0262_lochem.derived.ad b/datasets/GM0262_lochem/GM0262_lochem.derived.ad index bbdd0e3007..bbc0288f5b 100644 --- a/datasets/GM0262_lochem/GM0262_lochem.derived.ad +++ b/datasets/GM0262_lochem/GM0262_lochem.derived.ad @@ -1,6 +1,6 @@ - area = GM0262_lochem -- id = 128674 -- parent_id = 128674 +- id = 129016 +- parent_id = 129016 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0262_lochem/graph_values.yml b/datasets/GM0262_lochem/graph_values.yml index b130975924..2c1bee3c33 100644 --- a/datasets/GM0262_lochem/graph_values.yml +++ b/datasets/GM0262_lochem/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15063014675955463 - :network_gas: 0.17153419282244964 - :ambient_heat: 0.6778356604179958 + :electricity: 0.15399249343802737 + :network_gas: 0.15304128609084944 + :ambient_heat: 0.6929662204711232 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15122.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 85.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20999651536926575 - :network_gas: 0.16001393852293475 - :ambient_heat: 0.6299895461077996 + :electricity: 0.1612933973065925 + :network_gas: 0.3548264107736283 + :ambient_heat: 0.4838801919197792 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0263_maasdriel/GM0263_maasdriel.derived.ad b/datasets/GM0263_maasdriel/GM0263_maasdriel.derived.ad index b3a3e4e9e8..b3248d5ed6 100644 --- a/datasets/GM0263_maasdriel/GM0263_maasdriel.derived.ad +++ b/datasets/GM0263_maasdriel/GM0263_maasdriel.derived.ad @@ -1,6 +1,6 @@ - area = GM0263_maasdriel -- id = 128678 -- parent_id = 128678 +- id = 129020 +- parent_id = 129020 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0263_maasdriel/graph_values.yml b/datasets/GM0263_maasdriel/graph_values.yml index d5634faff8..25354eb2d7 100644 --- a/datasets/GM0263_maasdriel/graph_values.yml +++ b/datasets/GM0263_maasdriel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15667544721037907 - :network_gas: 0.13828504034291514 - :ambient_heat: 0.7050395124467058 + :electricity: 0.15948269666854867 + :network_gas: 0.12284516832298228 + :ambient_heat: 0.717672135008469 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10195.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 60.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21783723968347382 - :network_gas: 0.12865104126610236 - :ambient_heat: 0.6535117190504238 + :electricity: 0.17528358108191713 + :network_gas: 0.2988656756723295 + :ambient_heat: 0.5258507432457533 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0267_nijkerk/GM0267_nijkerk.derived.ad b/datasets/GM0267_nijkerk/GM0267_nijkerk.derived.ad index 002281eadc..76f84f348a 100644 --- a/datasets/GM0267_nijkerk/GM0267_nijkerk.derived.ad +++ b/datasets/GM0267_nijkerk/GM0267_nijkerk.derived.ad @@ -1,6 +1,6 @@ - area = GM0267_nijkerk -- id = 128696 -- parent_id = 128696 +- id = 129038 +- parent_id = 129038 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0267_nijkerk/graph_values.yml b/datasets/GM0267_nijkerk/graph_values.yml index 8e0205efc3..6c95066bbd 100644 --- a/datasets/GM0267_nijkerk/graph_values.yml +++ b/datasets/GM0267_nijkerk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1561516240274299 - :network_gas: 0.1411660678491355 - :ambient_heat: 0.7026823081234346 + :electricity: 0.1590088450461901 + :network_gas: 0.12545135224595458 + :ambient_heat: 0.7155398027078553 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 17338.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 337.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21715951208421094 - :network_gas: 0.13136195166315395 - :ambient_heat: 0.6514785362526352 + :electricity: 0.17402191914037426 + :network_gas: 0.30391232343850105 + :ambient_heat: 0.5220657574211247 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0268_nijmegen/GM0268_nijmegen.derived.ad b/datasets/GM0268_nijmegen/GM0268_nijmegen.derived.ad index 16a0042837..75fe2e290f 100644 --- a/datasets/GM0268_nijmegen/GM0268_nijmegen.derived.ad +++ b/datasets/GM0268_nijmegen/GM0268_nijmegen.derived.ad @@ -1,6 +1,6 @@ - area = GM0268_nijmegen -- id = 128697 -- parent_id = 128697 +- id = 129039 +- parent_id = 129039 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0268_nijmegen/graph_values.yml b/datasets/GM0268_nijmegen/graph_values.yml index 5fa91908bf..bc6632150c 100644 --- a/datasets/GM0268_nijmegen/graph_values.yml +++ b/datasets/GM0268_nijmegen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15401649605867546 - :network_gas: 0.15290927167728494 - :ambient_heat: 0.6930742322640396 + :electricity: 0.15707373674642175 + :network_gas: 0.13609444789468048 + :ambient_heat: 0.7068318153588978 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 82196.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 5934.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2143937924556412 - :network_gas: 0.14242483017743313 - :ambient_heat: 0.6431813773669258 + :electricity: 0.16897871365789954 + :network_gas: 0.3240851453683999 + :ambient_heat: 0.5069361409737005 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0269_oldebroek/GM0269_oldebroek.derived.ad b/datasets/GM0269_oldebroek/GM0269_oldebroek.derived.ad index b0d56dc806..b58def816b 100644 --- a/datasets/GM0269_oldebroek/GM0269_oldebroek.derived.ad +++ b/datasets/GM0269_oldebroek/GM0269_oldebroek.derived.ad @@ -1,6 +1,6 @@ - area = GM0269_oldebroek -- id = 128709 -- parent_id = 128709 +- id = 129051 +- parent_id = 129051 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0269_oldebroek/graph_values.yml b/datasets/GM0269_oldebroek/graph_values.yml index 84e1e74478..f95d11cf17 100644 --- a/datasets/GM0269_oldebroek/graph_values.yml +++ b/datasets/GM0269_oldebroek/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1544294637351701 - :network_gas: 0.15063794945656442 - :ambient_heat: 0.6949325868082654 + :electricity: 0.15744847752152952 + :network_gas: 0.13403337363158763 + :ambient_heat: 0.7085181488468828 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9451.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 18.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21492913663067245 - :network_gas: 0.1402834534773079 - :ambient_heat: 0.6447874098920197 + :electricity: 0.16994190302512532 + :network_gas: 0.320232387899497 + :ambient_heat: 0.5098257090753778 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0273_putten/GM0273_putten.derived.ad b/datasets/GM0273_putten/GM0273_putten.derived.ad index 1d8c66d311..bb807ffc21 100644 --- a/datasets/GM0273_putten/GM0273_putten.derived.ad +++ b/datasets/GM0273_putten/GM0273_putten.derived.ad @@ -1,6 +1,6 @@ - area = GM0273_putten -- id = 128729 -- parent_id = 128729 +- id = 129071 +- parent_id = 129071 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0273_putten/graph_values.yml b/datasets/GM0273_putten/graph_values.yml index ecd89037fb..1923c80958 100644 --- a/datasets/GM0273_putten/graph_values.yml +++ b/datasets/GM0273_putten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15569744433287538 - :network_gas: 0.1436640561691856 - :ambient_heat: 0.7006384994979392 + :electricity: 0.15859770653214128 + :network_gas: 0.12771261407322293 + :ambient_heat: 0.7136896793946358 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9898.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 18.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21657163425996562 - :network_gas: 0.13371346296013525 - :ambient_heat: 0.6497149027798992 + :electricity: 0.17293587042272218 + :network_gas: 0.3082565183091096 + :ambient_heat: 0.5188076112681683 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0274_renkum/GM0274_renkum.derived.ad b/datasets/GM0274_renkum/GM0274_renkum.derived.ad index 079dcbb791..a46f45ec44 100644 --- a/datasets/GM0274_renkum/GM0274_renkum.derived.ad +++ b/datasets/GM0274_renkum/GM0274_renkum.derived.ad @@ -1,6 +1,6 @@ - area = GM0274_renkum -- id = 128732 -- parent_id = 128732 +- id = 129074 +- parent_id = 129074 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0274_renkum/graph_values.yml b/datasets/GM0274_renkum/graph_values.yml index 1079652c4e..547bceddd3 100644 --- a/datasets/GM0274_renkum/graph_values.yml +++ b/datasets/GM0274_renkum/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15038631665438176 - :network_gas: 0.17287525840090032 - :ambient_heat: 0.6767384249447179 + :electricity: 0.1537700555933527 + :network_gas: 0.15426469423656025 + :ambient_heat: 0.6919652501700871 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14987.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 422.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20967938207179979 - :network_gas: 0.1612824717127987 - :ambient_heat: 0.6290381462154016 + :electricity: 0.16075425091303272 + :network_gas: 0.3569829963478673 + :ambient_heat: 0.4822627527390999 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0275_rheden/GM0275_rheden.derived.ad b/datasets/GM0275_rheden/GM0275_rheden.derived.ad index 41e755b489..455fbd47d1 100644 --- a/datasets/GM0275_rheden/GM0275_rheden.derived.ad +++ b/datasets/GM0275_rheden/GM0275_rheden.derived.ad @@ -1,6 +1,6 @@ - area = GM0275_rheden -- id = 128735 -- parent_id = 128735 +- id = 129077 +- parent_id = 129077 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0275_rheden/graph_values.yml b/datasets/GM0275_rheden/graph_values.yml index 6989a54f28..3f4b2b2686 100644 --- a/datasets/GM0275_rheden/graph_values.yml +++ b/datasets/GM0275_rheden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1497403479071092 - :network_gas: 0.17642808651089947 - :ambient_heat: 0.6738315655819913 + :electricity: 0.1531803849243356 + :network_gas: 0.15750788291615395 + :ambient_heat: 0.6893117321595102 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 21217.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 577.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20883888083965343 - :network_gas: 0.164644476641384 - :ambient_heat: 0.6265166425189624 + :electricity: 0.1593348725048036 + :network_gas: 0.36266050998078375 + :ambient_heat: 0.47800461751441253 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0277_rozendaal/GM0277_rozendaal.derived.ad b/datasets/GM0277_rozendaal/GM0277_rozendaal.derived.ad index 12a922df70..d535ef2c39 100644 --- a/datasets/GM0277_rozendaal/GM0277_rozendaal.derived.ad +++ b/datasets/GM0277_rozendaal/GM0277_rozendaal.derived.ad @@ -1,6 +1,6 @@ - area = GM0277_rozendaal -- id = 128744 -- parent_id = 128744 +- id = 129086 +- parent_id = 129086 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0277_rozendaal/graph_values.yml b/datasets/GM0277_rozendaal/graph_values.yml index 3b7caef094..d56d610e13 100644 --- a/datasets/GM0277_rozendaal/graph_values.yml +++ b/datasets/GM0277_rozendaal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15467339009118963 - :network_gas: 0.14929635449845702 - :ambient_heat: 0.6960302554103533 + :electricity: 0.15766972074412194 + :network_gas: 0.13281653590732925 + :ambient_heat: 0.7095137433485488 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 694.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 7.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2152452542932283 - :network_gas: 0.1390189828270846 - :ambient_heat: 0.6457357628796871 + :electricity: 0.17051355656232803 + :network_gas: 0.3179457737506859 + :ambient_heat: 0.511540669686986 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0279_scherpenzeel/GM0279_scherpenzeel.derived.ad b/datasets/GM0279_scherpenzeel/GM0279_scherpenzeel.derived.ad index b6c6a9616a..43d9b43d79 100644 --- a/datasets/GM0279_scherpenzeel/GM0279_scherpenzeel.derived.ad +++ b/datasets/GM0279_scherpenzeel/GM0279_scherpenzeel.derived.ad @@ -1,6 +1,6 @@ - area = GM0279_scherpenzeel -- id = 128747 -- parent_id = 128747 +- id = 129089 +- parent_id = 129089 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0279_scherpenzeel/graph_values.yml b/datasets/GM0279_scherpenzeel/graph_values.yml index 191322ac3c..bcca81e10b 100644 --- a/datasets/GM0279_scherpenzeel/graph_values.yml +++ b/datasets/GM0279_scherpenzeel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1550816422335736 - :network_gas: 0.14705096771534523 - :ambient_heat: 0.6978673900510811 + :electricity: 0.1580398365213299 + :network_gas: 0.13078089913268567 + :ambient_heat: 0.7111792643459846 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4112.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 68.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2157741772947494 - :network_gas: 0.13690329082100003 - :ambient_heat: 0.6473225318842505 + :electricity: 0.17147488648037967 + :network_gas: 0.3141004540784795 + :ambient_heat: 0.5144246594411409 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0281_tiel/GM0281_tiel.derived.ad b/datasets/GM0281_tiel/GM0281_tiel.derived.ad index 5aad2a7a52..59bc06461a 100644 --- a/datasets/GM0281_tiel/GM0281_tiel.derived.ad +++ b/datasets/GM0281_tiel/GM0281_tiel.derived.ad @@ -1,6 +1,6 @@ - area = GM0281_tiel -- id = 128774 -- parent_id = 128774 +- id = 129116 +- parent_id = 129116 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0281_tiel/graph_values.yml b/datasets/GM0281_tiel/graph_values.yml index 5d8a87e682..86923b600f 100644 --- a/datasets/GM0281_tiel/graph_values.yml +++ b/datasets/GM0281_tiel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1554220863868968 - :network_gas: 0.14517852487206767 - :ambient_heat: 0.6993993887410356 + :electricity: 0.15834831368584848 + :network_gas: 0.1290842747278333 + :ambient_heat: 0.7125674115863182 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18255.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 980.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21621510275071093 - :network_gas: 0.13513958899715392 - :ambient_heat: 0.6486453082521351 + :electricity: 0.17228095338314078 + :network_gas: 0.31087618646743514 + :ambient_heat: 0.5168428601494242 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0285_voorst/GM0285_voorst.derived.ad b/datasets/GM0285_voorst/GM0285_voorst.derived.ad index 8bcf97f80e..3670059e8d 100644 --- a/datasets/GM0285_voorst/GM0285_voorst.derived.ad +++ b/datasets/GM0285_voorst/GM0285_voorst.derived.ad @@ -1,6 +1,6 @@ - area = GM0285_voorst -- id = 128800 -- parent_id = 128800 +- id = 129142 +- parent_id = 129142 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0285_voorst/graph_values.yml b/datasets/GM0285_voorst/graph_values.yml index 0f83a0b66b..eaee06b254 100644 --- a/datasets/GM0285_voorst/graph_values.yml +++ b/datasets/GM0285_voorst/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15305558473177316 - :network_gas: 0.15819428397524746 - :ambient_heat: 0.6887501312929792 + :electricity: 0.15620091752696674 + :network_gas: 0.140894953601683 + :ambient_heat: 0.7029041288713503 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10715.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 40.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21314736789980698 - :network_gas: 0.1474105284007697 - :ambient_heat: 0.6394421036994233 + :electricity: 0.16675974756242584 + :network_gas: 0.33296100975029497 + :ambient_heat: 0.5002792426872793 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0289_wageningen/GM0289_wageningen.derived.ad b/datasets/GM0289_wageningen/GM0289_wageningen.derived.ad index 24348e3686..bddea7f814 100644 --- a/datasets/GM0289_wageningen/GM0289_wageningen.derived.ad +++ b/datasets/GM0289_wageningen/GM0289_wageningen.derived.ad @@ -1,6 +1,6 @@ - area = GM0289_wageningen -- id = 128805 -- parent_id = 128805 +- id = 129147 +- parent_id = 129147 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0289_wageningen/graph_values.yml b/datasets/GM0289_wageningen/graph_values.yml index 9abb9dd1e5..438742948a 100644 --- a/datasets/GM0289_wageningen/graph_values.yml +++ b/datasets/GM0289_wageningen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1556021021905919 - :network_gas: 0.14418843795174455 - :ambient_heat: 0.7002094598576636 + :electricity: 0.15851136584026687 + :network_gas: 0.12818748787853235 + :ambient_heat: 0.7133011462812009 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18053.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 534.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21644819581880198 - :network_gas: 0.13420721672478977 - :ambient_heat: 0.6493445874564082 + :electricity: 0.1727088065326554 + :network_gas: 0.30916477386937635 + :ambient_heat: 0.5181264195979681 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0293_westervoort/GM0293_westervoort.derived.ad b/datasets/GM0293_westervoort/GM0293_westervoort.derived.ad index d40558e994..494eaaaccd 100644 --- a/datasets/GM0293_westervoort/GM0293_westervoort.derived.ad +++ b/datasets/GM0293_westervoort/GM0293_westervoort.derived.ad @@ -1,6 +1,6 @@ - area = GM0293_westervoort -- id = 128811 -- parent_id = 128811 +- id = 129153 +- parent_id = 129153 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0293_westervoort/graph_values.yml b/datasets/GM0293_westervoort/graph_values.yml index dadc53f9f7..4b874ee139 100644 --- a/datasets/GM0293_westervoort/graph_values.yml +++ b/datasets/GM0293_westervoort/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16468088878776646 - :network_gas: 0.09425511166728445 - :ambient_heat: 0.741063999544949 + :electricity: 0.16668066954030633 + :network_gas: 0.08325631752831508 + :ambient_heat: 0.7500630129313786 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6739.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 5.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.22815561589145555 - :network_gas: 0.08737753643417526 - :ambient_heat: 0.6844668476743692 + :electricity: 0.1958609998771615 + :network_gas: 0.21655600049135204 + :ambient_heat: 0.5875829996314865 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0294_winterswijk/GM0294_winterswijk.derived.ad b/datasets/GM0294_winterswijk/GM0294_winterswijk.derived.ad index 588c5fbb4e..8fd5e5f184 100644 --- a/datasets/GM0294_winterswijk/GM0294_winterswijk.derived.ad +++ b/datasets/GM0294_winterswijk/GM0294_winterswijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0294_winterswijk -- id = 128818 -- parent_id = 128818 +- id = 129160 +- parent_id = 129160 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0294_winterswijk/graph_values.yml b/datasets/GM0294_winterswijk/graph_values.yml index 0760beceb4..39a6aed856 100644 --- a/datasets/GM0294_winterswijk/graph_values.yml +++ b/datasets/GM0294_winterswijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1533735785797161 - :network_gas: 0.1564453178115615 - :ambient_heat: 0.6901811036087224 + :electricity: 0.15648989175256064 + :network_gas: 0.1393055953609165 + :ambient_heat: 0.7042045128865229 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13072.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 435.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21355996457418713 - :network_gas: 0.1457601417032491 - :ambient_heat: 0.6406798937225637 + :electricity: 0.16749065324157691 + :network_gas: 0.3300373870336906 + :ambient_heat: 0.5024719597247326 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0296_wijchen/GM0296_wijchen.derived.ad b/datasets/GM0296_wijchen/GM0296_wijchen.derived.ad index 2fe9108d24..ca5317ad3d 100644 --- a/datasets/GM0296_wijchen/GM0296_wijchen.derived.ad +++ b/datasets/GM0296_wijchen/GM0296_wijchen.derived.ad @@ -1,6 +1,6 @@ - area = GM0296_wijchen -- id = 128815 -- parent_id = 128815 +- id = 129157 +- parent_id = 129157 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0296_wijchen/graph_values.yml b/datasets/GM0296_wijchen/graph_values.yml index 282a36a7f0..817af07e98 100644 --- a/datasets/GM0296_wijchen/graph_values.yml +++ b/datasets/GM0296_wijchen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15639841084314351 - :network_gas: 0.1398087403627107 - :ambient_heat: 0.7037928487941458 + :electricity: 0.1592321330342562 + :network_gas: 0.12422326831159076 + :ambient_heat: 0.716544598654153 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18166.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 43.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21747884663790443 - :network_gas: 0.13008461344838007 - :ambient_heat: 0.6524365399137155 + :electricity: 0.17461510312402112 + :network_gas: 0.3015395875039137 + :ambient_heat: 0.5238453093720653 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0297_zaltbommel/GM0297_zaltbommel.derived.ad b/datasets/GM0297_zaltbommel/GM0297_zaltbommel.derived.ad index d7380c4176..b25163bbf5 100644 --- a/datasets/GM0297_zaltbommel/GM0297_zaltbommel.derived.ad +++ b/datasets/GM0297_zaltbommel/GM0297_zaltbommel.derived.ad @@ -1,6 +1,6 @@ - area = GM0297_zaltbommel -- id = 128824 -- parent_id = 128824 +- id = 129166 +- parent_id = 129166 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0297_zaltbommel/graph_values.yml b/datasets/GM0297_zaltbommel/graph_values.yml index e3438aeafc..8cfebbfba0 100644 --- a/datasets/GM0297_zaltbommel/graph_values.yml +++ b/datasets/GM0297_zaltbommel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.156337080678121 - :network_gas: 0.14014605627033458 - :ambient_heat: 0.7035168630515445 + :electricity: 0.15917665001016973 + :network_gas: 0.12452842494406638 + :ambient_heat: 0.7162949250457639 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11803.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 458.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21739949383496016 - :network_gas: 0.1304020246601569 - :ambient_heat: 0.6521984815048828 + :electricity: 0.17446748602986603 + :network_gas: 0.30213005588053404 + :ambient_heat: 0.5234024580896 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0299_zevenaar/GM0299_zevenaar.derived.ad b/datasets/GM0299_zevenaar/GM0299_zevenaar.derived.ad index 478613acbc..6827389122 100644 --- a/datasets/GM0299_zevenaar/GM0299_zevenaar.derived.ad +++ b/datasets/GM0299_zevenaar/GM0299_zevenaar.derived.ad @@ -1,6 +1,6 @@ - area = GM0299_zevenaar -- id = 128828 -- parent_id = 128828 +- id = 129170 +- parent_id = 129170 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0299_zevenaar/graph_values.yml b/datasets/GM0299_zevenaar/graph_values.yml index 8b78935ee5..492fbe61e5 100644 --- a/datasets/GM0299_zevenaar/graph_values.yml +++ b/datasets/GM0299_zevenaar/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15665290387909722 - :network_gas: 0.1384090286649653 - :ambient_heat: 0.7049380674559375 + :electricity: 0.15946231120568938 + :network_gas: 0.12295728836870833 + :ambient_heat: 0.7175804004256021 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20189.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 174.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21780807940052357 - :network_gas: 0.12876768239790337 - :ambient_heat: 0.653424238201573 + :electricity: 0.1752290823158986 + :network_gas: 0.2990836707364037 + :ambient_heat: 0.5256872469476976 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0301_zutphen/GM0301_zutphen.derived.ad b/datasets/GM0301_zutphen/GM0301_zutphen.derived.ad index a408e33fcd..9330b0e142 100644 --- a/datasets/GM0301_zutphen/GM0301_zutphen.derived.ad +++ b/datasets/GM0301_zutphen/GM0301_zutphen.derived.ad @@ -1,6 +1,6 @@ - area = GM0301_zutphen -- id = 128833 -- parent_id = 128833 +- id = 129175 +- parent_id = 129175 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0301_zutphen/graph_values.yml b/datasets/GM0301_zutphen/graph_values.yml index f0b8d79bf0..792b651fca 100644 --- a/datasets/GM0301_zutphen/graph_values.yml +++ b/datasets/GM0301_zutphen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15288178226975366 - :network_gas: 0.15915019751635487 - :ambient_heat: 0.6879680202138915 + :electricity: 0.15604292050234958 + :network_gas: 0.14176393723707742 + :ambient_heat: 0.702193142260573 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22588.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2097.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2129218099946983 - :network_gas: 0.1483127600212044 - :ambient_heat: 0.6387654299840972 + :electricity: 0.1663616806510125 + :network_gas: 0.33455327739594815 + :ambient_heat: 0.4990850419530394 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0302_nunspeet/GM0302_nunspeet.derived.ad b/datasets/GM0302_nunspeet/GM0302_nunspeet.derived.ad index 9c67abe22d..c5d617cb04 100644 --- a/datasets/GM0302_nunspeet/GM0302_nunspeet.derived.ad +++ b/datasets/GM0302_nunspeet/GM0302_nunspeet.derived.ad @@ -1,6 +1,6 @@ - area = GM0302_nunspeet -- id = 128704 -- parent_id = 128704 +- id = 129046 +- parent_id = 129046 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0302_nunspeet/graph_values.yml b/datasets/GM0302_nunspeet/graph_values.yml index a95dbdfc78..0a37215d8a 100644 --- a/datasets/GM0302_nunspeet/graph_values.yml +++ b/datasets/GM0302_nunspeet/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15431697999801086 - :network_gas: 0.1512566100109403 - :ambient_heat: 0.6944264099910489 + :electricity: 0.15734642788481967 + :network_gas: 0.13459464663349177 + :ambient_heat: 0.7080589254816885 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11197.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 37.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21478333960452273 - :network_gas: 0.14086664158190676 - :ambient_heat: 0.6443500188135706 + :electricity: 0.16967897618927905 + :network_gas: 0.32128409524288193 + :ambient_heat: 0.509036928567839 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0303_dronten/GM0303_dronten.derived.ad b/datasets/GM0303_dronten/GM0303_dronten.derived.ad index fb68aa3fde..03a75c4efd 100644 --- a/datasets/GM0303_dronten/GM0303_dronten.derived.ad +++ b/datasets/GM0303_dronten/GM0303_dronten.derived.ad @@ -1,6 +1,6 @@ - area = GM0303_dronten -- id = 128588 -- parent_id = 128588 +- id = 128930 +- parent_id = 128930 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0303_dronten/graph_values.yml b/datasets/GM0303_dronten/graph_values.yml index 994716b9ea..872a905314 100644 --- a/datasets/GM0303_dronten/graph_values.yml +++ b/datasets/GM0303_dronten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15578143351151688 - :network_gas: 0.14320211568665708 - :ambient_heat: 0.701016450801826 + :electricity: 0.15867375639088668 + :network_gas: 0.1272943398501233 + :ambient_heat: 0.7140319037589901 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 17696.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 0.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2166803654672303 - :network_gas: 0.1332785381310764 - :ambient_heat: 0.6500410964016932 + :electricity: 0.17313616056059616 + :network_gas: 0.30745535775761357 + :ambient_heat: 0.5194084816817903 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0307_amersfoort/GM0307_amersfoort.derived.ad b/datasets/GM0307_amersfoort/GM0307_amersfoort.derived.ad index 6f0993e263..3821485eae 100644 --- a/datasets/GM0307_amersfoort/GM0307_amersfoort.derived.ad +++ b/datasets/GM0307_amersfoort/GM0307_amersfoort.derived.ad @@ -1,6 +1,6 @@ - area = GM0307_amersfoort -- id = 128525 -- parent_id = 128525 +- id = 128867 +- parent_id = 128867 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0307_amersfoort/graph_values.yml b/datasets/GM0307_amersfoort/graph_values.yml index 1457bcf154..a8eaa9d8ad 100644 --- a/datasets/GM0307_amersfoort/graph_values.yml +++ b/datasets/GM0307_amersfoort/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1565436443034404 - :network_gas: 0.13900995633107782 - :ambient_heat: 0.7044463993654818 + :electricity: 0.1593635007761815 + :network_gas: 0.12350074573100173 + :ambient_heat: 0.7171357534928168 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 68785.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 4819.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21766674151043539 - :network_gas: 0.1293330339582562 - :ambient_heat: 0.6530002245313085 + :electricity: 0.17496520379692387 + :network_gas: 0.30013918481230256 + :ambient_heat: 0.5248956113907735 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0308_baarn/GM0308_baarn.derived.ad b/datasets/GM0308_baarn/GM0308_baarn.derived.ad index af906224be..86d5245550 100644 --- a/datasets/GM0308_baarn/GM0308_baarn.derived.ad +++ b/datasets/GM0308_baarn/GM0308_baarn.derived.ad @@ -1,6 +1,6 @@ - area = GM0308_baarn -- id = 128533 -- parent_id = 128533 +- id = 128875 +- parent_id = 128875 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0308_baarn/graph_values.yml b/datasets/GM0308_baarn/graph_values.yml index 9005904ecb..aa4abe9a02 100644 --- a/datasets/GM0308_baarn/graph_values.yml +++ b/datasets/GM0308_baarn/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.14994603360192246 - :network_gas: 0.1752968151894263 - :ambient_heat: 0.6747571512086512 + :electricity: 0.15336820370083348 + :network_gas: 0.15647487964541587 + :ambient_heat: 0.6901569166537507 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11684.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 547.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20910656101465178 - :network_gas: 0.1635737559413907 - :ambient_heat: 0.6273196830439576 + :electricity: 0.15978541814698974 + :network_gas: 0.36085832741203944 + :ambient_heat: 0.4793562544409709 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0310_de_bilt/GM0310_de_bilt.derived.ad b/datasets/GM0310_de_bilt/GM0310_de_bilt.derived.ad index a5eb870e5e..33707ec42c 100644 --- a/datasets/GM0310_de_bilt/GM0310_de_bilt.derived.ad +++ b/datasets/GM0310_de_bilt/GM0310_de_bilt.derived.ad @@ -1,6 +1,6 @@ - area = GM0310_de_bilt -- id = 128571 -- parent_id = 128571 +- id = 128913 +- parent_id = 128913 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0310_de_bilt/graph_values.yml b/datasets/GM0310_de_bilt/graph_values.yml index 292542b38f..df9a3661b9 100644 --- a/datasets/GM0310_de_bilt/graph_values.yml +++ b/datasets/GM0310_de_bilt/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15103027349245107 - :network_gas: 0.16933349579151913 - :ambient_heat: 0.6796362307160297 + :electricity: 0.1543573471496136 + :network_gas: 0.15103459067712527 + :ambient_heat: 0.6946080621732612 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19696.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 927.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2105167837075729 - :network_gas: 0.15793286516970625 - :ambient_heat: 0.6315503511227208 + :electricity: 0.1621821930434553 + :network_gas: 0.3512712278261771 + :ambient_heat: 0.48654657913036764 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0312_bunnik/GM0312_bunnik.derived.ad b/datasets/GM0312_bunnik/GM0312_bunnik.derived.ad index b6d04068e8..aeb3d76c32 100644 --- a/datasets/GM0312_bunnik/GM0312_bunnik.derived.ad +++ b/datasets/GM0312_bunnik/GM0312_bunnik.derived.ad @@ -1,6 +1,6 @@ - area = GM0312_bunnik -- id = 128561 -- parent_id = 128561 +- id = 128903 +- parent_id = 128903 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0312_bunnik/graph_values.yml b/datasets/GM0312_bunnik/graph_values.yml index 2651463a04..7d4dc8b3e4 100644 --- a/datasets/GM0312_bunnik/graph_values.yml +++ b/datasets/GM0312_bunnik/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15064970833298452 - :network_gas: 0.17142660416858507 - :ambient_heat: 0.6779236874984305 + :electricity: 0.15401033542669446 + :network_gas: 0.15294315515318052 + :ambient_heat: 0.693046509420125 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6470.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 69.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21002195479463084 - :network_gas: 0.1599121808214744 - :ambient_heat: 0.6300658643838948 + :electricity: 0.1613367318254764 + :network_gas: 0.35465307269809265 + :ambient_heat: 0.4840101954764309 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0313_bunschoten/GM0313_bunschoten.derived.ad b/datasets/GM0313_bunschoten/GM0313_bunschoten.derived.ad index 4ad3754146..550614be16 100644 --- a/datasets/GM0313_bunschoten/GM0313_bunschoten.derived.ad +++ b/datasets/GM0313_bunschoten/GM0313_bunschoten.derived.ad @@ -1,6 +1,6 @@ - area = GM0313_bunschoten -- id = 128562 -- parent_id = 128562 +- id = 128904 +- parent_id = 128904 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0313_bunschoten/graph_values.yml b/datasets/GM0313_bunschoten/graph_values.yml index 85a039a4fb..6f9f3bd235 100644 --- a/datasets/GM0313_bunschoten/graph_values.yml +++ b/datasets/GM0313_bunschoten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15696441481783321 - :network_gas: 0.13669571850191742 - :ambient_heat: 0.7063398666802494 + :electricity: 0.15974394603393585 + :network_gas: 0.12140829681335297 + :ambient_heat: 0.7188477571527113 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8541.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 218.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21821097371785944 - :network_gas: 0.12715610512856002 - :ambient_heat: 0.6546329211535806 + :electricity: 0.17598378000375142 + :network_gas: 0.2960648799849926 + :ambient_heat: 0.5279513400112561 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0317_eemnes/GM0317_eemnes.derived.ad b/datasets/GM0317_eemnes/GM0317_eemnes.derived.ad index 9f9d5981a9..4ecf90d122 100644 --- a/datasets/GM0317_eemnes/GM0317_eemnes.derived.ad +++ b/datasets/GM0317_eemnes/GM0317_eemnes.derived.ad @@ -1,6 +1,6 @@ - area = GM0317_eemnes -- id = 128594 -- parent_id = 128594 +- id = 128936 +- parent_id = 128936 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0317_eemnes/graph_values.yml b/datasets/GM0317_eemnes/graph_values.yml index e9f3ac9155..96ecc5d8ee 100644 --- a/datasets/GM0317_eemnes/graph_values.yml +++ b/datasets/GM0317_eemnes/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1526952793046283 - :network_gas: 0.16017596382454438 - :ambient_heat: 0.6871287568708274 + :electricity: 0.15587333429012087 + :network_gas: 0.14269666140433518 + :ambient_heat: 0.7014300043055439 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4079.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 5.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2126797307436889 - :network_gas: 0.14928107702524224 - :ambient_heat: 0.638039192231069 + :electricity: 0.16593563327581634 + :network_gas: 0.3362574668967328 + :ambient_heat: 0.4978068998274508 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0321_houten/GM0321_houten.derived.ad b/datasets/GM0321_houten/GM0321_houten.derived.ad index 9e154e661e..fe19d10a1c 100644 --- a/datasets/GM0321_houten/GM0321_houten.derived.ad +++ b/datasets/GM0321_houten/GM0321_houten.derived.ad @@ -1,6 +1,6 @@ - area = GM0321_houten -- id = 128648 -- parent_id = 128648 +- id = 128990 +- parent_id = 128990 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0321_houten/graph_values.yml b/datasets/GM0321_houten/graph_values.yml index 5df69cee4a..0df58751d1 100644 --- a/datasets/GM0321_houten/graph_values.yml +++ b/datasets/GM0321_houten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16159718848600838 - :network_gas: 0.11121546332695392 - :ambient_heat: 0.7271873481870378 + :electricity: 0.1639176974795091 + :network_gas: 0.09845266386269991 + :ambient_heat: 0.737629638657791 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20672.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 46.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2241896515214512 - :network_gas: 0.10324139391419268 - :ambient_heat: 0.6725689545643561 + :electricity: 0.18763447693238586 + :network_gas: 0.24946209227045452 + :ambient_heat: 0.5629034307971595 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0327_leusden/GM0327_leusden.derived.ad b/datasets/GM0327_leusden/GM0327_leusden.derived.ad index 71c7155296..21181cf18a 100644 --- a/datasets/GM0327_leusden/GM0327_leusden.derived.ad +++ b/datasets/GM0327_leusden/GM0327_leusden.derived.ad @@ -1,6 +1,6 @@ - area = GM0327_leusden -- id = 128671 -- parent_id = 128671 +- id = 129013 +- parent_id = 129013 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0327_leusden/graph_values.yml b/datasets/GM0327_leusden/graph_values.yml index a9743d4498..b565ee76fd 100644 --- a/datasets/GM0327_leusden/graph_values.yml +++ b/datasets/GM0327_leusden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15671207174584403 - :network_gas: 0.13808360539785786 - :ambient_heat: 0.7052043228562981 + :electricity: 0.15951581407334203 + :network_gas: 0.12266302259661886 + :ambient_heat: 0.7178211633300391 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13220.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 12.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21788461305992265 - :network_gas: 0.12846154776030708 - :ambient_heat: 0.6536538391797703 + :electricity: 0.17537216016152288 + :network_gas: 0.2985113593539066 + :ambient_heat: 0.5261164804845706 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0331_lopik/GM0331_lopik.derived.ad b/datasets/GM0331_lopik/GM0331_lopik.derived.ad index b22a616fc2..688b0e9a5c 100644 --- a/datasets/GM0331_lopik/GM0331_lopik.derived.ad +++ b/datasets/GM0331_lopik/GM0331_lopik.derived.ad @@ -1,6 +1,6 @@ - area = GM0331_lopik -- id = 128676 -- parent_id = 128676 +- id = 129018 +- parent_id = 129018 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0331_lopik/graph_values.yml b/datasets/GM0331_lopik/graph_values.yml index bcf3b6fea7..91d5b3dde6 100644 --- a/datasets/GM0331_lopik/graph_values.yml +++ b/datasets/GM0331_lopik/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15598087115297696 - :network_gas: 0.14210520865862664 - :ambient_heat: 0.7019139201883964 + :electricity: 0.15885430512010215 + :network_gas: 0.12630132183943835 + :ambient_heat: 0.7148443730404596 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5822.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 73.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21693852207835213 - :network_gas: 0.13224591168658906 - :ambient_heat: 0.6508155662350588 + :electricity: 0.17361275618520233 + :network_gas: 0.30554897525918895 + :ambient_heat: 0.5208382685556088 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0335_montfoort/GM0335_montfoort.derived.ad b/datasets/GM0335_montfoort/GM0335_montfoort.derived.ad index b9ede2dc34..f9564ac0f2 100644 --- a/datasets/GM0335_montfoort/GM0335_montfoort.derived.ad +++ b/datasets/GM0335_montfoort/GM0335_montfoort.derived.ad @@ -1,6 +1,6 @@ - area = GM0335_montfoort -- id = 128690 -- parent_id = 128690 +- id = 129032 +- parent_id = 129032 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0335_montfoort/graph_values.yml b/datasets/GM0335_montfoort/graph_values.yml index 20d41caaa0..7a96a45bbd 100644 --- a/datasets/GM0335_montfoort/graph_values.yml +++ b/datasets/GM0335_montfoort/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15575249146107667 - :network_gas: 0.1433612969640782 - :ambient_heat: 0.7008862115748451 + :electricity: 0.1586475512001348 + :network_gas: 0.1274384683992587 + :ambient_heat: 0.7139139804006066 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5746.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 171.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21664289841401765 - :network_gas: 0.13342840634392716 - :ambient_heat: 0.6499286952420552 + :electricity: 0.1730671140911642 + :network_gas: 0.3077315436353414 + :ambient_heat: 0.5192013422734945 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0339_renswoude/GM0339_renswoude.derived.ad b/datasets/GM0339_renswoude/GM0339_renswoude.derived.ad index b6cce15d39..6af9d54b31 100644 --- a/datasets/GM0339_renswoude/GM0339_renswoude.derived.ad +++ b/datasets/GM0339_renswoude/GM0339_renswoude.derived.ad @@ -1,6 +1,6 @@ - area = GM0339_renswoude -- id = 128733 -- parent_id = 128733 +- id = 129075 +- parent_id = 129075 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0339_renswoude/graph_values.yml b/datasets/GM0339_renswoude/graph_values.yml index 514f00cb0f..96e5733a39 100644 --- a/datasets/GM0339_renswoude/graph_values.yml +++ b/datasets/GM0339_renswoude/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15583346476549562 - :network_gas: 0.14291594378977412 - :ambient_heat: 0.7012505914447302 + :electricity: 0.15872086467064567 + :network_gas: 0.12703524431144897 + :ambient_heat: 0.7142438910179054 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 2149.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 8.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2167477203199046 - :network_gas: 0.1330091187203793 - :ambient_heat: 0.6502431609597161 + :electricity: 0.17326036451436033 + :network_gas: 0.30695854194255695 + :ambient_heat: 0.5197810935430828 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0340_rhenen/GM0340_rhenen.derived.ad b/datasets/GM0340_rhenen/GM0340_rhenen.derived.ad index 84169abd97..26182b3ff9 100644 --- a/datasets/GM0340_rhenen/GM0340_rhenen.derived.ad +++ b/datasets/GM0340_rhenen/GM0340_rhenen.derived.ad @@ -1,6 +1,6 @@ - area = GM0340_rhenen -- id = 128736 -- parent_id = 128736 +- id = 129078 +- parent_id = 129078 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0340_rhenen/graph_values.yml b/datasets/GM0340_rhenen/graph_values.yml index 8c07fdd8e0..4311765498 100644 --- a/datasets/GM0340_rhenen/graph_values.yml +++ b/datasets/GM0340_rhenen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1548682829006255 - :network_gas: 0.14822444404655982 - :ambient_heat: 0.6969072730528146 + :electricity: 0.15784643478408672 + :network_gas: 0.13184460868752307 + :ambient_heat: 0.7103089565283902 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8269.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 219.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.215497777346295 - :network_gas: 0.13800889061481772 - :ambient_heat: 0.6464933320388873 + :electricity: 0.17097176341219847 + :network_gas: 0.3161129463512044 + :ambient_heat: 0.5129152902365972 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0342_soest/GM0342_soest.derived.ad b/datasets/GM0342_soest/GM0342_soest.derived.ad index 0fe0a8b3f3..7a0c99b8dd 100644 --- a/datasets/GM0342_soest/GM0342_soest.derived.ad +++ b/datasets/GM0342_soest/GM0342_soest.derived.ad @@ -1,6 +1,6 @@ - area = GM0342_soest -- id = 128758 -- parent_id = 128758 +- id = 129100 +- parent_id = 129100 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0342_soest/graph_values.yml b/datasets/GM0342_soest/graph_values.yml index 6e7877606d..e3585df51e 100644 --- a/datasets/GM0342_soest/graph_values.yml +++ b/datasets/GM0342_soest/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15363475166379434 - :network_gas: 0.15500886584913107 - :ambient_heat: 0.6913563824870745 + :electricity: 0.15672713241776004 + :network_gas: 0.13800077170231975 + :ambient_heat: 0.7052720958799202 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20935.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 301.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21389874897970623 - :network_gas: 0.14440500408117274 - :ambient_heat: 0.641696246939121 + :electricity: 0.16809347703512656 + :network_gas: 0.3276260918594919 + :ambient_heat: 0.5042804311053816 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0344_utrecht/GM0344_utrecht.derived.ad b/datasets/GM0344_utrecht/GM0344_utrecht.derived.ad index 3ade0226bc..ca55116e64 100644 --- a/datasets/GM0344_utrecht/GM0344_utrecht.derived.ad +++ b/datasets/GM0344_utrecht/GM0344_utrecht.derived.ad @@ -1,6 +1,6 @@ - area = GM0344_utrecht -- id = 128783 -- parent_id = 128783 +- id = 129125 +- parent_id = 129125 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0344_utrecht/graph_values.yml b/datasets/GM0344_utrecht/graph_values.yml index ada007d092..15bb4c7a47 100644 --- a/datasets/GM0344_utrecht/graph_values.yml +++ b/datasets/GM0344_utrecht/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16079777161602193 - :network_gas: 0.11561225611187935 - :ambient_heat: 0.7235899722720986 + :electricity: 0.16319944973790793 + :network_gas: 0.10240302644150644 + :ambient_heat: 0.7343975238205857 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 159409.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 22086.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2231597449636124 - :network_gas: 0.10736102014554783 - :ambient_heat: 0.6694792348908396 + :electricity: 0.1855651501182519 + :network_gas: 0.25773939952699043 + :ambient_heat: 0.5566954503547576 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0345_veenendaal/GM0345_veenendaal.derived.ad b/datasets/GM0345_veenendaal/GM0345_veenendaal.derived.ad index a7a0fd5357..6231bc6503 100644 --- a/datasets/GM0345_veenendaal/GM0345_veenendaal.derived.ad +++ b/datasets/GM0345_veenendaal/GM0345_veenendaal.derived.ad @@ -1,6 +1,6 @@ - area = GM0345_veenendaal -- id = 128789 -- parent_id = 128789 +- id = 129131 +- parent_id = 129131 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0345_veenendaal/graph_values.yml b/datasets/GM0345_veenendaal/graph_values.yml index 88a702de9a..8eefb14860 100644 --- a/datasets/GM0345_veenendaal/graph_values.yml +++ b/datasets/GM0345_veenendaal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1580979708362248 - :network_gas: 0.13046116040076383 - :ambient_heat: 0.7114408687630115 + :electricity: 0.1607677316650938 + :network_gas: 0.11577747584198415 + :ambient_heat: 0.7234547924929221 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 28601.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 522.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21967612291323727 - :network_gas: 0.12129550834704861 - :ambient_heat: 0.6590283687397142 + :electricity: 0.1787597736546155 + :network_gas: 0.284960905381536 + :ambient_heat: 0.5362793209638484 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0351_woudenberg/GM0351_woudenberg.derived.ad b/datasets/GM0351_woudenberg/GM0351_woudenberg.derived.ad index 558036f9e7..9b57040b4b 100644 --- a/datasets/GM0351_woudenberg/GM0351_woudenberg.derived.ad +++ b/datasets/GM0351_woudenberg/GM0351_woudenberg.derived.ad @@ -1,6 +1,6 @@ - area = GM0351_woudenberg -- id = 128822 -- parent_id = 128822 +- id = 129164 +- parent_id = 129164 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0351_woudenberg/graph_values.yml b/datasets/GM0351_woudenberg/graph_values.yml index ae5b2e357a..fdb75ccb00 100644 --- a/datasets/GM0351_woudenberg/graph_values.yml +++ b/datasets/GM0351_woudenberg/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15738933612573136 - :network_gas: 0.13435865130847763 - :ambient_heat: 0.7082520125657911 + :electricity: 0.16012791285976974 + :network_gas: 0.11929647927126649 + :ambient_heat: 0.7205756078689637 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5279.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 27.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2187603680264041 - :network_gas: 0.12495852789438122 - :ambient_heat: 0.6562811040792147 + :electricity: 0.17701888591890844 + :network_gas: 0.2919244563243643 + :ambient_heat: 0.5310566577567272 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0352_wijk_bij_duurstede/GM0352_wijk_bij_duurstede.derived.ad b/datasets/GM0352_wijk_bij_duurstede/GM0352_wijk_bij_duurstede.derived.ad index d7c3b5a098..017f72026f 100644 --- a/datasets/GM0352_wijk_bij_duurstede/GM0352_wijk_bij_duurstede.derived.ad +++ b/datasets/GM0352_wijk_bij_duurstede/GM0352_wijk_bij_duurstede.derived.ad @@ -1,6 +1,6 @@ - area = GM0352_wijk_bij_duurstede -- id = 128817 -- parent_id = 128817 +- id = 129159 +- parent_id = 129159 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0352_wijk_bij_duurstede/graph_values.yml b/datasets/GM0352_wijk_bij_duurstede/graph_values.yml index 091b6c8ff3..c32acfed90 100644 --- a/datasets/GM0352_wijk_bij_duurstede/graph_values.yml +++ b/datasets/GM0352_wijk_bij_duurstede/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15414146629800987 - :network_gas: 0.15222193536094566 - :ambient_heat: 0.6936365983410445 + :electricity: 0.15718716226605509 + :network_gas: 0.13547060753669704 + :ambient_heat: 0.7073422301972478 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10238.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 232.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21455581643655944 - :network_gas: 0.14177673425376 - :ambient_heat: 0.6436674493096806 + :electricity: 0.16926957856998556 + :network_gas: 0.3229216857200559 + :ambient_heat: 0.5078087357099585 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0353_ijsselstein/GM0353_ijsselstein.derived.ad b/datasets/GM0353_ijsselstein/GM0353_ijsselstein.derived.ad index c814031297..571061e3de 100644 --- a/datasets/GM0353_ijsselstein/GM0353_ijsselstein.derived.ad +++ b/datasets/GM0353_ijsselstein/GM0353_ijsselstein.derived.ad @@ -1,6 +1,6 @@ - area = GM0353_ijsselstein -- id = 128651 -- parent_id = 128651 +- id = 128993 +- parent_id = 128993 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0353_ijsselstein/graph_values.yml b/datasets/GM0353_ijsselstein/graph_values.yml index 1e9ba842a6..7e33b28cac 100644 --- a/datasets/GM0353_ijsselstein/graph_values.yml +++ b/datasets/GM0353_ijsselstein/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15708603951047947 - :network_gas: 0.13602678269236274 - :ambient_heat: 0.7068871777971577 + :electricity: 0.1598538721239244 + :network_gas: 0.12080370331841553 + :ambient_heat: 0.71934242455766 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14438.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 168.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2183682473651754 - :network_gas: 0.12652701053929616 - :ambient_heat: 0.6551047420955285 + :electricity: 0.17627938902483323 + :network_gas: 0.29488244390066537 + :ambient_heat: 0.5288381670745015 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0355_zeist/GM0355_zeist.derived.ad b/datasets/GM0355_zeist/GM0355_zeist.derived.ad index 6cca6aa07d..5df251c880 100644 --- a/datasets/GM0355_zeist/GM0355_zeist.derived.ad +++ b/datasets/GM0355_zeist/GM0355_zeist.derived.ad @@ -1,6 +1,6 @@ - area = GM0355_zeist -- id = 128827 -- parent_id = 128827 +- id = 129169 +- parent_id = 129169 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0355_zeist/graph_values.yml b/datasets/GM0355_zeist/graph_values.yml index 93a82f76a1..d6ed36458e 100644 --- a/datasets/GM0355_zeist/graph_values.yml +++ b/datasets/GM0355_zeist/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15204731013219344 - :network_gas: 0.16373979427293617 - :ambient_heat: 0.6842128955948704 + :electricity: 0.1552837876276778 + :network_gas: 0.1459391680477721 + :ambient_heat: 0.6987770443245501 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 29560.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1509.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2118383595834605 - :network_gas: 0.15264656166615578 - :ambient_heat: 0.6355150787503838 + :electricity: 0.16446426380913864 + :network_gas: 0.3421429447634437 + :ambient_heat: 0.4933927914274177 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0356_nieuwegein/GM0356_nieuwegein.derived.ad b/datasets/GM0356_nieuwegein/GM0356_nieuwegein.derived.ad index aa4d71775e..6095a89e6d 100644 --- a/datasets/GM0356_nieuwegein/GM0356_nieuwegein.derived.ad +++ b/datasets/GM0356_nieuwegein/GM0356_nieuwegein.derived.ad @@ -1,6 +1,6 @@ - area = GM0356_nieuwegein -- id = 128694 -- parent_id = 128694 +- id = 129036 +- parent_id = 129036 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0356_nieuwegein/graph_values.yml b/datasets/GM0356_nieuwegein/graph_values.yml index 7f6724153f..584b605d9a 100644 --- a/datasets/GM0356_nieuwegein/graph_values.yml +++ b/datasets/GM0356_nieuwegein/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16783677965227972 - :network_gas: 0.07689771191246152 - :ambient_heat: 0.7552655084352587 + :electricity: 0.1694958496951503 + :network_gas: 0.06777282667667334 + :ambient_heat: 0.7627313236281763 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 29444.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 245.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2322032193514984 - :network_gas: 0.0711871225940041 - :ambient_heat: 0.6966096580544976 + :electricity: 0.2047045713303622 + :network_gas: 0.18118171467854893 + :ambient_heat: 0.6141137139910888 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0358_aalsmeer/GM0358_aalsmeer.derived.ad b/datasets/GM0358_aalsmeer/GM0358_aalsmeer.derived.ad index a2c56a6744..4609ba5677 100644 --- a/datasets/GM0358_aalsmeer/GM0358_aalsmeer.derived.ad +++ b/datasets/GM0358_aalsmeer/GM0358_aalsmeer.derived.ad @@ -1,6 +1,6 @@ - area = GM0358_aalsmeer -- id = 128514 -- parent_id = 128514 +- id = 128856 +- parent_id = 128856 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0358_aalsmeer/graph_values.yml b/datasets/GM0358_aalsmeer/graph_values.yml index 4db554f8b8..e1fea48be3 100644 --- a/datasets/GM0358_aalsmeer/graph_values.yml +++ b/datasets/GM0358_aalsmeer/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1546784016713237 - :network_gas: 0.14926879080771965 - :ambient_heat: 0.6960528075209568 + :electricity: 0.15767426548121957 + :network_gas: 0.1327915398532923 + :ambient_heat: 0.7095341946654881 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13276.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 204.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.215251748357674 - :network_gas: 0.13899300656930177 - :ambient_heat: 0.6457552450730243 + :electricity: 0.17052532280325605 + :network_gas: 0.31789870878697396 + :ambient_heat: 0.51157596840977 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0361_alkmaar/GM0361_alkmaar.derived.ad b/datasets/GM0361_alkmaar/GM0361_alkmaar.derived.ad index 95f5d13822..7cfa9b4558 100644 --- a/datasets/GM0361_alkmaar/GM0361_alkmaar.derived.ad +++ b/datasets/GM0361_alkmaar/GM0361_alkmaar.derived.ad @@ -1,6 +1,6 @@ - area = GM0361_alkmaar -- id = 128519 -- parent_id = 128519 +- id = 128861 +- parent_id = 128861 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0361_alkmaar/graph_values.yml b/datasets/GM0361_alkmaar/graph_values.yml index e987171a23..7a0f7606e5 100644 --- a/datasets/GM0361_alkmaar/graph_values.yml +++ b/datasets/GM0361_alkmaar/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1537214820042454 - :network_gas: 0.1545318489766503 - :ambient_heat: 0.6917466690191043 + :electricity: 0.1568058957084228 + :network_gas: 0.13756757360367472 + :ambient_heat: 0.7056265306879026 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 51588.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 4510.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21401123505550101 - :network_gas: 0.14395505977799364 - :ambient_heat: 0.6420337051665054 + :electricity: 0.1682941678503001 + :network_gas: 0.3268233285987978 + :ambient_heat: 0.504882503550902 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0362_amstelveen/GM0362_amstelveen.derived.ad b/datasets/GM0362_amstelveen/GM0362_amstelveen.derived.ad index 95e912af62..815147fd87 100644 --- a/datasets/GM0362_amstelveen/GM0362_amstelveen.derived.ad +++ b/datasets/GM0362_amstelveen/GM0362_amstelveen.derived.ad @@ -1,6 +1,6 @@ - area = GM0362_amstelveen -- id = 128526 -- parent_id = 128526 +- id = 128868 +- parent_id = 128868 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0362_amstelveen/graph_values.yml b/datasets/GM0362_amstelveen/graph_values.yml index 1837c15ae8..66126484c7 100644 --- a/datasets/GM0362_amstelveen/graph_values.yml +++ b/datasets/GM0362_amstelveen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15405360097319226 - :network_gas: 0.15270519464744262 - :ambient_heat: 0.6932412043793652 + :electricity: 0.15710741603081818 + :network_gas: 0.13590921183050003 + :ambient_heat: 0.7069833721386819 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 42242.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1997.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21444190087853188 - :network_gas: 0.14223239648587024 - :ambient_heat: 0.6433257026355979 + :electricity: 0.1690650191920607 + :network_gas: 0.3237399232317554 + :ambient_heat: 0.5071950575761839 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0363_amsterdam/GM0363_amsterdam.derived.ad b/datasets/GM0363_amsterdam/GM0363_amsterdam.derived.ad index 3a8424b5bc..9f26a71edf 100644 --- a/datasets/GM0363_amsterdam/GM0363_amsterdam.derived.ad +++ b/datasets/GM0363_amsterdam/GM0363_amsterdam.derived.ad @@ -1,6 +1,6 @@ - area = GM0363_amsterdam -- id = 128527 -- parent_id = 128527 +- id = 128869 +- parent_id = 128869 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0363_amsterdam/graph_values.yml b/datasets/GM0363_amsterdam/graph_values.yml index 251e0f7b8b..92826f544e 100644 --- a/datasets/GM0363_amsterdam/graph_values.yml +++ b/datasets/GM0363_amsterdam/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1536034907586839 - :network_gas: 0.15518080082723856 - :ambient_heat: 0.6912157084140775 + :electricity: 0.15669874074730736 + :network_gas: 0.13815692588980943 + :ambient_heat: 0.7051443333628831 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 457831.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 10186.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21385820260033056 - :network_gas: 0.14456718959867546 - :ambient_heat: 0.641574607800994 + :electricity: 0.16802120230255863 + :network_gas: 0.32791519078976383 + :ambient_heat: 0.5040636069076776 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0373_bergen/GM0373_bergen.derived.ad b/datasets/GM0373_bergen/GM0373_bergen.derived.ad index a479c25701..75967de9de 100644 --- a/datasets/GM0373_bergen/GM0373_bergen.derived.ad +++ b/datasets/GM0373_bergen/GM0373_bergen.derived.ad @@ -1,6 +1,6 @@ - area = GM0373_bergen -- id = 128541 -- parent_id = 128541 +- id = 128883 +- parent_id = 128883 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0373_bergen/graph_values.yml b/datasets/GM0373_bergen/graph_values.yml index a8828877ca..017f2dbf75 100644 --- a/datasets/GM0373_bergen/graph_values.yml +++ b/datasets/GM0373_bergen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1498788863186848 - :network_gas: 0.17566612524723377 - :ambient_heat: 0.6744549884340815 + :electricity: 0.1533068952591767 + :network_gas: 0.15681207607452805 + :ambient_heat: 0.6898810286662952 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15239.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 273.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20901918067476688 - :network_gas: 0.16392327730093026 - :ambient_heat: 0.6270575420243029 + :electricity: 0.1596381911368398 + :network_gas: 0.36144723545263924 + :ambient_heat: 0.47891457341052107 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0375_beverwijk/GM0375_beverwijk.derived.ad b/datasets/GM0375_beverwijk/GM0375_beverwijk.derived.ad index 4cb059f0a5..5597492030 100644 --- a/datasets/GM0375_beverwijk/GM0375_beverwijk.derived.ad +++ b/datasets/GM0375_beverwijk/GM0375_beverwijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0375_beverwijk -- id = 128547 -- parent_id = 128547 +- id = 128889 +- parent_id = 128889 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0375_beverwijk/graph_values.yml b/datasets/GM0375_beverwijk/graph_values.yml index d2b438c9cb..3364d2f610 100644 --- a/datasets/GM0375_beverwijk/graph_values.yml +++ b/datasets/GM0375_beverwijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15297306864016064 - :network_gas: 0.15864812247911655 - :ambient_heat: 0.6883788088807229 + :electricity: 0.15612591026622158 + :network_gas: 0.1413074935357814 + :ambient_heat: 0.7025665961979971 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19501.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1514.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21304028426127752 - :network_gas: 0.1478388629548877 - :ambient_heat: 0.6391208527838348 + :electricity: 0.1665706331185661 + :network_gas: 0.3337174675257338 + :ambient_heat: 0.4997118993557 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0376_blaricum/GM0376_blaricum.derived.ad b/datasets/GM0376_blaricum/GM0376_blaricum.derived.ad index ec763e4c7b..55202f3442 100644 --- a/datasets/GM0376_blaricum/GM0376_blaricum.derived.ad +++ b/datasets/GM0376_blaricum/GM0376_blaricum.derived.ad @@ -1,6 +1,6 @@ - area = GM0376_blaricum -- id = 128549 -- parent_id = 128549 +- id = 128891 +- parent_id = 128891 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0376_blaricum/graph_values.yml b/datasets/GM0376_blaricum/graph_values.yml index b3f2403281..0c36c05cd2 100644 --- a/datasets/GM0376_blaricum/graph_values.yml +++ b/datasets/GM0376_blaricum/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15600177420992856 - :network_gas: 0.14199024184539275 - :ambient_heat: 0.7020079839446786 + :electricity: 0.15887322545755914 + :network_gas: 0.12619725998342485 + :ambient_heat: 0.7149295145590161 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5136.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 21.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21696557681804882 - :network_gas: 0.1321376927278023 - :ambient_heat: 0.6508967304541488 + :electricity: 0.1736627893383379 + :network_gas: 0.30534884264664663 + :ambient_heat: 0.5209883680150156 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0377_bloemendaal/GM0377_bloemendaal.derived.ad b/datasets/GM0377_bloemendaal/GM0377_bloemendaal.derived.ad index fcfe2f5fef..5c11a03b80 100644 --- a/datasets/GM0377_bloemendaal/GM0377_bloemendaal.derived.ad +++ b/datasets/GM0377_bloemendaal/GM0377_bloemendaal.derived.ad @@ -1,6 +1,6 @@ - area = GM0377_bloemendaal -- id = 128550 -- parent_id = 128550 +- id = 128892 +- parent_id = 128892 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0377_bloemendaal/graph_values.yml b/datasets/GM0377_bloemendaal/graph_values.yml index e67c51bb03..9d74904757 100644 --- a/datasets/GM0377_bloemendaal/graph_values.yml +++ b/datasets/GM0377_bloemendaal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.14749567854031542 - :network_gas: 0.1887737680282651 - :ambient_heat: 0.6637305534314194 + :electricity: 0.15112709634292337 + :network_gas: 0.16880097011392148 + :ambient_heat: 0.6800719335431551 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10145.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1312.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20591446331405433 - :network_gas: 0.1763421467437805 - :ambient_heat: 0.6177433899421652 + :electricity: 0.15450162884429225 + :network_gas: 0.3819934846228294 + :ambient_heat: 0.46350488653287836 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0383_castricum/GM0383_castricum.derived.ad b/datasets/GM0383_castricum/GM0383_castricum.derived.ad index 38e540a3e6..90cd63e30f 100644 --- a/datasets/GM0383_castricum/GM0383_castricum.derived.ad +++ b/datasets/GM0383_castricum/GM0383_castricum.derived.ad @@ -1,6 +1,6 @@ - area = GM0383_castricum -- id = 128565 -- parent_id = 128565 +- id = 128907 +- parent_id = 128907 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0383_castricum/graph_values.yml b/datasets/GM0383_castricum/graph_values.yml index af181da0d0..63ad56ddde 100644 --- a/datasets/GM0383_castricum/graph_values.yml +++ b/datasets/GM0383_castricum/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1528763317382504 - :network_gas: 0.1591801754396227 - :ambient_heat: 0.6879434928221269 + :electricity: 0.15603796500254774 + :network_gas: 0.14179119248598737 + :ambient_heat: 0.7021708425114648 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16223.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 363.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21291473582203216 - :network_gas: 0.14834105671186915 - :ambient_heat: 0.6387442074660987 + :electricity: 0.16634921320607798 + :network_gas: 0.3346031471756864 + :ambient_heat: 0.49904763961823567 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0384_diemen/GM0384_diemen.derived.ad b/datasets/GM0384_diemen/GM0384_diemen.derived.ad index 81b4be6e16..d2d5817eea 100644 --- a/datasets/GM0384_diemen/GM0384_diemen.derived.ad +++ b/datasets/GM0384_diemen/GM0384_diemen.derived.ad @@ -1,6 +1,6 @@ - area = GM0384_diemen -- id = 128580 -- parent_id = 128580 +- id = 128922 +- parent_id = 128922 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0384_diemen/graph_values.yml b/datasets/GM0384_diemen/graph_values.yml index e720675f8b..0bb6d080cd 100644 --- a/datasets/GM0384_diemen/graph_values.yml +++ b/datasets/GM0384_diemen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15938830478089142 - :network_gas: 0.12336432370509723 - :ambient_heat: 0.7172473715140114 + :electricity: 0.16193110414940312 + :network_gas: 0.10937892717828268 + :ambient_heat: 0.7286899686723141 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15467.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 185.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.22134211605853285 - :network_gas: 0.11463153576586624 - :ambient_heat: 0.6640263481756009 + :electricity: 0.18197763805799871 + :network_gas: 0.27208944776800315 + :ambient_heat: 0.5459329141739981 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0385_edam_volendam/GM0385_edam_volendam.derived.ad b/datasets/GM0385_edam_volendam/GM0385_edam_volendam.derived.ad index bf8456b5f9..be2de4998d 100644 --- a/datasets/GM0385_edam_volendam/GM0385_edam_volendam.derived.ad +++ b/datasets/GM0385_edam_volendam/GM0385_edam_volendam.derived.ad @@ -1,6 +1,6 @@ - area = GM0385_edam_volendam -- id = 128592 -- parent_id = 128592 +- id = 128934 +- parent_id = 128934 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0385_edam_volendam/graph_values.yml b/datasets/GM0385_edam_volendam/graph_values.yml index b5b2c06b73..63ae472e3a 100644 --- a/datasets/GM0385_edam_volendam/graph_values.yml +++ b/datasets/GM0385_edam_volendam/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1532450888885955 - :network_gas: 0.15715201111272478 - :ambient_heat: 0.6896028999986799 + :electricity: 0.15637314363745866 + :network_gas: 0.13994770999397735 + :ambient_heat: 0.703679146368564 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15416.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 652.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2133932634084681 - :network_gas: 0.1464269463661255 - :ambient_heat: 0.6401797902254066 + :electricity: 0.16719491644891266 + :network_gas: 0.33122033420434766 + :ambient_heat: 0.5015847493467397 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0388_enkhuizen/GM0388_enkhuizen.derived.ad b/datasets/GM0388_enkhuizen/GM0388_enkhuizen.derived.ad index 8a84d231f7..dcd54cc42a 100644 --- a/datasets/GM0388_enkhuizen/GM0388_enkhuizen.derived.ad +++ b/datasets/GM0388_enkhuizen/GM0388_enkhuizen.derived.ad @@ -1,6 +1,6 @@ - area = GM0388_enkhuizen -- id = 128600 -- parent_id = 128600 +- id = 128942 +- parent_id = 128942 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0388_enkhuizen/graph_values.yml b/datasets/GM0388_enkhuizen/graph_values.yml index d256078814..fab2bd7897 100644 --- a/datasets/GM0388_enkhuizen/graph_values.yml +++ b/datasets/GM0388_enkhuizen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15230893794172068 - :network_gas: 0.16230084132053632 - :ambient_heat: 0.685390220737743 + :electricity: 0.1555218921656375 + :network_gas: 0.14462959308899376 + :ambient_heat: 0.6998485147453688 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8878.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 904.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21217813498076935 - :network_gas: 0.1512874600769204 - :ambient_heat: 0.6365344049423103 + :electricity: 0.16505670471079978 + :network_gas: 0.3397731811567992 + :ambient_heat: 0.4951701141324011 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0392_haarlem/GM0392_haarlem.derived.ad b/datasets/GM0392_haarlem/GM0392_haarlem.derived.ad index 18aea80b73..37dfb7725b 100644 --- a/datasets/GM0392_haarlem/GM0392_haarlem.derived.ad +++ b/datasets/GM0392_haarlem/GM0392_haarlem.derived.ad @@ -1,6 +1,6 @@ - area = GM0392_haarlem -- id = 128619 -- parent_id = 128619 +- id = 128961 +- parent_id = 128961 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0392_haarlem/graph_values.yml b/datasets/GM0392_haarlem/graph_values.yml index ef2c21000d..ace2acafb9 100644 --- a/datasets/GM0392_haarlem/graph_values.yml +++ b/datasets/GM0392_haarlem/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.14967672104722257 - :network_gas: 0.17677803424027577 - :ambient_heat: 0.6735452447125017 + :electricity: 0.15312227381452098 + :network_gas: 0.15782749402013463 + :ambient_heat: 0.6890502321653444 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 77093.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 21955.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2087560666460567 - :network_gas: 0.16497573341577101 - :ambient_heat: 0.6262681999381723 + :electricity: 0.15919576508848443 + :network_gas: 0.3632169396460606 + :ambient_heat: 0.477587295265455 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0394_haarlemmermeer/GM0394_haarlemmermeer.derived.ad b/datasets/GM0394_haarlemmermeer/GM0394_haarlemmermeer.derived.ad index 62e21eb034..ccad19a451 100644 --- a/datasets/GM0394_haarlemmermeer/GM0394_haarlemmermeer.derived.ad +++ b/datasets/GM0394_haarlemmermeer/GM0394_haarlemmermeer.derived.ad @@ -1,6 +1,6 @@ - area = GM0394_haarlemmermeer -- id = 128620 -- parent_id = 128620 +- id = 128962 +- parent_id = 128962 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0394_haarlemmermeer/graph_values.yml b/datasets/GM0394_haarlemmermeer/graph_values.yml index febc6452c7..eef8fd2403 100644 --- a/datasets/GM0394_haarlemmermeer/graph_values.yml +++ b/datasets/GM0394_haarlemmermeer/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15603201314128287 - :network_gas: 0.14182392772294422 - :ambient_heat: 0.7021440591357729 + :electricity: 0.1589005951349067 + :network_gas: 0.12604672675801304 + :ambient_heat: 0.7150526781070802 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 65149.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 794.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21700471405087426 - :network_gas: 0.1319811437965007 - :ambient_heat: 0.6510141421526251 + :electricity: 0.17373519596506173 + :network_gas: 0.3050592161397512 + :ambient_heat: 0.5212055878951871 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0396_heemskerk/GM0396_heemskerk.derived.ad b/datasets/GM0396_heemskerk/GM0396_heemskerk.derived.ad index 10357cd37b..ee24296069 100644 --- a/datasets/GM0396_heemskerk/GM0396_heemskerk.derived.ad +++ b/datasets/GM0396_heemskerk/GM0396_heemskerk.derived.ad @@ -1,6 +1,6 @@ - area = GM0396_heemskerk -- id = 128627 -- parent_id = 128627 +- id = 128969 +- parent_id = 128969 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0396_heemskerk/graph_values.yml b/datasets/GM0396_heemskerk/graph_values.yml index cf3dde2b06..77ce9a5b2f 100644 --- a/datasets/GM0396_heemskerk/graph_values.yml +++ b/datasets/GM0396_heemskerk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15421713074842894 - :network_gas: 0.151805780883641 - :ambient_heat: 0.6939770883679302 + :electricity: 0.1572558270170332 + :network_gas: 0.13509295140631758 + :ambient_heat: 0.7076512215766493 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 17591.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 89.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2146539066748073 - :network_gas: 0.14138437330076845 - :ambient_heat: 0.6439617200244242 + :electricity: 0.16944594276051098 + :network_gas: 0.3222162289579543 + :ambient_heat: 0.5083378282815348 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0397_heemstede/GM0397_heemstede.derived.ad b/datasets/GM0397_heemstede/GM0397_heemstede.derived.ad index 539a2dfc26..7264fc7428 100644 --- a/datasets/GM0397_heemstede/GM0397_heemstede.derived.ad +++ b/datasets/GM0397_heemstede/GM0397_heemstede.derived.ad @@ -1,6 +1,6 @@ - area = GM0397_heemstede -- id = 128628 -- parent_id = 128628 +- id = 128970 +- parent_id = 128970 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0397_heemstede/graph_values.yml b/datasets/GM0397_heemstede/graph_values.yml index f338e376ae..18789fffcc 100644 --- a/datasets/GM0397_heemstede/graph_values.yml +++ b/datasets/GM0397_heemstede/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.14845058502712585 - :network_gas: 0.18352178235080777 - :ambient_heat: 0.6680276326220664 + :electricity: 0.15200139497185594 + :network_gas: 0.1639923276547924 + :ambient_heat: 0.6840062773733517 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12813.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2159.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20715925808681038 - :network_gas: 0.1713629676527563 - :ambient_heat: 0.6214777742604334 + :electricity: 0.1565392169559117 + :network_gas: 0.3738431321763517 + :ambient_heat: 0.4696176508677367 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0399_heiloo/GM0399_heiloo.derived.ad b/datasets/GM0399_heiloo/GM0399_heiloo.derived.ad index 8e44714e27..4b2c35f4d0 100644 --- a/datasets/GM0399_heiloo/GM0399_heiloo.derived.ad +++ b/datasets/GM0399_heiloo/GM0399_heiloo.derived.ad @@ -1,6 +1,6 @@ - area = GM0399_heiloo -- id = 128633 -- parent_id = 128633 +- id = 128975 +- parent_id = 128975 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0399_heiloo/graph_values.yml b/datasets/GM0399_heiloo/graph_values.yml index 84e0067e8c..0f90d6cb79 100644 --- a/datasets/GM0399_heiloo/graph_values.yml +++ b/datasets/GM0399_heiloo/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1527218616949107 - :network_gas: 0.16002976067799127 - :ambient_heat: 0.6872483776270981 + :electricity: 0.15589750828694715 + :network_gas: 0.14256370442179073 + :ambient_heat: 0.7015387872912622 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10934.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 96.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21271423691645433 - :network_gas: 0.14914305233418043 - :ambient_heat: 0.6381427107493652 + :electricity: 0.16599628816149023 + :network_gas: 0.3360148473540372 + :ambient_heat: 0.4979888644844725 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0400_den_helder/GM0400_den_helder.derived.ad b/datasets/GM0400_den_helder/GM0400_den_helder.derived.ad index eac36dbc61..ddcb2dc832 100644 --- a/datasets/GM0400_den_helder/GM0400_den_helder.derived.ad +++ b/datasets/GM0400_den_helder/GM0400_den_helder.derived.ad @@ -1,6 +1,6 @@ - area = GM0400_den_helder -- id = 128577 -- parent_id = 128577 +- id = 128919 +- parent_id = 128919 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0400_den_helder/graph_values.yml b/datasets/GM0400_den_helder/graph_values.yml index a0931f44d8..4aadfa0e1c 100644 --- a/datasets/GM0400_den_helder/graph_values.yml +++ b/datasets/GM0400_den_helder/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.14937417038567777 - :network_gas: 0.1784420628787723 - :ambient_heat: 0.67218376673555 + :electricity: 0.15284587848914238 + :network_gas: 0.15934766830971675 + :ambient_heat: 0.6878064532011409 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 28369.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 3822.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20836221439465308 - :network_gas: 0.1665511424213856 - :ambient_heat: 0.6250866431839615 + :electricity: 0.1585360015726182 + :network_gas: 0.3658559937095254 + :ambient_heat: 0.4756080047178563 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0402_hilversum/GM0402_hilversum.derived.ad b/datasets/GM0402_hilversum/GM0402_hilversum.derived.ad index 8840363f4e..614498bfa5 100644 --- a/datasets/GM0402_hilversum/GM0402_hilversum.derived.ad +++ b/datasets/GM0402_hilversum/GM0402_hilversum.derived.ad @@ -1,6 +1,6 @@ - area = GM0402_hilversum -- id = 128642 -- parent_id = 128642 +- id = 128984 +- parent_id = 128984 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0402_hilversum/graph_values.yml b/datasets/GM0402_hilversum/graph_values.yml index d16d062cde..61dd00fc2f 100644 --- a/datasets/GM0402_hilversum/graph_values.yml +++ b/datasets/GM0402_hilversum/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.14938379755423886 - :network_gas: 0.1783891134516862 - :ambient_heat: 0.6722270889940749 + :electricity: 0.1528546752398501 + :network_gas: 0.15929928618082434 + :ambient_heat: 0.6878460385793255 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 42918.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 8091.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2083747484194476 - :network_gas: 0.16650100632220746 - :ambient_heat: 0.625124245258345 + :electricity: 0.1585569520203167 + :network_gas: 0.3657721919187315 + :ambient_heat: 0.4756708560609518 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0405_hoorn/GM0405_hoorn.derived.ad b/datasets/GM0405_hoorn/GM0405_hoorn.derived.ad index c6d2084ddf..791018294b 100644 --- a/datasets/GM0405_hoorn/GM0405_hoorn.derived.ad +++ b/datasets/GM0405_hoorn/GM0405_hoorn.derived.ad @@ -1,6 +1,6 @@ - area = GM0405_hoorn -- id = 128646 -- parent_id = 128646 +- id = 128988 +- parent_id = 128988 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0405_hoorn/graph_values.yml b/datasets/GM0405_hoorn/graph_values.yml index 117fb2d5b2..05c6b8fb31 100644 --- a/datasets/GM0405_hoorn/graph_values.yml +++ b/datasets/GM0405_hoorn/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15460177727487417 - :network_gas: 0.149690224988192 - :ambient_heat: 0.6957079977369338 + :electricity: 0.15760477531523923 + :network_gas: 0.13317373576618424 + :ambient_heat: 0.7092214889185765 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 33643.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1483.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21515245439939565 - :network_gas: 0.1393901824024152 - :ambient_heat: 0.6454573631981891 + :electricity: 0.1703455172738297 + :network_gas: 0.31861793090467916 + :ambient_heat: 0.511036551821491 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0406_huizen/GM0406_huizen.derived.ad b/datasets/GM0406_huizen/GM0406_huizen.derived.ad index ad3a8165d8..ea5a044c12 100644 --- a/datasets/GM0406_huizen/GM0406_huizen.derived.ad +++ b/datasets/GM0406_huizen/GM0406_huizen.derived.ad @@ -1,6 +1,6 @@ - area = GM0406_huizen -- id = 128649 -- parent_id = 128649 +- id = 128991 +- parent_id = 128991 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0406_huizen/graph_values.yml b/datasets/GM0406_huizen/graph_values.yml index 622f2f31db..b03a12adeb 100644 --- a/datasets/GM0406_huizen/graph_values.yml +++ b/datasets/GM0406_huizen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1524768430243796 - :network_gas: 0.16137736336591227 - :ambient_heat: 0.6861457936097082 + :electricity: 0.1556746537848842 + :network_gas: 0.14378940418313688 + :ambient_heat: 0.7005359420319789 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19010.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 422.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2123961511752331 - :network_gas: 0.1504153952990653 - :ambient_heat: 0.6371884535257016 + :electricity: 0.16543808986504474 + :network_gas: 0.33824764053981926 + :ambient_heat: 0.49631426959513597 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0415_landsmeer/GM0415_landsmeer.derived.ad b/datasets/GM0415_landsmeer/GM0415_landsmeer.derived.ad index 5026978fb6..47dcecd1a7 100644 --- a/datasets/GM0415_landsmeer/GM0415_landsmeer.derived.ad +++ b/datasets/GM0415_landsmeer/GM0415_landsmeer.derived.ad @@ -1,6 +1,6 @@ - area = GM0415_landsmeer -- id = 128662 -- parent_id = 128662 +- id = 129004 +- parent_id = 129004 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0415_landsmeer/graph_values.yml b/datasets/GM0415_landsmeer/graph_values.yml index 96300b0bee..1be72a7964 100644 --- a/datasets/GM0415_landsmeer/graph_values.yml +++ b/datasets/GM0415_landsmeer/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15497101096020208 - :network_gas: 0.14765943971888862 - :ambient_heat: 0.6973695493209093 + :electricity: 0.15793956102885 + :network_gas: 0.13133241434132503 + :ambient_heat: 0.710728024629825 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4888.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 7.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21563086469636628 - :network_gas: 0.13747654121453265 - :ambient_heat: 0.6468925940891012 + :electricity: 0.1712138105013312 + :network_gas: 0.31514475799467345 + :ambient_heat: 0.5136414315039954 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0417_laren/GM0417_laren.derived.ad b/datasets/GM0417_laren/GM0417_laren.derived.ad index dfb4b32d42..34d458881d 100644 --- a/datasets/GM0417_laren/GM0417_laren.derived.ad +++ b/datasets/GM0417_laren/GM0417_laren.derived.ad @@ -1,6 +1,6 @@ - area = GM0417_laren -- id = 128664 -- parent_id = 128664 +- id = 129006 +- parent_id = 129006 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0417_laren/graph_values.yml b/datasets/GM0417_laren/graph_values.yml index 342baf53ff..7c10fde529 100644 --- a/datasets/GM0417_laren/graph_values.yml +++ b/datasets/GM0417_laren/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.14694837215088066 - :network_gas: 0.19178395317015642 - :ambient_heat: 0.661267674678963 + :electricity: 0.15062545030019178 + :network_gas: 0.17156002334894518 + :ambient_heat: 0.677814526350863 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5427.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 257.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20520052828317567 - :network_gas: 0.1791978868672951 - :ambient_heat: 0.6156015848495292 + :electricity: 0.15334590986223148 + :network_gas: 0.38661636055107257 + :ambient_heat: 0.46003772958669603 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0420_medemblik/GM0420_medemblik.derived.ad b/datasets/GM0420_medemblik/GM0420_medemblik.derived.ad index adc4c5f992..da42e141be 100644 --- a/datasets/GM0420_medemblik/GM0420_medemblik.derived.ad +++ b/datasets/GM0420_medemblik/GM0420_medemblik.derived.ad @@ -1,6 +1,6 @@ - area = GM0420_medemblik -- id = 128682 -- parent_id = 128682 +- id = 129024 +- parent_id = 129024 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0420_medemblik/graph_values.yml b/datasets/GM0420_medemblik/graph_values.yml index c1c5545f44..5d71c33315 100644 --- a/datasets/GM0420_medemblik/graph_values.yml +++ b/datasets/GM0420_medemblik/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15401674152263733 - :network_gas: 0.15290792162549466 - :ambient_heat: 0.6930753368518681 + :electricity: 0.15707395955432346 + :network_gas: 0.13609322245122105 + :ambient_heat: 0.7068328179944555 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19174.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 305.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21439411071746747 - :network_gas: 0.1424235571301279 - :ambient_heat: 0.6431823321524047 + :electricity: 0.1689792844508241 + :network_gas: 0.32408286219670174 + :ambient_heat: 0.5069378533524741 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0431_oostzaan/GM0431_oostzaan.derived.ad b/datasets/GM0431_oostzaan/GM0431_oostzaan.derived.ad index 98fa31ec27..1aaa948788 100644 --- a/datasets/GM0431_oostzaan/GM0431_oostzaan.derived.ad +++ b/datasets/GM0431_oostzaan/GM0431_oostzaan.derived.ad @@ -1,6 +1,6 @@ - area = GM0431_oostzaan -- id = 128716 -- parent_id = 128716 +- id = 129058 +- parent_id = 129058 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0431_oostzaan/graph_values.yml b/datasets/GM0431_oostzaan/graph_values.yml index 21ecc21707..8b59f05aa7 100644 --- a/datasets/GM0431_oostzaan/graph_values.yml +++ b/datasets/GM0431_oostzaan/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15496120087359946 - :network_gas: 0.147713395195203 - :ambient_heat: 0.6973254039311976 + :electricity: 0.15793066846374276 + :network_gas: 0.13138132344941483 + :ambient_heat: 0.7106880080868424 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4100.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 37.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21561815595397826 - :network_gas: 0.1375273761840846 - :ambient_heat: 0.6468544678619371 + :electricity: 0.17119068032959547 + :network_gas: 0.3152372786816163 + :ambient_heat: 0.5135720409887883 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0432_opmeer/GM0432_opmeer.derived.ad b/datasets/GM0432_opmeer/GM0432_opmeer.derived.ad index f7a457371b..5db458be95 100644 --- a/datasets/GM0432_opmeer/GM0432_opmeer.derived.ad +++ b/datasets/GM0432_opmeer/GM0432_opmeer.derived.ad @@ -1,6 +1,6 @@ - area = GM0432_opmeer -- id = 128717 -- parent_id = 128717 +- id = 129059 +- parent_id = 129059 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0432_opmeer/graph_values.yml b/datasets/GM0432_opmeer/graph_values.yml index 5d50b7a2bc..8a0c5ebc00 100644 --- a/datasets/GM0432_opmeer/graph_values.yml +++ b/datasets/GM0432_opmeer/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15461196311354355 - :network_gas: 0.14963420287551052 - :ambient_heat: 0.695753834010946 + :electricity: 0.15761401322398003 + :network_gas: 0.1331229272681099 + :ambient_heat: 0.7092630595079101 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4957.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 9.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2151656541398629 - :network_gas: 0.13933738344054603 - :ambient_heat: 0.6454969624195911 + :electricity: 0.17036940760026395 + :network_gas: 0.3185223695989424 + :ambient_heat: 0.5111082228007937 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0437_ouder_amstel/GM0437_ouder_amstel.derived.ad b/datasets/GM0437_ouder_amstel/GM0437_ouder_amstel.derived.ad index 1a7a4792a3..9c68f7c60a 100644 --- a/datasets/GM0437_ouder_amstel/GM0437_ouder_amstel.derived.ad +++ b/datasets/GM0437_ouder_amstel/GM0437_ouder_amstel.derived.ad @@ -1,6 +1,6 @@ - area = GM0437_ouder_amstel -- id = 128721 -- parent_id = 128721 +- id = 129063 +- parent_id = 129063 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0437_ouder_amstel/graph_values.yml b/datasets/GM0437_ouder_amstel/graph_values.yml index ad5d1d5267..b21665080b 100644 --- a/datasets/GM0437_ouder_amstel/graph_values.yml +++ b/datasets/GM0437_ouder_amstel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.154775309779879 - :network_gas: 0.14873579621066554 - :ambient_heat: 0.6964888940094555 + :electricity: 0.15776213993045682 + :network_gas: 0.13230823038248749 + :ambient_heat: 0.7099296296870558 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6296.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 135.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21537731732799514 - :network_gas: 0.13849073068801718 - :ambient_heat: 0.6461319519839877 + :electricity: 0.17075301416953437 + :network_gas: 0.31698794332186064 + :ambient_heat: 0.512259042508605 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0439_purmerend/GM0439_purmerend.derived.ad b/datasets/GM0439_purmerend/GM0439_purmerend.derived.ad index 278a594d8b..98f117ba74 100644 --- a/datasets/GM0439_purmerend/GM0439_purmerend.derived.ad +++ b/datasets/GM0439_purmerend/GM0439_purmerend.derived.ad @@ -1,6 +1,6 @@ - area = GM0439_purmerend -- id = 128728 -- parent_id = 128728 +- id = 129070 +- parent_id = 129070 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0439_purmerend/graph_values.yml b/datasets/GM0439_purmerend/graph_values.yml index 8b24b51a91..62296e7dd5 100644 --- a/datasets/GM0439_purmerend/graph_values.yml +++ b/datasets/GM0439_purmerend/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17002245423577123 - :network_gas: 0.0648765017032582 - :ambient_heat: 0.7651010440609706 + :electricity: 0.1714382065293504 + :network_gas: 0.057089864088572764 + :ambient_heat: 0.7714719293820769 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 41148.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 463.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.23499984814158031 - :network_gas: 0.060000607433676245 - :ambient_heat: 0.7049995444247434 + :electricity: 0.2110984624907338 + :network_gas: 0.15560615003706252 + :ambient_heat: 0.6332953874722037 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0441_schagen/GM0441_schagen.derived.ad b/datasets/GM0441_schagen/GM0441_schagen.derived.ad index def8cc8aca..12286a4fdc 100644 --- a/datasets/GM0441_schagen/GM0441_schagen.derived.ad +++ b/datasets/GM0441_schagen/GM0441_schagen.derived.ad @@ -1,6 +1,6 @@ - area = GM0441_schagen -- id = 128746 -- parent_id = 128746 +- id = 129088 +- parent_id = 129088 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0441_schagen/graph_values.yml b/datasets/GM0441_schagen/graph_values.yml index 1a8d243dc7..0ae0eef0ae 100644 --- a/datasets/GM0441_schagen/graph_values.yml +++ b/datasets/GM0441_schagen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1535714480598116 - :network_gas: 0.1553570356710363 - :ambient_heat: 0.6910715162691522 + :electricity: 0.15666963772308637 + :network_gas: 0.1383169925230251 + :ambient_heat: 0.7050133697538886 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20529.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 251.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21381664103831163 - :network_gas: 0.14473343584675108 - :ambient_heat: 0.6414499231149372 + :electricity: 0.16794715405153243 + :network_gas: 0.32821138379386855 + :ambient_heat: 0.5038414621545991 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0448_texel/GM0448_texel.derived.ad b/datasets/GM0448_texel/GM0448_texel.derived.ad index fae9ab424a..20836a5645 100644 --- a/datasets/GM0448_texel/GM0448_texel.derived.ad +++ b/datasets/GM0448_texel/GM0448_texel.derived.ad @@ -1,6 +1,6 @@ - area = GM0448_texel -- id = 128771 -- parent_id = 128771 +- id = 129113 +- parent_id = 129113 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0448_texel/graph_values.yml b/datasets/GM0448_texel/graph_values.yml index 0fc5d82c43..bbee56cd6e 100644 --- a/datasets/GM0448_texel/graph_values.yml +++ b/datasets/GM0448_texel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.151917295247268 - :network_gas: 0.1644548761400261 - :ambient_heat: 0.6836278286127059 + :electricity: 0.1551654294009777 + :network_gas: 0.14659013829462283 + :ambient_heat: 0.6982444323043995 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6770.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 304.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21166948010254516 - :network_gas: 0.1533220795898172 - :ambient_heat: 0.6350084403076377 + :electricity: 0.16417067817738237 + :network_gas: 0.34331728729046873 + :ambient_heat: 0.49251203453214887 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0450_uitgeest/GM0450_uitgeest.derived.ad b/datasets/GM0450_uitgeest/GM0450_uitgeest.derived.ad index 0f455c5692..dca4c4eeb8 100644 --- a/datasets/GM0450_uitgeest/GM0450_uitgeest.derived.ad +++ b/datasets/GM0450_uitgeest/GM0450_uitgeest.derived.ad @@ -1,6 +1,6 @@ - area = GM0450_uitgeest -- id = 128780 -- parent_id = 128780 +- id = 129122 +- parent_id = 129122 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0450_uitgeest/graph_values.yml b/datasets/GM0450_uitgeest/graph_values.yml index 3a87c00dfa..94e8870233 100644 --- a/datasets/GM0450_uitgeest/graph_values.yml +++ b/datasets/GM0450_uitgeest/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15487913761110192 - :network_gas: 0.14816474313893968 - :ambient_heat: 0.6969561192499586 + :electricity: 0.15785627556855017 + :network_gas: 0.13179048437297416 + :ambient_heat: 0.7103532400584758 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5720.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 124.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21551184053139694 - :network_gas: 0.1379526378744101 - :ambient_heat: 0.646535521594193 + :electricity: 0.17099732201353815 + :network_gas: 0.3160107119458457 + :ambient_heat: 0.5129919660406163 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0451_uithoorn/GM0451_uithoorn.derived.ad b/datasets/GM0451_uithoorn/GM0451_uithoorn.derived.ad index 219bee6766..83d32ee299 100644 --- a/datasets/GM0451_uithoorn/GM0451_uithoorn.derived.ad +++ b/datasets/GM0451_uithoorn/GM0451_uithoorn.derived.ad @@ -1,6 +1,6 @@ - area = GM0451_uithoorn -- id = 128781 -- parent_id = 128781 +- id = 129123 +- parent_id = 129123 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0451_uithoorn/graph_values.yml b/datasets/GM0451_uithoorn/graph_values.yml index be176e4ed0..1f222c0472 100644 --- a/datasets/GM0451_uithoorn/graph_values.yml +++ b/datasets/GM0451_uithoorn/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15570444004488723 - :network_gas: 0.14362557975312015 - :ambient_heat: 0.7006699802019926 + :electricity: 0.15860404130205252 + :network_gas: 0.1276777728387111 + :ambient_heat: 0.7137181858592363 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13250.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 82.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21658069112036177 - :network_gas: 0.13367723551855054 - :ambient_heat: 0.6497420733610877 + :electricity: 0.1729525437403862 + :network_gas: 0.3081898250384534 + :ambient_heat: 0.5188576312211605 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0453_velsen/GM0453_velsen.derived.ad b/datasets/GM0453_velsen/GM0453_velsen.derived.ad index 5c9cc6b977..5630ab4380 100644 --- a/datasets/GM0453_velsen/GM0453_velsen.derived.ad +++ b/datasets/GM0453_velsen/GM0453_velsen.derived.ad @@ -1,6 +1,6 @@ - area = GM0453_velsen -- id = 128792 -- parent_id = 128792 +- id = 129134 +- parent_id = 129134 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0453_velsen/graph_values.yml b/datasets/GM0453_velsen/graph_values.yml index eb1bf276b9..08868e7fd6 100644 --- a/datasets/GM0453_velsen/graph_values.yml +++ b/datasets/GM0453_velsen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1513438864064553 - :network_gas: 0.16760862476449587 - :ambient_heat: 0.6810474888290489 + :electricity: 0.15464316762770722 + :network_gas: 0.14946257804761026 + :ambient_heat: 0.6958942543246824 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 31435.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 4067.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21092443195910882 - :network_gas: 0.15630227216356238 - :ambient_heat: 0.6327732958773287 + :electricity: 0.16288236194691455 + :network_gas: 0.3484705522123399 + :ambient_heat: 0.48864708584074545 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0473_zandvoort/GM0473_zandvoort.derived.ad b/datasets/GM0473_zandvoort/GM0473_zandvoort.derived.ad index 1d5e3c1956..1bb57aac4f 100644 --- a/datasets/GM0473_zandvoort/GM0473_zandvoort.derived.ad +++ b/datasets/GM0473_zandvoort/GM0473_zandvoort.derived.ad @@ -1,6 +1,6 @@ - area = GM0473_zandvoort -- id = 128825 -- parent_id = 128825 +- id = 129167 +- parent_id = 129167 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0473_zandvoort/graph_values.yml b/datasets/GM0473_zandvoort/graph_values.yml index 1bec5e45b5..d16c364c1f 100644 --- a/datasets/GM0473_zandvoort/graph_values.yml +++ b/datasets/GM0473_zandvoort/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1501576367064158 - :network_gas: 0.17413299811471322 - :ambient_heat: 0.675709365178871 + :electricity: 0.15356136814279 + :network_gas: 0.155412475214655 + :ambient_heat: 0.6910261566425551 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9695.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 723.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20938189088374 - :network_gas: 0.16247243646503776 - :ambient_heat: 0.6281456726512222 + :electricity: 0.16025029310180414 + :network_gas: 0.3589988275927818 + :ambient_heat: 0.48075087930541405 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0479_zaanstad/GM0479_zaanstad.derived.ad b/datasets/GM0479_zaanstad/GM0479_zaanstad.derived.ad index 0bbde96e09..506a8e7445 100644 --- a/datasets/GM0479_zaanstad/GM0479_zaanstad.derived.ad +++ b/datasets/GM0479_zaanstad/GM0479_zaanstad.derived.ad @@ -1,6 +1,6 @@ - area = GM0479_zaanstad -- id = 128823 -- parent_id = 128823 +- id = 129165 +- parent_id = 129165 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0479_zaanstad/graph_values.yml b/datasets/GM0479_zaanstad/graph_values.yml index 20096bbe64..9a7e66a9ed 100644 --- a/datasets/GM0479_zaanstad/graph_values.yml +++ b/datasets/GM0479_zaanstad/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15363452729551139 - :network_gas: 0.15501009987468747 - :ambient_heat: 0.6913553728298012 + :electricity: 0.15672692864729568 + :network_gas: 0.13800189243987365 + :ambient_heat: 0.7052711789128305 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 69079.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 4437.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.213898457970992 - :network_gas: 0.14440616811602966 - :ambient_heat: 0.6416953739129783 + :electricity: 0.16809295818240547 + :network_gas: 0.3276281672703764 + :ambient_heat: 0.5042788745472182 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0482_alblasserdam/GM0482_alblasserdam.derived.ad b/datasets/GM0482_alblasserdam/GM0482_alblasserdam.derived.ad index bbfec604ea..3fb1201b1c 100644 --- a/datasets/GM0482_alblasserdam/GM0482_alblasserdam.derived.ad +++ b/datasets/GM0482_alblasserdam/GM0482_alblasserdam.derived.ad @@ -1,6 +1,6 @@ - area = GM0482_alblasserdam -- id = 128517 -- parent_id = 128517 +- id = 128859 +- parent_id = 128859 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0482_alblasserdam/graph_values.yml b/datasets/GM0482_alblasserdam/graph_values.yml index d2f411d7bb..67bd46a45a 100644 --- a/datasets/GM0482_alblasserdam/graph_values.yml +++ b/datasets/GM0482_alblasserdam/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15624266086139704 - :network_gas: 0.14066536526231627 - :ambient_heat: 0.7030919738762867 + :electricity: 0.15909122257651379 + :network_gas: 0.12499827582917422 + :ambient_heat: 0.715910501594312 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8406.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 245.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21727731910890316 - :network_gas: 0.13089072356438505 - :ambient_heat: 0.6518319573267118 + :electricity: 0.17424048613787685 + :network_gas: 0.30303805544849066 + :ambient_heat: 0.5227214584136324 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0484_alphen_aan_den_rijn/GM0484_alphen_aan_den_rijn.derived.ad b/datasets/GM0484_alphen_aan_den_rijn/GM0484_alphen_aan_den_rijn.derived.ad index f243b75418..300893b057 100644 --- a/datasets/GM0484_alphen_aan_den_rijn/GM0484_alphen_aan_den_rijn.derived.ad +++ b/datasets/GM0484_alphen_aan_den_rijn/GM0484_alphen_aan_den_rijn.derived.ad @@ -1,6 +1,6 @@ - area = GM0484_alphen_aan_den_rijn -- id = 128522 -- parent_id = 128522 +- id = 128864 +- parent_id = 128864 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0484_alphen_aan_den_rijn/graph_values.yml b/datasets/GM0484_alphen_aan_den_rijn/graph_values.yml index a77c8bf2e1..f8d8317823 100644 --- a/datasets/GM0484_alphen_aan_den_rijn/graph_values.yml +++ b/datasets/GM0484_alphen_aan_den_rijn/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15618748365509005 - :network_gas: 0.14096883989700468 - :ambient_heat: 0.7028436764479052 + :electricity: 0.15904129502970427 + :network_gas: 0.12527287733662648 + :ambient_heat: 0.7156858276336693 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 48847.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1649.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21720591769311767 - :network_gas: 0.13117632922752692 - :ambient_heat: 0.6516177530793554 + :electricity: 0.1741079781240857 + :network_gas: 0.3035680875036554 + :ambient_heat: 0.522323934372259 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0489_barendrecht/GM0489_barendrecht.derived.ad b/datasets/GM0489_barendrecht/GM0489_barendrecht.derived.ad index 5c0fc66a58..2aecdcaee2 100644 --- a/datasets/GM0489_barendrecht/GM0489_barendrecht.derived.ad +++ b/datasets/GM0489_barendrecht/GM0489_barendrecht.derived.ad @@ -1,6 +1,6 @@ - area = GM0489_barendrecht -- id = 128534 -- parent_id = 128534 +- id = 128876 +- parent_id = 128876 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0489_barendrecht/graph_values.yml b/datasets/GM0489_barendrecht/graph_values.yml index d94f593e14..962992560b 100644 --- a/datasets/GM0489_barendrecht/graph_values.yml +++ b/datasets/GM0489_barendrecht/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1589768348148365 - :network_gas: 0.12562740851839937 - :ambient_heat: 0.7153957566667641 + :electricity: 0.16156035243859032 + :network_gas: 0.11141806158775312 + :ambient_heat: 0.7270215859736564 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19420.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 151.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2208110608806525 - :network_gas: 0.11675575647738755 - :ambient_heat: 0.6624331826419599 + :electricity: 0.1809447047311239 + :network_gas: 0.2762211810755025 + :ambient_heat: 0.5428341141933736 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0498_drechterland/GM0498_drechterland.derived.ad b/datasets/GM0498_drechterland/GM0498_drechterland.derived.ad index b5ea47f7aa..6755a07b4b 100644 --- a/datasets/GM0498_drechterland/GM0498_drechterland.derived.ad +++ b/datasets/GM0498_drechterland/GM0498_drechterland.derived.ad @@ -1,6 +1,6 @@ - area = GM0498_drechterland -- id = 128586 -- parent_id = 128586 +- id = 128928 +- parent_id = 128928 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0498_drechterland/graph_values.yml b/datasets/GM0498_drechterland/graph_values.yml index 623bb713f1..7ca37fdae0 100644 --- a/datasets/GM0498_drechterland/graph_values.yml +++ b/datasets/GM0498_drechterland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15596350188725538 - :network_gas: 0.14220073962009533 - :ambient_heat: 0.7018357584926492 + :electricity: 0.1588385829538498 + :network_gas: 0.12638779375382608 + :ambient_heat: 0.7147736232923241 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8399.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 11.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2169160407272426 - :network_gas: 0.13233583709102725 - :ambient_heat: 0.6507481221817302 + :electricity: 0.1735711931777485 + :network_gas: 0.30571522728900424 + :ambient_heat: 0.5207135795332474 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0502_capelle_aan_den_ijssel/GM0502_capelle_aan_den_ijssel.derived.ad b/datasets/GM0502_capelle_aan_den_ijssel/GM0502_capelle_aan_den_ijssel.derived.ad index bec61986c4..8fd7019369 100644 --- a/datasets/GM0502_capelle_aan_den_ijssel/GM0502_capelle_aan_den_ijssel.derived.ad +++ b/datasets/GM0502_capelle_aan_den_ijssel/GM0502_capelle_aan_den_ijssel.derived.ad @@ -1,6 +1,6 @@ - area = GM0502_capelle_aan_den_ijssel -- id = 128564 -- parent_id = 128564 +- id = 128906 +- parent_id = 128906 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0502_capelle_aan_den_ijssel/graph_values.yml b/datasets/GM0502_capelle_aan_den_ijssel/graph_values.yml index e305868ebc..eac023c71d 100644 --- a/datasets/GM0502_capelle_aan_den_ijssel/graph_values.yml +++ b/datasets/GM0502_capelle_aan_den_ijssel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16144617410548912 - :network_gas: 0.1120460424198099 - :ambient_heat: 0.726507783474701 + :electricity: 0.16378207889004973 + :network_gas: 0.0991985661047264 + :ambient_heat: 0.7370193550052238 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 31546.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 271.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2239951523071619 - :network_gas: 0.10401939077134999 - :ambient_heat: 0.6719854569214881 + :electricity: 0.1872416218942203 + :network_gas: 0.2510335124231167 + :ambient_heat: 0.5617248656826629 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0503_delft/GM0503_delft.derived.ad b/datasets/GM0503_delft/GM0503_delft.derived.ad index 3f96cb1d16..bf1a6d35d2 100644 --- a/datasets/GM0503_delft/GM0503_delft.derived.ad +++ b/datasets/GM0503_delft/GM0503_delft.derived.ad @@ -1,6 +1,6 @@ - area = GM0503_delft -- id = 128575 -- parent_id = 128575 +- id = 128917 +- parent_id = 128917 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0503_delft/graph_values.yml b/datasets/GM0503_delft/graph_values.yml index 6e6b8c662a..6e7ca6a002 100644 --- a/datasets/GM0503_delft/graph_values.yml +++ b/datasets/GM0503_delft/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15598159475557488 - :network_gas: 0.14210122884433807 - :ambient_heat: 0.701917176400087 + :electricity: 0.15885496009618283 + :network_gas: 0.12629771947099452 + :ambient_heat: 0.7148473204328227 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 51465.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 5113.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2169394586425922 - :network_gas: 0.13224216542962877 - :ambient_heat: 0.650818375927779 + :electricity: 0.17361448792867668 + :network_gas: 0.3055420482852916 + :ambient_heat: 0.5208434637860319 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0505_dordrecht/GM0505_dordrecht.derived.ad b/datasets/GM0505_dordrecht/GM0505_dordrecht.derived.ad index df1af9139e..79a0dd2046 100644 --- a/datasets/GM0505_dordrecht/GM0505_dordrecht.derived.ad +++ b/datasets/GM0505_dordrecht/GM0505_dordrecht.derived.ad @@ -1,6 +1,6 @@ - area = GM0505_dordrecht -- id = 128585 -- parent_id = 128585 +- id = 128927 +- parent_id = 128927 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0505_dordrecht/graph_values.yml b/datasets/GM0505_dordrecht/graph_values.yml index 362f40f265..8f9eb74d78 100644 --- a/datasets/GM0505_dordrecht/graph_values.yml +++ b/datasets/GM0505_dordrecht/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1543326749493162 - :network_gas: 0.15117028777876093 - :ambient_heat: 0.6944970372719229 + :electricity: 0.15736066794101888 + :network_gas: 0.1345163263243961 + :ambient_heat: 0.708123005734585 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 55783.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 6233.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21480368366376212 - :network_gas: 0.14078526534494923 - :ambient_heat: 0.6444110509912886 + :electricity: 0.1697156367253386 + :network_gas: 0.3211374530986439 + :ambient_heat: 0.5091469101760177 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0512_gorinchem/GM0512_gorinchem.derived.ad b/datasets/GM0512_gorinchem/GM0512_gorinchem.derived.ad index 5047c1cd8a..e065175397 100644 --- a/datasets/GM0512_gorinchem/GM0512_gorinchem.derived.ad +++ b/datasets/GM0512_gorinchem/GM0512_gorinchem.derived.ad @@ -1,6 +1,6 @@ - area = GM0512_gorinchem -- id = 128614 -- parent_id = 128614 +- id = 128956 +- parent_id = 128956 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0512_gorinchem/graph_values.yml b/datasets/GM0512_gorinchem/graph_values.yml index 2c9add2f92..1276c38a1d 100644 --- a/datasets/GM0512_gorinchem/graph_values.yml +++ b/datasets/GM0512_gorinchem/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1568347137427353 - :network_gas: 0.1374090744149559 - :ambient_heat: 0.7057562118423089 + :electricity: 0.159626699403917 + :network_gas: 0.12205315327845648 + :ambient_heat: 0.7183201473176265 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 17273.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 805.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21804323770817235 - :network_gas: 0.12782704916730814 - :ambient_heat: 0.6541297131245194 + :electricity: 0.17566912922559386 + :network_gas: 0.29732348309762263 + :ambient_heat: 0.5270073876767835 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0513_gouda/GM0513_gouda.derived.ad b/datasets/GM0513_gouda/GM0513_gouda.derived.ad index 139cd3b2c8..ff082f3de5 100644 --- a/datasets/GM0513_gouda/GM0513_gouda.derived.ad +++ b/datasets/GM0513_gouda/GM0513_gouda.derived.ad @@ -1,6 +1,6 @@ - area = GM0513_gouda -- id = 128615 -- parent_id = 128615 +- id = 128957 +- parent_id = 128957 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0513_gouda/graph_values.yml b/datasets/GM0513_gouda/graph_values.yml index 13e777d42f..fef26746e0 100644 --- a/datasets/GM0513_gouda/graph_values.yml +++ b/datasets/GM0513_gouda/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1541145142357247 - :network_gas: 0.1523701717035141 - :ambient_heat: 0.6935153140607613 + :electricity: 0.15716270174043823 + :network_gas: 0.1356051404275898 + :ambient_heat: 0.7072321578319719 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 33708.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 4726.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21452087459839717 - :network_gas: 0.1419165016064089 - :ambient_heat: 0.6435626237951938 + :electricity: 0.16920680363767218 + :network_gas: 0.3231727854493096 + :ambient_heat: 0.5076204109130183 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0518_s_gravenhage/GM0518_s_gravenhage.derived.ad b/datasets/GM0518_s_gravenhage/GM0518_s_gravenhage.derived.ad index 3f96b5c4e8..e064f59821 100644 --- a/datasets/GM0518_s_gravenhage/GM0518_s_gravenhage.derived.ad +++ b/datasets/GM0518_s_gravenhage/GM0518_s_gravenhage.derived.ad @@ -1,6 +1,6 @@ - area = GM0518_s_gravenhage -- id = 128576 -- parent_id = 128576 +- id = 128918 +- parent_id = 128918 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0518_s_gravenhage/graph_values.yml b/datasets/GM0518_s_gravenhage/graph_values.yml index 2c65bdd249..8c21c9d7c8 100644 --- a/datasets/GM0518_s_gravenhage/graph_values.yml +++ b/datasets/GM0518_s_gravenhage/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15219394164634026 - :network_gas: 0.16293332094512852 - :ambient_heat: 0.6848727374085312 + :electricity: 0.15541724629686265 + :network_gas: 0.1452051453672554 + :ambient_heat: 0.699377608335882 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 265826.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 16816.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21202879932978472 - :network_gas: 0.15188480268085894 - :ambient_heat: 0.6360863979893564 + :electricity: 0.16479602840901392 + :network_gas: 0.34081588636394256 + :ambient_heat: 0.49438808522704353 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0523_hardinxveld_giessendam/GM0523_hardinxveld_giessendam.derived.ad b/datasets/GM0523_hardinxveld_giessendam/GM0523_hardinxveld_giessendam.derived.ad index 29caca1123..4bb2270ad4 100644 --- a/datasets/GM0523_hardinxveld_giessendam/GM0523_hardinxveld_giessendam.derived.ad +++ b/datasets/GM0523_hardinxveld_giessendam/GM0523_hardinxveld_giessendam.derived.ad @@ -1,6 +1,6 @@ - area = GM0523_hardinxveld_giessendam -- id = 128624 -- parent_id = 128624 +- id = 128966 +- parent_id = 128966 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0523_hardinxveld_giessendam/graph_values.yml b/datasets/GM0523_hardinxveld_giessendam/graph_values.yml index 1c746ae119..c63556ef1f 100644 --- a/datasets/GM0523_hardinxveld_giessendam/graph_values.yml +++ b/datasets/GM0523_hardinxveld_giessendam/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1556523405304498 - :network_gas: 0.1439121270825262 - :ambient_heat: 0.700435532387024 + :electricity: 0.15855686253712992 + :network_gas: 0.1279372560457855 + :ambient_heat: 0.7135058814170846 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7508.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 129.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21651324015953852 - :network_gas: 0.13394703936184374 - :ambient_heat: 0.6495397204786179 + :electricity: 0.172828412909169 + :network_gas: 0.30868634836332226 + :ambient_heat: 0.5184852387275087 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0531_hendrik_ido_ambacht/GM0531_hendrik_ido_ambacht.derived.ad b/datasets/GM0531_hendrik_ido_ambacht/GM0531_hendrik_ido_ambacht.derived.ad index 2e4fc94af9..aa9055e349 100644 --- a/datasets/GM0531_hendrik_ido_ambacht/GM0531_hendrik_ido_ambacht.derived.ad +++ b/datasets/GM0531_hendrik_ido_ambacht/GM0531_hendrik_ido_ambacht.derived.ad @@ -1,6 +1,6 @@ - area = GM0531_hendrik_ido_ambacht -- id = 128636 -- parent_id = 128636 +- id = 128978 +- parent_id = 128978 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0531_hendrik_ido_ambacht/graph_values.yml b/datasets/GM0531_hendrik_ido_ambacht/graph_values.yml index b7907bd465..4c04d216a0 100644 --- a/datasets/GM0531_hendrik_ido_ambacht/graph_values.yml +++ b/datasets/GM0531_hendrik_ido_ambacht/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15858780501097333 - :network_gas: 0.12776707243964652 - :ambient_heat: 0.71364512254938 + :electricity: 0.16120962056175014 + :network_gas: 0.11334708691037433 + :ambient_heat: 0.7254432925278756 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12330.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 78.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2203087890633568 - :network_gas: 0.11876484374657048 - :ambient_heat: 0.6609263671900727 + :electricity: 0.1799739815795985 + :network_gas: 0.280104073681604 + :ambient_heat: 0.5399219447387974 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0532_stede_broec/GM0532_stede_broec.derived.ad b/datasets/GM0532_stede_broec/GM0532_stede_broec.derived.ad index 2d45d3cdef..cbf3369251 100644 --- a/datasets/GM0532_stede_broec/GM0532_stede_broec.derived.ad +++ b/datasets/GM0532_stede_broec/GM0532_stede_broec.derived.ad @@ -1,6 +1,6 @@ - area = GM0532_stede_broec -- id = 128763 -- parent_id = 128763 +- id = 129105 +- parent_id = 129105 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0532_stede_broec/graph_values.yml b/datasets/GM0532_stede_broec/graph_values.yml index 02804cd3ce..000a5ff85f 100644 --- a/datasets/GM0532_stede_broec/graph_values.yml +++ b/datasets/GM0532_stede_broec/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1548214547602405 - :network_gas: 0.14848199881867713 - :ambient_heat: 0.6966965464210824 + :electricity: 0.15780397905894245 + :network_gas: 0.13207811517581655 + :ambient_heat: 0.710117905765241 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9251.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 38.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21543710601719193 - :network_gas: 0.13825157593123003 - :ambient_heat: 0.646311318051578 + :electricity: 0.17086154794222633 + :network_gas: 0.31655380823109275 + :ambient_heat: 0.5125846438266809 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0534_hillegom/GM0534_hillegom.derived.ad b/datasets/GM0534_hillegom/GM0534_hillegom.derived.ad index a0101844c0..b21d2411c7 100644 --- a/datasets/GM0534_hillegom/GM0534_hillegom.derived.ad +++ b/datasets/GM0534_hillegom/GM0534_hillegom.derived.ad @@ -1,6 +1,6 @@ - area = GM0534_hillegom -- id = 128640 -- parent_id = 128640 +- id = 128982 +- parent_id = 128982 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0534_hillegom/graph_values.yml b/datasets/GM0534_hillegom/graph_values.yml index dc883d09b5..39f85fe61b 100644 --- a/datasets/GM0534_hillegom/graph_values.yml +++ b/datasets/GM0534_hillegom/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15495521779320137 - :network_gas: 0.1477463021373925 - :ambient_heat: 0.6972984800694062 + :electricity: 0.15792524491003912 + :network_gas: 0.13141115299478467 + :ambient_heat: 0.7106636020951761 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9858.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 832.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2156104049559558 - :network_gas: 0.13755838017617456 - :ambient_heat: 0.6468312148678697 + :electricity: 0.17117657508388343 + :network_gas: 0.3152936996644645 + :ambient_heat: 0.5135297252516521 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0537_katwijk/GM0537_katwijk.derived.ad b/datasets/GM0537_katwijk/GM0537_katwijk.derived.ad index 244e693dbf..821ffdf82f 100644 --- a/datasets/GM0537_katwijk/GM0537_katwijk.derived.ad +++ b/datasets/GM0537_katwijk/GM0537_katwijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0537_katwijk -- id = 128655 -- parent_id = 128655 +- id = 128997 +- parent_id = 128997 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0537_katwijk/graph_values.yml b/datasets/GM0537_katwijk/graph_values.yml index c4f32824d3..f65c9ddb90 100644 --- a/datasets/GM0537_katwijk/graph_values.yml +++ b/datasets/GM0537_katwijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15602664665216393 - :network_gas: 0.14185344341309833 - :ambient_heat: 0.7021199099347377 + :electricity: 0.15889573793710038 + :network_gas: 0.12607344134594792 + :ambient_heat: 0.7150308207169517 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 27160.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1783.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2169977684611615 - :network_gas: 0.13200892615535167 - :ambient_heat: 0.6509933053834868 + :electricity: 0.17372234363709455 + :network_gas: 0.3051106254516199 + :ambient_heat: 0.5211670309112855 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0542_krimpen_aan_den_ijssel/GM0542_krimpen_aan_den_ijssel.derived.ad b/datasets/GM0542_krimpen_aan_den_ijssel/GM0542_krimpen_aan_den_ijssel.derived.ad index bdbd8e0a37..733fab7c91 100644 --- a/datasets/GM0542_krimpen_aan_den_ijssel/GM0542_krimpen_aan_den_ijssel.derived.ad +++ b/datasets/GM0542_krimpen_aan_den_ijssel/GM0542_krimpen_aan_den_ijssel.derived.ad @@ -1,6 +1,6 @@ - area = GM0542_krimpen_aan_den_ijssel -- id = 128658 -- parent_id = 128658 +- id = 129000 +- parent_id = 129000 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0542_krimpen_aan_den_ijssel/graph_values.yml b/datasets/GM0542_krimpen_aan_den_ijssel/graph_values.yml index 69c8fd7efb..6d2bf55312 100644 --- a/datasets/GM0542_krimpen_aan_den_ijssel/graph_values.yml +++ b/datasets/GM0542_krimpen_aan_den_ijssel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15588337557136975 - :network_gas: 0.14264143435746643 - :ambient_heat: 0.7014751900711639 + :electricity: 0.15876604984532558 + :network_gas: 0.12678672585070935 + :ambient_heat: 0.7144472243039651 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12643.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 113.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2168123273066475 - :network_gas: 0.13275069077340756 - :ambient_heat: 0.6504369819199449 + :electricity: 0.17337959623447094 + :network_gas: 0.30648161506211447 + :ambient_heat: 0.5201387887034146 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0546_leiden/GM0546_leiden.derived.ad b/datasets/GM0546_leiden/GM0546_leiden.derived.ad index 96f1f0e462..12687ce36d 100644 --- a/datasets/GM0546_leiden/GM0546_leiden.derived.ad +++ b/datasets/GM0546_leiden/GM0546_leiden.derived.ad @@ -1,6 +1,6 @@ - area = GM0546_leiden -- id = 128666 -- parent_id = 128666 +- id = 129008 +- parent_id = 129008 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0546_leiden/graph_values.yml b/datasets/GM0546_leiden/graph_values.yml index fc40fe1968..ff9147dde3 100644 --- a/datasets/GM0546_leiden/graph_values.yml +++ b/datasets/GM0546_leiden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15625314653285075 - :network_gas: 0.140607694069321 - :ambient_heat: 0.7031391593978283 + :electricity: 0.15910071017805025 + :network_gas: 0.12494609402072368 + :ambient_heat: 0.7159531958012261 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 60499.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 9342.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21729088757264192 - :network_gas: 0.13083644970942987 - :ambient_heat: 0.6518726627179282 + :electricity: 0.17426567968573867 + :network_gas: 0.30293728125704356 + :ambient_heat: 0.5227970390572179 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0547_leiderdorp/GM0547_leiderdorp.derived.ad b/datasets/GM0547_leiderdorp/GM0547_leiderdorp.derived.ad index bd2e2122c1..2ac333867b 100644 --- a/datasets/GM0547_leiderdorp/GM0547_leiderdorp.derived.ad +++ b/datasets/GM0547_leiderdorp/GM0547_leiderdorp.derived.ad @@ -1,6 +1,6 @@ - area = GM0547_leiderdorp -- id = 128667 -- parent_id = 128667 +- id = 129009 +- parent_id = 129009 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0547_leiderdorp/graph_values.yml b/datasets/GM0547_leiderdorp/graph_values.yml index 0f4fb1bf62..4ee7183ba8 100644 --- a/datasets/GM0547_leiderdorp/graph_values.yml +++ b/datasets/GM0547_leiderdorp/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15629330004313136 - :network_gas: 0.14038684976277754 - :ambient_heat: 0.7033198501940912 + :electricity: 0.15913704039838372 + :network_gas: 0.12474627780888967 + :ambient_heat: 0.7161166817927267 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12376.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 379.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2173428450634538 - :network_gas: 0.1306286197461824 - :ambient_heat: 0.6520285351903637 + :electricity: 0.1743621911961533 + :network_gas: 0.302551235215385 + :ambient_heat: 0.5230865735884617 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0553_lisse/GM0553_lisse.derived.ad b/datasets/GM0553_lisse/GM0553_lisse.derived.ad index 7f7c51cfd6..7b80b3da23 100644 --- a/datasets/GM0553_lisse/GM0553_lisse.derived.ad +++ b/datasets/GM0553_lisse/GM0553_lisse.derived.ad @@ -1,6 +1,6 @@ - area = GM0553_lisse -- id = 128673 -- parent_id = 128673 +- id = 129015 +- parent_id = 129015 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0553_lisse/graph_values.yml b/datasets/GM0553_lisse/graph_values.yml index 2ae345046b..a39e91bac9 100644 --- a/datasets/GM0553_lisse/graph_values.yml +++ b/datasets/GM0553_lisse/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15589554142907805 - :network_gas: 0.14257452214007071 - :ambient_heat: 0.7015299364308512 + :electricity: 0.15877706333357028 + :network_gas: 0.1267261516653634 + :ambient_heat: 0.7144967850010663 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10408.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 487.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2168280749526796 - :network_gas: 0.13268770018927925 - :ambient_heat: 0.6504842248580411 + :electricity: 0.17340867249702602 + :network_gas: 0.3063653100118942 + :ambient_heat: 0.5202260174910799 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0556_maassluis/GM0556_maassluis.derived.ad b/datasets/GM0556_maassluis/GM0556_maassluis.derived.ad index 1d8f596d10..01a1e5fd37 100644 --- a/datasets/GM0556_maassluis/GM0556_maassluis.derived.ad +++ b/datasets/GM0556_maassluis/GM0556_maassluis.derived.ad @@ -1,6 +1,6 @@ - area = GM0556_maassluis -- id = 128680 -- parent_id = 128680 +- id = 129022 +- parent_id = 129022 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0556_maassluis/graph_values.yml b/datasets/GM0556_maassluis/graph_values.yml index 741bc25f5a..47f7a8b2d5 100644 --- a/datasets/GM0556_maassluis/graph_values.yml +++ b/datasets/GM0556_maassluis/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15680049187258802 - :network_gas: 0.13759729470076587 - :ambient_heat: 0.7056022134266461 + :electricity: 0.1595957600487831 + :network_gas: 0.12222331973169298 + :ambient_heat: 0.718180920219524 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15387.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 792.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21799897702395526 - :network_gas: 0.12800409190417664 - :ambient_heat: 0.6539969310718682 + :electricity: 0.17558620899173716 + :network_gas: 0.2976551640330495 + :ambient_heat: 0.5267586269752133 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0569_nieuwkoop/GM0569_nieuwkoop.derived.ad b/datasets/GM0569_nieuwkoop/GM0569_nieuwkoop.derived.ad index 4215ef26fb..6a2ffd790f 100644 --- a/datasets/GM0569_nieuwkoop/GM0569_nieuwkoop.derived.ad +++ b/datasets/GM0569_nieuwkoop/GM0569_nieuwkoop.derived.ad @@ -1,6 +1,6 @@ - area = GM0569_nieuwkoop -- id = 128695 -- parent_id = 128695 +- id = 129037 +- parent_id = 129037 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0569_nieuwkoop/graph_values.yml b/datasets/GM0569_nieuwkoop/graph_values.yml index ce59cedbce..3b09cc6c64 100644 --- a/datasets/GM0569_nieuwkoop/graph_values.yml +++ b/datasets/GM0569_nieuwkoop/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15692322981290432 - :network_gas: 0.13692223602902612 - :ambient_heat: 0.7061545341580695 + :electricity: 0.1597067181352013 + :network_gas: 0.12161305025639293 + :ambient_heat: 0.7186802316084059 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11633.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 26.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21815771327645647 - :network_gas: 0.12736914689417178 - :ambient_heat: 0.6544731398293717 + :electricity: 0.17588380079226718 + :network_gas: 0.29646479683092947 + :ambient_heat: 0.5276514023768034 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0575_noordwijk/GM0575_noordwijk.derived.ad b/datasets/GM0575_noordwijk/GM0575_noordwijk.derived.ad index 8b6cc7730c..167476e869 100644 --- a/datasets/GM0575_noordwijk/GM0575_noordwijk.derived.ad +++ b/datasets/GM0575_noordwijk/GM0575_noordwijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0575_noordwijk -- id = 128702 -- parent_id = 128702 +- id = 129044 +- parent_id = 129044 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0575_noordwijk/graph_values.yml b/datasets/GM0575_noordwijk/graph_values.yml index e0ef2aad8b..1b95be21c5 100644 --- a/datasets/GM0575_noordwijk/graph_values.yml +++ b/datasets/GM0575_noordwijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15426484633454238 - :network_gas: 0.15154334516001683 - :ambient_heat: 0.6941918085054408 + :electricity: 0.15729912463234297 + :network_gas: 0.13485481452211384 + :ambient_heat: 0.7078460608455434 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20093.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 864.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21471576103479315 - :network_gas: 0.14113695586082528 - :ambient_heat: 0.6441472831043816 + :electricity: 0.1695572616298163 + :network_gas: 0.3217709534807329 + :ambient_heat: 0.5086717848894508 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0579_oegstgeest/GM0579_oegstgeest.derived.ad b/datasets/GM0579_oegstgeest/GM0579_oegstgeest.derived.ad index d5b6964ae2..efa3758483 100644 --- a/datasets/GM0579_oegstgeest/GM0579_oegstgeest.derived.ad +++ b/datasets/GM0579_oegstgeest/GM0579_oegstgeest.derived.ad @@ -1,6 +1,6 @@ - area = GM0579_oegstgeest -- id = 128705 -- parent_id = 128705 +- id = 129047 +- parent_id = 129047 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0579_oegstgeest/graph_values.yml b/datasets/GM0579_oegstgeest/graph_values.yml index f9013934cd..55b0c4de4b 100644 --- a/datasets/GM0579_oegstgeest/graph_values.yml +++ b/datasets/GM0579_oegstgeest/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1552455675865343 - :network_gas: 0.1461493782740614 - :ambient_heat: 0.6986050541394042 + :electricity: 0.15818838833255072 + :network_gas: 0.1299638641709711 + :ambient_heat: 0.7118477474964783 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11008.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 700.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2159865015105192 - :network_gas: 0.13605399395792084 - :ambient_heat: 0.6479595045315599 + :electricity: 0.17186250876994447 + :network_gas: 0.3125499649202203 + :ambient_heat: 0.5155875263098352 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0589_oudewater/GM0589_oudewater.derived.ad b/datasets/GM0589_oudewater/GM0589_oudewater.derived.ad index 70e87893a0..746bf65eb9 100644 --- a/datasets/GM0589_oudewater/GM0589_oudewater.derived.ad +++ b/datasets/GM0589_oudewater/GM0589_oudewater.derived.ad @@ -1,6 +1,6 @@ - area = GM0589_oudewater -- id = 128722 -- parent_id = 128722 +- id = 129064 +- parent_id = 129064 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0589_oudewater/graph_values.yml b/datasets/GM0589_oudewater/graph_values.yml index dc48da9f3a..44664cb9e8 100644 --- a/datasets/GM0589_oudewater/graph_values.yml +++ b/datasets/GM0589_oudewater/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15458275482888156 - :network_gas: 0.14979484844115137 - :ambient_heat: 0.6956223967299671 + :electricity: 0.15758752280525742 + :network_gas: 0.13326862457108407 + :ambient_heat: 0.7091438526236585 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4315.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 304.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21512780305526238 - :network_gas: 0.13948878777894816 - :ambient_heat: 0.6453834091657895 + :electricity: 0.17030091068023995 + :network_gas: 0.3187963572790383 + :ambient_heat: 0.5109027320407217 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0590_papendrecht/GM0590_papendrecht.derived.ad b/datasets/GM0590_papendrecht/GM0590_papendrecht.derived.ad index d677b11518..66264656f3 100644 --- a/datasets/GM0590_papendrecht/GM0590_papendrecht.derived.ad +++ b/datasets/GM0590_papendrecht/GM0590_papendrecht.derived.ad @@ -1,6 +1,6 @@ - area = GM0590_papendrecht -- id = 128724 -- parent_id = 128724 +- id = 129066 +- parent_id = 129066 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0590_papendrecht/graph_values.yml b/datasets/GM0590_papendrecht/graph_values.yml index 4bc8b8ec53..afceaa2eb0 100644 --- a/datasets/GM0590_papendrecht/graph_values.yml +++ b/datasets/GM0590_papendrecht/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15738135164694622 - :network_gas: 0.13440256594179587 - :ambient_heat: 0.708216082411258 + :electricity: 0.16012070007834264 + :network_gas: 0.11933614956911551 + :ambient_heat: 0.7205431503525418 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14474.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 112.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2187500465524956 - :network_gas: 0.12499981379001522 - :ambient_heat: 0.6562501396574891 + :electricity: 0.1769993753524582 + :network_gas: 0.2920024985901653 + :ambient_heat: 0.5309981260573765 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0597_ridderkerk/GM0597_ridderkerk.derived.ad b/datasets/GM0597_ridderkerk/GM0597_ridderkerk.derived.ad index 4a9d57312f..904267734f 100644 --- a/datasets/GM0597_ridderkerk/GM0597_ridderkerk.derived.ad +++ b/datasets/GM0597_ridderkerk/GM0597_ridderkerk.derived.ad @@ -1,6 +1,6 @@ - area = GM0597_ridderkerk -- id = 128737 -- parent_id = 128737 +- id = 129079 +- parent_id = 129079 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0597_ridderkerk/graph_values.yml b/datasets/GM0597_ridderkerk/graph_values.yml index 180f9bf454..3554ebb75b 100644 --- a/datasets/GM0597_ridderkerk/graph_values.yml +++ b/datasets/GM0597_ridderkerk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15699989317181878 - :network_gas: 0.13650058755499672 - :ambient_heat: 0.7064995192731846 + :electricity: 0.15977601383215326 + :network_gas: 0.12123192392315713 + :ambient_heat: 0.7189920622446897 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 21285.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 656.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21825685275541565 - :network_gas: 0.12697258897833497 - :ambient_heat: 0.6547705582662493 + :electricity: 0.17606995501328598 + :network_gas: 0.2957201799468542 + :ambient_heat: 0.5282098650398599 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0599_rotterdam/GM0599_rotterdam.derived.ad b/datasets/GM0599_rotterdam/GM0599_rotterdam.derived.ad index 0954b3d096..f2e9009402 100644 --- a/datasets/GM0599_rotterdam/GM0599_rotterdam.derived.ad +++ b/datasets/GM0599_rotterdam/GM0599_rotterdam.derived.ad @@ -1,6 +1,6 @@ - area = GM0599_rotterdam -- id = 128743 -- parent_id = 128743 +- id = 129085 +- parent_id = 129085 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0599_rotterdam/graph_values.yml b/datasets/GM0599_rotterdam/graph_values.yml index 8c232ec7a7..26097df03f 100644 --- a/datasets/GM0599_rotterdam/graph_values.yml +++ b/datasets/GM0599_rotterdam/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15627857335777026 - :network_gas: 0.14046784653226377 - :ambient_heat: 0.7032535801099661 + :electricity: 0.1591237161828218 + :network_gas: 0.12481956099448005 + :ambient_heat: 0.716056722822698 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 317566.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 14168.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2173237893704079 - :network_gas: 0.1307048425183662 - :ambient_heat: 0.651971368111226 + :electricity: 0.174326788022107 + :network_gas: 0.30269284791157025 + :ambient_heat: 0.5229803640663228 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0603_rijswijk/GM0603_rijswijk.derived.ad b/datasets/GM0603_rijswijk/GM0603_rijswijk.derived.ad index 0b7351edb4..f6590a23f1 100644 --- a/datasets/GM0603_rijswijk/GM0603_rijswijk.derived.ad +++ b/datasets/GM0603_rijswijk/GM0603_rijswijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0603_rijswijk -- id = 128739 -- parent_id = 128739 +- id = 129081 +- parent_id = 129081 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0603_rijswijk/graph_values.yml b/datasets/GM0603_rijswijk/graph_values.yml index 2a7c87f1ac..9f6a91ba40 100644 --- a/datasets/GM0603_rijswijk/graph_values.yml +++ b/datasets/GM0603_rijswijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15424888366482484 - :network_gas: 0.1516311398434633 - :ambient_heat: 0.6941199764917118 + :electricity: 0.1572846402694224 + :network_gas: 0.13493447851817686 + :ambient_heat: 0.7077808812124008 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 27201.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1518.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21469506870250646 - :network_gas: 0.1412197251899719 - :ambient_heat: 0.6440852061075216 + :electricity: 0.16952001264490746 + :network_gas: 0.3219199494203684 + :ambient_heat: 0.5085600379347242 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0606_schiedam/GM0606_schiedam.derived.ad b/datasets/GM0606_schiedam/GM0606_schiedam.derived.ad index fd249c2103..c6ac63f7e2 100644 --- a/datasets/GM0606_schiedam/GM0606_schiedam.derived.ad +++ b/datasets/GM0606_schiedam/GM0606_schiedam.derived.ad @@ -1,6 +1,6 @@ - area = GM0606_schiedam -- id = 128748 -- parent_id = 128748 +- id = 129090 +- parent_id = 129090 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0606_schiedam/graph_values.yml b/datasets/GM0606_schiedam/graph_values.yml index 4408a3b8bf..e67d232907 100644 --- a/datasets/GM0606_schiedam/graph_values.yml +++ b/datasets/GM0606_schiedam/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15370657773935573 - :network_gas: 0.15461382243354344 - :ambient_heat: 0.6916795998271008 + :electricity: 0.1567923612437058 + :network_gas: 0.13764201315961805 + :ambient_heat: 0.7055656255966761 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 37452.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 3154.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21399190538787635 - :network_gas: 0.14403237844849234 - :ambient_heat: 0.6419757161636314 + :electricity: 0.16825966196555642 + :network_gas: 0.3269613521377724 + :ambient_heat: 0.5047789858966711 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0610_sliedrecht/GM0610_sliedrecht.derived.ad b/datasets/GM0610_sliedrecht/GM0610_sliedrecht.derived.ad index 45caf41444..0b1fe25b95 100644 --- a/datasets/GM0610_sliedrecht/GM0610_sliedrecht.derived.ad +++ b/datasets/GM0610_sliedrecht/GM0610_sliedrecht.derived.ad @@ -1,6 +1,6 @@ - area = GM0610_sliedrecht -- id = 128755 -- parent_id = 128755 +- id = 129097 +- parent_id = 129097 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0610_sliedrecht/graph_values.yml b/datasets/GM0610_sliedrecht/graph_values.yml index a71e6143d4..f9ca604601 100644 --- a/datasets/GM0610_sliedrecht/graph_values.yml +++ b/datasets/GM0610_sliedrecht/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15643281746201168 - :network_gas: 0.13961950395893563 - :ambient_heat: 0.7039476785790526 + :electricity: 0.15926325724530208 + :network_gas: 0.1240520851508385 + :ambient_heat: 0.7166846576038594 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11078.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 522.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2175233621777653 - :network_gas: 0.1299065512889365 - :ambient_heat: 0.6525700865332982 + :electricity: 0.17469797592471634 + :network_gas: 0.30120809630113277 + :ambient_heat: 0.5240939277741509 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0613_albrandswaard/GM0613_albrandswaard.derived.ad b/datasets/GM0613_albrandswaard/GM0613_albrandswaard.derived.ad index 669728cb15..dc456a912d 100644 --- a/datasets/GM0613_albrandswaard/GM0613_albrandswaard.derived.ad +++ b/datasets/GM0613_albrandswaard/GM0613_albrandswaard.derived.ad @@ -1,6 +1,6 @@ - area = GM0613_albrandswaard -- id = 128518 -- parent_id = 128518 +- id = 128860 +- parent_id = 128860 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0613_albrandswaard/graph_values.yml b/datasets/GM0613_albrandswaard/graph_values.yml index 57817154df..2bb4fcfdb2 100644 --- a/datasets/GM0613_albrandswaard/graph_values.yml +++ b/datasets/GM0613_albrandswaard/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1570775142367521 - :network_gas: 0.13607367169786355 - :ambient_heat: 0.7068488140653844 + :electricity: 0.15984616748373065 + :network_gas: 0.12084607883948144 + :ambient_heat: 0.7193077536767879 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10558.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 55.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21835722383495257 - :network_gas: 0.1265711046601874 - :ambient_heat: 0.65507167150486 + :electricity: 0.176258650911438 + :network_gas: 0.2949653963542462 + :ambient_heat: 0.5287759527343159 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0622_vlaardingen/GM0622_vlaardingen.derived.ad b/datasets/GM0622_vlaardingen/GM0622_vlaardingen.derived.ad index acde3c4440..bbc86aa727 100644 --- a/datasets/GM0622_vlaardingen/GM0622_vlaardingen.derived.ad +++ b/datasets/GM0622_vlaardingen/GM0622_vlaardingen.derived.ad @@ -1,6 +1,6 @@ - area = GM0622_vlaardingen -- id = 128795 -- parent_id = 128795 +- id = 129137 +- parent_id = 129137 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0622_vlaardingen/graph_values.yml b/datasets/GM0622_vlaardingen/graph_values.yml index 70bf741eb1..70527dec85 100644 --- a/datasets/GM0622_vlaardingen/graph_values.yml +++ b/datasets/GM0622_vlaardingen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15341714749372018 - :network_gas: 0.15620568878453897 - :ambient_heat: 0.6903771637217408 + :electricity: 0.15652947441011497 + :network_gas: 0.13908789074436775 + :ambient_heat: 0.7043826348455173 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 35541.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2660.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2136164860912618 - :network_gas: 0.1455340556349505 - :ambient_heat: 0.6408494582737877 + :electricity: 0.1675910579881122 + :network_gas: 0.32963576804754946 + :ambient_heat: 0.5027731739643384 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0626_voorschoten/GM0626_voorschoten.derived.ad b/datasets/GM0626_voorschoten/GM0626_voorschoten.derived.ad index 40643589b2..3d07cec2cc 100644 --- a/datasets/GM0626_voorschoten/GM0626_voorschoten.derived.ad +++ b/datasets/GM0626_voorschoten/GM0626_voorschoten.derived.ad @@ -1,6 +1,6 @@ - area = GM0626_voorschoten -- id = 128799 -- parent_id = 128799 +- id = 129141 +- parent_id = 129141 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0626_voorschoten/graph_values.yml b/datasets/GM0626_voorschoten/graph_values.yml index c0d383dc08..bf76653ce4 100644 --- a/datasets/GM0626_voorschoten/graph_values.yml +++ b/datasets/GM0626_voorschoten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15319467378659438 - :network_gas: 0.157429294173731 - :ambient_heat: 0.6893760320396747 + :electricity: 0.15632732968648327 + :network_gas: 0.14019968672434213 + :ambient_heat: 0.7034729835891746 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11502.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 696.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2133278501771498 - :network_gas: 0.1466885992913986 - :ambient_heat: 0.6399835505314517 + :electricity: 0.1670790291141504 + :network_gas: 0.33168388354339656 + :ambient_heat: 0.501237087342453 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0627_waddinxveen/GM0627_waddinxveen.derived.ad b/datasets/GM0627_waddinxveen/GM0627_waddinxveen.derived.ad index 49c440ec29..5154f583c6 100644 --- a/datasets/GM0627_waddinxveen/GM0627_waddinxveen.derived.ad +++ b/datasets/GM0627_waddinxveen/GM0627_waddinxveen.derived.ad @@ -1,6 +1,6 @@ - area = GM0627_waddinxveen -- id = 128804 -- parent_id = 128804 +- id = 129146 +- parent_id = 129146 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0627_waddinxveen/graph_values.yml b/datasets/GM0627_waddinxveen/graph_values.yml index da613c132d..f8c2a8b45c 100644 --- a/datasets/GM0627_waddinxveen/graph_values.yml +++ b/datasets/GM0627_waddinxveen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16007288346850856 - :network_gas: 0.119599140923203 - :ambient_heat: 0.7203279756082885 + :electricity: 0.16254745764685183 + :network_gas: 0.10598898294231489 + :ambient_heat: 0.7314635594108333 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12786.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 221.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2222252233821721 - :network_gas: 0.11109910647130924 - :ambient_heat: 0.6666756701465186 + :electricity: 0.18371049089201183 + :network_gas: 0.26515803643195074 + :ambient_heat: 0.5511314726760375 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0629_wassenaar/GM0629_wassenaar.derived.ad b/datasets/GM0629_wassenaar/GM0629_wassenaar.derived.ad index 9b24ea92ba..fd24293e94 100644 --- a/datasets/GM0629_wassenaar/GM0629_wassenaar.derived.ad +++ b/datasets/GM0629_wassenaar/GM0629_wassenaar.derived.ad @@ -1,6 +1,6 @@ - area = GM0629_wassenaar -- id = 128806 -- parent_id = 128806 +- id = 129148 +- parent_id = 129148 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0629_wassenaar/graph_values.yml b/datasets/GM0629_wassenaar/graph_values.yml index 4577ec12fb..0f656fc24b 100644 --- a/datasets/GM0629_wassenaar/graph_values.yml +++ b/datasets/GM0629_wassenaar/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.14728359739853053 - :network_gas: 0.18994021430808217 - :ambient_heat: 0.6627761882933874 + :electricity: 0.1509327553293369 + :network_gas: 0.16986984568864708 + :ambient_heat: 0.6791973989820161 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12255.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1596.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20563785501024306 - :network_gas: 0.17744857995902555 - :ambient_heat: 0.6169135650307314 + :electricity: 0.15405274763146404 + :network_gas: 0.38378900947414213 + :ambient_heat: 0.46215824289439383 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0632_woerden/GM0632_woerden.derived.ad b/datasets/GM0632_woerden/GM0632_woerden.derived.ad index 533a09bb47..104fb33f01 100644 --- a/datasets/GM0632_woerden/GM0632_woerden.derived.ad +++ b/datasets/GM0632_woerden/GM0632_woerden.derived.ad @@ -1,6 +1,6 @@ - area = GM0632_woerden -- id = 128820 -- parent_id = 128820 +- id = 129162 +- parent_id = 129162 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0632_woerden/graph_values.yml b/datasets/GM0632_woerden/graph_values.yml index b8ab13ae16..f928ec8a09 100644 --- a/datasets/GM0632_woerden/graph_values.yml +++ b/datasets/GM0632_woerden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1555923701602013 - :network_gas: 0.1442419641188928 - :ambient_heat: 0.7001656657209059 + :electricity: 0.15850255197071408 + :network_gas: 0.12823596416107266 + :ambient_heat: 0.7132614838682133 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22411.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 901.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2164355952752528 - :network_gas: 0.13425761889898644 - :ambient_heat: 0.6493067858257607 + :electricity: 0.17268564693716867 + :network_gas: 0.30925741225132347 + :ambient_heat: 0.5180569408115079 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0637_zoetermeer/GM0637_zoetermeer.derived.ad b/datasets/GM0637_zoetermeer/GM0637_zoetermeer.derived.ad index 365899af82..6129b968f2 100644 --- a/datasets/GM0637_zoetermeer/GM0637_zoetermeer.derived.ad +++ b/datasets/GM0637_zoetermeer/GM0637_zoetermeer.derived.ad @@ -1,6 +1,6 @@ - area = GM0637_zoetermeer -- id = 128829 -- parent_id = 128829 +- id = 129171 +- parent_id = 129171 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0637_zoetermeer/graph_values.yml b/datasets/GM0637_zoetermeer/graph_values.yml index d5db57913e..5649708530 100644 --- a/datasets/GM0637_zoetermeer/graph_values.yml +++ b/datasets/GM0637_zoetermeer/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1589736645716735 - :network_gas: 0.12564484485579588 - :ambient_heat: 0.7153814905725308 + :electricity: 0.16155749507374378 + :network_gas: 0.11143377709440926 + :ambient_heat: 0.727008727831847 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 56357.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 142.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.22080696851844453 - :network_gas: 0.11677212592621951 - :ambient_heat: 0.662420905555336 + :electricity: 0.1809367711950276 + :network_gas: 0.2762529152198877 + :ambient_heat: 0.5428103135850847 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0638_zoeterwoude/GM0638_zoeterwoude.derived.ad b/datasets/GM0638_zoeterwoude/GM0638_zoeterwoude.derived.ad index 6f5ad0e60e..a5f83cd209 100644 --- a/datasets/GM0638_zoeterwoude/GM0638_zoeterwoude.derived.ad +++ b/datasets/GM0638_zoeterwoude/GM0638_zoeterwoude.derived.ad @@ -1,6 +1,6 @@ - area = GM0638_zoeterwoude -- id = 128830 -- parent_id = 128830 +- id = 129172 +- parent_id = 129172 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0638_zoeterwoude/graph_values.yml b/datasets/GM0638_zoeterwoude/graph_values.yml index e1a4744d85..28c4b99525 100644 --- a/datasets/GM0638_zoeterwoude/graph_values.yml +++ b/datasets/GM0638_zoeterwoude/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15825854136719514 - :network_gas: 0.12957802248042674 - :ambient_heat: 0.7121634361523781 + :electricity: 0.16091261940209498 + :network_gas: 0.11498059328847769 + :ambient_heat: 0.7241067873094273 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 3732.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 99.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2198835449510983 - :network_gas: 0.12046582019560452 - :ambient_heat: 0.6596506348532972 + :electricity: 0.17915681530146635 + :network_gas: 0.28337273879413266 + :ambient_heat: 0.537470445904401 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0642_zwijndrecht/GM0642_zwijndrecht.derived.ad b/datasets/GM0642_zwijndrecht/GM0642_zwijndrecht.derived.ad index 27f0f64256..e24e63b20e 100644 --- a/datasets/GM0642_zwijndrecht/GM0642_zwijndrecht.derived.ad +++ b/datasets/GM0642_zwijndrecht/GM0642_zwijndrecht.derived.ad @@ -1,6 +1,6 @@ - area = GM0642_zwijndrecht -- id = 128835 -- parent_id = 128835 +- id = 129177 +- parent_id = 129177 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0642_zwijndrecht/graph_values.yml b/datasets/GM0642_zwijndrecht/graph_values.yml index f491b9e212..56c8d4a7bc 100644 --- a/datasets/GM0642_zwijndrecht/graph_values.yml +++ b/datasets/GM0642_zwijndrecht/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15406130350122285 - :network_gas: 0.15266283074327425 - :ambient_heat: 0.6932758657555028 + :electricity: 0.1571144072161243 + :network_gas: 0.13587076031131634 + :ambient_heat: 0.7070148324725593 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20717.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 623.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21445188740158472 - :network_gas: 0.14219245039365885 - :ambient_heat: 0.6433556622047564 + :electricity: 0.16908294100587162 + :network_gas: 0.3236682359765117 + :ambient_heat: 0.5072488230176166 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0654_borsele/GM0654_borsele.derived.ad b/datasets/GM0654_borsele/GM0654_borsele.derived.ad index f241aa4486..07163c5854 100644 --- a/datasets/GM0654_borsele/GM0654_borsele.derived.ad +++ b/datasets/GM0654_borsele/GM0654_borsele.derived.ad @@ -1,6 +1,6 @@ - area = GM0654_borsele -- id = 128555 -- parent_id = 128555 +- id = 128897 +- parent_id = 128897 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0654_borsele/graph_values.yml b/datasets/GM0654_borsele/graph_values.yml index da500445f9..9a9ab5322e 100644 --- a/datasets/GM0654_borsele/graph_values.yml +++ b/datasets/GM0654_borsele/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15294975750399806 - :network_gas: 0.1587763337280106 - :ambient_heat: 0.6882739087679912 + :electricity: 0.15610471880342996 + :network_gas: 0.14142404658113514 + :ambient_heat: 0.7024712346154349 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9820.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 225.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21301003126587634 - :network_gas: 0.1479598749364925 - :ambient_heat: 0.6390300937976312 + :electricity: 0.16651724828706652 + :network_gas: 0.3339310068517322 + :ambient_heat: 0.4995517448612013 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0664_goes/GM0664_goes.derived.ad b/datasets/GM0664_goes/GM0664_goes.derived.ad index 8728ad4278..a39884207f 100644 --- a/datasets/GM0664_goes/GM0664_goes.derived.ad +++ b/datasets/GM0664_goes/GM0664_goes.derived.ad @@ -1,6 +1,6 @@ - area = GM0664_goes -- id = 128611 -- parent_id = 128611 +- id = 128953 +- parent_id = 128953 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0664_goes/graph_values.yml b/datasets/GM0664_goes/graph_values.yml index c0bd961c77..f06fce5676 100644 --- a/datasets/GM0664_goes/graph_values.yml +++ b/datasets/GM0664_goes/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15682848892886744 - :network_gas: 0.13744331089122913 - :ambient_heat: 0.7057282001799035 + :electricity: 0.1596210717779586 + :network_gas: 0.12208410522122784 + :ambient_heat: 0.7182948230008137 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18622.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 889.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21803518697657828 - :network_gas: 0.12785925209368443 - :ambient_heat: 0.6541055609297372 + :electricity: 0.17565404325140085 + :network_gas: 0.29738382699439486 + :ambient_heat: 0.5269621297542044 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0668_west_maas_en_waal/GM0668_west_maas_en_waal.derived.ad b/datasets/GM0668_west_maas_en_waal/GM0668_west_maas_en_waal.derived.ad index 662cd21158..eef1064ec7 100644 --- a/datasets/GM0668_west_maas_en_waal/GM0668_west_maas_en_waal.derived.ad +++ b/datasets/GM0668_west_maas_en_waal/GM0668_west_maas_en_waal.derived.ad @@ -1,6 +1,6 @@ - area = GM0668_west_maas_en_waal -- id = 128809 -- parent_id = 128809 +- id = 129151 +- parent_id = 129151 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0668_west_maas_en_waal/graph_values.yml b/datasets/GM0668_west_maas_en_waal/graph_values.yml index f14de6432c..1431296e1c 100644 --- a/datasets/GM0668_west_maas_en_waal/graph_values.yml +++ b/datasets/GM0668_west_maas_en_waal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15688103549636134 - :network_gas: 0.13715430477001272 - :ambient_heat: 0.705964659733626 + :electricity: 0.15966857563483478 + :network_gas: 0.12182283400840865 + :ambient_heat: 0.7185085903567564 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8346.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 37.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2181031455705715 - :network_gas: 0.12758741771771162 - :ambient_heat: 0.6543094367117168 + :electricity: 0.175781434808876 + :network_gas: 0.2968742607644941 + :ambient_heat: 0.5273443044266298 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0677_hulst/GM0677_hulst.derived.ad b/datasets/GM0677_hulst/GM0677_hulst.derived.ad index 79df5c79b0..10f9d256e6 100644 --- a/datasets/GM0677_hulst/GM0677_hulst.derived.ad +++ b/datasets/GM0677_hulst/GM0677_hulst.derived.ad @@ -1,6 +1,6 @@ - area = GM0677_hulst -- id = 128650 -- parent_id = 128650 +- id = 128992 +- parent_id = 128992 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0677_hulst/graph_values.yml b/datasets/GM0677_hulst/graph_values.yml index 02f75bd084..b3c35e6e1d 100644 --- a/datasets/GM0677_hulst/graph_values.yml +++ b/datasets/GM0677_hulst/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15378090364500197 - :network_gas: 0.1542050299524892 - :ambient_heat: 0.6920140664025088 + :electricity: 0.15685985324472035 + :network_gas: 0.13727080715403797 + :ambient_heat: 0.7058693396012415 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13607.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 391.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21408829773279095 - :network_gas: 0.1436468090688341 - :ambient_heat: 0.6422648931983751 + :electricity: 0.1684318131553256 + :network_gas: 0.3262727473786958 + :ambient_heat: 0.5052954394659787 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0678_kapelle/GM0678_kapelle.derived.ad b/datasets/GM0678_kapelle/GM0678_kapelle.derived.ad index 3b97828145..a2ce07dd3d 100644 --- a/datasets/GM0678_kapelle/GM0678_kapelle.derived.ad +++ b/datasets/GM0678_kapelle/GM0678_kapelle.derived.ad @@ -1,6 +1,6 @@ - area = GM0678_kapelle -- id = 128654 -- parent_id = 128654 +- id = 128996 +- parent_id = 128996 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0678_kapelle/graph_values.yml b/datasets/GM0678_kapelle/graph_values.yml index d2e33106bd..e547b19a2f 100644 --- a/datasets/GM0678_kapelle/graph_values.yml +++ b/datasets/GM0678_kapelle/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15685567618473606 - :network_gas: 0.13729378098395187 - :ambient_heat: 0.7058505428313122 + :electricity: 0.1596456504119237 + :network_gas: 0.12194892273441967 + :ambient_heat: 0.7184054268536566 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5456.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 98.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2180703487122359 - :network_gas: 0.1277186051510541 - :ambient_heat: 0.65421104613671 + :electricity: 0.1757199424184386 + :network_gas: 0.2971202303262436 + :ambient_heat: 0.5271598272553177 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0687_middelburg/GM0687_middelburg.derived.ad b/datasets/GM0687_middelburg/GM0687_middelburg.derived.ad index 924dc5609e..4e5737f2e4 100644 --- a/datasets/GM0687_middelburg/GM0687_middelburg.derived.ad +++ b/datasets/GM0687_middelburg/GM0687_middelburg.derived.ad @@ -1,6 +1,6 @@ - area = GM0687_middelburg -- id = 128685 -- parent_id = 128685 +- id = 129027 +- parent_id = 129027 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0687_middelburg/graph_values.yml b/datasets/GM0687_middelburg/graph_values.yml index d3c43a8029..2527c054c0 100644 --- a/datasets/GM0687_middelburg/graph_values.yml +++ b/datasets/GM0687_middelburg/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15181116010362944 - :network_gas: 0.16503861943003806 - :ambient_heat: 0.6831502204663324 + :electricity: 0.15506879362890708 + :network_gas: 0.14712163504101106 + :ambient_heat: 0.6978095713300819 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 23882.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2427.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2115316040877635 - :network_gas: 0.15387358364894374 - :ambient_heat: 0.6345948122632927 + :electricity: 0.1639314200874426 + :network_gas: 0.34427431965022787 + :ambient_heat: 0.49179426026232953 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0703_reimerswaal/GM0703_reimerswaal.derived.ad b/datasets/GM0703_reimerswaal/GM0703_reimerswaal.derived.ad index db70e6b789..d3a2d7d3bf 100644 --- a/datasets/GM0703_reimerswaal/GM0703_reimerswaal.derived.ad +++ b/datasets/GM0703_reimerswaal/GM0703_reimerswaal.derived.ad @@ -1,6 +1,6 @@ - area = GM0703_reimerswaal -- id = 128731 -- parent_id = 128731 +- id = 129073 +- parent_id = 129073 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0703_reimerswaal/graph_values.yml b/datasets/GM0703_reimerswaal/graph_values.yml index 1ffe25526b..e9e00a1ed8 100644 --- a/datasets/GM0703_reimerswaal/graph_values.yml +++ b/datasets/GM0703_reimerswaal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15328757589516473 - :network_gas: 0.15691833257659407 - :ambient_heat: 0.6897940915282412 + :electricity: 0.15641175049092806 + :network_gas: 0.13973537229989558 + :ambient_heat: 0.7038528772091763 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9322.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 239.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21344838771241115 - :network_gas: 0.14620644915035305 - :ambient_heat: 0.6403451631372358 + :electricity: 0.16729264536320734 + :network_gas: 0.3308294185471689 + :ambient_heat: 0.5018779360896238 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0715_terneuzen/GM0715_terneuzen.derived.ad b/datasets/GM0715_terneuzen/GM0715_terneuzen.derived.ad index ec36727c08..0939c25db5 100644 --- a/datasets/GM0715_terneuzen/GM0715_terneuzen.derived.ad +++ b/datasets/GM0715_terneuzen/GM0715_terneuzen.derived.ad @@ -1,6 +1,6 @@ - area = GM0715_terneuzen -- id = 128769 -- parent_id = 128769 +- id = 129111 +- parent_id = 129111 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0715_terneuzen/graph_values.yml b/datasets/GM0715_terneuzen/graph_values.yml index 23576a9e4e..a74745eefc 100644 --- a/datasets/GM0715_terneuzen/graph_values.yml +++ b/datasets/GM0715_terneuzen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15032777778926773 - :network_gas: 0.17319722215902747 - :ambient_heat: 0.6764750000517048 + :electricity: 0.1537166410343379 + :network_gas: 0.15455847431114147 + :ambient_heat: 0.6917248846545206 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 27046.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1594.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20960323427032673 - :network_gas: 0.16158706291869077 - :ambient_heat: 0.6288097028109825 + :electricity: 0.1606250893976883 + :network_gas: 0.3574996424092452 + :ambient_heat: 0.4818752681930666 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0716_tholen/GM0716_tholen.derived.ad b/datasets/GM0716_tholen/GM0716_tholen.derived.ad index 70115c2feb..2b067b9642 100644 --- a/datasets/GM0716_tholen/GM0716_tholen.derived.ad +++ b/datasets/GM0716_tholen/GM0716_tholen.derived.ad @@ -1,6 +1,6 @@ - area = GM0716_tholen -- id = 128773 -- parent_id = 128773 +- id = 129115 +- parent_id = 129115 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0716_tholen/graph_values.yml b/datasets/GM0716_tholen/graph_values.yml index fef34239e8..6d17da1960 100644 --- a/datasets/GM0716_tholen/graph_values.yml +++ b/datasets/GM0716_tholen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15627001262608697 - :network_gas: 0.14051493055652162 - :ambient_heat: 0.7032150568173914 + :electricity: 0.15911597058868265 + :network_gas: 0.12486216176224528 + :ambient_heat: 0.7160218676490719 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11102.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1132.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21731271203964853 - :network_gas: 0.1307491518414036 - :ambient_heat: 0.6519381361189479 + :electricity: 0.1743062114353037 + :network_gas: 0.3027751542587833 + :ambient_heat: 0.5229186343059129 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0717_veere/GM0717_veere.derived.ad b/datasets/GM0717_veere/GM0717_veere.derived.ad index 7f4b5d7c07..5673c8bfc4 100644 --- a/datasets/GM0717_veere/GM0717_veere.derived.ad +++ b/datasets/GM0717_veere/GM0717_veere.derived.ad @@ -1,6 +1,6 @@ - area = GM0717_veere -- id = 128790 -- parent_id = 128790 +- id = 129132 +- parent_id = 129132 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0717_veere/graph_values.yml b/datasets/GM0717_veere/graph_values.yml index 32f26b5b0d..427b8322c8 100644 --- a/datasets/GM0717_veere/graph_values.yml +++ b/datasets/GM0717_veere/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15319827337194358 - :network_gas: 0.15740949645431038 - :ambient_heat: 0.6893922301737461 + :electricity: 0.156330600863882 + :network_gas: 0.14018169524864887 + :ambient_heat: 0.7034877038874691 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10972.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 248.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21333252071056033 - :network_gas: 0.14666991715775635 - :ambient_heat: 0.6399975621316834 + :electricity: 0.16708730054929802 + :network_gas: 0.3316507978028062 + :ambient_heat: 0.5012619016478959 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0718_vlissingen/GM0718_vlissingen.derived.ad b/datasets/GM0718_vlissingen/GM0718_vlissingen.derived.ad index d186d56130..a4914609e5 100644 --- a/datasets/GM0718_vlissingen/GM0718_vlissingen.derived.ad +++ b/datasets/GM0718_vlissingen/GM0718_vlissingen.derived.ad @@ -1,6 +1,6 @@ - area = GM0718_vlissingen -- id = 128797 -- parent_id = 128797 +- id = 129139 +- parent_id = 129139 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0718_vlissingen/graph_values.yml b/datasets/GM0718_vlissingen/graph_values.yml index e79b59b27f..4739e2d693 100644 --- a/datasets/GM0718_vlissingen/graph_values.yml +++ b/datasets/GM0718_vlissingen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15339556275016772 - :network_gas: 0.1563244048740775 - :ambient_heat: 0.6902800323757546 + :electricity: 0.15650986483032023 + :network_gas: 0.13919574343323876 + :ambient_heat: 0.7042943917364409 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22881.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1741.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2135884846931195 - :network_gas: 0.14564606122751975 - :ambient_heat: 0.6407654540793608 + :electricity: 0.16754130794271327 + :network_gas: 0.3298347682291452 + :ambient_heat: 0.5026239238281416 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0736_de_ronde_venen/GM0736_de_ronde_venen.derived.ad b/datasets/GM0736_de_ronde_venen/GM0736_de_ronde_venen.derived.ad index 07ed4a35bf..6d4bc3c992 100644 --- a/datasets/GM0736_de_ronde_venen/GM0736_de_ronde_venen.derived.ad +++ b/datasets/GM0736_de_ronde_venen/GM0736_de_ronde_venen.derived.ad @@ -1,6 +1,6 @@ - area = GM0736_de_ronde_venen -- id = 128573 -- parent_id = 128573 +- id = 128915 +- parent_id = 128915 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0736_de_ronde_venen/graph_values.yml b/datasets/GM0736_de_ronde_venen/graph_values.yml index 9054cafb70..5dc7857a76 100644 --- a/datasets/GM0736_de_ronde_venen/graph_values.yml +++ b/datasets/GM0736_de_ronde_venen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15554169693905395 - :network_gas: 0.14452066683520332 - :ambient_heat: 0.6999376362257428 + :electricity: 0.1584566574980744 + :network_gas: 0.12848838376059085 + :ambient_heat: 0.7130549587413348 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18550.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 162.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2163699843735996 - :network_gas: 0.13452006250559911 - :ambient_heat: 0.6491099531208012 + :electricity: 0.1725651119386649 + :network_gas: 0.30973955224533856 + :ambient_heat: 0.5176953358159966 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0737_tytsjerksteradiel/GM0737_tytsjerksteradiel.derived.ad b/datasets/GM0737_tytsjerksteradiel/GM0737_tytsjerksteradiel.derived.ad index b3546856c8..7a6e5124a0 100644 --- a/datasets/GM0737_tytsjerksteradiel/GM0737_tytsjerksteradiel.derived.ad +++ b/datasets/GM0737_tytsjerksteradiel/GM0737_tytsjerksteradiel.derived.ad @@ -1,6 +1,6 @@ - area = GM0737_tytsjerksteradiel -- id = 128779 -- parent_id = 128779 +- id = 129121 +- parent_id = 129121 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0737_tytsjerksteradiel/graph_values.yml b/datasets/GM0737_tytsjerksteradiel/graph_values.yml index 6482725a7c..ed6959e2d5 100644 --- a/datasets/GM0737_tytsjerksteradiel/graph_values.yml +++ b/datasets/GM0737_tytsjerksteradiel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15211845206238703 - :network_gas: 0.16334851365687136 - :ambient_heat: 0.6845330342807416 + :electricity: 0.15534854191885578 + :network_gas: 0.1455830194462933 + :ambient_heat: 0.6990684386348509 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14018.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 47.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21193075927612312 - :network_gas: 0.15227696289550519 - :ambient_heat: 0.6357922778283717 + :electricity: 0.1646251405479638 + :network_gas: 0.3414994378081431 + :ambient_heat: 0.4938754216438932 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0743_asten/GM0743_asten.derived.ad b/datasets/GM0743_asten/GM0743_asten.derived.ad index 27a06092b3..44e6911b22 100644 --- a/datasets/GM0743_asten/GM0743_asten.derived.ad +++ b/datasets/GM0743_asten/GM0743_asten.derived.ad @@ -1,6 +1,6 @@ - area = GM0743_asten -- id = 128531 -- parent_id = 128531 +- id = 128873 +- parent_id = 128873 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0743_asten/graph_values.yml b/datasets/GM0743_asten/graph_values.yml index b134d58370..2f72e8851a 100644 --- a/datasets/GM0743_asten/graph_values.yml +++ b/datasets/GM0743_asten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1567062168576253 - :network_gas: 0.1381158072830608 - :ambient_heat: 0.705177975859314 + :electricity: 0.15951051995973572 + :network_gas: 0.1226921402214535 + :ambient_heat: 0.7177973398188108 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7040.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 58.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21787703993919272 - :network_gas: 0.12849184024322685 - :ambient_heat: 0.6536311198175805 + :electricity: 0.17535799646213365 + :network_gas: 0.2985680141514636 + :ambient_heat: 0.5260739893864028 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0744_baarle_nassau/GM0744_baarle_nassau.derived.ad b/datasets/GM0744_baarle_nassau/GM0744_baarle_nassau.derived.ad index fc10c05e70..8fa4868fad 100644 --- a/datasets/GM0744_baarle_nassau/GM0744_baarle_nassau.derived.ad +++ b/datasets/GM0744_baarle_nassau/GM0744_baarle_nassau.derived.ad @@ -1,6 +1,6 @@ - area = GM0744_baarle_nassau -- id = 128532 -- parent_id = 128532 +- id = 128874 +- parent_id = 128874 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0744_baarle_nassau/graph_values.yml b/datasets/GM0744_baarle_nassau/graph_values.yml index 673cf29fb2..507e86bdd6 100644 --- a/datasets/GM0744_baarle_nassau/graph_values.yml +++ b/datasets/GM0744_baarle_nassau/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15355851984714372 - :network_gas: 0.15542814084070955 - :ambient_heat: 0.6910133393121468 + :electricity: 0.1566578951987514 + :network_gas: 0.1383815764068675 + :ambient_heat: 0.7049605283943812 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 2911.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 37.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21379987193049405 - :network_gas: 0.14480051227802157 - :ambient_heat: 0.6413996157914845 + :electricity: 0.16791728766406416 + :network_gas: 0.32833084934374146 + :ambient_heat: 0.5037518629921942 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0748_bergen_op_zoom/GM0748_bergen_op_zoom.derived.ad b/datasets/GM0748_bergen_op_zoom/GM0748_bergen_op_zoom.derived.ad index b484664e0e..90cfb85fdc 100644 --- a/datasets/GM0748_bergen_op_zoom/GM0748_bergen_op_zoom.derived.ad +++ b/datasets/GM0748_bergen_op_zoom/GM0748_bergen_op_zoom.derived.ad @@ -1,6 +1,6 @@ - area = GM0748_bergen_op_zoom -- id = 128542 -- parent_id = 128542 +- id = 128884 +- parent_id = 128884 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0748_bergen_op_zoom/graph_values.yml b/datasets/GM0748_bergen_op_zoom/graph_values.yml index 9d6e15c611..881f449e91 100644 --- a/datasets/GM0748_bergen_op_zoom/graph_values.yml +++ b/datasets/GM0748_bergen_op_zoom/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1559401876677186 - :network_gas: 0.14232896782754753 - :ambient_heat: 0.7017308445047338 + :electricity: 0.15881747897200912 + :network_gas: 0.12650386565394972 + :ambient_heat: 0.7146786553740411 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 30883.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2761.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21688586417006525 - :network_gas: 0.13245654331973677 - :ambient_heat: 0.6506575925101981 + :electricity: 0.1735154211899666 + :network_gas: 0.30593831524013165 + :ambient_heat: 0.5205462635699016 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0753_best/GM0753_best.derived.ad b/datasets/GM0753_best/GM0753_best.derived.ad index 5103d1c836..0c84fd8fbd 100644 --- a/datasets/GM0753_best/GM0753_best.derived.ad +++ b/datasets/GM0753_best/GM0753_best.derived.ad @@ -1,6 +1,6 @@ - area = GM0753_best -- id = 128545 -- parent_id = 128545 +- id = 128887 +- parent_id = 128887 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0753_best/graph_values.yml b/datasets/GM0753_best/graph_values.yml index 4631443dba..ad9637bcf3 100644 --- a/datasets/GM0753_best/graph_values.yml +++ b/datasets/GM0753_best/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1574141107357897 - :network_gas: 0.13422239095315652 - :ambient_heat: 0.7083634983110537 + :electricity: 0.16015029248937804 + :network_gas: 0.11917339130842067 + :ambient_heat: 0.7206763162022012 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12967.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 35.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21879239350665744 - :network_gas: 0.12483042597336776 - :ambient_heat: 0.6563771805199747 + :electricity: 0.17707943898647452 + :network_gas: 0.2916822440541001 + :ambient_heat: 0.5312383169594255 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0755_boekel/GM0755_boekel.derived.ad b/datasets/GM0755_boekel/GM0755_boekel.derived.ad index 2a4294ecc3..38d6845829 100644 --- a/datasets/GM0755_boekel/GM0755_boekel.derived.ad +++ b/datasets/GM0755_boekel/GM0755_boekel.derived.ad @@ -1,6 +1,6 @@ - area = GM0755_boekel -- id = 128552 -- parent_id = 128552 +- id = 128894 +- parent_id = 128894 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0755_boekel/graph_values.yml b/datasets/GM0755_boekel/graph_values.yml index d38473e239..7a9cdca3cd 100644 --- a/datasets/GM0755_boekel/graph_values.yml +++ b/datasets/GM0755_boekel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15793442720583536 - :network_gas: 0.13136065036790545 - :ambient_heat: 0.7107049224262592 + :electricity: 0.16062012715431234 + :network_gas: 0.11658930065128223 + :ambient_heat: 0.7227905721944055 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4373.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 11.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21946482985018356 - :network_gas: 0.12214068059926333 - :ambient_heat: 0.658394489550553 + :electricity: 0.17835636104190414 + :network_gas: 0.28657455583238156 + :ambient_heat: 0.5350690831257143 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0757_boxtel/GM0757_boxtel.derived.ad b/datasets/GM0757_boxtel/GM0757_boxtel.derived.ad index c114628922..8f30323c47 100644 --- a/datasets/GM0757_boxtel/GM0757_boxtel.derived.ad +++ b/datasets/GM0757_boxtel/GM0757_boxtel.derived.ad @@ -1,6 +1,6 @@ - area = GM0757_boxtel -- id = 128556 -- parent_id = 128556 +- id = 128898 +- parent_id = 128898 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0757_boxtel/graph_values.yml b/datasets/GM0757_boxtel/graph_values.yml index 0c31bbf099..58a82620fb 100644 --- a/datasets/GM0757_boxtel/graph_values.yml +++ b/datasets/GM0757_boxtel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15601180337192466 - :network_gas: 0.14193508145441427 - :ambient_heat: 0.7020531151736611 + :electricity: 0.15888230312237095 + :network_gas: 0.1261473328269598 + :ambient_heat: 0.7149703640506693 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14342.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 240.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21697855734212426 - :network_gas: 0.1320857706315005 - :ambient_heat: 0.6509356720263751 + :electricity: 0.17368680042324836 + :network_gas: 0.30525279830700475 + :ambient_heat: 0.521060401269747 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0758_breda/GM0758_breda.derived.ad b/datasets/GM0758_breda/GM0758_breda.derived.ad index e5823400f4..a79143a2ca 100644 --- a/datasets/GM0758_breda/GM0758_breda.derived.ad +++ b/datasets/GM0758_breda/GM0758_breda.derived.ad @@ -1,6 +1,6 @@ - area = GM0758_breda -- id = 128557 -- parent_id = 128557 +- id = 128899 +- parent_id = 128899 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0758_breda/graph_values.yml b/datasets/GM0758_breda/graph_values.yml index 1a30c638ff..30cc70186f 100644 --- a/datasets/GM0758_breda/graph_values.yml +++ b/datasets/GM0758_breda/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15811807906504455 - :network_gas: 0.13035056514225496 - :ambient_heat: 0.7115313557927005 + :electricity: 0.1607858777538068 + :network_gas: 0.11567767235406252 + :ambient_heat: 0.7235364498921305 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 85127.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 6239.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21970209997212906 - :network_gas: 0.12119160011148135 - :ambient_heat: 0.6591062999163896 + :electricity: 0.1788094428110102 + :network_gas: 0.28476222875595736 + :ambient_heat: 0.5364283284330325 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0762_deurne/GM0762_deurne.derived.ad b/datasets/GM0762_deurne/GM0762_deurne.derived.ad index fc521ba23f..c0dfeece4e 100644 --- a/datasets/GM0762_deurne/GM0762_deurne.derived.ad +++ b/datasets/GM0762_deurne/GM0762_deurne.derived.ad @@ -1,6 +1,6 @@ - area = GM0762_deurne -- id = 128578 -- parent_id = 128578 +- id = 128920 +- parent_id = 128920 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0762_deurne/graph_values.yml b/datasets/GM0762_deurne/graph_values.yml index c685014f24..f16cb1f736 100644 --- a/datasets/GM0762_deurne/graph_values.yml +++ b/datasets/GM0762_deurne/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1556206969909659 - :network_gas: 0.14408616654968764 - :ambient_heat: 0.7002931364593464 + :electricity: 0.15852820598845246 + :network_gas: 0.12809486706351145 + :ambient_heat: 0.7133769269480361 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13959.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 37.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21647227112784234 - :network_gas: 0.13411091548862833 - :ambient_heat: 0.6494168133835293 + :electricity: 0.17275306633770954 + :network_gas: 0.3089877346491599 + :ambient_heat: 0.5182591990131304 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0765_pekela/GM0765_pekela.derived.ad b/datasets/GM0765_pekela/GM0765_pekela.derived.ad index bcf124ec4c..724bbc2092 100644 --- a/datasets/GM0765_pekela/GM0765_pekela.derived.ad +++ b/datasets/GM0765_pekela/GM0765_pekela.derived.ad @@ -1,6 +1,6 @@ - area = GM0765_pekela -- id = 128726 -- parent_id = 128726 +- id = 129068 +- parent_id = 129068 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0765_pekela/graph_values.yml b/datasets/GM0765_pekela/graph_values.yml index 633896bac6..03c3ca84bc 100644 --- a/datasets/GM0765_pekela/graph_values.yml +++ b/datasets/GM0765_pekela/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1459967152941206 - :network_gas: 0.19701806588233686 - :ambient_heat: 0.6569852188235427 + :electricity: 0.14975224878771565 + :network_gas: 0.17636263166756388 + :ambient_heat: 0.6738851195447204 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5751.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 41.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20395830601505904 - :network_gas: 0.1841667759397616 - :ambient_heat: 0.6118749180451794 + :electricity: 0.15135703314244456 + :network_gas: 0.3945718674302202 + :ambient_heat: 0.45407109942733526 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0766_dongen/GM0766_dongen.derived.ad b/datasets/GM0766_dongen/GM0766_dongen.derived.ad index b4126a481c..93bbff3e6e 100644 --- a/datasets/GM0766_dongen/GM0766_dongen.derived.ad +++ b/datasets/GM0766_dongen/GM0766_dongen.derived.ad @@ -1,6 +1,6 @@ - area = GM0766_dongen -- id = 128584 -- parent_id = 128584 +- id = 128926 +- parent_id = 128926 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0766_dongen/graph_values.yml b/datasets/GM0766_dongen/graph_values.yml index 50c0a29efe..65db6a3f2d 100644 --- a/datasets/GM0766_dongen/graph_values.yml +++ b/datasets/GM0766_dongen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15490223493381564 - :network_gas: 0.148037707864014 - :ambient_heat: 0.6970600572021703 + :electricity: 0.15787721488964265 + :network_gas: 0.13167531810696548 + :ambient_heat: 0.710447467003392 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11447.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 152.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21554176459225685 - :network_gas: 0.13783294163097023 - :ambient_heat: 0.6466252937767728 + :electricity: 0.17105172069054997 + :network_gas: 0.3157931172377983 + :ambient_heat: 0.5131551620716518 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0770_eersel/GM0770_eersel.derived.ad b/datasets/GM0770_eersel/GM0770_eersel.derived.ad index c95fa9606d..f393e7a057 100644 --- a/datasets/GM0770_eersel/GM0770_eersel.derived.ad +++ b/datasets/GM0770_eersel/GM0770_eersel.derived.ad @@ -1,6 +1,6 @@ - area = GM0770_eersel -- id = 128595 -- parent_id = 128595 +- id = 128937 +- parent_id = 128937 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0770_eersel/graph_values.yml b/datasets/GM0770_eersel/graph_values.yml index c38ef27f99..aa11ea342b 100644 --- a/datasets/GM0770_eersel/graph_values.yml +++ b/datasets/GM0770_eersel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15641565171863447 - :network_gas: 0.13971391554751036 - :ambient_heat: 0.7038704327338552 + :electricity: 0.15924772931283737 + :network_gas: 0.12413748877939453 + :ambient_heat: 0.7166147819077681 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8482.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 13.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2175011531813625 - :network_gas: 0.12999538727454768 - :ambient_heat: 0.6525034595440898 + :electricity: 0.1746566247338939 + :network_gas: 0.30137350106442257 + :ambient_heat: 0.5239698742016835 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0772_eindhoven/GM0772_eindhoven.derived.ad b/datasets/GM0772_eindhoven/GM0772_eindhoven.derived.ad index 0706c5b9f9..772764bf54 100644 --- a/datasets/GM0772_eindhoven/GM0772_eindhoven.derived.ad +++ b/datasets/GM0772_eindhoven/GM0772_eindhoven.derived.ad @@ -1,6 +1,6 @@ - area = GM0772_eindhoven -- id = 128597 -- parent_id = 128597 +- id = 128939 +- parent_id = 128939 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0772_eindhoven/graph_values.yml b/datasets/GM0772_eindhoven/graph_values.yml index 1314631482..47a4972b91 100644 --- a/datasets/GM0772_eindhoven/graph_values.yml +++ b/datasets/GM0772_eindhoven/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1546632873826724 - :network_gas: 0.14935191939530165 - :ambient_heat: 0.6959847932220259 + :electricity: 0.15766055903300352 + :network_gas: 0.13286692531848068 + :ambient_heat: 0.7094725156485158 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 114315.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 8656.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2152321629967191 - :network_gas: 0.13907134801312135 - :ambient_heat: 0.6456964889901595 + :electricity: 0.17048983993429212 + :network_gas: 0.3180406402628296 + :ambient_heat: 0.5114695198028782 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0777_etten_leur/GM0777_etten_leur.derived.ad b/datasets/GM0777_etten_leur/GM0777_etten_leur.derived.ad index 58d3427e3c..bb65ac11ed 100644 --- a/datasets/GM0777_etten_leur/GM0777_etten_leur.derived.ad +++ b/datasets/GM0777_etten_leur/GM0777_etten_leur.derived.ad @@ -1,6 +1,6 @@ - area = GM0777_etten_leur -- id = 128604 -- parent_id = 128604 +- id = 128946 +- parent_id = 128946 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0777_etten_leur/graph_values.yml b/datasets/GM0777_etten_leur/graph_values.yml index 1e0905f397..8b6e7b919c 100644 --- a/datasets/GM0777_etten_leur/graph_values.yml +++ b/datasets/GM0777_etten_leur/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15825838051580135 - :network_gas: 0.12957890716309267 - :ambient_heat: 0.7121627123211061 + :electricity: 0.1609124742774997 + :network_gas: 0.11498139147375167 + :ambient_heat: 0.7241061342487486 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19146.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 56.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2198833371810575 - :network_gas: 0.12046665127576764 - :ambient_heat: 0.6596500115431748 + :electricity: 0.17915641708684726 + :network_gas: 0.28337433165260906 + :ambient_heat: 0.5374692512605437 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0779_geertruidenberg/GM0779_geertruidenberg.derived.ad b/datasets/GM0779_geertruidenberg/GM0779_geertruidenberg.derived.ad index 89ac31b3b5..88fe4f46f8 100644 --- a/datasets/GM0779_geertruidenberg/GM0779_geertruidenberg.derived.ad +++ b/datasets/GM0779_geertruidenberg/GM0779_geertruidenberg.derived.ad @@ -1,6 +1,6 @@ - area = GM0779_geertruidenberg -- id = 128605 -- parent_id = 128605 +- id = 128947 +- parent_id = 128947 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0779_geertruidenberg/graph_values.yml b/datasets/GM0779_geertruidenberg/graph_values.yml index 44a133b3ca..07d91163d3 100644 --- a/datasets/GM0779_geertruidenberg/graph_values.yml +++ b/datasets/GM0779_geertruidenberg/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15708795128991673 - :network_gas: 0.1360162679054579 - :ambient_heat: 0.7068957808046253 + :electricity: 0.15985559986471506 + :network_gas: 0.12079420074406709 + :ambient_heat: 0.7193501993912178 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9636.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 275.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21837071936329427 - :network_gas: 0.1265171225468205 - :ambient_heat: 0.6551121580898852 + :electricity: 0.17628403987550917 + :network_gas: 0.2948638404979615 + :ambient_heat: 0.5288521196265294 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0784_gilze_en_rijen/GM0784_gilze_en_rijen.derived.ad b/datasets/GM0784_gilze_en_rijen/GM0784_gilze_en_rijen.derived.ad index 8767073c24..cd40bbc7ae 100644 --- a/datasets/GM0784_gilze_en_rijen/GM0784_gilze_en_rijen.derived.ad +++ b/datasets/GM0784_gilze_en_rijen/GM0784_gilze_en_rijen.derived.ad @@ -1,6 +1,6 @@ - area = GM0784_gilze_en_rijen -- id = 128609 -- parent_id = 128609 +- id = 128951 +- parent_id = 128951 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0784_gilze_en_rijen/graph_values.yml b/datasets/GM0784_gilze_en_rijen/graph_values.yml index 6503b42a1c..babcaa7ee1 100644 --- a/datasets/GM0784_gilze_en_rijen/graph_values.yml +++ b/datasets/GM0784_gilze_en_rijen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1567181308541753 - :network_gas: 0.13805028030203592 - :ambient_heat: 0.7052315888437889 + :electricity: 0.1595212928005728 + :network_gas: 0.12263288959684959 + :ambient_heat: 0.7178458176025777 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11376.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 83.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2178924502916693 - :network_gas: 0.12843019883332063 - :ambient_heat: 0.6536773508750101 + :electricity: 0.1753868191893737 + :network_gas: 0.2984527232425032 + :ambient_heat: 0.526160457568123 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0785_goirle/GM0785_goirle.derived.ad b/datasets/GM0785_goirle/GM0785_goirle.derived.ad index 4afb41c42d..58cf8d9681 100644 --- a/datasets/GM0785_goirle/GM0785_goirle.derived.ad +++ b/datasets/GM0785_goirle/GM0785_goirle.derived.ad @@ -1,6 +1,6 @@ - area = GM0785_goirle -- id = 128612 -- parent_id = 128612 +- id = 128954 +- parent_id = 128954 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0785_goirle/graph_values.yml b/datasets/GM0785_goirle/graph_values.yml index a759f338ac..5fe6e3b156 100644 --- a/datasets/GM0785_goirle/graph_values.yml +++ b/datasets/GM0785_goirle/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15752221160622232 - :network_gas: 0.13362783616577734 - :ambient_heat: 0.7088499522280004 + :electricity: 0.1602479339250744 + :network_gas: 0.11863636341209097 + :ambient_heat: 0.7211157026628346 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10411.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 222.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2189321243766865 - :network_gas: 0.12427150249325175 - :ambient_heat: 0.6567963731300619 + :electricity: 0.17734391647199246 + :network_gas: 0.29062433411202837 + :ambient_heat: 0.5320317494159792 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0794_helmond/GM0794_helmond.derived.ad b/datasets/GM0794_helmond/GM0794_helmond.derived.ad index c8f0274808..6b4c3aab86 100644 --- a/datasets/GM0794_helmond/GM0794_helmond.derived.ad +++ b/datasets/GM0794_helmond/GM0794_helmond.derived.ad @@ -1,6 +1,6 @@ - area = GM0794_helmond -- id = 128635 -- parent_id = 128635 +- id = 128977 +- parent_id = 128977 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0794_helmond/graph_values.yml b/datasets/GM0794_helmond/graph_values.yml index 7b75804327..6e4ab72178 100644 --- a/datasets/GM0794_helmond/graph_values.yml +++ b/datasets/GM0794_helmond/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15909489882025762 - :network_gas: 0.12497805648858297 - :ambient_heat: 0.7159270446911593 + :electricity: 0.16166675526820004 + :network_gas: 0.11083284602489984 + :ambient_heat: 0.7275003987069002 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 41212.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1187.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2209634575993525 - :network_gas: 0.11614616960258764 - :ambient_heat: 0.6628903727980598 + :electricity: 0.18124043032980036 + :network_gas: 0.27503827868079656 + :ambient_heat: 0.543721290989403 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0796_s_hertogenbosch/GM0796_s_hertogenbosch.derived.ad b/datasets/GM0796_s_hertogenbosch/GM0796_s_hertogenbosch.derived.ad index 2fafe889a1..1f0c64249a 100644 --- a/datasets/GM0796_s_hertogenbosch/GM0796_s_hertogenbosch.derived.ad +++ b/datasets/GM0796_s_hertogenbosch/GM0796_s_hertogenbosch.derived.ad @@ -1,6 +1,6 @@ - area = GM0796_s_hertogenbosch -- id = 128751 -- parent_id = 128751 +- id = 129093 +- parent_id = 129093 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0796_s_hertogenbosch/graph_values.yml b/datasets/GM0796_s_hertogenbosch/graph_values.yml index 1d509652d2..afd353a949 100644 --- a/datasets/GM0796_s_hertogenbosch/graph_values.yml +++ b/datasets/GM0796_s_hertogenbosch/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15620816890414269 - :network_gas: 0.14085507102721517 - :ambient_heat: 0.7029367600686421 + :electricity: 0.15906001270686593 + :network_gas: 0.1251699301122374 + :ambient_heat: 0.7157700571808967 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 73387.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2551.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21723268560733955 - :network_gas: 0.13106925757063947 - :ambient_heat: 0.6516980568220209 + :electricity: 0.17415764107658796 + :network_gas: 0.30336943569364627 + :ambient_heat: 0.5224729232297658 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0797_heusden/GM0797_heusden.derived.ad b/datasets/GM0797_heusden/GM0797_heusden.derived.ad index e382b1ef54..7e40bfefc4 100644 --- a/datasets/GM0797_heusden/GM0797_heusden.derived.ad +++ b/datasets/GM0797_heusden/GM0797_heusden.derived.ad @@ -1,6 +1,6 @@ - area = GM0797_heusden -- id = 128639 -- parent_id = 128639 +- id = 128981 +- parent_id = 128981 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0797_heusden/graph_values.yml b/datasets/GM0797_heusden/graph_values.yml index d30d2d8720..7461f20261 100644 --- a/datasets/GM0797_heusden/graph_values.yml +++ b/datasets/GM0797_heusden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15650723560583885 - :network_gas: 0.13921020416788635 - :ambient_heat: 0.7042825602262748 + :electricity: 0.1593305706414281 + :network_gas: 0.12368186147214535 + :ambient_heat: 0.7169875678864265 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19327.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 173.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21761964026725214 - :network_gas: 0.1295214389309892 - :ambient_heat: 0.6528589208017588 + :electricity: 0.17487736606394505 + :network_gas: 0.3004905357442179 + :ambient_heat: 0.5246320981918371 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0798_hilvarenbeek/GM0798_hilvarenbeek.derived.ad b/datasets/GM0798_hilvarenbeek/GM0798_hilvarenbeek.derived.ad index 2629df1d7f..e4a59a44a4 100644 --- a/datasets/GM0798_hilvarenbeek/GM0798_hilvarenbeek.derived.ad +++ b/datasets/GM0798_hilvarenbeek/GM0798_hilvarenbeek.derived.ad @@ -1,6 +1,6 @@ - area = GM0798_hilvarenbeek -- id = 128641 -- parent_id = 128641 +- id = 128983 +- parent_id = 128983 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0798_hilvarenbeek/graph_values.yml b/datasets/GM0798_hilvarenbeek/graph_values.yml index 64a86a9c21..9ab55bc67b 100644 --- a/datasets/GM0798_hilvarenbeek/graph_values.yml +++ b/datasets/GM0798_hilvarenbeek/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15287579214201358 - :network_gas: 0.15918314321892524 - :ambient_heat: 0.6879410646390611 + :electricity: 0.15603747441176982 + :network_gas: 0.1417938907352659 + :ambient_heat: 0.7021686348529642 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6840.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 75.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21291403548535276 - :network_gas: 0.14834385805858677 - :ambient_heat: 0.6387421064560606 + :electricity: 0.16634797899692405 + :network_gas: 0.3346080840123021 + :ambient_heat: 0.49904393699077393 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0809_loon_op_zand/GM0809_loon_op_zand.derived.ad b/datasets/GM0809_loon_op_zand/GM0809_loon_op_zand.derived.ad index eaec008706..8fca2e25fc 100644 --- a/datasets/GM0809_loon_op_zand/GM0809_loon_op_zand.derived.ad +++ b/datasets/GM0809_loon_op_zand/GM0809_loon_op_zand.derived.ad @@ -1,6 +1,6 @@ - area = GM0809_loon_op_zand -- id = 128675 -- parent_id = 128675 +- id = 129017 +- parent_id = 129017 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0809_loon_op_zand/graph_values.yml b/datasets/GM0809_loon_op_zand/graph_values.yml index 5b1e079c04..da48fddd23 100644 --- a/datasets/GM0809_loon_op_zand/graph_values.yml +++ b/datasets/GM0809_loon_op_zand/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1543604272023535 - :network_gas: 0.1510176503870558 - :ambient_heat: 0.6946219224105906 + :electricity: 0.15738584682682752 + :network_gas: 0.13437784245244852 + :ambient_heat: 0.7082363107207239 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10472.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 112.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21483965590413548 - :network_gas: 0.14064137638345586 - :ambient_heat: 0.6445189677124087 + :electricity: 0.16978048143565044 + :network_gas: 0.3208780742573964 + :ambient_heat: 0.509341444306953 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0820_nuenen_gerwen_en_nederwetten/GM0820_nuenen_gerwen_en_nederwetten.derived.ad b/datasets/GM0820_nuenen_gerwen_en_nederwetten/GM0820_nuenen_gerwen_en_nederwetten.derived.ad index 36375847c5..e942ed1432 100644 --- a/datasets/GM0820_nuenen_gerwen_en_nederwetten/GM0820_nuenen_gerwen_en_nederwetten.derived.ad +++ b/datasets/GM0820_nuenen_gerwen_en_nederwetten/GM0820_nuenen_gerwen_en_nederwetten.derived.ad @@ -1,6 +1,6 @@ - area = GM0820_nuenen_gerwen_en_nederwetten -- id = 128703 -- parent_id = 128703 +- id = 129045 +- parent_id = 129045 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0820_nuenen_gerwen_en_nederwetten/graph_values.yml b/datasets/GM0820_nuenen_gerwen_en_nederwetten/graph_values.yml index bcad265069..e9d76e81ad 100644 --- a/datasets/GM0820_nuenen_gerwen_en_nederwetten/graph_values.yml +++ b/datasets/GM0820_nuenen_gerwen_en_nederwetten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15471597532391673 - :network_gas: 0.14906213571845792 - :ambient_heat: 0.6962218889576253 + :electricity: 0.1577083380050072 + :network_gas: 0.13260414097246045 + :ambient_heat: 0.7096875210225324 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10435.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 83.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2153004358155889 - :network_gas: 0.1387982567376422 - :ambient_heat: 0.6459013074467689 + :electricity: 0.1706135660676789 + :network_gas: 0.3175457357292824 + :ambient_heat: 0.5118406982030386 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0823_oirschot/GM0823_oirschot.derived.ad b/datasets/GM0823_oirschot/GM0823_oirschot.derived.ad index 41f20f0c4b..0d5382d16d 100644 --- a/datasets/GM0823_oirschot/GM0823_oirschot.derived.ad +++ b/datasets/GM0823_oirschot/GM0823_oirschot.derived.ad @@ -1,6 +1,6 @@ - area = GM0823_oirschot -- id = 128706 -- parent_id = 128706 +- id = 129048 +- parent_id = 129048 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0823_oirschot/graph_values.yml b/datasets/GM0823_oirschot/graph_values.yml index 5f93907e02..df5339ebb8 100644 --- a/datasets/GM0823_oirschot/graph_values.yml +++ b/datasets/GM0823_oirschot/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15720875626588696 - :network_gas: 0.1353518405376219 - :ambient_heat: 0.7074394031964912 + :electricity: 0.15996476592986897 + :network_gas: 0.1201937873857207 + :ambient_heat: 0.7198414466844104 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8010.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 81.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21852691592860715 - :network_gas: 0.12589233628556917 - :ambient_heat: 0.6555807477858238 + :electricity: 0.17657819459931504 + :network_gas: 0.2936872216027379 + :ambient_heat: 0.529734583797947 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0824_oisterwijk/GM0824_oisterwijk.derived.ad b/datasets/GM0824_oisterwijk/GM0824_oisterwijk.derived.ad index f6fe63d8ad..b20cafca6c 100644 --- a/datasets/GM0824_oisterwijk/GM0824_oisterwijk.derived.ad +++ b/datasets/GM0824_oisterwijk/GM0824_oisterwijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0824_oisterwijk -- id = 128707 -- parent_id = 128707 +- id = 129049 +- parent_id = 129049 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0824_oisterwijk/graph_values.yml b/datasets/GM0824_oisterwijk/graph_values.yml index 75e9340c93..502994c7d9 100644 --- a/datasets/GM0824_oisterwijk/graph_values.yml +++ b/datasets/GM0824_oisterwijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1551139886851656 - :network_gas: 0.14687306223158925 - :ambient_heat: 0.6980129490832453 + :electricity: 0.158069152151595 + :network_gas: 0.13061966316622753 + :ambient_heat: 0.7113111846821775 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14096.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 259.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21581607646990958 - :network_gas: 0.13673569412035938 - :ambient_heat: 0.647448229409731 + :electricity: 0.17155130002936222 + :network_gas: 0.3137947998825493 + :ambient_heat: 0.5146539000880885 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0826_oosterhout/GM0826_oosterhout.derived.ad b/datasets/GM0826_oosterhout/GM0826_oosterhout.derived.ad index ed7dae1243..d22ef8ddca 100644 --- a/datasets/GM0826_oosterhout/GM0826_oosterhout.derived.ad +++ b/datasets/GM0826_oosterhout/GM0826_oosterhout.derived.ad @@ -1,6 +1,6 @@ - area = GM0826_oosterhout -- id = 128714 -- parent_id = 128714 +- id = 129056 +- parent_id = 129056 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0826_oosterhout/graph_values.yml b/datasets/GM0826_oosterhout/graph_values.yml index 3d2813e30d..1fbeb3c25d 100644 --- a/datasets/GM0826_oosterhout/graph_values.yml +++ b/datasets/GM0826_oosterhout/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15669443027173033 - :network_gas: 0.13818063350548326 - :ambient_heat: 0.7051249362227864 + :electricity: 0.15949986214580314 + :network_gas: 0.12275075819808264 + :ambient_heat: 0.7177493796561142 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 25176.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 400.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21786179422743082 - :network_gas: 0.12855282309027433 - :ambient_heat: 0.6535853826822947 + :electricity: 0.1753294869804834 + :network_gas: 0.2986820520780646 + :ambient_heat: 0.525988460941452 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0828_oss/GM0828_oss.derived.ad b/datasets/GM0828_oss/GM0828_oss.derived.ad index 0ec0063239..94ad59f467 100644 --- a/datasets/GM0828_oss/GM0828_oss.derived.ad +++ b/datasets/GM0828_oss/GM0828_oss.derived.ad @@ -1,6 +1,6 @@ - area = GM0828_oss -- id = 128719 -- parent_id = 128719 +- id = 129061 +- parent_id = 129061 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0828_oss/graph_values.yml b/datasets/GM0828_oss/graph_values.yml index 99f4e08b58..3eb42d8ca3 100644 --- a/datasets/GM0828_oss/graph_values.yml +++ b/datasets/GM0828_oss/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1557873142688455 - :network_gas: 0.1431697715213497 - :ambient_heat: 0.7010429142098048 + :electricity: 0.15867908091138527 + :network_gas: 0.127265054987381 + :ambient_heat: 0.7140558641012338 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 40708.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 364.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2166879783084532 - :network_gas: 0.13324808676618494 - :ambient_heat: 0.6500639349253619 + :electricity: 0.17315019376274438 + :network_gas: 0.3073992249490207 + :ambient_heat: 0.519450581288235 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0840_rucphen/GM0840_rucphen.derived.ad b/datasets/GM0840_rucphen/GM0840_rucphen.derived.ad index 93aa488c6c..b9a9ab8e35 100644 --- a/datasets/GM0840_rucphen/GM0840_rucphen.derived.ad +++ b/datasets/GM0840_rucphen/GM0840_rucphen.derived.ad @@ -1,6 +1,6 @@ - area = GM0840_rucphen -- id = 128745 -- parent_id = 128745 +- id = 129087 +- parent_id = 129087 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0840_rucphen/graph_values.yml b/datasets/GM0840_rucphen/graph_values.yml index ed2c73b122..46e2e8d8ee 100644 --- a/datasets/GM0840_rucphen/graph_values.yml +++ b/datasets/GM0840_rucphen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15620494412048694 - :network_gas: 0.140872807337322 - :ambient_heat: 0.7029222485421912 + :electricity: 0.15905709469954982 + :network_gas: 0.12518597915247598 + :ambient_heat: 0.7157569261479743 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9868.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 19.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2172285125823145 - :network_gas: 0.13108594967073978 - :ambient_heat: 0.6516855377469457 + :electricity: 0.17414989773587977 + :network_gas: 0.3034004090564792 + :ambient_heat: 0.5224496932076412 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0845_sint_michielsgestel/GM0845_sint_michielsgestel.derived.ad b/datasets/GM0845_sint_michielsgestel/GM0845_sint_michielsgestel.derived.ad index 5dc11f670f..3f3afffa56 100644 --- a/datasets/GM0845_sint_michielsgestel/GM0845_sint_michielsgestel.derived.ad +++ b/datasets/GM0845_sint_michielsgestel/GM0845_sint_michielsgestel.derived.ad @@ -1,6 +1,6 @@ - area = GM0845_sint_michielsgestel -- id = 128753 -- parent_id = 128753 +- id = 129095 +- parent_id = 129095 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0845_sint_michielsgestel/graph_values.yml b/datasets/GM0845_sint_michielsgestel/graph_values.yml index 8f1380def9..ace3af8cf5 100644 --- a/datasets/GM0845_sint_michielsgestel/graph_values.yml +++ b/datasets/GM0845_sint_michielsgestel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15604959728214685 - :network_gas: 0.14172721494819232 - :ambient_heat: 0.7022231877696608 + :electricity: 0.15891651024271794 + :network_gas: 0.1259591936650514 + :ambient_heat: 0.7151242960922307 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12248.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 88.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21702747212946993 - :network_gas: 0.13189011148211796 - :ambient_heat: 0.6510824163884121 + :electricity: 0.17377731575803276 + :network_gas: 0.304890736967867 + :ambient_heat: 0.5213319472741001 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0847_someren/GM0847_someren.derived.ad b/datasets/GM0847_someren/GM0847_someren.derived.ad index 5ba8a17961..e90d511263 100644 --- a/datasets/GM0847_someren/GM0847_someren.derived.ad +++ b/datasets/GM0847_someren/GM0847_someren.derived.ad @@ -1,6 +1,6 @@ - area = GM0847_someren -- id = 128759 -- parent_id = 128759 +- id = 129101 +- parent_id = 129101 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0847_someren/graph_values.yml b/datasets/GM0847_someren/graph_values.yml index 556ec49df6..4faad7bd09 100644 --- a/datasets/GM0847_someren/graph_values.yml +++ b/datasets/GM0847_someren/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15598637267993296 - :network_gas: 0.14207495026036876 - :ambient_heat: 0.7019386770596984 + :electricity: 0.15885928486492149 + :network_gas: 0.1262739332429318 + :ambient_heat: 0.7148667818921466 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8163.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 10.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21694564273059597 - :network_gas: 0.1322174290776138 - :ambient_heat: 0.6508369281917902 + :electricity: 0.1736259230382525 + :network_gas: 0.3054963078469882 + :ambient_heat: 0.5208777691147594 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0848_son_en_breugel/GM0848_son_en_breugel.derived.ad b/datasets/GM0848_son_en_breugel/GM0848_son_en_breugel.derived.ad index 07cf32e0bc..7762cc523f 100644 --- a/datasets/GM0848_son_en_breugel/GM0848_son_en_breugel.derived.ad +++ b/datasets/GM0848_son_en_breugel/GM0848_son_en_breugel.derived.ad @@ -1,6 +1,6 @@ - area = GM0848_son_en_breugel -- id = 128760 -- parent_id = 128760 +- id = 129102 +- parent_id = 129102 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0848_son_en_breugel/graph_values.yml b/datasets/GM0848_son_en_breugel/graph_values.yml index 77340327a2..a79082acff 100644 --- a/datasets/GM0848_son_en_breugel/graph_values.yml +++ b/datasets/GM0848_son_en_breugel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15521348155460613 - :network_gas: 0.1463258514496662 - :ambient_heat: 0.6984606669957276 + :electricity: 0.15815931418519277 + :network_gas: 0.1301237719814399 + :ambient_heat: 0.7117169138333674 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7308.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 12.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21594494453474214 - :network_gas: 0.1362202218610292 - :ambient_heat: 0.6478348336042287 + :electricity: 0.171786563934383 + :network_gas: 0.31285374426246626 + :ambient_heat: 0.5153596918031508 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0851_steenbergen/GM0851_steenbergen.derived.ad b/datasets/GM0851_steenbergen/GM0851_steenbergen.derived.ad index 84f5bcaa5f..26d3decbec 100644 --- a/datasets/GM0851_steenbergen/GM0851_steenbergen.derived.ad +++ b/datasets/GM0851_steenbergen/GM0851_steenbergen.derived.ad @@ -1,6 +1,6 @@ - area = GM0851_steenbergen -- id = 128764 -- parent_id = 128764 +- id = 129106 +- parent_id = 129106 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0851_steenbergen/graph_values.yml b/datasets/GM0851_steenbergen/graph_values.yml index c12fc07bc2..a976f27923 100644 --- a/datasets/GM0851_steenbergen/graph_values.yml +++ b/datasets/GM0851_steenbergen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15661273638030443 - :network_gas: 0.13862994990832544 - :ambient_heat: 0.70475731371137 + :electricity: 0.15942598695352742 + :network_gas: 0.12315707175559931 + :ambient_heat: 0.7174169412908733 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10458.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 261.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2177561204296766 - :network_gas: 0.12897551828129128 - :ambient_heat: 0.6532683612890322 + :electricity: 0.17513202203252945 + :network_gas: 0.2994719118698803 + :ambient_heat: 0.5253960660975902 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0852_waterland/GM0852_waterland.derived.ad b/datasets/GM0852_waterland/GM0852_waterland.derived.ad index 1b55248330..bb22c44c33 100644 --- a/datasets/GM0852_waterland/GM0852_waterland.derived.ad +++ b/datasets/GM0852_waterland/GM0852_waterland.derived.ad @@ -1,6 +1,6 @@ - area = GM0852_waterland -- id = 128807 -- parent_id = 128807 +- id = 129149 +- parent_id = 129149 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0852_waterland/graph_values.yml b/datasets/GM0852_waterland/graph_values.yml index 715db86079..b28ec174b6 100644 --- a/datasets/GM0852_waterland/graph_values.yml +++ b/datasets/GM0852_waterland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15224353031850574 - :network_gas: 0.16266058324821844 - :ambient_heat: 0.6850958864332759 + :electricity: 0.15546237377083594 + :network_gas: 0.1449569442604024 + :ambient_heat: 0.6995806819687617 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7391.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 367.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21209319768644314 - :network_gas: 0.1516272092542254 - :ambient_heat: 0.6362795930593316 + :electricity: 0.16490838441458786 + :network_gas: 0.3403664623416468 + :ambient_heat: 0.4947251532437653 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0855_tilburg/GM0855_tilburg.derived.ad b/datasets/GM0855_tilburg/GM0855_tilburg.derived.ad index 56b837b6d1..1b30f00a34 100644 --- a/datasets/GM0855_tilburg/GM0855_tilburg.derived.ad +++ b/datasets/GM0855_tilburg/GM0855_tilburg.derived.ad @@ -1,6 +1,6 @@ - area = GM0855_tilburg -- id = 128775 -- parent_id = 128775 +- id = 129117 +- parent_id = 129117 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0855_tilburg/graph_values.yml b/datasets/GM0855_tilburg/graph_values.yml index 93457b2f8d..d3d2710de3 100644 --- a/datasets/GM0855_tilburg/graph_values.yml +++ b/datasets/GM0855_tilburg/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1609147728043901 - :network_gas: 0.1149687495758544 - :ambient_heat: 0.7241164776197554 + :electricity: 0.16330462212938154 + :network_gas: 0.10182457828840152 + :ambient_heat: 0.7348707995822169 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 102395.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 10266.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.22331052585411998 - :network_gas: 0.10675789658351781 - :ambient_heat: 0.6699315775623623 + :electricity: 0.18586643147148357 + :network_gas: 0.2565342741140637 + :ambient_heat: 0.5575992944144528 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0858_valkenswaard/GM0858_valkenswaard.derived.ad b/datasets/GM0858_valkenswaard/GM0858_valkenswaard.derived.ad index 3ebabe3f55..e116f0af05 100644 --- a/datasets/GM0858_valkenswaard/GM0858_valkenswaard.derived.ad +++ b/datasets/GM0858_valkenswaard/GM0858_valkenswaard.derived.ad @@ -1,6 +1,6 @@ - area = GM0858_valkenswaard -- id = 128787 -- parent_id = 128787 +- id = 129129 +- parent_id = 129129 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0858_valkenswaard/graph_values.yml b/datasets/GM0858_valkenswaard/graph_values.yml index 3e67316854..2123c84d44 100644 --- a/datasets/GM0858_valkenswaard/graph_values.yml +++ b/datasets/GM0858_valkenswaard/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15543178392538862 - :network_gas: 0.14512518841036243 - :ambient_heat: 0.6994430276642488 + :electricity: 0.15835709845140758 + :network_gas: 0.12903595851725833 + :ambient_heat: 0.7126069430313342 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14873.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 163.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21622766053863818 - :network_gas: 0.13508935784544482 - :ambient_heat: 0.6486829816159169 + :electricity: 0.17230397320980406 + :network_gas: 0.31078410716078186 + :ambient_heat: 0.5169119196294141 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0861_veldhoven/GM0861_veldhoven.derived.ad b/datasets/GM0861_veldhoven/GM0861_veldhoven.derived.ad index 7021b8ba87..b52b3691bd 100644 --- a/datasets/GM0861_veldhoven/GM0861_veldhoven.derived.ad +++ b/datasets/GM0861_veldhoven/GM0861_veldhoven.derived.ad @@ -1,6 +1,6 @@ - area = GM0861_veldhoven -- id = 128791 -- parent_id = 128791 +- id = 129133 +- parent_id = 129133 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0861_veldhoven/graph_values.yml b/datasets/GM0861_veldhoven/graph_values.yml index d964d7a1c2..99a8ec1201 100644 --- a/datasets/GM0861_veldhoven/graph_values.yml +++ b/datasets/GM0861_veldhoven/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.156107488461369 - :network_gas: 0.14140881346247064 - :ambient_heat: 0.7024836980761605 + :electricity: 0.15896890374831474 + :network_gas: 0.12567102938426897 + :ambient_heat: 0.7153600668674163 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20078.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 49.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2171023946286328 - :network_gas: 0.13159042148546649 - :ambient_heat: 0.6513071838859008 + :electricity: 0.17391606139277016 + :network_gas: 0.30433575442891747 + :ambient_heat: 0.5217481841783124 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0865_vught/GM0865_vught.derived.ad b/datasets/GM0865_vught/GM0865_vught.derived.ad index f638a93121..26a7b72832 100644 --- a/datasets/GM0865_vught/GM0865_vught.derived.ad +++ b/datasets/GM0865_vught/GM0865_vught.derived.ad @@ -1,6 +1,6 @@ - area = GM0865_vught -- id = 128801 -- parent_id = 128801 +- id = 129143 +- parent_id = 129143 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0865_vught/graph_values.yml b/datasets/GM0865_vught/graph_values.yml index f6475be058..a2fe0ba89b 100644 --- a/datasets/GM0865_vught/graph_values.yml +++ b/datasets/GM0865_vught/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15398192138855205 - :network_gas: 0.15309943236296372 - :ambient_heat: 0.6929186462484842 + :electricity: 0.15704235250098317 + :network_gas: 0.13626706124459254 + :ambient_heat: 0.7066905862544244 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13714.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 537.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21434896319373303 - :network_gas: 0.14260414722506562 - :ambient_heat: 0.6430468895812014 + :electricity: 0.16889833532664134 + :network_gas: 0.3244066586934329 + :ambient_heat: 0.5066950059799258 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0866_waalre/GM0866_waalre.derived.ad b/datasets/GM0866_waalre/GM0866_waalre.derived.ad index 2c96809af9..5ece39b55a 100644 --- a/datasets/GM0866_waalre/GM0866_waalre.derived.ad +++ b/datasets/GM0866_waalre/GM0866_waalre.derived.ad @@ -1,6 +1,6 @@ - area = GM0866_waalre -- id = 128802 -- parent_id = 128802 +- id = 129144 +- parent_id = 129144 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0866_waalre/graph_values.yml b/datasets/GM0866_waalre/graph_values.yml index 5469bccdee..2ebffcc4e8 100644 --- a/datasets/GM0866_waalre/graph_values.yml +++ b/datasets/GM0866_waalre/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1540074069843353 - :network_gas: 0.1529592615861559 - :ambient_heat: 0.6930333314295088 + :electricity: 0.15706548652889976 + :network_gas: 0.13613982409105144 + :ambient_heat: 0.7067946893800489 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7789.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 145.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21438200776269503 - :network_gas: 0.14247196894921757 - :ambient_heat: 0.6431460232880873 + :electricity: 0.1689575796905512 + :network_gas: 0.3241696812377933 + :ambient_heat: 0.5068727390716554 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0867_waalwijk/GM0867_waalwijk.derived.ad b/datasets/GM0867_waalwijk/GM0867_waalwijk.derived.ad index d88b5fbf63..85723f0b27 100644 --- a/datasets/GM0867_waalwijk/GM0867_waalwijk.derived.ad +++ b/datasets/GM0867_waalwijk/GM0867_waalwijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0867_waalwijk -- id = 128803 -- parent_id = 128803 +- id = 129145 +- parent_id = 129145 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0867_waalwijk/graph_values.yml b/datasets/GM0867_waalwijk/graph_values.yml index e16c13cbbf..21cf551bf9 100644 --- a/datasets/GM0867_waalwijk/graph_values.yml +++ b/datasets/GM0867_waalwijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15530368786655105 - :network_gas: 0.14582971673396924 - :ambient_heat: 0.6988665953994798 + :electricity: 0.15824104952966717 + :network_gas: 0.12967422758683042 + :ambient_heat: 0.7120847228835022 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 21972.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 371.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2160617743312283 - :network_gas: 0.1357529026750845 - :ambient_heat: 0.6481853229936871 + :electricity: 0.17200016544526864 + :network_gas: 0.3119993382189236 + :ambient_heat: 0.5160004963358078 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0873_woensdrecht/GM0873_woensdrecht.derived.ad b/datasets/GM0873_woensdrecht/GM0873_woensdrecht.derived.ad index 808e38fec9..78309fec4a 100644 --- a/datasets/GM0873_woensdrecht/GM0873_woensdrecht.derived.ad +++ b/datasets/GM0873_woensdrecht/GM0873_woensdrecht.derived.ad @@ -1,6 +1,6 @@ - area = GM0873_woensdrecht -- id = 128819 -- parent_id = 128819 +- id = 129161 +- parent_id = 129161 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0873_woensdrecht/graph_values.yml b/datasets/GM0873_woensdrecht/graph_values.yml index 5a599739eb..f04552c6bd 100644 --- a/datasets/GM0873_woensdrecht/graph_values.yml +++ b/datasets/GM0873_woensdrecht/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1556487612100915 - :network_gas: 0.14393181334449676 - :ambient_heat: 0.7004194254454117 + :electricity: 0.15855362115146715 + :network_gas: 0.12795508366693079 + :ambient_heat: 0.7134912951816021 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9912.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 62.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21650860605536387 - :network_gas: 0.13396557577854215 - :ambient_heat: 0.649525818166094 + :electricity: 0.17281988841430554 + :network_gas: 0.308720446342776 + :ambient_heat: 0.5184596652429184 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0879_zundert/GM0879_zundert.derived.ad b/datasets/GM0879_zundert/GM0879_zundert.derived.ad index f1cefad99a..0ab99443b4 100644 --- a/datasets/GM0879_zundert/GM0879_zundert.derived.ad +++ b/datasets/GM0879_zundert/GM0879_zundert.derived.ad @@ -1,6 +1,6 @@ - area = GM0879_zundert -- id = 128832 -- parent_id = 128832 +- id = 129174 +- parent_id = 129174 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0879_zundert/graph_values.yml b/datasets/GM0879_zundert/graph_values.yml index 8b8edb618f..a4f8a1f16e 100644 --- a/datasets/GM0879_zundert/graph_values.yml +++ b/datasets/GM0879_zundert/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.154611434684592 - :network_gas: 0.14963710923474402 - :ambient_heat: 0.695751456080664 + :electricity: 0.15761353397578617 + :network_gas: 0.13312556313317592 + :ambient_heat: 0.7092609028910378 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9626.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 70.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2151649693562863 - :network_gas: 0.13934012257485262 - :ambient_heat: 0.6454949080688611 + :electricity: 0.17036816811173816 + :network_gas: 0.3185273275530454 + :ambient_heat: 0.5111045043352164 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0880_wormerland/GM0880_wormerland.derived.ad b/datasets/GM0880_wormerland/GM0880_wormerland.derived.ad index fe83eefcdd..b3844cda3c 100644 --- a/datasets/GM0880_wormerland/GM0880_wormerland.derived.ad +++ b/datasets/GM0880_wormerland/GM0880_wormerland.derived.ad @@ -1,6 +1,6 @@ - area = GM0880_wormerland -- id = 128821 -- parent_id = 128821 +- id = 129163 +- parent_id = 129163 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0880_wormerland/graph_values.yml b/datasets/GM0880_wormerland/graph_values.yml index f18bfe7fe7..9512a18964 100644 --- a/datasets/GM0880_wormerland/graph_values.yml +++ b/datasets/GM0880_wormerland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15445035492557524 - :network_gas: 0.15052304790933616 - :ambient_heat: 0.6950265971650886 + :electricity: 0.1574674290205407 + :network_gas: 0.13392914038702602 + :ambient_heat: 0.7086034305924332 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6911.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 130.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21495621336808124 - :network_gas: 0.14017514652767282 - :ambient_heat: 0.644868640104246 + :electricity: 0.16999078294770764 + :network_gas: 0.3200368682091676 + :ambient_heat: 0.5099723488431248 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0882_landgraaf/GM0882_landgraaf.derived.ad b/datasets/GM0882_landgraaf/GM0882_landgraaf.derived.ad index 6d2023d789..789be2fcb0 100644 --- a/datasets/GM0882_landgraaf/GM0882_landgraaf.derived.ad +++ b/datasets/GM0882_landgraaf/GM0882_landgraaf.derived.ad @@ -1,6 +1,6 @@ - area = GM0882_landgraaf -- id = 128661 -- parent_id = 128661 +- id = 129003 +- parent_id = 129003 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0882_landgraaf/graph_values.yml b/datasets/GM0882_landgraaf/graph_values.yml index fc636dedb8..979c7faf2b 100644 --- a/datasets/GM0882_landgraaf/graph_values.yml +++ b/datasets/GM0882_landgraaf/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1543973049183598 - :network_gas: 0.15081482294902132 - :ambient_heat: 0.6947878721326189 + :electricity: 0.15741930346053148 + :network_gas: 0.13419383096707674 + :ambient_heat: 0.7083868655723917 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18136.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 892.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2148874551188652 - :network_gas: 0.14045017952453695 - :ambient_heat: 0.6446623653565979 + :electricity: 0.16986668889683634 + :network_gas: 0.32053324441265285 + :ambient_heat: 0.5096000666905108 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0888_beek/GM0888_beek.derived.ad b/datasets/GM0888_beek/GM0888_beek.derived.ad index 00f86d8cd4..5f52ab26fe 100644 --- a/datasets/GM0888_beek/GM0888_beek.derived.ad +++ b/datasets/GM0888_beek/GM0888_beek.derived.ad @@ -1,6 +1,6 @@ - area = GM0888_beek -- id = 128536 -- parent_id = 128536 +- id = 128878 +- parent_id = 128878 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0888_beek/graph_values.yml b/datasets/GM0888_beek/graph_values.yml index b4d8ffeb53..d0804bec65 100644 --- a/datasets/GM0888_beek/graph_values.yml +++ b/datasets/GM0888_beek/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15480304121828212 - :network_gas: 0.14858327329944837 - :ambient_heat: 0.6966136854822695 + :electricity: 0.15778728404040732 + :network_gas: 0.13216993777775976 + :ambient_heat: 0.7100427781818329 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7484.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 281.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21541324842874743 - :network_gas: 0.13834700628500804 - :ambient_heat: 0.6462397452862446 + :electricity: 0.1708182302009983 + :network_gas: 0.31672707919600496 + :ambient_heat: 0.5124546906029968 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0889_beesel/GM0889_beesel.derived.ad b/datasets/GM0889_beesel/GM0889_beesel.derived.ad index d300a7a4ed..602bf7fbcb 100644 --- a/datasets/GM0889_beesel/GM0889_beesel.derived.ad +++ b/datasets/GM0889_beesel/GM0889_beesel.derived.ad @@ -1,6 +1,6 @@ - area = GM0889_beesel -- id = 128537 -- parent_id = 128537 +- id = 128879 +- parent_id = 128879 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0889_beesel/graph_values.yml b/datasets/GM0889_beesel/graph_values.yml index 30b64d585c..e6467f41f5 100644 --- a/datasets/GM0889_beesel/graph_values.yml +++ b/datasets/GM0889_beesel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15619798410609195 - :network_gas: 0.14091108741649416 - :ambient_heat: 0.7028909284774137 + :electricity: 0.15905079675136194 + :network_gas: 0.12522061786750932 + :ambient_heat: 0.7157285853811287 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6031.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 51.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21721950594841005 - :network_gas: 0.13112197620635763 - :ambient_heat: 0.6516585178452324 + :electricity: 0.17413318662758864 + :network_gas: 0.30346725348964354 + :ambient_heat: 0.5223995598827678 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0893_bergen/GM0893_bergen.derived.ad b/datasets/GM0893_bergen/GM0893_bergen.derived.ad index 695ede6aa3..82a07cb5b8 100644 --- a/datasets/GM0893_bergen/GM0893_bergen.derived.ad +++ b/datasets/GM0893_bergen/GM0893_bergen.derived.ad @@ -1,6 +1,6 @@ - area = GM0893_bergen -- id = 128540 -- parent_id = 128540 +- id = 128882 +- parent_id = 128882 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0893_bergen/graph_values.yml b/datasets/GM0893_bergen/graph_values.yml index 22aa04b5bb..7e98cd9a61 100644 --- a/datasets/GM0893_bergen/graph_values.yml +++ b/datasets/GM0893_bergen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1562221429177464 - :network_gas: 0.14077821395239498 - :ambient_heat: 0.7029996431298586 + :electricity: 0.15907265720595437 + :network_gas: 0.1251003853672511 + :ambient_heat: 0.7158269574267946 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5772.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 24.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21725076851417566 - :network_gas: 0.1309969259432952 - :ambient_heat: 0.6517523055425293 + :electricity: 0.1741911996984823 + :network_gas: 0.30323520120606895 + :ambient_heat: 0.5225735990954488 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0899_brunssum/GM0899_brunssum.derived.ad b/datasets/GM0899_brunssum/GM0899_brunssum.derived.ad index 664441b39d..0dca1fafa8 100644 --- a/datasets/GM0899_brunssum/GM0899_brunssum.derived.ad +++ b/datasets/GM0899_brunssum/GM0899_brunssum.derived.ad @@ -1,6 +1,6 @@ - area = GM0899_brunssum -- id = 128560 -- parent_id = 128560 +- id = 128902 +- parent_id = 128902 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0899_brunssum/graph_values.yml b/datasets/GM0899_brunssum/graph_values.yml index bdf313042d..e066aaba04 100644 --- a/datasets/GM0899_brunssum/graph_values.yml +++ b/datasets/GM0899_brunssum/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1553970235883845 - :network_gas: 0.14531637026388539 - :ambient_heat: 0.6992866061477302 + :electricity: 0.15832560933996784 + :network_gas: 0.12920914863017685 + :ambient_heat: 0.7124652420298553 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14436.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1202.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21618264728004435 - :network_gas: 0.13526941087982025 - :ambient_heat: 0.6485479418401354 + :electricity: 0.1722214749872402 + :network_gas: 0.31111410005103735 + :ambient_heat: 0.5166644249617224 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0907_gennep/GM0907_gennep.derived.ad b/datasets/GM0907_gennep/GM0907_gennep.derived.ad index d2bfdcaf74..97453aee08 100644 --- a/datasets/GM0907_gennep/GM0907_gennep.derived.ad +++ b/datasets/GM0907_gennep/GM0907_gennep.derived.ad @@ -1,6 +1,6 @@ - area = GM0907_gennep -- id = 128608 -- parent_id = 128608 +- id = 128950 +- parent_id = 128950 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0907_gennep/graph_values.yml b/datasets/GM0907_gennep/graph_values.yml index 822c100f82..a03a2bface 100644 --- a/datasets/GM0907_gennep/graph_values.yml +++ b/datasets/GM0907_gennep/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15507112237921286 - :network_gas: 0.1471088269143294 - :ambient_heat: 0.6978200507064579 + :electricity: 0.15803030207234425 + :network_gas: 0.13083333860210652 + :ambient_heat: 0.7111363593255492 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7484.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 139.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21576055040195535 - :network_gas: 0.1369577983921763 - :ambient_heat: 0.6472816512058684 + :electricity: 0.17145004273484893 + :network_gas: 0.3141998290606025 + :ambient_heat: 0.5143501282045486 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0917_heerlen/GM0917_heerlen.derived.ad b/datasets/GM0917_heerlen/GM0917_heerlen.derived.ad index 7b80a7324c..43ef237c6b 100644 --- a/datasets/GM0917_heerlen/GM0917_heerlen.derived.ad +++ b/datasets/GM0917_heerlen/GM0917_heerlen.derived.ad @@ -1,6 +1,6 @@ - area = GM0917_heerlen -- id = 128631 -- parent_id = 128631 +- id = 128973 +- parent_id = 128973 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0917_heerlen/graph_values.yml b/datasets/GM0917_heerlen/graph_values.yml index 0fd2046ba3..7bc07412f2 100644 --- a/datasets/GM0917_heerlen/graph_values.yml +++ b/datasets/GM0917_heerlen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15381852804268134 - :network_gas: 0.1539980957652526 - :ambient_heat: 0.692183376192066 + :electricity: 0.15689401553124108 + :network_gas: 0.13708291457817423 + :ambient_heat: 0.7060230698905847 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 45956.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 3851.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21413708991526714 - :network_gas: 0.14345164033892902 - :ambient_heat: 0.6424112697458038 + :electricity: 0.16851902834132773 + :network_gas: 0.32592388663468713 + :ambient_heat: 0.505557085023985 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0928_kerkrade/GM0928_kerkrade.derived.ad b/datasets/GM0928_kerkrade/GM0928_kerkrade.derived.ad index 241114b5c1..914c67c6dc 100644 --- a/datasets/GM0928_kerkrade/GM0928_kerkrade.derived.ad +++ b/datasets/GM0928_kerkrade/GM0928_kerkrade.derived.ad @@ -1,6 +1,6 @@ - area = GM0928_kerkrade -- id = 128656 -- parent_id = 128656 +- id = 128998 +- parent_id = 128998 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0928_kerkrade/graph_values.yml b/datasets/GM0928_kerkrade/graph_values.yml index 61c3b17d16..b70df0c573 100644 --- a/datasets/GM0928_kerkrade/graph_values.yml +++ b/datasets/GM0928_kerkrade/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15291275209156394 - :network_gas: 0.15897986349639837 - :ambient_heat: 0.6881073844120377 + :electricity: 0.15607107683018465 + :network_gas: 0.14160907743398457 + :ambient_heat: 0.7023198457358308 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 23908.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2171.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21296200466430193 - :network_gas: 0.14815198134279003 - :ambient_heat: 0.6388860139929081 + :electricity: 0.16643253905194763 + :network_gas: 0.33426984379220775 + :ambient_heat: 0.4992976171558447 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0935_maastricht/GM0935_maastricht.derived.ad b/datasets/GM0935_maastricht/GM0935_maastricht.derived.ad index dba5806415..aa8fdae074 100644 --- a/datasets/GM0935_maastricht/GM0935_maastricht.derived.ad +++ b/datasets/GM0935_maastricht/GM0935_maastricht.derived.ad @@ -1,6 +1,6 @@ - area = GM0935_maastricht -- id = 128681 -- parent_id = 128681 +- id = 129023 +- parent_id = 129023 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0935_maastricht/graph_values.yml b/datasets/GM0935_maastricht/graph_values.yml index e64da4b18c..4c02e4a28c 100644 --- a/datasets/GM0935_maastricht/graph_values.yml +++ b/datasets/GM0935_maastricht/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15196369144779315 - :network_gas: 0.16419969703713774 - :ambient_heat: 0.6838366115150691 + :electricity: 0.15520766841349046 + :network_gas: 0.14635782372580253 + :ambient_heat: 0.6984345078607069 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 62599.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 5445.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2117297474958715 - :network_gas: 0.15308101001651156 - :ambient_heat: 0.6351892424876168 + :electricity: 0.1642753823492168 + :network_gas: 0.34289847060313106 + :ambient_heat: 0.4928261470476521 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0938_meerssen/GM0938_meerssen.derived.ad b/datasets/GM0938_meerssen/GM0938_meerssen.derived.ad index f5dc6bfc68..dc342d8f51 100644 --- a/datasets/GM0938_meerssen/GM0938_meerssen.derived.ad +++ b/datasets/GM0938_meerssen/GM0938_meerssen.derived.ad @@ -1,6 +1,6 @@ - area = GM0938_meerssen -- id = 128683 -- parent_id = 128683 +- id = 129025 +- parent_id = 129025 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0938_meerssen/graph_values.yml b/datasets/GM0938_meerssen/graph_values.yml index 0ef2a568b4..2de528bc36 100644 --- a/datasets/GM0938_meerssen/graph_values.yml +++ b/datasets/GM0938_meerssen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15448443009671345 - :network_gas: 0.150335634468076 - :ambient_heat: 0.6951799354352105 + :electricity: 0.15749833919006112 + :network_gas: 0.1337591344546638 + :ambient_heat: 0.708742526355275 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8632.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 385.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21500037657134494 - :network_gas: 0.139998493714618 - :ambient_heat: 0.645001129714037 + :electricity: 0.17007054189887436 + :network_gas: 0.3197178324045007 + :ambient_heat: 0.5102116256966249 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0944_mook_en_middelaar/GM0944_mook_en_middelaar.derived.ad b/datasets/GM0944_mook_en_middelaar/GM0944_mook_en_middelaar.derived.ad index a5a667b202..6cbafba7fa 100644 --- a/datasets/GM0944_mook_en_middelaar/GM0944_mook_en_middelaar.derived.ad +++ b/datasets/GM0944_mook_en_middelaar/GM0944_mook_en_middelaar.derived.ad @@ -1,6 +1,6 @@ - area = GM0944_mook_en_middelaar -- id = 128691 -- parent_id = 128691 +- id = 129033 +- parent_id = 129033 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0944_mook_en_middelaar/graph_values.yml b/datasets/GM0944_mook_en_middelaar/graph_values.yml index 80dac8e5e8..3a551733f6 100644 --- a/datasets/GM0944_mook_en_middelaar/graph_values.yml +++ b/datasets/GM0944_mook_en_middelaar/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15449765315927796 - :network_gas: 0.15026290762397101 - :ambient_heat: 0.6952394392167509 + :electricity: 0.15751033365094452 + :network_gas: 0.1336931649198052 + :ambient_heat: 0.7087965014292503 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 3661.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 8.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21501751399095062 - :network_gas: 0.13992994403619513 - :ambient_heat: 0.6450525419728542 + :electricity: 0.17010150348802064 + :network_gas: 0.3195939860479156 + :ambient_heat: 0.5103045104640638 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0946_nederweert/GM0946_nederweert.derived.ad b/datasets/GM0946_nederweert/GM0946_nederweert.derived.ad index c8632c11b6..823c78f5ab 100644 --- a/datasets/GM0946_nederweert/GM0946_nederweert.derived.ad +++ b/datasets/GM0946_nederweert/GM0946_nederweert.derived.ad @@ -1,6 +1,6 @@ - area = GM0946_nederweert -- id = 128693 -- parent_id = 128693 +- id = 129035 +- parent_id = 129035 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0946_nederweert/graph_values.yml b/datasets/GM0946_nederweert/graph_values.yml index 719c2c3b03..bfdb7e4c8c 100644 --- a/datasets/GM0946_nederweert/graph_values.yml +++ b/datasets/GM0946_nederweert/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15745428313452262 - :network_gas: 0.1340014427601256 - :ambient_heat: 0.7085442741053518 + :electricity: 0.16018657971303807 + :network_gas: 0.11897381157829057 + :ambient_heat: 0.7208396087086714 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7513.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 31.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21884432180008143 - :network_gas: 0.12462271279967185 - :ambient_heat: 0.6565329654002466 + :electricity: 0.17717767422498276 + :network_gas: 0.29128930310006707 + :ambient_heat: 0.5315330226749502 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0957_roermond/GM0957_roermond.derived.ad b/datasets/GM0957_roermond/GM0957_roermond.derived.ad index fd13b63401..651c028542 100644 --- a/datasets/GM0957_roermond/GM0957_roermond.derived.ad +++ b/datasets/GM0957_roermond/GM0957_roermond.derived.ad @@ -1,6 +1,6 @@ - area = GM0957_roermond -- id = 128741 -- parent_id = 128741 +- id = 129083 +- parent_id = 129083 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0957_roermond/graph_values.yml b/datasets/GM0957_roermond/graph_values.yml index 8c73f0f408..d249082f32 100644 --- a/datasets/GM0957_roermond/graph_values.yml +++ b/datasets/GM0957_roermond/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15506946192944748 - :network_gas: 0.14711795938803882 - :ambient_heat: 0.6978125786825137 + :electricity: 0.15802879714550644 + :network_gas: 0.13084161569971456 + :ambient_heat: 0.7111295871547789 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 27685.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1646.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21575839952678127 - :network_gas: 0.1369664018928726 - :ambient_heat: 0.6472751985803462 + :electricity: 0.17144612175745153 + :network_gas: 0.314215512970192 + :ambient_heat: 0.5143383652723564 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0965_simpelveld/GM0965_simpelveld.derived.ad b/datasets/GM0965_simpelveld/GM0965_simpelveld.derived.ad index df7095e68e..5146588570 100644 --- a/datasets/GM0965_simpelveld/GM0965_simpelveld.derived.ad +++ b/datasets/GM0965_simpelveld/GM0965_simpelveld.derived.ad @@ -1,6 +1,6 @@ - area = GM0965_simpelveld -- id = 128752 -- parent_id = 128752 +- id = 129094 +- parent_id = 129094 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0965_simpelveld/graph_values.yml b/datasets/GM0965_simpelveld/graph_values.yml index dfdaefcc28..6a9500ebc1 100644 --- a/datasets/GM0965_simpelveld/graph_values.yml +++ b/datasets/GM0965_simpelveld/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15227571599006046 - :network_gas: 0.16248356205466746 - :ambient_heat: 0.6852407219552721 + :electricity: 0.15549166217650004 + :network_gas: 0.14479585802924985 + :ambient_heat: 0.6997124797942501 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5176.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 348.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21213499410385436 - :network_gas: 0.1514600235845803 - :ambient_heat: 0.6364049823115653 + :electricity: 0.16498135220903454 + :network_gas: 0.34007459116386013 + :ambient_heat: 0.49494405662710533 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0971_stein/GM0971_stein.derived.ad b/datasets/GM0971_stein/GM0971_stein.derived.ad index 2fd2a793bf..7d8ed98d24 100644 --- a/datasets/GM0971_stein/GM0971_stein.derived.ad +++ b/datasets/GM0971_stein/GM0971_stein.derived.ad @@ -1,6 +1,6 @@ - area = GM0971_stein -- id = 128766 -- parent_id = 128766 +- id = 129108 +- parent_id = 129108 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0971_stein/graph_values.yml b/datasets/GM0971_stein/graph_values.yml index fddc0802f2..5db0d2ecbb 100644 --- a/datasets/GM0971_stein/graph_values.yml +++ b/datasets/GM0971_stein/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15683950288721582 - :network_gas: 0.13738273412031302 - :ambient_heat: 0.7057777629924711 + :electricity: 0.1596310290598478 + :network_gas: 0.12202934017083701 + :ambient_heat: 0.7183396307693151 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11803.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 251.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21804943161674245 - :network_gas: 0.12780227353302778 - :ambient_heat: 0.6541482948502297 + :electricity: 0.17568073677187188 + :network_gas: 0.29727705291251055 + :ambient_heat: 0.5270422103156175 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0981_vaals/GM0981_vaals.derived.ad b/datasets/GM0981_vaals/GM0981_vaals.derived.ad index bd2d6db693..a459993cc8 100644 --- a/datasets/GM0981_vaals/GM0981_vaals.derived.ad +++ b/datasets/GM0981_vaals/GM0981_vaals.derived.ad @@ -1,6 +1,6 @@ - area = GM0981_vaals -- id = 128785 -- parent_id = 128785 +- id = 129127 +- parent_id = 129127 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0981_vaals/graph_values.yml b/datasets/GM0981_vaals/graph_values.yml index b87249919f..693096139e 100644 --- a/datasets/GM0981_vaals/graph_values.yml +++ b/datasets/GM0981_vaals/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.14851620555352824 - :network_gas: 0.18316086945559476 - :ambient_heat: 0.6683229249908771 + :electricity: 0.15206143223046245 + :network_gas: 0.16366212273245642 + :ambient_heat: 0.6842764450370811 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5816.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 184.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20724476058048774 - :network_gas: 0.17102095767804681 - :ambient_heat: 0.6217342817414654 + :electricity: 0.1566802373337816 + :network_gas: 0.3732790506648718 + :ambient_heat: 0.4700407120013465 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0983_venlo/GM0983_venlo.derived.ad b/datasets/GM0983_venlo/GM0983_venlo.derived.ad index bb7539ef5f..72f2b31aba 100644 --- a/datasets/GM0983_venlo/GM0983_venlo.derived.ad +++ b/datasets/GM0983_venlo/GM0983_venlo.derived.ad @@ -1,6 +1,6 @@ - area = GM0983_venlo -- id = 128793 -- parent_id = 128793 +- id = 129135 +- parent_id = 129135 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0983_venlo/graph_values.yml b/datasets/GM0983_venlo/graph_values.yml index b25931ddba..9b5f035e7b 100644 --- a/datasets/GM0983_venlo/graph_values.yml +++ b/datasets/GM0983_venlo/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15474805124120253 - :network_gas: 0.14888571817338606 - :ambient_heat: 0.6963662305854114 + :electricity: 0.15773742362906795 + :network_gas: 0.1324441700401263 + :ambient_heat: 0.7098184063308057 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 47741.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2292.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21534199809013835 - :network_gas: 0.13863200763944422 - :ambient_heat: 0.6460259942704174 + :electricity: 0.17068893601525276 + :network_gas: 0.3172442559389872 + :ambient_heat: 0.5120668080457601 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0984_venray/GM0984_venray.derived.ad b/datasets/GM0984_venray/GM0984_venray.derived.ad index 39e1ad593a..11a9977dd9 100644 --- a/datasets/GM0984_venray/GM0984_venray.derived.ad +++ b/datasets/GM0984_venray/GM0984_venray.derived.ad @@ -1,6 +1,6 @@ - area = GM0984_venray -- id = 128794 -- parent_id = 128794 +- id = 129136 +- parent_id = 129136 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0984_venray/graph_values.yml b/datasets/GM0984_venray/graph_values.yml index a12ed9ae63..96d86dbc6b 100644 --- a/datasets/GM0984_venray/graph_values.yml +++ b/datasets/GM0984_venray/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15608692954506723 - :network_gas: 0.1415218875021303 - :ambient_heat: 0.7023911829528026 + :electricity: 0.15895029771814143 + :network_gas: 0.125773362550222 + :ambient_heat: 0.7152763397316364 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19163.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 107.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21707578781506268 - :network_gas: 0.13169684873974707 - :ambient_heat: 0.6512273634451904 + :electricity: 0.1738667750288741 + :network_gas: 0.3045328998845017 + :ambient_heat: 0.5216003250866242 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0986_voerendaal/GM0986_voerendaal.derived.ad b/datasets/GM0986_voerendaal/GM0986_voerendaal.derived.ad index 02bd35eed8..5823d22974 100644 --- a/datasets/GM0986_voerendaal/GM0986_voerendaal.derived.ad +++ b/datasets/GM0986_voerendaal/GM0986_voerendaal.derived.ad @@ -1,6 +1,6 @@ - area = GM0986_voerendaal -- id = 128798 -- parent_id = 128798 +- id = 129140 +- parent_id = 129140 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0986_voerendaal/graph_values.yml b/datasets/GM0986_voerendaal/graph_values.yml index 0371343249..669b3638df 100644 --- a/datasets/GM0986_voerendaal/graph_values.yml +++ b/datasets/GM0986_voerendaal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15414849846295456 - :network_gas: 0.15218325845374997 - :ambient_heat: 0.6936682430832954 + :electricity: 0.15719354419986123 + :network_gas: 0.13543550690076328 + :ambient_heat: 0.7073709488993755 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5803.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 200.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21456493310635258 - :network_gas: 0.14174026757458733 - :ambient_heat: 0.64369479931906 + :electricity: 0.16928596146568253 + :network_gas: 0.3228561541372679 + :ambient_heat: 0.5078578843970495 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0988_weert/GM0988_weert.derived.ad b/datasets/GM0988_weert/GM0988_weert.derived.ad index 3058a416bb..8fe2a78bb5 100644 --- a/datasets/GM0988_weert/GM0988_weert.derived.ad +++ b/datasets/GM0988_weert/GM0988_weert.derived.ad @@ -1,6 +1,6 @@ - area = GM0988_weert -- id = 128808 -- parent_id = 128808 +- id = 129150 +- parent_id = 129150 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0988_weert/graph_values.yml b/datasets/GM0988_weert/graph_values.yml index 21a4a167e2..ae785cbad6 100644 --- a/datasets/GM0988_weert/graph_values.yml +++ b/datasets/GM0988_weert/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15533519399489878 - :network_gas: 0.1456564330280566 - :ambient_heat: 0.6990083729770445 + :electricity: 0.1582695945463456 + :network_gas: 0.12951722999509935 + :ambient_heat: 0.7122131754585551 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6030.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 12.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2161025769663592 - :network_gas: 0.13558969213456099 - :ambient_heat: 0.6483077308990799 + :electricity: 0.1720748361377713 + :network_gas: 0.31170065544891284 + :ambient_heat: 0.5162245084133158 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0994_valkenburg_aan_de_geul/GM0994_valkenburg_aan_de_geul.derived.ad b/datasets/GM0994_valkenburg_aan_de_geul/GM0994_valkenburg_aan_de_geul.derived.ad index 2ef5a1ad5b..4eca547386 100644 --- a/datasets/GM0994_valkenburg_aan_de_geul/GM0994_valkenburg_aan_de_geul.derived.ad +++ b/datasets/GM0994_valkenburg_aan_de_geul/GM0994_valkenburg_aan_de_geul.derived.ad @@ -1,6 +1,6 @@ - area = GM0994_valkenburg_aan_de_geul -- id = 128786 -- parent_id = 128786 +- id = 129128 +- parent_id = 129128 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0994_valkenburg_aan_de_geul/graph_values.yml b/datasets/GM0994_valkenburg_aan_de_geul/graph_values.yml index fe56cafefb..3351aa9818 100644 --- a/datasets/GM0994_valkenburg_aan_de_geul/graph_values.yml +++ b/datasets/GM0994_valkenburg_aan_de_geul/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1516879317752206 - :network_gas: 0.1657163752362866 - :ambient_heat: 0.6825956929884928 + :electricity: 0.15495657615194322 + :network_gas: 0.14773883116431225 + :ambient_heat: 0.6973045926837446 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8304.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 374.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2113715066222081 - :network_gas: 0.15451397351116522 - :ambient_heat: 0.6341145198666266 + :electricity: 0.1636540846137019 + :network_gas: 0.3453836615451907 + :ambient_heat: 0.4909622538411074 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0995_lelystad/GM0995_lelystad.derived.ad b/datasets/GM0995_lelystad/GM0995_lelystad.derived.ad index 42290a7790..53e6679bdc 100644 --- a/datasets/GM0995_lelystad/GM0995_lelystad.derived.ad +++ b/datasets/GM0995_lelystad/GM0995_lelystad.derived.ad @@ -1,6 +1,6 @@ - area = GM0995_lelystad -- id = 128669 -- parent_id = 128669 +- id = 129011 +- parent_id = 129011 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0995_lelystad/graph_values.yml b/datasets/GM0995_lelystad/graph_values.yml index 2031eedc1b..ff80b2fbb1 100644 --- a/datasets/GM0995_lelystad/graph_values.yml +++ b/datasets/GM0995_lelystad/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15844166882475516 - :network_gas: 0.1285708214638466 - :ambient_heat: 0.7129875097113982 + :electricity: 0.16107782052692612 + :network_gas: 0.11407198710190637 + :ambient_heat: 0.7248501923711675 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 33718.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 0.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.22012006948383755 - :network_gas: 0.11951972206464748 - :ambient_heat: 0.660360208451515 + :electricity: 0.17961080210613103 + :network_gas: 0.28155679157547403 + :ambient_heat: 0.538832406318395 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1507_horst_aan_de_maas/GM1507_horst_aan_de_maas.derived.ad b/datasets/GM1507_horst_aan_de_maas/GM1507_horst_aan_de_maas.derived.ad index da1088c997..518d6bf0e6 100644 --- a/datasets/GM1507_horst_aan_de_maas/GM1507_horst_aan_de_maas.derived.ad +++ b/datasets/GM1507_horst_aan_de_maas/GM1507_horst_aan_de_maas.derived.ad @@ -1,6 +1,6 @@ - area = GM1507_horst_aan_de_maas -- id = 128647 -- parent_id = 128647 +- id = 128989 +- parent_id = 128989 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1507_horst_aan_de_maas/graph_values.yml b/datasets/GM1507_horst_aan_de_maas/graph_values.yml index 6221f0a94a..67a9983290 100644 --- a/datasets/GM1507_horst_aan_de_maas/graph_values.yml +++ b/datasets/GM1507_horst_aan_de_maas/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15569661596941034 - :network_gas: 0.14366861216824303 - :ambient_heat: 0.7006347718623466 + :electricity: 0.15859695642675906 + :network_gas: 0.12771673965282512 + :ambient_heat: 0.7136863039204157 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 17884.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 118.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21657056183183254 - :network_gas: 0.13371775267266756 - :ambient_heat: 0.6497116854954998 + :electricity: 0.1729338962459677 + :network_gas: 0.3082644150161274 + :ambient_heat: 0.5188016887379049 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1509_oude_ijsselstreek/GM1509_oude_ijsselstreek.derived.ad b/datasets/GM1509_oude_ijsselstreek/GM1509_oude_ijsselstreek.derived.ad index c0f6633fa6..9cb90b46de 100644 --- a/datasets/GM1509_oude_ijsselstreek/GM1509_oude_ijsselstreek.derived.ad +++ b/datasets/GM1509_oude_ijsselstreek/GM1509_oude_ijsselstreek.derived.ad @@ -1,6 +1,6 @@ - area = GM1509_oude_ijsselstreek -- id = 128720 -- parent_id = 128720 +- id = 129062 +- parent_id = 129062 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1509_oude_ijsselstreek/graph_values.yml b/datasets/GM1509_oude_ijsselstreek/graph_values.yml index bdefcdc9aa..2853ca7fe8 100644 --- a/datasets/GM1509_oude_ijsselstreek/graph_values.yml +++ b/datasets/GM1509_oude_ijsselstreek/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15563358278258402 - :network_gas: 0.1440152946957879 - :ambient_heat: 0.700351122521628 + :electricity: 0.15853987558232643 + :network_gas: 0.1280306842972046 + :ambient_heat: 0.7134294401204689 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 17403.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 162.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21648895455893705 - :network_gas: 0.13404418176424968 - :ambient_heat: 0.6494668636768134 + :electricity: 0.1727837445199936 + :network_gas: 0.3088650219200239 + :ambient_heat: 0.5183512335599826 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1525_teylingen/GM1525_teylingen.derived.ad b/datasets/GM1525_teylingen/GM1525_teylingen.derived.ad index 6d161d7e68..dcf9aa9c6e 100644 --- a/datasets/GM1525_teylingen/GM1525_teylingen.derived.ad +++ b/datasets/GM1525_teylingen/GM1525_teylingen.derived.ad @@ -1,6 +1,6 @@ - area = GM1525_teylingen -- id = 128772 -- parent_id = 128772 +- id = 129114 +- parent_id = 129114 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1525_teylingen/graph_values.yml b/datasets/GM1525_teylingen/graph_values.yml index 4a66b29d2b..1ca5eb6246 100644 --- a/datasets/GM1525_teylingen/graph_values.yml +++ b/datasets/GM1525_teylingen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15643151601992264 - :network_gas: 0.13962666189042547 - :ambient_heat: 0.7039418220896518 + :electricity: 0.15926207998918723 + :network_gas: 0.12405856005947029 + :ambient_heat: 0.7166793599513425 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16273.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 577.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21752167838708272 - :network_gas: 0.12991328645166678 - :ambient_heat: 0.6525650351612505 + :electricity: 0.1746948404650197 + :network_gas: 0.3012206381399193 + :ambient_heat: 0.524084521395061 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1581_utrechtse_heuvelrug/GM1581_utrechtse_heuvelrug.derived.ad b/datasets/GM1581_utrechtse_heuvelrug/GM1581_utrechtse_heuvelrug.derived.ad index e5e8602a4e..7d2244018c 100644 --- a/datasets/GM1581_utrechtse_heuvelrug/GM1581_utrechtse_heuvelrug.derived.ad +++ b/datasets/GM1581_utrechtse_heuvelrug/GM1581_utrechtse_heuvelrug.derived.ad @@ -1,6 +1,6 @@ - area = GM1581_utrechtse_heuvelrug -- id = 128784 -- parent_id = 128784 +- id = 129126 +- parent_id = 129126 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1581_utrechtse_heuvelrug/graph_values.yml b/datasets/GM1581_utrechtse_heuvelrug/graph_values.yml index 9b2576b928..444be8636e 100644 --- a/datasets/GM1581_utrechtse_heuvelrug/graph_values.yml +++ b/datasets/GM1581_utrechtse_heuvelrug/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15234772074478517 - :network_gas: 0.16208753590368163 - :ambient_heat: 0.6855647433515332 + :electricity: 0.1555571803805354 + :network_gas: 0.14443550790705525 + :ambient_heat: 0.7000073117124094 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 21833.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 148.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.212228495371317 - :network_gas: 0.1510860185147297 - :ambient_heat: 0.6366854861139533 + :electricity: 0.16514471556585433 + :network_gas: 0.33942113773658084 + :ambient_heat: 0.4954341466975648 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1586_oost_gelre/GM1586_oost_gelre.derived.ad b/datasets/GM1586_oost_gelre/GM1586_oost_gelre.derived.ad index 4436c47773..a7950cd73e 100644 --- a/datasets/GM1586_oost_gelre/GM1586_oost_gelre.derived.ad +++ b/datasets/GM1586_oost_gelre/GM1586_oost_gelre.derived.ad @@ -1,6 +1,6 @@ - area = GM1586_oost_gelre -- id = 128713 -- parent_id = 128713 +- id = 129055 +- parent_id = 129055 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1586_oost_gelre/graph_values.yml b/datasets/GM1586_oost_gelre/graph_values.yml index 69c065cdea..cf4e5d4633 100644 --- a/datasets/GM1586_oost_gelre/graph_values.yml +++ b/datasets/GM1586_oost_gelre/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15555047131973723 - :network_gas: 0.14447240774144526 - :ambient_heat: 0.6999771209388176 + :electricity: 0.15846460464646278 + :network_gas: 0.12844467444445468 + :ambient_heat: 0.7130907209090824 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12912.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 161.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21638134551753513 - :network_gas: 0.13447461792985724 - :ambient_heat: 0.6491440365526078 + :electricity: 0.17258597688902722 + :network_gas: 0.3096560924438893 + :ambient_heat: 0.5177579306670834 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1598_koggenland/GM1598_koggenland.derived.ad b/datasets/GM1598_koggenland/GM1598_koggenland.derived.ad index d7f58403cf..7abf2792a2 100644 --- a/datasets/GM1598_koggenland/GM1598_koggenland.derived.ad +++ b/datasets/GM1598_koggenland/GM1598_koggenland.derived.ad @@ -1,6 +1,6 @@ - area = GM1598_koggenland -- id = 128657 -- parent_id = 128657 +- id = 128999 +- parent_id = 128999 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1598_koggenland/graph_values.yml b/datasets/GM1598_koggenland/graph_values.yml index 5280ab3de8..a4cfea2a61 100644 --- a/datasets/GM1598_koggenland/graph_values.yml +++ b/datasets/GM1598_koggenland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15621579378166658 - :network_gas: 0.14081313420083374 - :ambient_heat: 0.7029710720174998 + :electricity: 0.1590669121701131 + :network_gas: 0.12513198306437784 + :ambient_heat: 0.715801104765509 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9603.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 17.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21724255251767446 - :network_gas: 0.13102978992929978 - :ambient_heat: 0.6517276575530258 + :electricity: 0.17417595137660521 + :network_gas: 0.3032961944935772 + :ambient_heat: 0.5225278541298176 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1621_lansingerland/GM1621_lansingerland.derived.ad b/datasets/GM1621_lansingerland/GM1621_lansingerland.derived.ad index 8c4f05bd08..86c6018bda 100644 --- a/datasets/GM1621_lansingerland/GM1621_lansingerland.derived.ad +++ b/datasets/GM1621_lansingerland/GM1621_lansingerland.derived.ad @@ -1,6 +1,6 @@ - area = GM1621_lansingerland -- id = 128663 -- parent_id = 128663 +- id = 129005 +- parent_id = 129005 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1621_lansingerland/graph_values.yml b/datasets/GM1621_lansingerland/graph_values.yml index e13ffccec8..1f73efc30b 100644 --- a/datasets/GM1621_lansingerland/graph_values.yml +++ b/datasets/GM1621_lansingerland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15953647917745456 - :network_gas: 0.12254936452399982 - :ambient_heat: 0.7179141562985456 + :electricity: 0.16206456236131592 + :network_gas: 0.10864490701276226 + :ambient_heat: 0.7292905306259218 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 24648.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 287.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.22153330674064456 - :network_gas: 0.1138667730374195 - :ambient_heat: 0.664599920221936 + :electricity: 0.18235118386689467 + :network_gas: 0.27059526453241933 + :ambient_heat: 0.5470535516006859 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1640_leudal/GM1640_leudal.derived.ad b/datasets/GM1640_leudal/GM1640_leudal.derived.ad index e3bb5dae90..1175fbda70 100644 --- a/datasets/GM1640_leudal/GM1640_leudal.derived.ad +++ b/datasets/GM1640_leudal/GM1640_leudal.derived.ad @@ -1,6 +1,6 @@ - area = GM1640_leudal -- id = 128670 -- parent_id = 128670 +- id = 129012 +- parent_id = 129012 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1640_leudal/graph_values.yml b/datasets/GM1640_leudal/graph_values.yml index 13d3db6166..c896618ae1 100644 --- a/datasets/GM1640_leudal/graph_values.yml +++ b/datasets/GM1640_leudal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15645104837920193 - :network_gas: 0.13951923391438925 - :ambient_heat: 0.7040297177064088 + :electricity: 0.15927974830558733 + :network_gas: 0.12396138431926985 + :ambient_heat: 0.7167588673751429 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16118.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 124.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2175469489221297 - :network_gas: 0.1298122043114789 - :ambient_heat: 0.6526408467663913 + :electricity: 0.17474190455441063 + :network_gas: 0.3010323817823557 + :ambient_heat: 0.5242257136632338 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1641_maasgouw/GM1641_maasgouw.derived.ad b/datasets/GM1641_maasgouw/GM1641_maasgouw.derived.ad index 2c5396d129..48508bb38f 100644 --- a/datasets/GM1641_maasgouw/GM1641_maasgouw.derived.ad +++ b/datasets/GM1641_maasgouw/GM1641_maasgouw.derived.ad @@ -1,6 +1,6 @@ - area = GM1641_maasgouw -- id = 128679 -- parent_id = 128679 +- id = 129021 +- parent_id = 129021 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1641_maasgouw/graph_values.yml b/datasets/GM1641_maasgouw/graph_values.yml index dba75d3210..6c2a758b33 100644 --- a/datasets/GM1641_maasgouw/graph_values.yml +++ b/datasets/GM1641_maasgouw/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15620050896726687 - :network_gas: 0.14089720068003214 - :ambient_heat: 0.7029022903527009 + :electricity: 0.15905308144421382 + :network_gas: 0.12520805205682398 + :ambient_heat: 0.7157388664989622 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10946.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 268.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21722277326135345 - :network_gas: 0.13110890695458385 - :ambient_heat: 0.6516683197840627 + :electricity: 0.17413924866194816 + :network_gas: 0.3034430053522055 + :ambient_heat: 0.5224177459858463 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1652_gemert_bakel/GM1652_gemert_bakel.derived.ad b/datasets/GM1652_gemert_bakel/GM1652_gemert_bakel.derived.ad index 6d66b28161..2eb3bec628 100644 --- a/datasets/GM1652_gemert_bakel/GM1652_gemert_bakel.derived.ad +++ b/datasets/GM1652_gemert_bakel/GM1652_gemert_bakel.derived.ad @@ -1,6 +1,6 @@ - area = GM1652_gemert_bakel -- id = 128607 -- parent_id = 128607 +- id = 128949 +- parent_id = 128949 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1652_gemert_bakel/graph_values.yml b/datasets/GM1652_gemert_bakel/graph_values.yml index 977481c396..f350e07f16 100644 --- a/datasets/GM1652_gemert_bakel/graph_values.yml +++ b/datasets/GM1652_gemert_bakel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1567108673317001 - :network_gas: 0.1380902296756495 - :ambient_heat: 0.7051989029926504 + :electricity: 0.1595147250202401 + :network_gas: 0.1226690123886793 + :ambient_heat: 0.7178162625910806 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12601.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 138.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.217883055189897 - :network_gas: 0.12846777924040972 - :ambient_heat: 0.6536491655696933 + :electricity: 0.17536924643415908 + :network_gas: 0.298523014263362 + :ambient_heat: 0.526107739302479 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1655_halderberge/GM1655_halderberge.derived.ad b/datasets/GM1655_halderberge/GM1655_halderberge.derived.ad index 44ea1b70fb..f4e56d4bea 100644 --- a/datasets/GM1655_halderberge/GM1655_halderberge.derived.ad +++ b/datasets/GM1655_halderberge/GM1655_halderberge.derived.ad @@ -1,6 +1,6 @@ - area = GM1655_halderberge -- id = 128621 -- parent_id = 128621 +- id = 128963 +- parent_id = 128963 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1655_halderberge/graph_values.yml b/datasets/GM1655_halderberge/graph_values.yml index 38f12acb1d..5589293293 100644 --- a/datasets/GM1655_halderberge/graph_values.yml +++ b/datasets/GM1655_halderberge/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15520537239920987 - :network_gas: 0.14637045180434557 - :ambient_heat: 0.6984241757964444 + :electricity: 0.15815196601761702 + :network_gas: 0.1301641869031065 + :ambient_heat: 0.7116838470792766 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13469.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 281.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2159344415843547 - :network_gas: 0.13626223366257878 - :ambient_heat: 0.6478033247530665 + :electricity: 0.1717673759281494 + :network_gas: 0.31293049628740066 + :ambient_heat: 0.51530212778445 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1658_heeze_leende/GM1658_heeze_leende.derived.ad b/datasets/GM1658_heeze_leende/GM1658_heeze_leende.derived.ad index 3f15b8d6fa..c21d25dfd1 100644 --- a/datasets/GM1658_heeze_leende/GM1658_heeze_leende.derived.ad +++ b/datasets/GM1658_heeze_leende/GM1658_heeze_leende.derived.ad @@ -1,6 +1,6 @@ - area = GM1658_heeze_leende -- id = 128632 -- parent_id = 128632 +- id = 128974 +- parent_id = 128974 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1658_heeze_leende/graph_values.yml b/datasets/GM1658_heeze_leende/graph_values.yml index d30a916db8..50a3cff225 100644 --- a/datasets/GM1658_heeze_leende/graph_values.yml +++ b/datasets/GM1658_heeze_leende/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1556591873947409 - :network_gas: 0.14387446932892484 - :ambient_heat: 0.7004663432763342 + :electricity: 0.15856306292170277 + :network_gas: 0.12790315393063473 + :ambient_heat: 0.7135337831476625 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6905.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 70.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21652210467348296 - :network_gas: 0.13391158130606576 - :ambient_heat: 0.6495663140204512 + :electricity: 0.17284472062409595 + :network_gas: 0.3086211175036145 + :ambient_heat: 0.5185341618722896 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1659_laarbeek/GM1659_laarbeek.derived.ad b/datasets/GM1659_laarbeek/GM1659_laarbeek.derived.ad index 4260660f90..75920c9057 100644 --- a/datasets/GM1659_laarbeek/GM1659_laarbeek.derived.ad +++ b/datasets/GM1659_laarbeek/GM1659_laarbeek.derived.ad @@ -1,6 +1,6 @@ - area = GM1659_laarbeek -- id = 128660 -- parent_id = 128660 +- id = 129002 +- parent_id = 129002 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1659_laarbeek/graph_values.yml b/datasets/GM1659_laarbeek/graph_values.yml index 23c4f5d5c5..6d25c3041a 100644 --- a/datasets/GM1659_laarbeek/graph_values.yml +++ b/datasets/GM1659_laarbeek/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15580022183578196 - :network_gas: 0.14309877990319936 - :ambient_heat: 0.7011009982610188 + :electricity: 0.15869076744768137 + :network_gas: 0.1272007790377525 + :ambient_heat: 0.7141084535145662 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9783.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 74.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21670468745506705 - :network_gas: 0.13318125017972957 - :ambient_heat: 0.6501140623652034 + :electricity: 0.17318099924355598 + :network_gas: 0.30727600302577424 + :ambient_heat: 0.5195429977306698 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1667_reusel_de_mierden/GM1667_reusel_de_mierden.derived.ad b/datasets/GM1667_reusel_de_mierden/GM1667_reusel_de_mierden.derived.ad index 4be99f2010..0ae600947f 100644 --- a/datasets/GM1667_reusel_de_mierden/GM1667_reusel_de_mierden.derived.ad +++ b/datasets/GM1667_reusel_de_mierden/GM1667_reusel_de_mierden.derived.ad @@ -1,6 +1,6 @@ - area = GM1667_reusel_de_mierden -- id = 128734 -- parent_id = 128734 +- id = 129076 +- parent_id = 129076 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1667_reusel_de_mierden/graph_values.yml b/datasets/GM1667_reusel_de_mierden/graph_values.yml index 550ab98cde..ab47e7b71d 100644 --- a/datasets/GM1667_reusel_de_mierden/graph_values.yml +++ b/datasets/GM1667_reusel_de_mierden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15795230492126064 - :network_gas: 0.13126232293306653 - :ambient_heat: 0.7107853721456728 + :electricity: 0.16063626416382087 + :network_gas: 0.11650054709898516 + :ambient_heat: 0.7228631887371939 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5509.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 16.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2194879287735568 - :network_gas: 0.12204828490577037 - :ambient_heat: 0.6584637863206727 + :electricity: 0.1784004118868342 + :network_gas: 0.2863983524526612 + :ambient_heat: 0.5352012356605046 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1669_roerdalen/GM1669_roerdalen.derived.ad b/datasets/GM1669_roerdalen/GM1669_roerdalen.derived.ad index 50693492a7..867642ab20 100644 --- a/datasets/GM1669_roerdalen/GM1669_roerdalen.derived.ad +++ b/datasets/GM1669_roerdalen/GM1669_roerdalen.derived.ad @@ -1,6 +1,6 @@ - area = GM1669_roerdalen -- id = 128740 -- parent_id = 128740 +- id = 129082 +- parent_id = 129082 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1669_roerdalen/graph_values.yml b/datasets/GM1669_roerdalen/graph_values.yml index 879b539d0f..f8e0d83f14 100644 --- a/datasets/GM1669_roerdalen/graph_values.yml +++ b/datasets/GM1669_roerdalen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15596929384697106 - :network_gas: 0.14216888384165946 - :ambient_heat: 0.7018618223113696 + :electricity: 0.15884382571463848 + :network_gas: 0.1263589585694883 + :ambient_heat: 0.7147972157158731 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9538.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 53.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21692353740284206 - :network_gas: 0.1323058503886294 - :ambient_heat: 0.6507706122085285 + :electricity: 0.17358505160560178 + :network_gas: 0.30565979357759104 + :ambient_heat: 0.5207551548168072 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1674_roosendaal/GM1674_roosendaal.derived.ad b/datasets/GM1674_roosendaal/GM1674_roosendaal.derived.ad index 359d7313d7..09ea7927c4 100644 --- a/datasets/GM1674_roosendaal/GM1674_roosendaal.derived.ad +++ b/datasets/GM1674_roosendaal/GM1674_roosendaal.derived.ad @@ -1,6 +1,6 @@ - area = GM1674_roosendaal -- id = 128742 -- parent_id = 128742 +- id = 129084 +- parent_id = 129084 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1674_roosendaal/graph_values.yml b/datasets/GM1674_roosendaal/graph_values.yml index 9ede64cd24..e46801d4bc 100644 --- a/datasets/GM1674_roosendaal/graph_values.yml +++ b/datasets/GM1674_roosendaal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15324329668348693 - :network_gas: 0.15716186824082182 - :ambient_heat: 0.6895948350756912 + :electricity: 0.15637151505511587 + :network_gas: 0.13995666719686278 + :ambient_heat: 0.7036718177480215 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 35586.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 935.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.213390938085616 - :network_gas: 0.1464362476575338 - :ambient_heat: 0.6401728142568504 + :electricity: 0.1671907953253484 + :network_gas: 0.3312368186986046 + :ambient_heat: 0.501572385976047 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1676_schouwen_duiveland/GM1676_schouwen_duiveland.derived.ad b/datasets/GM1676_schouwen_duiveland/GM1676_schouwen_duiveland.derived.ad index cf57f68fb2..96a411b36d 100644 --- a/datasets/GM1676_schouwen_duiveland/GM1676_schouwen_duiveland.derived.ad +++ b/datasets/GM1676_schouwen_duiveland/GM1676_schouwen_duiveland.derived.ad @@ -1,6 +1,6 @@ - area = GM1676_schouwen_duiveland -- id = 128750 -- parent_id = 128750 +- id = 129092 +- parent_id = 129092 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1676_schouwen_duiveland/graph_values.yml b/datasets/GM1676_schouwen_duiveland/graph_values.yml index 543529a692..00fc2c7f17 100644 --- a/datasets/GM1676_schouwen_duiveland/graph_values.yml +++ b/datasets/GM1676_schouwen_duiveland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15412338705882908 - :network_gas: 0.15232137117644 - :ambient_heat: 0.6935552417647308 + :electricity: 0.15717075443473236 + :network_gas: 0.13556085060897208 + :ambient_heat: 0.7072683949562956 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16968.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1124.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21453237780883463 - :network_gas: 0.1418704887646591 - :ambient_heat: 0.6435971334265063 + :electricity: 0.16922746690321283 + :network_gas: 0.3230901323871469 + :ambient_heat: 0.5076824007096402 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1680_aa_en_hunze/GM1680_aa_en_hunze.derived.ad b/datasets/GM1680_aa_en_hunze/GM1680_aa_en_hunze.derived.ad index 22134ce91b..adec542651 100644 --- a/datasets/GM1680_aa_en_hunze/GM1680_aa_en_hunze.derived.ad +++ b/datasets/GM1680_aa_en_hunze/GM1680_aa_en_hunze.derived.ad @@ -1,6 +1,6 @@ - area = GM1680_aa_en_hunze -- id = 128513 -- parent_id = 128513 +- id = 128855 +- parent_id = 128855 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1680_aa_en_hunze/graph_values.yml b/datasets/GM1680_aa_en_hunze/graph_values.yml index 62aa4f0f46..fafb49846b 100644 --- a/datasets/GM1680_aa_en_hunze/graph_values.yml +++ b/datasets/GM1680_aa_en_hunze/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15263935609033782 - :network_gas: 0.16048354150314192 - :ambient_heat: 0.6868771024065202 + :electricity: 0.15582247478102984 + :network_gas: 0.14297638870433582 + :ambient_heat: 0.7012011365146343 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11030.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 13.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2126071350517391 - :network_gas: 0.14957145979304146 - :ambient_heat: 0.6378214051552195 + :electricity: 0.16580810515877337 + :network_gas: 0.33676757936490476 + :ambient_heat: 0.4974243154763218 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1681_borger_odoorn/GM1681_borger_odoorn.derived.ad b/datasets/GM1681_borger_odoorn/GM1681_borger_odoorn.derived.ad index 24368ca6af..20308e95a9 100644 --- a/datasets/GM1681_borger_odoorn/GM1681_borger_odoorn.derived.ad +++ b/datasets/GM1681_borger_odoorn/GM1681_borger_odoorn.derived.ad @@ -1,6 +1,6 @@ - area = GM1681_borger_odoorn -- id = 128553 -- parent_id = 128553 +- id = 128895 +- parent_id = 128895 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1681_borger_odoorn/graph_values.yml b/datasets/GM1681_borger_odoorn/graph_values.yml index 2f14519178..f9f9b0de09 100644 --- a/datasets/GM1681_borger_odoorn/graph_values.yml +++ b/datasets/GM1681_borger_odoorn/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1489430995286598 - :network_gas: 0.18081295259237115 - :ambient_heat: 0.6702439478789691 + :electricity: 0.15245186644365016 + :network_gas: 0.16151473455992404 + :ambient_heat: 0.6860333989964258 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11192.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 0.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2078008743473639 - :network_gas: 0.16879650261054213 - :ambient_heat: 0.6234026230420939 + :electricity: 0.1576008119793519 + :network_gas: 0.36959675208259063 + :ambient_heat: 0.4728024359380574 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1690_de_wolden/GM1690_de_wolden.derived.ad b/datasets/GM1690_de_wolden/GM1690_de_wolden.derived.ad index d2457e6172..00c502f5fc 100644 --- a/datasets/GM1690_de_wolden/GM1690_de_wolden.derived.ad +++ b/datasets/GM1690_de_wolden/GM1690_de_wolden.derived.ad @@ -1,6 +1,6 @@ - area = GM1690_de_wolden -- id = 128574 -- parent_id = 128574 +- id = 128916 +- parent_id = 128916 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1690_de_wolden/graph_values.yml b/datasets/GM1690_de_wolden/graph_values.yml index 9b10f0c388..e26ccc40cb 100644 --- a/datasets/GM1690_de_wolden/graph_values.yml +++ b/datasets/GM1690_de_wolden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15218968207442332 - :network_gas: 0.16295674859067188 - :ambient_heat: 0.6848535693349049 + :electricity: 0.15541336978409254 + :network_gas: 0.14522646618749113 + :ambient_heat: 0.6993601640284164 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10429.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 6.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2120232675016309 - :network_gas: 0.151906929993474 - :ambient_heat: 0.636069802504895 + :electricity: 0.1647863809713314 + :network_gas: 0.34085447611467273 + :ambient_heat: 0.4943591429139959 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1695_noord_beveland/GM1695_noord_beveland.derived.ad b/datasets/GM1695_noord_beveland/GM1695_noord_beveland.derived.ad index 2bc773faba..c18f621153 100644 --- a/datasets/GM1695_noord_beveland/GM1695_noord_beveland.derived.ad +++ b/datasets/GM1695_noord_beveland/GM1695_noord_beveland.derived.ad @@ -1,6 +1,6 @@ - area = GM1695_noord_beveland -- id = 128699 -- parent_id = 128699 +- id = 129041 +- parent_id = 129041 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1695_noord_beveland/graph_values.yml b/datasets/GM1695_noord_beveland/graph_values.yml index 4f80b24f15..1753853b57 100644 --- a/datasets/GM1695_noord_beveland/graph_values.yml +++ b/datasets/GM1695_noord_beveland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15571173686148093 - :network_gas: 0.14358544726185477 - :ambient_heat: 0.7007028158766643 + :electricity: 0.15861064866138908 + :network_gas: 0.12764143236236028 + :ambient_heat: 0.7137479189762508 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4552.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 456.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21659013773979555 - :network_gas: 0.13363944904081562 - :ambient_heat: 0.6497704132193889 + :electricity: 0.172969936528608 + :network_gas: 0.3081202538855662 + :ambient_heat: 0.5189098095858259 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1696_wijdemeren/GM1696_wijdemeren.derived.ad b/datasets/GM1696_wijdemeren/GM1696_wijdemeren.derived.ad index e5b8bce21d..d19efbaea3 100644 --- a/datasets/GM1696_wijdemeren/GM1696_wijdemeren.derived.ad +++ b/datasets/GM1696_wijdemeren/GM1696_wijdemeren.derived.ad @@ -1,6 +1,6 @@ - area = GM1696_wijdemeren -- id = 128816 -- parent_id = 128816 +- id = 129158 +- parent_id = 129158 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1696_wijdemeren/graph_values.yml b/datasets/GM1696_wijdemeren/graph_values.yml index 060714ab6b..1626c032cf 100644 --- a/datasets/GM1696_wijdemeren/graph_values.yml +++ b/datasets/GM1696_wijdemeren/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15198190491244587 - :network_gas: 0.1640995229815477 - :ambient_heat: 0.6839185721060065 + :electricity: 0.155224249150963 + :network_gas: 0.1462666296697035 + :ambient_heat: 0.6985091211793336 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10783.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 268.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2117534056063192 - :network_gas: 0.1529863775747209 - :ambient_heat: 0.6352602168189599 + :electricity: 0.1643165044286546 + :network_gas: 0.34273398228537993 + :ambient_heat: 0.4929495132859655 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1699_noordenveld/GM1699_noordenveld.derived.ad b/datasets/GM1699_noordenveld/GM1699_noordenveld.derived.ad index 272a44ca76..c1ef8dcf16 100644 --- a/datasets/GM1699_noordenveld/GM1699_noordenveld.derived.ad +++ b/datasets/GM1699_noordenveld/GM1699_noordenveld.derived.ad @@ -1,6 +1,6 @@ - area = GM1699_noordenveld -- id = 128700 -- parent_id = 128700 +- id = 129042 +- parent_id = 129042 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1699_noordenveld/graph_values.yml b/datasets/GM1699_noordenveld/graph_values.yml index aa4614578e..cc0395d9ef 100644 --- a/datasets/GM1699_noordenveld/graph_values.yml +++ b/datasets/GM1699_noordenveld/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1503151145452154 - :network_gas: 0.17326687000131535 - :ambient_heat: 0.6764180154534692 + :electricity: 0.15370508570143024 + :network_gas: 0.15462202864213362 + :ambient_heat: 0.6916728856564361 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14831.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 26.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20958676130302997 - :network_gas: 0.16165295478787772 - :ambient_heat: 0.6287602839090922 + :electricity: 0.16059716300225313 + :network_gas: 0.3576113479909858 + :ambient_heat: 0.48179148900676105 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1700_twenterand/GM1700_twenterand.derived.ad b/datasets/GM1700_twenterand/GM1700_twenterand.derived.ad index ed624b82b2..0f0c1d859e 100644 --- a/datasets/GM1700_twenterand/GM1700_twenterand.derived.ad +++ b/datasets/GM1700_twenterand/GM1700_twenterand.derived.ad @@ -1,6 +1,6 @@ - area = GM1700_twenterand -- id = 128777 -- parent_id = 128777 +- id = 129119 +- parent_id = 129119 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1700_twenterand/graph_values.yml b/datasets/GM1700_twenterand/graph_values.yml index cb8b94b37c..cf7075527c 100644 --- a/datasets/GM1700_twenterand/graph_values.yml +++ b/datasets/GM1700_twenterand/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15331501217682808 - :network_gas: 0.1567674330274456 - :ambient_heat: 0.6899175547957264 + :electricity: 0.15643667989131593 + :network_gas: 0.1395982605977624 + :ambient_heat: 0.7039650595109216 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13808.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 16.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21348398350879955 - :network_gas: 0.14606406596479965 - :ambient_heat: 0.6404519505264009 + :electricity: 0.16735578640463936 + :network_gas: 0.3305768543814407 + :ambient_heat: 0.5020673592139199 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1701_westerveld/GM1701_westerveld.derived.ad b/datasets/GM1701_westerveld/GM1701_westerveld.derived.ad index 659ee4f81e..fc4b53b978 100644 --- a/datasets/GM1701_westerveld/GM1701_westerveld.derived.ad +++ b/datasets/GM1701_westerveld/GM1701_westerveld.derived.ad @@ -1,6 +1,6 @@ - area = GM1701_westerveld -- id = 128810 -- parent_id = 128810 +- id = 129152 +- parent_id = 129152 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1701_westerveld/graph_values.yml b/datasets/GM1701_westerveld/graph_values.yml index 8cb48ce871..d9cd18f3d0 100644 --- a/datasets/GM1701_westerveld/graph_values.yml +++ b/datasets/GM1701_westerveld/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1528418760817832 - :network_gas: 0.15936968155019238 - :ambient_heat: 0.6877884423680245 + :electricity: 0.15600663780670657 + :network_gas: 0.14196349206311396 + :ambient_heat: 0.7020298701301795 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8415.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 27.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21287001548684586 - :network_gas: 0.1485199380526142 - :ambient_heat: 0.6386100464605399 + :electricity: 0.16627042264157213 + :network_gas: 0.3349183094337097 + :ambient_heat: 0.49881126792471814 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1705_lingewaard/GM1705_lingewaard.derived.ad b/datasets/GM1705_lingewaard/GM1705_lingewaard.derived.ad index 576f52a85b..203904ad72 100644 --- a/datasets/GM1705_lingewaard/GM1705_lingewaard.derived.ad +++ b/datasets/GM1705_lingewaard/GM1705_lingewaard.derived.ad @@ -1,6 +1,6 @@ - area = GM1705_lingewaard -- id = 128672 -- parent_id = 128672 +- id = 129014 +- parent_id = 129014 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1705_lingewaard/graph_values.yml b/datasets/GM1705_lingewaard/graph_values.yml index 34202fef83..7d3b68c697 100644 --- a/datasets/GM1705_lingewaard/graph_values.yml +++ b/datasets/GM1705_lingewaard/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15653807169557585 - :network_gas: 0.13904060567433268 - :ambient_heat: 0.7044213226300914 + :electricity: 0.15935846069765472 + :network_gas: 0.12352846616289911 + :ambient_heat: 0.7171130731394462 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20045.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 69.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2176595324319384 - :network_gas: 0.12936187027224408 - :ambient_heat: 0.6529785972958174 + :electricity: 0.17495175654309023 + :network_gas: 0.30019297382763727 + :ambient_heat: 0.5248552696292725 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1706_cranendonck/GM1706_cranendonck.derived.ad b/datasets/GM1706_cranendonck/GM1706_cranendonck.derived.ad index 2bc776a1d2..762c0a1629 100644 --- a/datasets/GM1706_cranendonck/GM1706_cranendonck.derived.ad +++ b/datasets/GM1706_cranendonck/GM1706_cranendonck.derived.ad @@ -1,6 +1,6 @@ - area = GM1706_cranendonck -- id = 128567 -- parent_id = 128567 +- id = 128909 +- parent_id = 128909 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1706_cranendonck/graph_values.yml b/datasets/GM1706_cranendonck/graph_values.yml index 9d9b6675c5..9ee95f7b58 100644 --- a/datasets/GM1706_cranendonck/graph_values.yml +++ b/datasets/GM1706_cranendonck/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15370918777463422 - :network_gas: 0.15459946723951165 - :ambient_heat: 0.691691344985854 + :electricity: 0.15679473142034991 + :network_gas: 0.1376289771880753 + :ambient_heat: 0.7055762913915746 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9032.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 112.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21399529041833343 - :network_gas: 0.14401883832666415 - :ambient_heat: 0.6419858712550025 + :electricity: 0.16826570409827504 + :network_gas: 0.32693718360689794 + :ambient_heat: 0.5047971122948269 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1708_steenwijkerland/GM1708_steenwijkerland.derived.ad b/datasets/GM1708_steenwijkerland/GM1708_steenwijkerland.derived.ad index 82f38aaa46..c4f96becb5 100644 --- a/datasets/GM1708_steenwijkerland/GM1708_steenwijkerland.derived.ad +++ b/datasets/GM1708_steenwijkerland/GM1708_steenwijkerland.derived.ad @@ -1,6 +1,6 @@ - area = GM1708_steenwijkerland -- id = 128765 -- parent_id = 128765 +- id = 129107 +- parent_id = 129107 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1708_steenwijkerland/graph_values.yml b/datasets/GM1708_steenwijkerland/graph_values.yml index 0aa527b31c..1a534cba41 100644 --- a/datasets/GM1708_steenwijkerland/graph_values.yml +++ b/datasets/GM1708_steenwijkerland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15063393292202049 - :network_gas: 0.17151336892888736 - :ambient_heat: 0.6778526981490922 + :electricity: 0.15399594681210121 + :network_gas: 0.15302229253344324 + :ambient_heat: 0.6929817606544555 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20197.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 560.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21000143923059414 - :network_gas: 0.15999424307762122 - :ambient_heat: 0.6300043176917847 + :electricity: 0.16130178380822086 + :network_gas: 0.35479286476711486 + :ambient_heat: 0.48390535142466434 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1709_moerdijk/GM1709_moerdijk.derived.ad b/datasets/GM1709_moerdijk/GM1709_moerdijk.derived.ad index 5943f3be24..f323b2b7ea 100644 --- a/datasets/GM1709_moerdijk/GM1709_moerdijk.derived.ad +++ b/datasets/GM1709_moerdijk/GM1709_moerdijk.derived.ad @@ -1,6 +1,6 @@ - area = GM1709_moerdijk -- id = 128688 -- parent_id = 128688 +- id = 129030 +- parent_id = 129030 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1709_moerdijk/graph_values.yml b/datasets/GM1709_moerdijk/graph_values.yml index 075bc61124..ceddb8e0ca 100644 --- a/datasets/GM1709_moerdijk/graph_values.yml +++ b/datasets/GM1709_moerdijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15513053805535953 - :network_gas: 0.14678204069552264 - :ambient_heat: 0.6980874212491178 + :electricity: 0.1580841503436695 + :network_gas: 0.13053717310981783 + :ambient_heat: 0.7113786765465127 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16616.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 332.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21583751282041944 - :network_gas: 0.1366499487183199 - :ambient_heat: 0.6475125384612607 + :electricity: 0.171590409395297 + :network_gas: 0.3136383624188101 + :ambient_heat: 0.5147712281858928 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1711_echt_susteren/GM1711_echt_susteren.derived.ad b/datasets/GM1711_echt_susteren/GM1711_echt_susteren.derived.ad index 0f4d02ce8f..5f6eaad74a 100644 --- a/datasets/GM1711_echt_susteren/GM1711_echt_susteren.derived.ad +++ b/datasets/GM1711_echt_susteren/GM1711_echt_susteren.derived.ad @@ -1,6 +1,6 @@ - area = GM1711_echt_susteren -- id = 128591 -- parent_id = 128591 +- id = 128933 +- parent_id = 128933 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1711_echt_susteren/graph_values.yml b/datasets/GM1711_echt_susteren/graph_values.yml index 00bb3711fc..4056723eb7 100644 --- a/datasets/GM1711_echt_susteren/graph_values.yml +++ b/datasets/GM1711_echt_susteren/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15566299972794123 - :network_gas: 0.14385350149632326 - :ambient_heat: 0.7004834987757356 + :electricity: 0.15856651526883134 + :network_gas: 0.1278841660214275 + :ambient_heat: 0.7135493187097411 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14672.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 387.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2165270404103588 - :network_gas: 0.13389183835856242 - :ambient_heat: 0.6495811212310787 + :electricity: 0.17285380146978516 + :network_gas: 0.3085847941208575 + :ambient_heat: 0.5185614044093573 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1714_sluis/GM1714_sluis.derived.ad b/datasets/GM1714_sluis/GM1714_sluis.derived.ad index a29352c201..935d660b11 100644 --- a/datasets/GM1714_sluis/GM1714_sluis.derived.ad +++ b/datasets/GM1714_sluis/GM1714_sluis.derived.ad @@ -1,6 +1,6 @@ - area = GM1714_sluis -- id = 128756 -- parent_id = 128756 +- id = 129098 +- parent_id = 129098 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1714_sluis/graph_values.yml b/datasets/GM1714_sluis/graph_values.yml index ecf87e175c..463884dd19 100644 --- a/datasets/GM1714_sluis/graph_values.yml +++ b/datasets/GM1714_sluis/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15038044119842683 - :network_gas: 0.17290757340865234 - :ambient_heat: 0.6767119853929208 + :electricity: 0.1537646946582374 + :network_gas: 0.15429417937969428 + :ambient_heat: 0.6919411259620682 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14123.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 747.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2096717394134342 - :network_gas: 0.161313042346261 - :ambient_heat: 0.6290152182403048 + :electricity: 0.1607412823356689 + :network_gas: 0.3570348706573227 + :ambient_heat: 0.4822238470070084 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1719_drimmelen/GM1719_drimmelen.derived.ad b/datasets/GM1719_drimmelen/GM1719_drimmelen.derived.ad index 2d21d18412..7c42bd8c37 100644 --- a/datasets/GM1719_drimmelen/GM1719_drimmelen.derived.ad +++ b/datasets/GM1719_drimmelen/GM1719_drimmelen.derived.ad @@ -1,6 +1,6 @@ - area = GM1719_drimmelen -- id = 128587 -- parent_id = 128587 +- id = 128929 +- parent_id = 128929 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1719_drimmelen/graph_values.yml b/datasets/GM1719_drimmelen/graph_values.yml index c101f82266..19df8ffdf5 100644 --- a/datasets/GM1719_drimmelen/graph_values.yml +++ b/datasets/GM1719_drimmelen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15572845101401545 - :network_gas: 0.14349351942291505 - :ambient_heat: 0.7007780295630694 + :electricity: 0.15862578327789212 + :network_gas: 0.12755819197159335 + :ambient_heat: 0.7138160247505146 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11831.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 131.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21661177601857545 - :network_gas: 0.133552895925696 - :ambient_heat: 0.6498353280557286 + :electricity: 0.17300978364351408 + :network_gas: 0.3079608654259418 + :ambient_heat: 0.5190293509305441 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1721_bernheze/GM1721_bernheze.derived.ad b/datasets/GM1721_bernheze/GM1721_bernheze.derived.ad index 8c659d78e2..8e2b4ae76b 100644 --- a/datasets/GM1721_bernheze/GM1721_bernheze.derived.ad +++ b/datasets/GM1721_bernheze/GM1721_bernheze.derived.ad @@ -1,6 +1,6 @@ - area = GM1721_bernheze -- id = 128544 -- parent_id = 128544 +- id = 128886 +- parent_id = 128886 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1721_bernheze/graph_values.yml b/datasets/GM1721_bernheze/graph_values.yml index 0c6ead0bba..ad4cc711f7 100644 --- a/datasets/GM1721_bernheze/graph_values.yml +++ b/datasets/GM1721_bernheze/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1569329374232548 - :network_gas: 0.13686884417209855 - :ambient_heat: 0.7061982184046466 + :electricity: 0.15971549322314837 + :network_gas: 0.12156478727268398 + :ambient_heat: 0.7187197195041678 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12775.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 21.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21817026733221279 - :network_gas: 0.12731893067114655 - :ambient_heat: 0.6545108019966407 + :electricity: 0.17590736112362876 + :network_gas: 0.296370555505483 + :ambient_heat: 0.5277220833708882 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1723_alphen_chaam/GM1723_alphen_chaam.derived.ad b/datasets/GM1723_alphen_chaam/GM1723_alphen_chaam.derived.ad index 04c153562f..cac5bd13cc 100644 --- a/datasets/GM1723_alphen_chaam/GM1723_alphen_chaam.derived.ad +++ b/datasets/GM1723_alphen_chaam/GM1723_alphen_chaam.derived.ad @@ -1,6 +1,6 @@ - area = GM1723_alphen_chaam -- id = 128523 -- parent_id = 128523 +- id = 128865 +- parent_id = 128865 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1723_alphen_chaam/graph_values.yml b/datasets/GM1723_alphen_chaam/graph_values.yml index 900bd0f5cd..51b4266072 100644 --- a/datasets/GM1723_alphen_chaam/graph_values.yml +++ b/datasets/GM1723_alphen_chaam/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1556568151939548 - :network_gas: 0.1438875164332486 - :ambient_heat: 0.7004556683727967 + :electricity: 0.1585609147105515 + :network_gas: 0.12791496909196656 + :ambient_heat: 0.7135241161974818 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4407.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 16.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21651903343324888 - :network_gas: 0.13392386626700215 - :ambient_heat: 0.6495571002997489 + :electricity: 0.17283907038102156 + :network_gas: 0.308643718475912 + :ambient_heat: 0.5185172111430665 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1724_bergeijk/GM1724_bergeijk.derived.ad b/datasets/GM1724_bergeijk/GM1724_bergeijk.derived.ad index dba699acbe..ae2e8a183d 100644 --- a/datasets/GM1724_bergeijk/GM1724_bergeijk.derived.ad +++ b/datasets/GM1724_bergeijk/GM1724_bergeijk.derived.ad @@ -1,6 +1,6 @@ - area = GM1724_bergeijk -- id = 128539 -- parent_id = 128539 +- id = 128881 +- parent_id = 128881 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1724_bergeijk/graph_values.yml b/datasets/GM1724_bergeijk/graph_values.yml index d93dc173c3..670113a338 100644 --- a/datasets/GM1724_bergeijk/graph_values.yml +++ b/datasets/GM1724_bergeijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15643965563054954 - :network_gas: 0.1395818940319774 - :ambient_heat: 0.703978450337473 + :electricity: 0.15926944286745873 + :network_gas: 0.12401806422897722 + :ambient_heat: 0.7167124929035642 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7994.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 15.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21753220928889577 - :network_gas: 0.12987116284441452 - :ambient_heat: 0.6525966278666897 + :electricity: 0.17471445156605198 + :network_gas: 0.3011421937357902 + :ambient_heat: 0.5241433546981578 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1728_bladel/GM1728_bladel.derived.ad b/datasets/GM1728_bladel/GM1728_bladel.derived.ad index 4d22fd5240..d0dadaf570 100644 --- a/datasets/GM1728_bladel/GM1728_bladel.derived.ad +++ b/datasets/GM1728_bladel/GM1728_bladel.derived.ad @@ -1,6 +1,6 @@ - area = GM1728_bladel -- id = 128548 -- parent_id = 128548 +- id = 128890 +- parent_id = 128890 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1728_bladel/graph_values.yml b/datasets/GM1728_bladel/graph_values.yml index b0f47d90da..a87f85fa8e 100644 --- a/datasets/GM1728_bladel/graph_values.yml +++ b/datasets/GM1728_bladel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15661426754758848 - :network_gas: 0.13862152848826334 - :ambient_heat: 0.7047642039641482 + :electricity: 0.1594273716560766 + :network_gas: 0.12314945589157875 + :ambient_heat: 0.7174231724523447 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8820.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 24.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2177581011166876 - :network_gas: 0.1289675955332472 - :ambient_heat: 0.6532743033500652 + :electricity: 0.17513572086856924 + :network_gas: 0.2994571165257211 + :ambient_heat: 0.5254071626057096 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1729_gulpen_wittem/GM1729_gulpen_wittem.derived.ad b/datasets/GM1729_gulpen_wittem/GM1729_gulpen_wittem.derived.ad index 58fb3d73fb..391ed8e9b3 100644 --- a/datasets/GM1729_gulpen_wittem/GM1729_gulpen_wittem.derived.ad +++ b/datasets/GM1729_gulpen_wittem/GM1729_gulpen_wittem.derived.ad @@ -1,6 +1,6 @@ - area = GM1729_gulpen_wittem -- id = 128617 -- parent_id = 128617 +- id = 128959 +- parent_id = 128959 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1729_gulpen_wittem/graph_values.yml b/datasets/GM1729_gulpen_wittem/graph_values.yml index 2c90f85c06..2c74538751 100644 --- a/datasets/GM1729_gulpen_wittem/graph_values.yml +++ b/datasets/GM1729_gulpen_wittem/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1531117309520375 - :network_gas: 0.15788547976379375 - :ambient_heat: 0.6890027892841688 + :electricity: 0.15625194947590476 + :network_gas: 0.14061427788252384 + :ambient_heat: 0.7031337726415714 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6866.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 313.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21322022605560695 - :network_gas: 0.14711909577756993 - :ambient_heat: 0.6396606781668231 + :electricity: 0.16688855507874 + :network_gas: 0.3324457796850382 + :ambient_heat: 0.5006656652362218 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1730_tynaarlo/GM1730_tynaarlo.derived.ad b/datasets/GM1730_tynaarlo/GM1730_tynaarlo.derived.ad index ecac0a9ae0..9f4ac3260a 100644 --- a/datasets/GM1730_tynaarlo/GM1730_tynaarlo.derived.ad +++ b/datasets/GM1730_tynaarlo/GM1730_tynaarlo.derived.ad @@ -1,6 +1,6 @@ - area = GM1730_tynaarlo -- id = 128778 -- parent_id = 128778 +- id = 129120 +- parent_id = 129120 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1730_tynaarlo/graph_values.yml b/datasets/GM1730_tynaarlo/graph_values.yml index acc834098f..6b790eb862 100644 --- a/datasets/GM1730_tynaarlo/graph_values.yml +++ b/datasets/GM1730_tynaarlo/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15092551627920625 - :network_gas: 0.16990966046436573 - :ambient_heat: 0.6791648232564281 + :electricity: 0.15426184495832926 + :network_gas: 0.151559852729189 + :ambient_heat: 0.6941783023124817 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14575.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 22.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2103805901464551 - :network_gas: 0.15847763941417747 - :ambient_heat: 0.6311417704393675 + :electricity: 0.1619490087655907 + :network_gas: 0.3522039649376355 + :ambient_heat: 0.48584702629677384 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1731_midden_drenthe/GM1731_midden_drenthe.derived.ad b/datasets/GM1731_midden_drenthe/GM1731_midden_drenthe.derived.ad index b59392f199..c91b8e9d53 100644 --- a/datasets/GM1731_midden_drenthe/GM1731_midden_drenthe.derived.ad +++ b/datasets/GM1731_midden_drenthe/GM1731_midden_drenthe.derived.ad @@ -1,6 +1,6 @@ - area = GM1731_midden_drenthe -- id = 128687 -- parent_id = 128687 +- id = 129029 +- parent_id = 129029 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1731_midden_drenthe/graph_values.yml b/datasets/GM1731_midden_drenthe/graph_values.yml index 343adc7518..37cf06e4b3 100644 --- a/datasets/GM1731_midden_drenthe/graph_values.yml +++ b/datasets/GM1731_midden_drenthe/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15256034750968944 - :network_gas: 0.16091808869670804 - :ambient_heat: 0.6865215637936025 + :electricity: 0.1557506132972913 + :network_gas: 0.14337162686489777 + :ambient_heat: 0.7008777598378109 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14395.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 20.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21250456535109524 - :network_gas: 0.14998173859561664 - :ambient_heat: 0.637513696053288 + :electricity: 0.16562810768648273 + :network_gas: 0.3374875692540673 + :ambient_heat: 0.49688432305945 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1734_overbetuwe/GM1734_overbetuwe.derived.ad b/datasets/GM1734_overbetuwe/GM1734_overbetuwe.derived.ad index 799fc247b0..38158f2c74 100644 --- a/datasets/GM1734_overbetuwe/GM1734_overbetuwe.derived.ad +++ b/datasets/GM1734_overbetuwe/GM1734_overbetuwe.derived.ad @@ -1,6 +1,6 @@ - area = GM1734_overbetuwe -- id = 128723 -- parent_id = 128723 +- id = 129065 +- parent_id = 129065 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1734_overbetuwe/graph_values.yml b/datasets/GM1734_overbetuwe/graph_values.yml index 5417034654..9035c311a3 100644 --- a/datasets/GM1734_overbetuwe/graph_values.yml +++ b/datasets/GM1734_overbetuwe/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15361454067596375 - :network_gas: 0.1551200262821994 - :ambient_heat: 0.6912654330418369 + :electricity: 0.15670877660958712 + :network_gas: 0.13810172864727083 + :ambient_heat: 0.7051894947431421 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20053.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 37.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2138725348203516 - :network_gas: 0.1445098607185914 - :ambient_heat: 0.6416176044610571 + :electricity: 0.16804674579960602 + :network_gas: 0.3278130168015742 + :ambient_heat: 0.5041402373988197 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1735_hof_van_twente/GM1735_hof_van_twente.derived.ad b/datasets/GM1735_hof_van_twente/GM1735_hof_van_twente.derived.ad index 3287def56e..b45e34c731 100644 --- a/datasets/GM1735_hof_van_twente/GM1735_hof_van_twente.derived.ad +++ b/datasets/GM1735_hof_van_twente/GM1735_hof_van_twente.derived.ad @@ -1,6 +1,6 @@ - area = GM1735_hof_van_twente -- id = 128643 -- parent_id = 128643 +- id = 128985 +- parent_id = 128985 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1735_hof_van_twente/graph_values.yml b/datasets/GM1735_hof_van_twente/graph_values.yml index ebfb71ccb8..ccb575db26 100644 --- a/datasets/GM1735_hof_van_twente/graph_values.yml +++ b/datasets/GM1735_hof_van_twente/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15222833758962412 - :network_gas: 0.16274414325706743 - :ambient_heat: 0.6850275191533085 + :electricity: 0.15544854818147621 + :network_gas: 0.14503298500188094 + :ambient_heat: 0.699518466816643 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15251.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 266.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2120734679430009 - :network_gas: 0.15170612822799423 - :ambient_heat: 0.6362204038290049 + :electricity: 0.1648739528491106 + :network_gas: 0.3405041886035559 + :ambient_heat: 0.49462185854733354 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1740_neder_betuwe/GM1740_neder_betuwe.derived.ad b/datasets/GM1740_neder_betuwe/GM1740_neder_betuwe.derived.ad index 7635b1a758..f9b51a3c66 100644 --- a/datasets/GM1740_neder_betuwe/GM1740_neder_betuwe.derived.ad +++ b/datasets/GM1740_neder_betuwe/GM1740_neder_betuwe.derived.ad @@ -1,6 +1,6 @@ - area = GM1740_neder_betuwe -- id = 128692 -- parent_id = 128692 +- id = 129034 +- parent_id = 129034 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1740_neder_betuwe/graph_values.yml b/datasets/GM1740_neder_betuwe/graph_values.yml index 4a1565d504..2ce6b406b8 100644 --- a/datasets/GM1740_neder_betuwe/graph_values.yml +++ b/datasets/GM1740_neder_betuwe/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1552896437968816 - :network_gas: 0.14590695911715124 - :ambient_heat: 0.6988033970859672 + :electricity: 0.15822832498209677 + :network_gas: 0.1297442125984678 + :ambient_heat: 0.7120274624194355 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8886.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 20.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21604358591220632 - :network_gas: 0.13582565635117233 - :ambient_heat: 0.6481307577366212 + :electricity: 0.1719668916022517 + :network_gas: 0.3121324335909914 + :ambient_heat: 0.5159006748067568 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1742_rijssen_holten/GM1742_rijssen_holten.derived.ad b/datasets/GM1742_rijssen_holten/GM1742_rijssen_holten.derived.ad index e5d304bd0e..6d10530beb 100644 --- a/datasets/GM1742_rijssen_holten/GM1742_rijssen_holten.derived.ad +++ b/datasets/GM1742_rijssen_holten/GM1742_rijssen_holten.derived.ad @@ -1,6 +1,6 @@ - area = GM1742_rijssen_holten -- id = 128738 -- parent_id = 128738 +- id = 129080 +- parent_id = 129080 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1742_rijssen_holten/graph_values.yml b/datasets/GM1742_rijssen_holten/graph_values.yml index 06ab618fde..bd09a8dc67 100644 --- a/datasets/GM1742_rijssen_holten/graph_values.yml +++ b/datasets/GM1742_rijssen_holten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1531112887443076 - :network_gas: 0.15788791190630816 - :ambient_heat: 0.6890007993493842 + :electricity: 0.15625154756418067 + :network_gas: 0.14061648839700627 + :ambient_heat: 0.7031319640388131 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14849.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 37.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21321965223887934 - :network_gas: 0.14712139104448038 - :ambient_heat: 0.6396589567166403 + :electricity: 0.16688754018245147 + :network_gas: 0.3324498392701924 + :ambient_heat: 0.5006626205473562 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1771_geldrop_mierlo/GM1771_geldrop_mierlo.derived.ad b/datasets/GM1771_geldrop_mierlo/GM1771_geldrop_mierlo.derived.ad index f9bf6e64e9..d76780976a 100644 --- a/datasets/GM1771_geldrop_mierlo/GM1771_geldrop_mierlo.derived.ad +++ b/datasets/GM1771_geldrop_mierlo/GM1771_geldrop_mierlo.derived.ad @@ -1,6 +1,6 @@ - area = GM1771_geldrop_mierlo -- id = 128606 -- parent_id = 128606 +- id = 128948 +- parent_id = 128948 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1771_geldrop_mierlo/graph_values.yml b/datasets/GM1771_geldrop_mierlo/graph_values.yml index fa7d8795a9..4687f2873d 100644 --- a/datasets/GM1771_geldrop_mierlo/graph_values.yml +++ b/datasets/GM1771_geldrop_mierlo/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15474296459235082 - :network_gas: 0.1489136947420705 - :ambient_heat: 0.6963433406655787 + :electricity: 0.1577328112744026 + :network_gas: 0.1324695379907858 + :ambient_heat: 0.7097976507348117 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18051.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 167.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2153354071591649 - :network_gas: 0.13865837136333817 - :ambient_heat: 0.646006221477497 + :electricity: 0.17067698137461573 + :network_gas: 0.31729207450153524 + :ambient_heat: 0.512030944123849 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1773_olst_wijhe/GM1773_olst_wijhe.derived.ad b/datasets/GM1773_olst_wijhe/GM1773_olst_wijhe.derived.ad index d677e42094..a6f78ffbe2 100644 --- a/datasets/GM1773_olst_wijhe/GM1773_olst_wijhe.derived.ad +++ b/datasets/GM1773_olst_wijhe/GM1773_olst_wijhe.derived.ad @@ -1,6 +1,6 @@ - area = GM1773_olst_wijhe -- id = 128711 -- parent_id = 128711 +- id = 129053 +- parent_id = 129053 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1773_olst_wijhe/graph_values.yml b/datasets/GM1773_olst_wijhe/graph_values.yml index e572840773..896829949b 100644 --- a/datasets/GM1773_olst_wijhe/graph_values.yml +++ b/datasets/GM1773_olst_wijhe/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15411188391021308 - :network_gas: 0.1523846384938281 - :ambient_heat: 0.6935034775959588 + :electricity: 0.1571603145203909 + :network_gas: 0.1356182701378501 + :ambient_heat: 0.707221415341759 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7821.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 88.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21451746448388617 - :network_gas: 0.14193014206445304 - :ambient_heat: 0.6435523934516608 + :electricity: 0.1692006785784417 + :network_gas: 0.3231972856862314 + :ambient_heat: 0.5076020357353269 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1774_dinkelland/GM1774_dinkelland.derived.ad b/datasets/GM1774_dinkelland/GM1774_dinkelland.derived.ad index 815f03490d..1aa4a72b74 100644 --- a/datasets/GM1774_dinkelland/GM1774_dinkelland.derived.ad +++ b/datasets/GM1774_dinkelland/GM1774_dinkelland.derived.ad @@ -1,6 +1,6 @@ - area = GM1774_dinkelland -- id = 128581 -- parent_id = 128581 +- id = 128923 +- parent_id = 128923 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1774_dinkelland/graph_values.yml b/datasets/GM1774_dinkelland/graph_values.yml index f008468488..1a50d4e302 100644 --- a/datasets/GM1774_dinkelland/graph_values.yml +++ b/datasets/GM1774_dinkelland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1538583572153983 - :network_gas: 0.15377903531530931 - :ambient_heat: 0.6923626074692923 + :electricity: 0.15693017771429496 + :network_gas: 0.13688402257137774 + :ambient_heat: 0.7061857997143274 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11038.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 55.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.214188739519476 - :network_gas: 0.14324504192209359 - :ambient_heat: 0.6425662185584303 + :electricity: 0.1686114062200274 + :network_gas: 0.32555437511988855 + :ambient_heat: 0.505834218660084 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1783_westland/GM1783_westland.derived.ad b/datasets/GM1783_westland/GM1783_westland.derived.ad index bb620f7c65..a40062bf39 100644 --- a/datasets/GM1783_westland/GM1783_westland.derived.ad +++ b/datasets/GM1783_westland/GM1783_westland.derived.ad @@ -1,6 +1,6 @@ - area = GM1783_westland -- id = 128812 -- parent_id = 128812 +- id = 129154 +- parent_id = 129154 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1783_westland/graph_values.yml b/datasets/GM1783_westland/graph_values.yml index f5a264729e..449104777a 100644 --- a/datasets/GM1783_westland/graph_values.yml +++ b/datasets/GM1783_westland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15722703800209592 - :network_gas: 0.13525129098847252 - :ambient_heat: 0.7075216710094316 + :electricity: 0.15998128468212433 + :network_gas: 0.12010293424831624 + :ambient_heat: 0.7199157810695594 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 45912.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1775.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21855055210599425 - :network_gas: 0.12579779157602058 - :ambient_heat: 0.6556516563179852 + :electricity: 0.1766227558885366 + :network_gas: 0.2935089764458518 + :ambient_heat: 0.5298682676656116 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1842_midden_delfland/GM1842_midden_delfland.derived.ad b/datasets/GM1842_midden_delfland/GM1842_midden_delfland.derived.ad index 312c6da74a..75eea6ef94 100644 --- a/datasets/GM1842_midden_delfland/GM1842_midden_delfland.derived.ad +++ b/datasets/GM1842_midden_delfland/GM1842_midden_delfland.derived.ad @@ -1,6 +1,6 @@ - area = GM1842_midden_delfland -- id = 128686 -- parent_id = 128686 +- id = 129028 +- parent_id = 129028 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1842_midden_delfland/graph_values.yml b/datasets/GM1842_midden_delfland/graph_values.yml index 4b0f292841..5b3de84ceb 100644 --- a/datasets/GM1842_midden_delfland/graph_values.yml +++ b/datasets/GM1842_midden_delfland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15744467093425527 - :network_gas: 0.13405430986159603 - :ambient_heat: 0.7085010192041487 + :electricity: 0.16017789732214627 + :network_gas: 0.11902156472819543 + :ambient_heat: 0.7208005379496583 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7978.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 273.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2188318968916586 - :network_gas: 0.12467241243336327 - :ambient_heat: 0.6564956906749781 + :electricity: 0.17715416375713375 + :network_gas: 0.2913833449714631 + :ambient_heat: 0.5314624912714031 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1859_berkelland/GM1859_berkelland.derived.ad b/datasets/GM1859_berkelland/GM1859_berkelland.derived.ad index 643e43411f..151d4f0b00 100644 --- a/datasets/GM1859_berkelland/GM1859_berkelland.derived.ad +++ b/datasets/GM1859_berkelland/GM1859_berkelland.derived.ad @@ -1,6 +1,6 @@ - area = GM1859_berkelland -- id = 128543 -- parent_id = 128543 +- id = 128885 +- parent_id = 128885 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1859_berkelland/graph_values.yml b/datasets/GM1859_berkelland/graph_values.yml index 619b7464ea..e89934624a 100644 --- a/datasets/GM1859_berkelland/graph_values.yml +++ b/datasets/GM1859_berkelland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1516340145816958 - :network_gas: 0.16601291980067318 - :ambient_heat: 0.6823530656176311 + :electricity: 0.15490747041412464 + :network_gas: 0.14800891272231448 + :ambient_heat: 0.6970836168635609 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19547.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 86.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21130145221495358 - :network_gas: 0.15479419114018333 - :ambient_heat: 0.633904356644863 + :electricity: 0.16353289312251126 + :network_gas: 0.3458684275099534 + :ambient_heat: 0.49059867936753554 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1876_bronckhorst/GM1876_bronckhorst.derived.ad b/datasets/GM1876_bronckhorst/GM1876_bronckhorst.derived.ad index c997de3715..b9db357196 100644 --- a/datasets/GM1876_bronckhorst/GM1876_bronckhorst.derived.ad +++ b/datasets/GM1876_bronckhorst/GM1876_bronckhorst.derived.ad @@ -1,6 +1,6 @@ - area = GM1876_bronckhorst -- id = 128558 -- parent_id = 128558 +- id = 128900 +- parent_id = 128900 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1876_bronckhorst/graph_values.yml b/datasets/GM1876_bronckhorst/graph_values.yml index c725b7ee90..16b544d3db 100644 --- a/datasets/GM1876_bronckhorst/graph_values.yml +++ b/datasets/GM1876_bronckhorst/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15360224167357064 - :network_gas: 0.15518767079536144 - :ambient_heat: 0.6912100875310679 + :electricity: 0.15669760628123247 + :network_gas: 0.13816316545322155 + :ambient_heat: 0.7051392282655461 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16139.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 66.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21385658247411116 - :network_gas: 0.14457367010355313 - :ambient_heat: 0.6415697474223357 + :electricity: 0.16801831511730356 + :network_gas: 0.32792673953078394 + :ambient_heat: 0.5040549453519125 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1883_sittard_geleen/GM1883_sittard_geleen.derived.ad b/datasets/GM1883_sittard_geleen/GM1883_sittard_geleen.derived.ad index 798d0a8d5a..04a4090609 100644 --- a/datasets/GM1883_sittard_geleen/GM1883_sittard_geleen.derived.ad +++ b/datasets/GM1883_sittard_geleen/GM1883_sittard_geleen.derived.ad @@ -1,6 +1,6 @@ - area = GM1883_sittard_geleen -- id = 128754 -- parent_id = 128754 +- id = 129096 +- parent_id = 129096 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1883_sittard_geleen/graph_values.yml b/datasets/GM1883_sittard_geleen/graph_values.yml index f4c9592683..5b0a37059a 100644 --- a/datasets/GM1883_sittard_geleen/graph_values.yml +++ b/datasets/GM1883_sittard_geleen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15552508110940744 - :network_gas: 0.1446120538982594 - :ambient_heat: 0.6998628649923334 + :electricity: 0.1584416079054245 + :network_gas: 0.12857115652016526 + :ambient_heat: 0.7129872355744102 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 46679.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1935.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21634846981075945 - :network_gas: 0.13460612075695985 - :ambient_heat: 0.6490454094322807 + :electricity: 0.17252560786612076 + :network_gas: 0.30989756853551514 + :ambient_heat: 0.5175768235983641 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1884_kaag_en_braassem/GM1884_kaag_en_braassem.derived.ad b/datasets/GM1884_kaag_en_braassem/GM1884_kaag_en_braassem.derived.ad index 001acce754..b1c4430b21 100644 --- a/datasets/GM1884_kaag_en_braassem/GM1884_kaag_en_braassem.derived.ad +++ b/datasets/GM1884_kaag_en_braassem/GM1884_kaag_en_braassem.derived.ad @@ -1,6 +1,6 @@ - area = GM1884_kaag_en_braassem -- id = 128652 -- parent_id = 128652 +- id = 128994 +- parent_id = 128994 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1884_kaag_en_braassem/graph_values.yml b/datasets/GM1884_kaag_en_braassem/graph_values.yml index 91581933f2..b42b727a7b 100644 --- a/datasets/GM1884_kaag_en_braassem/graph_values.yml +++ b/datasets/GM1884_kaag_en_braassem/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15757603221534028 - :network_gas: 0.13333182281562841 - :ambient_heat: 0.7090921449690313 + :electricity: 0.16029654144801467 + :network_gas: 0.11836902203591933 + :ambient_heat: 0.721334436516066 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11874.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 65.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2190016877322112 - :network_gas: 0.12399324907115274 - :ambient_heat: 0.657005063196636 + :electricity: 0.17747575201497273 + :network_gas: 0.29009699194010724 + :ambient_heat: 0.5324272560449201 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1891_dantumadiel/GM1891_dantumadiel.derived.ad b/datasets/GM1891_dantumadiel/GM1891_dantumadiel.derived.ad index d338989450..7492673a0a 100644 --- a/datasets/GM1891_dantumadiel/GM1891_dantumadiel.derived.ad +++ b/datasets/GM1891_dantumadiel/GM1891_dantumadiel.derived.ad @@ -1,6 +1,6 @@ - area = GM1891_dantumadiel -- id = 128570 -- parent_id = 128570 +- id = 128912 +- parent_id = 128912 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1891_dantumadiel/graph_values.yml b/datasets/GM1891_dantumadiel/graph_values.yml index 7c70ccec4e..4ebd5350d6 100644 --- a/datasets/GM1891_dantumadiel/graph_values.yml +++ b/datasets/GM1891_dantumadiel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15216849750814546 - :network_gas: 0.16307326370519998 - :ambient_heat: 0.6847582387866545 + :electricity: 0.15539408997448298 + :network_gas: 0.14533250514034365 + :ambient_heat: 0.6992734048851734 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8148.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 8.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21199575518091068 - :network_gas: 0.15201697927635513 - :ambient_heat: 0.6359872655427343 + :electricity: 0.16473840913504215 + :network_gas: 0.34104636345982964 + :ambient_heat: 0.4942152274051282 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1892_zuidplas/GM1892_zuidplas.derived.ad b/datasets/GM1892_zuidplas/GM1892_zuidplas.derived.ad index 5f0bf7b120..3e3e085f19 100644 --- a/datasets/GM1892_zuidplas/GM1892_zuidplas.derived.ad +++ b/datasets/GM1892_zuidplas/GM1892_zuidplas.derived.ad @@ -1,6 +1,6 @@ - area = GM1892_zuidplas -- id = 128831 -- parent_id = 128831 +- id = 129173 +- parent_id = 129173 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1892_zuidplas/graph_values.yml b/datasets/GM1892_zuidplas/graph_values.yml index 9fc151963b..4e42e0653d 100644 --- a/datasets/GM1892_zuidplas/graph_values.yml +++ b/datasets/GM1892_zuidplas/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1582141942177268 - :network_gas: 0.12982193180250257 - :ambient_heat: 0.7119638739797707 + :electricity: 0.16087260691354424 + :network_gas: 0.11520066197550669 + :ambient_heat: 0.7239267311109491 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18549.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 123.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2198262610833705 - :network_gas: 0.12069495566651563 - :ambient_heat: 0.6594787832501138 + :electricity: 0.17904706286079025 + :network_gas: 0.28381174855683705 + :ambient_heat: 0.5371411885823727 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1894_peel_en_maas/GM1894_peel_en_maas.derived.ad b/datasets/GM1894_peel_en_maas/GM1894_peel_en_maas.derived.ad index b72ae18bb2..319f86333a 100644 --- a/datasets/GM1894_peel_en_maas/GM1894_peel_en_maas.derived.ad +++ b/datasets/GM1894_peel_en_maas/GM1894_peel_en_maas.derived.ad @@ -1,6 +1,6 @@ - area = GM1894_peel_en_maas -- id = 128725 -- parent_id = 128725 +- id = 129067 +- parent_id = 129067 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1894_peel_en_maas/graph_values.yml b/datasets/GM1894_peel_en_maas/graph_values.yml index bc57ab95b8..b0736667da 100644 --- a/datasets/GM1894_peel_en_maas/graph_values.yml +++ b/datasets/GM1894_peel_en_maas/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15738509861512062 - :network_gas: 0.13438195761683658 - :ambient_heat: 0.7082329437680428 + :electricity: 0.1601240849134403 + :network_gas: 0.11931753297607839 + :ambient_heat: 0.7205583821104813 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18491.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 82.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21875489023836897 - :network_gas: 0.12498043904652181 - :ambient_heat: 0.6562646707151093 + :electricity: 0.17700853101124944 + :network_gas: 0.29196587595500023 + :ambient_heat: 0.5310255930337503 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1895_oldambt/GM1895_oldambt.derived.ad b/datasets/GM1895_oldambt/GM1895_oldambt.derived.ad index ce8b663a2e..3344f8b448 100644 --- a/datasets/GM1895_oldambt/GM1895_oldambt.derived.ad +++ b/datasets/GM1895_oldambt/GM1895_oldambt.derived.ad @@ -1,6 +1,6 @@ - area = GM1895_oldambt -- id = 128708 -- parent_id = 128708 +- id = 129050 +- parent_id = 129050 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1895_oldambt/graph_values.yml b/datasets/GM1895_oldambt/graph_values.yml index 26c7d90f70..d985ee29af 100644 --- a/datasets/GM1895_oldambt/graph_values.yml +++ b/datasets/GM1895_oldambt/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1508640545846111 - :network_gas: 0.17024769978463902 - :ambient_heat: 0.6788882456307499 + :electricity: 0.1542058065766916 + :network_gas: 0.1518680638281961 + :ambient_heat: 0.6939261295951122 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18399.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 325.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2103006786340039 - :network_gas: 0.15879728546398225 - :ambient_heat: 0.6309020359020139 + :electricity: 0.16181235971624003 + :network_gas: 0.3527505611350381 + :ambient_heat: 0.48543707914872186 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1896_zwartewaterland/GM1896_zwartewaterland.derived.ad b/datasets/GM1896_zwartewaterland/GM1896_zwartewaterland.derived.ad index 3bc9093eb5..9057a1b7bb 100644 --- a/datasets/GM1896_zwartewaterland/GM1896_zwartewaterland.derived.ad +++ b/datasets/GM1896_zwartewaterland/GM1896_zwartewaterland.derived.ad @@ -1,6 +1,6 @@ - area = GM1896_zwartewaterland -- id = 128834 -- parent_id = 128834 +- id = 129176 +- parent_id = 129176 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1896_zwartewaterland/graph_values.yml b/datasets/GM1896_zwartewaterland/graph_values.yml index 476c6553bd..45bce5ddda 100644 --- a/datasets/GM1896_zwartewaterland/graph_values.yml +++ b/datasets/GM1896_zwartewaterland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15454358818885208 - :network_gas: 0.15001026496131342 - :ambient_heat: 0.6954461468498344 + :electricity: 0.1575519989345851 + :network_gas: 0.13346400585978194 + :ambient_heat: 0.7089839952056329 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8961.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 505.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21507704536994227 - :network_gas: 0.1396918185202286 - :ambient_heat: 0.6452311361098292 + :electricity: 0.17020910604947506 + :network_gas: 0.3191635758020979 + :ambient_heat: 0.5106273181484271 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1900_sudwest_fryslan/GM1900_sudwest_fryslan.derived.ad b/datasets/GM1900_sudwest_fryslan/GM1900_sudwest_fryslan.derived.ad index 91742cb442..4b084b1d91 100644 --- a/datasets/GM1900_sudwest_fryslan/GM1900_sudwest_fryslan.derived.ad +++ b/datasets/GM1900_sudwest_fryslan/GM1900_sudwest_fryslan.derived.ad @@ -1,6 +1,6 @@ - area = GM1900_sudwest_fryslan -- id = 128768 -- parent_id = 128768 +- id = 129110 +- parent_id = 129110 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1900_sudwest_fryslan/graph_values.yml b/datasets/GM1900_sudwest_fryslan/graph_values.yml index 2a8cbd5121..8e750aa997 100644 --- a/datasets/GM1900_sudwest_fryslan/graph_values.yml +++ b/datasets/GM1900_sudwest_fryslan/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15198613737912395 - :network_gas: 0.16407624441481838 - :ambient_heat: 0.6839376182060577 + :electricity: 0.1552281021407089 + :network_gas: 0.14624543822610098 + :ambient_heat: 0.69852645963319 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 42025.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2651.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2117589032513061 - :network_gas: 0.1529643869947733 - :ambient_heat: 0.6352767097539206 + :electricity: 0.16432606196296798 + :network_gas: 0.3426957521481263 + :ambient_heat: 0.4929781858889057 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1901_bodegraven_reeuwijk/GM1901_bodegraven_reeuwijk.derived.ad b/datasets/GM1901_bodegraven_reeuwijk/GM1901_bodegraven_reeuwijk.derived.ad index a3902a701f..9fa30cda92 100644 --- a/datasets/GM1901_bodegraven_reeuwijk/GM1901_bodegraven_reeuwijk.derived.ad +++ b/datasets/GM1901_bodegraven_reeuwijk/GM1901_bodegraven_reeuwijk.derived.ad @@ -1,6 +1,6 @@ - area = GM1901_bodegraven_reeuwijk -- id = 128551 -- parent_id = 128551 +- id = 128893 +- parent_id = 128893 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1901_bodegraven_reeuwijk/graph_values.yml b/datasets/GM1901_bodegraven_reeuwijk/graph_values.yml index dbd76205d8..9094694305 100644 --- a/datasets/GM1901_bodegraven_reeuwijk/graph_values.yml +++ b/datasets/GM1901_bodegraven_reeuwijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15695232840274473 - :network_gas: 0.13676219378490398 - :ambient_heat: 0.7062854778123513 + :electricity: 0.1597330211230591 + :network_gas: 0.12146838382317487 + :ambient_heat: 0.718798595053766 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14665.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 367.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2181953437701272 - :network_gas: 0.12721862491948896 - :ambient_heat: 0.6545860313103838 + :electricity: 0.17595443312370881 + :network_gas: 0.2961822675051628 + :ambient_heat: 0.5278632993711284 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1903_eijsden_margraten/GM1903_eijsden_margraten.derived.ad b/datasets/GM1903_eijsden_margraten/GM1903_eijsden_margraten.derived.ad index 4bc0bc1308..0aae577426 100644 --- a/datasets/GM1903_eijsden_margraten/GM1903_eijsden_margraten.derived.ad +++ b/datasets/GM1903_eijsden_margraten/GM1903_eijsden_margraten.derived.ad @@ -1,6 +1,6 @@ - area = GM1903_eijsden_margraten -- id = 128596 -- parent_id = 128596 +- id = 128938 +- parent_id = 128938 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1903_eijsden_margraten/graph_values.yml b/datasets/GM1903_eijsden_margraten/graph_values.yml index 984ba7de72..f11088b3e3 100644 --- a/datasets/GM1903_eijsden_margraten/graph_values.yml +++ b/datasets/GM1903_eijsden_margraten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15425998892169754 - :network_gas: 0.1515700609306635 - :ambient_heat: 0.6941699501476389 + :electricity: 0.15729471710064663 + :network_gas: 0.1348790559464436 + :ambient_heat: 0.7078262269529099 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11342.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 420.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21470946442491826 - :network_gas: 0.14116214230032453 - :ambient_heat: 0.6441283932747571 + :electricity: 0.16954592591145307 + :network_gas: 0.32181629635418596 + :ambient_heat: 0.508637777734361 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1904_stichtse_vecht/GM1904_stichtse_vecht.derived.ad b/datasets/GM1904_stichtse_vecht/GM1904_stichtse_vecht.derived.ad index e4d1607955..e8b2e7844b 100644 --- a/datasets/GM1904_stichtse_vecht/GM1904_stichtse_vecht.derived.ad +++ b/datasets/GM1904_stichtse_vecht/GM1904_stichtse_vecht.derived.ad @@ -1,6 +1,6 @@ - area = GM1904_stichtse_vecht -- id = 128767 -- parent_id = 128767 +- id = 129109 +- parent_id = 129109 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1904_stichtse_vecht/graph_values.yml b/datasets/GM1904_stichtse_vecht/graph_values.yml index c5b12bfa5e..4269918cd4 100644 --- a/datasets/GM1904_stichtse_vecht/graph_values.yml +++ b/datasets/GM1904_stichtse_vecht/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1542273186907 - :network_gas: 0.15174974720115 - :ambient_heat: 0.69402293410815 + :electricity: 0.15726507190866582 + :network_gas: 0.13504210450233803 + :ambient_heat: 0.7076928235889961 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 28716.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 851.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21466711366286403 - :network_gas: 0.14133154534854167 - :ambient_heat: 0.6440013409885944 + :electricity: 0.16946970439655548 + :network_gas: 0.32212118241377635 + :ambient_heat: 0.5084091131896682 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1911_hollands_kroon/GM1911_hollands_kroon.derived.ad b/datasets/GM1911_hollands_kroon/GM1911_hollands_kroon.derived.ad index e57b103013..e2a8925bef 100644 --- a/datasets/GM1911_hollands_kroon/GM1911_hollands_kroon.derived.ad +++ b/datasets/GM1911_hollands_kroon/GM1911_hollands_kroon.derived.ad @@ -1,6 +1,6 @@ - area = GM1911_hollands_kroon -- id = 128644 -- parent_id = 128644 +- id = 128986 +- parent_id = 128986 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1911_hollands_kroon/graph_values.yml b/datasets/GM1911_hollands_kroon/graph_values.yml index ba320893ed..f6e93c0888 100644 --- a/datasets/GM1911_hollands_kroon/graph_values.yml +++ b/datasets/GM1911_hollands_kroon/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15459325539243124 - :network_gas: 0.1497370953416281 - :ambient_heat: 0.6956696492659405 + :electricity: 0.15759704640592118 + :network_gas: 0.13321624476743354 + :ambient_heat: 0.7091867088266454 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20923.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 247.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2151414108734974 - :network_gas: 0.13943435650600808 - :ambient_heat: 0.6454242326204944 + :electricity: 0.17032553239482032 + :network_gas: 0.318697870420717 + :ambient_heat: 0.5109765971844628 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1916_leidschendam_voorburg/GM1916_leidschendam_voorburg.derived.ad b/datasets/GM1916_leidschendam_voorburg/GM1916_leidschendam_voorburg.derived.ad index 53eb155dde..4367148874 100644 --- a/datasets/GM1916_leidschendam_voorburg/GM1916_leidschendam_voorburg.derived.ad +++ b/datasets/GM1916_leidschendam_voorburg/GM1916_leidschendam_voorburg.derived.ad @@ -1,6 +1,6 @@ - area = GM1916_leidschendam_voorburg -- id = 128668 -- parent_id = 128668 +- id = 129010 +- parent_id = 129010 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1916_leidschendam_voorburg/graph_values.yml b/datasets/GM1916_leidschendam_voorburg/graph_values.yml index 544116f88b..26763782e2 100644 --- a/datasets/GM1916_leidschendam_voorburg/graph_values.yml +++ b/datasets/GM1916_leidschendam_voorburg/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15062395664698178 - :network_gas: 0.17156823844160024 - :ambient_heat: 0.677807804911418 + :electricity: 0.15398684737103965 + :network_gas: 0.1530723394592819 + :ambient_heat: 0.6929408131696785 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 36938.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 3154.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20998846516229136 - :network_gas: 0.16004613935083237 - :ambient_heat: 0.6299653954868764 + :electricity: 0.16127968692942685 + :network_gas: 0.3548812522822908 + :ambient_heat: 0.48383906078828226 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1924_goeree_overflakkee/GM1924_goeree_overflakkee.derived.ad b/datasets/GM1924_goeree_overflakkee/GM1924_goeree_overflakkee.derived.ad index 564e2d2d5a..5a65d60d0b 100644 --- a/datasets/GM1924_goeree_overflakkee/GM1924_goeree_overflakkee.derived.ad +++ b/datasets/GM1924_goeree_overflakkee/GM1924_goeree_overflakkee.derived.ad @@ -1,6 +1,6 @@ - area = GM1924_goeree_overflakkee -- id = 128610 -- parent_id = 128610 +- id = 128952 +- parent_id = 128952 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1924_goeree_overflakkee/graph_values.yml b/datasets/GM1924_goeree_overflakkee/graph_values.yml index ceeafc48d8..8884130ac1 100644 --- a/datasets/GM1924_goeree_overflakkee/graph_values.yml +++ b/datasets/GM1924_goeree_overflakkee/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15561866472220875 - :network_gas: 0.14409734402785196 - :ambient_heat: 0.7002839912499393 + :electricity: 0.15852636551143276 + :network_gas: 0.12810498968712 + :ambient_heat: 0.7133686448014473 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22021.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1305.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21646963990099985 - :network_gas: 0.1341214403959981 - :ambient_heat: 0.649408919703002 + :electricity: 0.17274822849201893 + :network_gas: 0.3090070860319225 + :ambient_heat: 0.5182446854760586 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1926_pijnacker_nootdorp/GM1926_pijnacker_nootdorp.derived.ad b/datasets/GM1926_pijnacker_nootdorp/GM1926_pijnacker_nootdorp.derived.ad index eb8f6969ed..d7dd6afdcd 100644 --- a/datasets/GM1926_pijnacker_nootdorp/GM1926_pijnacker_nootdorp.derived.ad +++ b/datasets/GM1926_pijnacker_nootdorp/GM1926_pijnacker_nootdorp.derived.ad @@ -1,6 +1,6 @@ - area = GM1926_pijnacker_nootdorp -- id = 128727 -- parent_id = 128727 +- id = 129069 +- parent_id = 129069 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1926_pijnacker_nootdorp/graph_values.yml b/datasets/GM1926_pijnacker_nootdorp/graph_values.yml index 2551a6e85f..f1452266df 100644 --- a/datasets/GM1926_pijnacker_nootdorp/graph_values.yml +++ b/datasets/GM1926_pijnacker_nootdorp/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1621740730024119 - :network_gas: 0.10804259848673482 - :ambient_heat: 0.7297833285108535 + :electricity: 0.16443550140845828 + :network_gas: 0.0956047422534795 + :ambient_heat: 0.7399597563380623 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 21791.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 406.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.22493241096272515 - :network_gas: 0.10027035614909699 - :ambient_heat: 0.6747972328881778 + :electricity: 0.1891436484686146 + :network_gas: 0.2434254061255397 + :ambient_heat: 0.5674309454058457 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1930_nissewaard/GM1930_nissewaard.derived.ad b/datasets/GM1930_nissewaard/GM1930_nissewaard.derived.ad index dfe694cfff..cf8eba5c32 100644 --- a/datasets/GM1930_nissewaard/GM1930_nissewaard.derived.ad +++ b/datasets/GM1930_nissewaard/GM1930_nissewaard.derived.ad @@ -1,6 +1,6 @@ - area = GM1930_nissewaard -- id = 128698 -- parent_id = 128698 +- id = 129040 +- parent_id = 129040 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1930_nissewaard/graph_values.yml b/datasets/GM1930_nissewaard/graph_values.yml index 4ff7e56d6e..fa47e5c012 100644 --- a/datasets/GM1930_nissewaard/graph_values.yml +++ b/datasets/GM1930_nissewaard/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1585135571852412 - :network_gas: 0.1281754354811734 - :ambient_heat: 0.7133110073335853 + :electricity: 0.16114265997112429 + :network_gas: 0.11371537015881641 + :ambient_heat: 0.7251419698700592 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 39448.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 128.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.22021290883497638 - :network_gas: 0.11914836466009204 - :ambient_heat: 0.6606387265049316 + :electricity: 0.17978936028302714 + :network_gas: 0.28084255886788945 + :ambient_heat: 0.5393680808490834 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1931_krimpenerwaard/GM1931_krimpenerwaard.derived.ad b/datasets/GM1931_krimpenerwaard/GM1931_krimpenerwaard.derived.ad index 86894a5ca7..25e5b1b80c 100644 --- a/datasets/GM1931_krimpenerwaard/GM1931_krimpenerwaard.derived.ad +++ b/datasets/GM1931_krimpenerwaard/GM1931_krimpenerwaard.derived.ad @@ -1,6 +1,6 @@ - area = GM1931_krimpenerwaard -- id = 128659 -- parent_id = 128659 +- id = 129001 +- parent_id = 129001 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1931_krimpenerwaard/graph_values.yml b/datasets/GM1931_krimpenerwaard/graph_values.yml index 20fbb9e9e4..1c58af4981 100644 --- a/datasets/GM1931_krimpenerwaard/graph_values.yml +++ b/datasets/GM1931_krimpenerwaard/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15518718202181608 - :network_gas: 0.14647049888001146 - :ambient_heat: 0.6983423190981723 + :electricity: 0.15813548237133712 + :network_gas: 0.13025484695764594 + :ambient_heat: 0.711609670671017 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 23909.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 830.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21591088119394566 - :network_gas: 0.13635647522421504 - :ambient_heat: 0.6477326435818394 + :electricity: 0.17172434188028718 + :network_gas: 0.31310263247884945 + :ambient_heat: 0.5151730256408633 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1940_de_fryske_marren/GM1940_de_fryske_marren.derived.ad b/datasets/GM1940_de_fryske_marren/GM1940_de_fryske_marren.derived.ad index 622d328fa6..3e8f1b6199 100644 --- a/datasets/GM1940_de_fryske_marren/GM1940_de_fryske_marren.derived.ad +++ b/datasets/GM1940_de_fryske_marren/GM1940_de_fryske_marren.derived.ad @@ -1,6 +1,6 @@ - area = GM1940_de_fryske_marren -- id = 128572 -- parent_id = 128572 +- id = 128914 +- parent_id = 128914 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1940_de_fryske_marren/graph_values.yml b/datasets/GM1940_de_fryske_marren/graph_values.yml index c29164f855..d4ae692f43 100644 --- a/datasets/GM1940_de_fryske_marren/graph_values.yml +++ b/datasets/GM1940_de_fryske_marren/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15209536512095606 - :network_gas: 0.16347549183474175 - :ambient_heat: 0.6844291430443022 + :electricity: 0.15532752861264482 + :network_gas: 0.14569859263045354 + :ambient_heat: 0.6989738787569016 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 23318.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 364.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2119007744189425 - :network_gas: 0.15239690232422765 - :ambient_heat: 0.6357023232568298 + :electricity: 0.16457291492983853 + :network_gas: 0.3417083402806443 + :ambient_heat: 0.4937187447895173 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1942_gooise_meren/GM1942_gooise_meren.derived.ad b/datasets/GM1942_gooise_meren/GM1942_gooise_meren.derived.ad index 312a5e3754..61dbb98036 100644 --- a/datasets/GM1942_gooise_meren/GM1942_gooise_meren.derived.ad +++ b/datasets/GM1942_gooise_meren/GM1942_gooise_meren.derived.ad @@ -1,6 +1,6 @@ - area = GM1942_gooise_meren -- id = 128613 -- parent_id = 128613 +- id = 128955 +- parent_id = 128955 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1942_gooise_meren/graph_values.yml b/datasets/GM1942_gooise_meren/graph_values.yml index 1aaa716eb2..368f9a8fe6 100644 --- a/datasets/GM1942_gooise_meren/graph_values.yml +++ b/datasets/GM1942_gooise_meren/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1495224345598031 - :network_gas: 0.177626609921083 - :ambient_heat: 0.6728509555191139 + :electricity: 0.15298134027668722 + :network_gas: 0.15860262847822035 + :ambient_heat: 0.6884160312450924 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 26873.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 3613.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2085552339617661 - :network_gas: 0.1657790641529336 - :ambient_heat: 0.6256657018853005 + :electricity: 0.15885896588344497 + :network_gas: 0.3645641364662184 + :ambient_heat: 0.4765768976503366 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1945_berg_en_dal/GM1945_berg_en_dal.derived.ad b/datasets/GM1945_berg_en_dal/GM1945_berg_en_dal.derived.ad index 6d132c07f5..152ce73286 100644 --- a/datasets/GM1945_berg_en_dal/GM1945_berg_en_dal.derived.ad +++ b/datasets/GM1945_berg_en_dal/GM1945_berg_en_dal.derived.ad @@ -1,6 +1,6 @@ - area = GM1945_berg_en_dal -- id = 128538 -- parent_id = 128538 +- id = 128880 +- parent_id = 128880 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1945_berg_en_dal/graph_values.yml b/datasets/GM1945_berg_en_dal/graph_values.yml index 10cb6c5233..9aba84e4ad 100644 --- a/datasets/GM1945_berg_en_dal/graph_values.yml +++ b/datasets/GM1945_berg_en_dal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1543976173034571 - :network_gas: 0.15081310483098578 - :ambient_heat: 0.694789277865557 + :electricity: 0.1574195868586772 + :network_gas: 0.13419227227727532 + :ambient_heat: 0.7083881408640474 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15815.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 88.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21488786001148832 - :network_gas: 0.14044855995404432 - :ambient_heat: 0.6446635800344673 + :electricity: 0.16986741934407754 + :network_gas: 0.320530322623688 + :ambient_heat: 0.5096022580322344 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1948_meierijstad/GM1948_meierijstad.derived.ad b/datasets/GM1948_meierijstad/GM1948_meierijstad.derived.ad index 87e5aa1556..14a945c047 100644 --- a/datasets/GM1948_meierijstad/GM1948_meierijstad.derived.ad +++ b/datasets/GM1948_meierijstad/GM1948_meierijstad.derived.ad @@ -1,6 +1,6 @@ - area = GM1948_meierijstad -- id = 128837 -- parent_id = 128837 +- id = 129179 +- parent_id = 129179 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1948_meierijstad/graph_values.yml b/datasets/GM1948_meierijstad/graph_values.yml index 62d7087323..5521b366f4 100644 --- a/datasets/GM1948_meierijstad/graph_values.yml +++ b/datasets/GM1948_meierijstad/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1567666084100448 - :network_gas: 0.1377836537447536 - :ambient_heat: 0.7054497378452016 + :electricity: 0.15956512515498433 + :network_gas: 0.12239181164758636 + :ambient_heat: 0.7180430631974295 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 34829.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 245.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2179551526904395 - :network_gas: 0.12817938923823968 - :ambient_heat: 0.6538654580713208 + :electricity: 0.17550415019606933 + :network_gas: 0.29798339921572087 + :ambient_heat: 0.52651245058821 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1949_waadhoeke/GM1949_waadhoeke.derived.ad b/datasets/GM1949_waadhoeke/GM1949_waadhoeke.derived.ad index 4d60fc1dfd..0ef90c6480 100644 --- a/datasets/GM1949_waadhoeke/GM1949_waadhoeke.derived.ad +++ b/datasets/GM1949_waadhoeke/GM1949_waadhoeke.derived.ad @@ -1,6 +1,6 @@ - area = GM1949_waadhoeke -- id = 128838 -- parent_id = 128838 +- id = 129180 +- parent_id = 129180 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1949_waadhoeke/graph_values.yml b/datasets/GM1949_waadhoeke/graph_values.yml index 3460c014a6..413b446a8e 100644 --- a/datasets/GM1949_waadhoeke/graph_values.yml +++ b/datasets/GM1949_waadhoeke/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15195868121420342 - :network_gas: 0.1642272533218812 - :ambient_heat: 0.6838140654639154 + :electricity: 0.15520310724136227 + :network_gas: 0.14638291017250743 + :ambient_heat: 0.6984139825861302 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 21213.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 841.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.211723239459728 - :network_gas: 0.1531070421610857 - :ambient_heat: 0.6351697183791862 + :electricity: 0.16426407220246467 + :network_gas: 0.3429437111901396 + :ambient_heat: 0.49279221660739575 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1950_westerwolde/GM1950_westerwolde.derived.ad b/datasets/GM1950_westerwolde/GM1950_westerwolde.derived.ad index db24f2438b..f9c6a13f03 100644 --- a/datasets/GM1950_westerwolde/GM1950_westerwolde.derived.ad +++ b/datasets/GM1950_westerwolde/GM1950_westerwolde.derived.ad @@ -1,6 +1,6 @@ - area = GM1950_westerwolde -- id = 128839 -- parent_id = 128839 +- id = 129181 +- parent_id = 129181 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1950_westerwolde/graph_values.yml b/datasets/GM1950_westerwolde/graph_values.yml index 1690dd496f..8e802afb58 100644 --- a/datasets/GM1950_westerwolde/graph_values.yml +++ b/datasets/GM1950_westerwolde/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1474628423651695 - :network_gas: 0.1889543669915678 - :ambient_heat: 0.6635827906432626 + :electricity: 0.15109701071163736 + :network_gas: 0.1689664410859945 + :ambient_heat: 0.679936548202368 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11770.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 9.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20587163993179203 - :network_gas: 0.17651344027282984 - :ambient_heat: 0.6176149197953783 + :electricity: 0.15443204287355533 + :network_gas: 0.3822718285057771 + :ambient_heat: 0.4632961286206676 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1952_midden_groningen/GM1952_midden_groningen.derived.ad b/datasets/GM1952_midden_groningen/GM1952_midden_groningen.derived.ad index c6e928f32b..5de2a5fedd 100644 --- a/datasets/GM1952_midden_groningen/GM1952_midden_groningen.derived.ad +++ b/datasets/GM1952_midden_groningen/GM1952_midden_groningen.derived.ad @@ -1,6 +1,6 @@ - area = GM1952_midden_groningen -- id = 128840 -- parent_id = 128840 +- id = 129182 +- parent_id = 129182 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1952_midden_groningen/graph_values.yml b/datasets/GM1952_midden_groningen/graph_values.yml index 8e3667d721..2398d05dfc 100644 --- a/datasets/GM1952_midden_groningen/graph_values.yml +++ b/datasets/GM1952_midden_groningen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.148503439178904 - :network_gas: 0.1832310845160282 - :ambient_heat: 0.6682654763050679 + :electricity: 0.15204975251470168 + :network_gas: 0.16372636116914072 + :ambient_heat: 0.6842238863161576 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 27986.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 150.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20722812659143236 - :network_gas: 0.17108749363426823 - :ambient_heat: 0.6216843797742994 + :electricity: 0.15665279189788303 + :network_gas: 0.3733888324084661 + :ambient_heat: 0.4699583756936508 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1954_beekdaelen/GM1954_beekdaelen.derived.ad b/datasets/GM1954_beekdaelen/GM1954_beekdaelen.derived.ad index 70c85e218e..2152b88b90 100644 --- a/datasets/GM1954_beekdaelen/GM1954_beekdaelen.derived.ad +++ b/datasets/GM1954_beekdaelen/GM1954_beekdaelen.derived.ad @@ -1,6 +1,6 @@ - area = GM1954_beekdaelen -- id = 128845 -- parent_id = 128845 +- id = 129187 +- parent_id = 129187 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1954_beekdaelen/graph_values.yml b/datasets/GM1954_beekdaelen/graph_values.yml index 230b8b5cee..402b644a0d 100644 --- a/datasets/GM1954_beekdaelen/graph_values.yml +++ b/datasets/GM1954_beekdaelen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1551813967348474 - :network_gas: 0.14650231795833937 - :ambient_heat: 0.6983162853068133 + :electricity: 0.1581302398052787 + :network_gas: 0.1302836810709671 + :ambient_heat: 0.7115860791237543 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16651.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 860.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2159033879423891 - :network_gas: 0.13638644823044133 - :ambient_heat: 0.6477101638271696 + :electricity: 0.17171065769141802 + :network_gas: 0.3131573692343259 + :ambient_heat: 0.515131973074256 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1955_montferland/GM1955_montferland.derived.ad b/datasets/GM1955_montferland/GM1955_montferland.derived.ad index 1f9ef6dc3d..dc50873980 100644 --- a/datasets/GM1955_montferland/GM1955_montferland.derived.ad +++ b/datasets/GM1955_montferland/GM1955_montferland.derived.ad @@ -1,6 +1,6 @@ - area = GM1955_montferland -- id = 128689 -- parent_id = 128689 +- id = 129031 +- parent_id = 129031 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1955_montferland/graph_values.yml b/datasets/GM1955_montferland/graph_values.yml index a8311bc1c2..214f99588d 100644 --- a/datasets/GM1955_montferland/graph_values.yml +++ b/datasets/GM1955_montferland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1565811304925194 - :network_gas: 0.13880378229114332 - :ambient_heat: 0.7046150872163373 + :electricity: 0.15939740367108604 + :network_gas: 0.12331427980902676 + :ambient_heat: 0.7172883165198872 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15970.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 88.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21771523509042046 - :network_gas: 0.12913905963831593 - :ambient_heat: 0.6531457052712637 + :electricity: 0.17505569052646303 + :network_gas: 0.29977723789414595 + :ambient_heat: 0.5251670715793909 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1959_altena/GM1959_altena.derived.ad b/datasets/GM1959_altena/GM1959_altena.derived.ad index 4db06e462f..19e673977b 100644 --- a/datasets/GM1959_altena/GM1959_altena.derived.ad +++ b/datasets/GM1959_altena/GM1959_altena.derived.ad @@ -1,6 +1,6 @@ - area = GM1959_altena -- id = 128844 -- parent_id = 128844 +- id = 129186 +- parent_id = 129186 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1959_altena/graph_values.yml b/datasets/GM1959_altena/graph_values.yml index 88b988de35..c108daebcc 100644 --- a/datasets/GM1959_altena/graph_values.yml +++ b/datasets/GM1959_altena/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15641663642497247 - :network_gas: 0.1397084996626515 - :ambient_heat: 0.7038748639123761 + :electricity: 0.1592486200770488 + :network_gas: 0.1241325895762316 + :ambient_heat: 0.7166187903467196 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22525.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 328.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21750242720115923 - :network_gas: 0.12999029119536074 - :ambient_heat: 0.65250728160348 + :electricity: 0.1746589965452852 + :network_gas: 0.3013640138188574 + :ambient_heat: 0.5239769896358574 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1960_west_betuwe/GM1960_west_betuwe.derived.ad b/datasets/GM1960_west_betuwe/GM1960_west_betuwe.derived.ad index e9a7420005..603052a228 100644 --- a/datasets/GM1960_west_betuwe/GM1960_west_betuwe.derived.ad +++ b/datasets/GM1960_west_betuwe/GM1960_west_betuwe.derived.ad @@ -1,6 +1,6 @@ - area = GM1960_west_betuwe -- id = 128842 -- parent_id = 128842 +- id = 129184 +- parent_id = 129184 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1960_west_betuwe/graph_values.yml b/datasets/GM1960_west_betuwe/graph_values.yml index 99a6a0be11..1502eece5b 100644 --- a/datasets/GM1960_west_betuwe/graph_values.yml +++ b/datasets/GM1960_west_betuwe/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1567454569611169 - :network_gas: 0.13789998671385695 - :ambient_heat: 0.7053545563250261 + :electricity: 0.15954600084610127 + :network_gas: 0.12249699534644284 + :ambient_heat: 0.7179570038074558 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20961.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 320.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21792779507211743 - :network_gas: 0.12828881971152792 - :ambient_heat: 0.6537833852163546 + :electricity: 0.1754529466310092 + :network_gas: 0.2981882134759613 + :ambient_heat: 0.5263588398930295 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1961_vijfheerenlanden/GM1961_vijfheerenlanden.derived.ad b/datasets/GM1961_vijfheerenlanden/GM1961_vijfheerenlanden.derived.ad index 5040d89e79..0f7c574c89 100644 --- a/datasets/GM1961_vijfheerenlanden/GM1961_vijfheerenlanden.derived.ad +++ b/datasets/GM1961_vijfheerenlanden/GM1961_vijfheerenlanden.derived.ad @@ -1,6 +1,6 @@ - area = GM1961_vijfheerenlanden -- id = 128841 -- parent_id = 128841 +- id = 129183 +- parent_id = 129183 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1961_vijfheerenlanden/graph_values.yml b/datasets/GM1961_vijfheerenlanden/graph_values.yml index 96f0843956..90fe5fd7c1 100644 --- a/datasets/GM1961_vijfheerenlanden/graph_values.yml +++ b/datasets/GM1961_vijfheerenlanden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15711956116147943 - :network_gas: 0.13584241361186306 - :ambient_heat: 0.7070380252266574 + :electricity: 0.15988416610995432 + :network_gas: 0.12063708639525113 + :ambient_heat: 0.7194787474947945 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 24175.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 823.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2184115914309691 - :network_gas: 0.1263536342761213 - :ambient_heat: 0.6552347742929097 + :electricity: 0.17636095745078118 + :network_gas: 0.2945561701968734 + :ambient_heat: 0.5290828723523454 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1963_hoeksche_waard/GM1963_hoeksche_waard.derived.ad b/datasets/GM1963_hoeksche_waard/GM1963_hoeksche_waard.derived.ad index cfd42908ec..3f043d2fcb 100644 --- a/datasets/GM1963_hoeksche_waard/GM1963_hoeksche_waard.derived.ad +++ b/datasets/GM1963_hoeksche_waard/GM1963_hoeksche_waard.derived.ad @@ -1,6 +1,6 @@ - area = GM1963_hoeksche_waard -- id = 128846 -- parent_id = 128846 +- id = 129188 +- parent_id = 129188 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1963_hoeksche_waard/graph_values.yml b/datasets/GM1963_hoeksche_waard/graph_values.yml index 0f052b91f5..9d2cc87f9b 100644 --- a/datasets/GM1963_hoeksche_waard/graph_values.yml +++ b/datasets/GM1963_hoeksche_waard/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15689623433069352 - :network_gas: 0.13707071118118552 - :ambient_heat: 0.7060330544881209 + :electricity: 0.1596823152268576 + :network_gas: 0.12174726625228319 + :ambient_heat: 0.7185704185208592 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 38171.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 523.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21812280166514086 - :network_gas: 0.12750879333943418 - :ambient_heat: 0.6543684049954249 + :electricity: 0.17581830071745436 + :network_gas: 0.2967267971301807 + :ambient_heat: 0.5274549021523649 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1966_het_hogeland/GM1966_het_hogeland.derived.ad b/datasets/GM1966_het_hogeland/GM1966_het_hogeland.derived.ad index fda43aebfa..701b5a5948 100644 --- a/datasets/GM1966_het_hogeland/GM1966_het_hogeland.derived.ad +++ b/datasets/GM1966_het_hogeland/GM1966_het_hogeland.derived.ad @@ -1,6 +1,6 @@ - area = GM1966_het_hogeland -- id = 128843 -- parent_id = 128843 +- id = 129185 +- parent_id = 129185 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1966_het_hogeland/graph_values.yml b/datasets/GM1966_het_hogeland/graph_values.yml index 38e4700cbb..ed40e0b97b 100644 --- a/datasets/GM1966_het_hogeland/graph_values.yml +++ b/datasets/GM1966_het_hogeland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.14868886511163196 - :network_gas: 0.18221124188602425 - :ambient_heat: 0.6690998930023437 + :electricity: 0.1522193742162101 + :network_gas: 0.16279344181084446 + :ambient_heat: 0.6849871839729454 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22402.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 171.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20746970929435032 - :network_gas: 0.17012116282259648 - :ambient_heat: 0.6224091278830531 + :electricity: 0.15705190630983407 + :network_gas: 0.3717923747606622 + :ambient_heat: 0.4711557189295038 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1969_westerkwartier/GM1969_westerkwartier.derived.ad b/datasets/GM1969_westerkwartier/GM1969_westerkwartier.derived.ad index 2b2696ac31..5361753b66 100644 --- a/datasets/GM1969_westerkwartier/GM1969_westerkwartier.derived.ad +++ b/datasets/GM1969_westerkwartier/GM1969_westerkwartier.derived.ad @@ -1,6 +1,6 @@ - area = GM1969_westerkwartier -- id = 128849 -- parent_id = 128849 +- id = 129191 +- parent_id = 129191 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1969_westerkwartier/graph_values.yml b/datasets/GM1969_westerkwartier/graph_values.yml index 8016861e9e..8a93c97db0 100644 --- a/datasets/GM1969_westerkwartier/graph_values.yml +++ b/datasets/GM1969_westerkwartier/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15243201431775302 - :network_gas: 0.1616239212523584 - :ambient_heat: 0.6859440644298886 + :electricity: 0.15563387179517402 + :network_gas: 0.14401370512654288 + :ambient_heat: 0.700352423078283 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 27257.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 120.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21233794657544836 - :network_gas: 0.15064821369820425 - :ambient_heat: 0.6370138397263474 + :electricity: 0.16533617440593595 + :network_gas: 0.33865530237625446 + :ambient_heat: 0.49600852321780964 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1970_noardeast_fryslan/GM1970_noardeast_fryslan.derived.ad b/datasets/GM1970_noardeast_fryslan/GM1970_noardeast_fryslan.derived.ad index fe2d76cd8e..796991bddb 100644 --- a/datasets/GM1970_noardeast_fryslan/GM1970_noardeast_fryslan.derived.ad +++ b/datasets/GM1970_noardeast_fryslan/GM1970_noardeast_fryslan.derived.ad @@ -1,6 +1,6 @@ - area = GM1970_noardeast_fryslan -- id = 128848 -- parent_id = 128848 +- id = 129190 +- parent_id = 129190 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1970_noardeast_fryslan/graph_values.yml b/datasets/GM1970_noardeast_fryslan/graph_values.yml index bb86e1584c..c63825a358 100644 --- a/datasets/GM1970_noardeast_fryslan/graph_values.yml +++ b/datasets/GM1970_noardeast_fryslan/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15045225247340382 - :network_gas: 0.17251261139627888 - :ambient_heat: 0.6770351361303172 + :electricity: 0.1538302142398247 + :network_gas: 0.15393382168096403 + :ambient_heat: 0.6922359640792112 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20491.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 571.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20976514712677355 - :network_gas: 0.16093941149290353 - :ambient_heat: 0.629295441380323 + :electricity: 0.1608998615392584 + :network_gas: 0.35640055384296465 + :ambient_heat: 0.48269958461777696 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1978_molenlanden/GM1978_molenlanden.derived.ad b/datasets/GM1978_molenlanden/GM1978_molenlanden.derived.ad index 34c36dd198..8a39c9f767 100644 --- a/datasets/GM1978_molenlanden/GM1978_molenlanden.derived.ad +++ b/datasets/GM1978_molenlanden/GM1978_molenlanden.derived.ad @@ -1,6 +1,6 @@ - area = GM1978_molenlanden -- id = 128847 -- parent_id = 128847 +- id = 129189 +- parent_id = 129189 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1978_molenlanden/graph_values.yml b/datasets/GM1978_molenlanden/graph_values.yml index 03f24f920d..790f06ab71 100644 --- a/datasets/GM1978_molenlanden/graph_values.yml +++ b/datasets/GM1978_molenlanden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1560025048604546 - :network_gas: 0.14198622326749952 - :ambient_heat: 0.7020112718720458 + :electricity: 0.15887388679342587 + :network_gas: 0.12619362263615758 + :ambient_heat: 0.7149324905704165 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 17330.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 281.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2169665224868868 - :network_gas: 0.13213391005245056 - :ambient_heat: 0.6508995674606627 + :electricity: 0.17366453848834232 + :network_gas: 0.30534184604662884 + :ambient_heat: 0.5209936154650289 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1979_eemsdelta/GM1979_eemsdelta.derived.ad b/datasets/GM1979_eemsdelta/GM1979_eemsdelta.derived.ad index ad057fe8c1..88ba2c29b3 100644 --- a/datasets/GM1979_eemsdelta/GM1979_eemsdelta.derived.ad +++ b/datasets/GM1979_eemsdelta/GM1979_eemsdelta.derived.ad @@ -1,6 +1,6 @@ - area = GM1979_eemsdelta -- id = 128850 -- parent_id = 128850 +- id = 129192 +- parent_id = 129192 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1979_eemsdelta/graph_values.yml b/datasets/GM1979_eemsdelta/graph_values.yml index 6cac773d88..cf01a7af6a 100644 --- a/datasets/GM1979_eemsdelta/graph_values.yml +++ b/datasets/GM1979_eemsdelta/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15005346578981135 - :network_gas: 0.17470593815603752 - :ambient_heat: 0.6752405960541511 + :electricity: 0.15346628178208507 + :network_gas: 0.15593545019853208 + :ambient_heat: 0.6905982680193827 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22892.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 350.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20924635416411283 - :network_gas: 0.1630145833435465 - :ambient_heat: 0.6277390624923407 + :electricity: 0.16002126429795177 + :network_gas: 0.35991494280819114 + :ambient_heat: 0.48006379289385703 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1980_dijk_en_waard/GM1980_dijk_en_waard.derived.ad b/datasets/GM1980_dijk_en_waard/GM1980_dijk_en_waard.derived.ad index dc38d858dd..4444ccc514 100644 --- a/datasets/GM1980_dijk_en_waard/GM1980_dijk_en_waard.derived.ad +++ b/datasets/GM1980_dijk_en_waard/GM1980_dijk_en_waard.derived.ad @@ -1,6 +1,6 @@ - area = GM1980_dijk_en_waard -- id = 128851 -- parent_id = 128851 +- id = 129193 +- parent_id = 129193 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1980_dijk_en_waard/graph_values.yml b/datasets/GM1980_dijk_en_waard/graph_values.yml index f2bab0e638..78d4b6b39c 100644 --- a/datasets/GM1980_dijk_en_waard/graph_values.yml +++ b/datasets/GM1980_dijk_en_waard/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.159919167735872 - :network_gas: 0.12044457745270397 - :ambient_heat: 0.719636254811424 + :electricity: 0.16240911347793463 + :network_gas: 0.10674987587135966 + :ambient_heat: 0.7308410106507058 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 36193.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 78.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.22202697664442297 - :network_gas: 0.11189209342230583 - :ambient_heat: 0.6660809299332713 + :electricity: 0.1833198263726949 + :network_gas: 0.26672069450921854 + :ambient_heat: 0.5499594791180866 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1982_land_van_cuijk/GM1982_land_van_cuijk.derived.ad b/datasets/GM1982_land_van_cuijk/GM1982_land_van_cuijk.derived.ad index adcdd77ee3..ce2992576f 100644 --- a/datasets/GM1982_land_van_cuijk/GM1982_land_van_cuijk.derived.ad +++ b/datasets/GM1982_land_van_cuijk/GM1982_land_van_cuijk.derived.ad @@ -1,6 +1,6 @@ - area = GM1982_land_van_cuijk -- id = 128852 -- parent_id = 128852 +- id = 129194 +- parent_id = 129194 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1982_land_van_cuijk/graph_values.yml b/datasets/GM1982_land_van_cuijk/graph_values.yml index b86c538172..e455421397 100644 --- a/datasets/GM1982_land_van_cuijk/graph_values.yml +++ b/datasets/GM1982_land_van_cuijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1558134836882614 - :network_gas: 0.1430258397145625 - :ambient_heat: 0.7011606765971763 + :electricity: 0.1587027745307345 + :network_gas: 0.12713474008096026 + :ambient_heat: 0.7141624853883053 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 39031.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 325.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21672185503273356 - :network_gas: 0.1331125798690635 - :ambient_heat: 0.650165565098203 + :electricity: 0.17321265637002006 + :network_gas: 0.3071493745199179 + :ambient_heat: 0.5196379691100621 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1991_maashorst/GM1991_maashorst.derived.ad b/datasets/GM1991_maashorst/GM1991_maashorst.derived.ad index 1488393f1f..6a91354b99 100644 --- a/datasets/GM1991_maashorst/GM1991_maashorst.derived.ad +++ b/datasets/GM1991_maashorst/GM1991_maashorst.derived.ad @@ -1,6 +1,6 @@ - area = GM1991_maashorst -- id = 128853 -- parent_id = 128853 +- id = 129195 +- parent_id = 129195 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1991_maashorst/graph_values.yml b/datasets/GM1991_maashorst/graph_values.yml index b5a8bb3ebd..074f2dc675 100644 --- a/datasets/GM1991_maashorst/graph_values.yml +++ b/datasets/GM1991_maashorst/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15653460368612232 - :network_gas: 0.13905967972632716 - :ambient_heat: 0.7044057165875506 + :electricity: 0.1593553240777767 + :network_gas: 0.12354571757222838 + :ambient_heat: 0.717098958349995 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 25517.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 55.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2176550459772123 - :network_gas: 0.12937981609114832 - :ambient_heat: 0.6529651379316392 + :electricity: 0.1749433884535058 + :network_gas: 0.30022644618597494 + :ambient_heat: 0.5248301653605193 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1992_voorne_aan_zee/GM1992_voorne_aan_zee.derived.ad b/datasets/GM1992_voorne_aan_zee/GM1992_voorne_aan_zee.derived.ad index 35c5b1d5f5..c258cf1585 100644 --- a/datasets/GM1992_voorne_aan_zee/GM1992_voorne_aan_zee.derived.ad +++ b/datasets/GM1992_voorne_aan_zee/GM1992_voorne_aan_zee.derived.ad @@ -1,6 +1,6 @@ - area = GM1992_voorne_aan_zee -- id = 128854 -- parent_id = 128854 +- id = 129196 +- parent_id = 129196 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1992_voorne_aan_zee/graph_values.yml b/datasets/GM1992_voorne_aan_zee/graph_values.yml index c01dda2eff..97a5c1937a 100644 --- a/datasets/GM1992_voorne_aan_zee/graph_values.yml +++ b/datasets/GM1992_voorne_aan_zee/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15700378052227112 - :network_gas: 0.13647920712750863 - :ambient_heat: 0.7065170123502201 + :electricity: 0.159779527390693 + :network_gas: 0.12121259935118844 + :ambient_heat: 0.7190078732581185 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 33090.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 570.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21826187961703514 - :network_gas: 0.126952481531857 - :ambient_heat: 0.6547856388511077 + :electricity: 0.17607939993963062 + :network_gas: 0.2956824002414757 + :ambient_heat: 0.5282381998188937 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0366316528640784 + parent_share: 0.0371676180607669 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0174442272589 + parent_share: 0.0176994573116793 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174028867 + parent_share: 0.0323388136990158 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.097110671286661 + parent_share: 0.0985315173574029 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.141332525618111 + parent_share: 0.176496686762675 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.3922599511574879 + parent_share: 0.518304995130804 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.500658809437908 + parent_share: 0.383243045452293 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0212743750889039 + parent_share: 0.0381242022457029 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9983884281198973 + parent_share: 0.9967795658198888 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0016115718801027 + parent_share: 0.0032204341801112 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.4310899160384949 + parent_share: 0.438476898806052 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240718986006602 + parent_share: 0.0239827395498924 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.265438604839786 + parent_share: 0.2816302997565068 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104894965595536 + parent_share: 0.6943869606936007 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: From 94060c09b8201ba29ea7c77ecb6322ca62cd86e7 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Fri, 21 Aug 2026 15:04:26 +0200 Subject: [PATCH 2/6] Incorrect updated graph values for PV22 (for show casing) --- datasets/PV22_drenthe/PV22_drenthe.derived.ad | 6 +- datasets/PV22_drenthe/graph_values.yml | 60 +++++++++---------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/datasets/PV22_drenthe/PV22_drenthe.derived.ad b/datasets/PV22_drenthe/PV22_drenthe.derived.ad index 2a54160cc6..385d49e6a9 100644 --- a/datasets/PV22_drenthe/PV22_drenthe.derived.ad +++ b/datasets/PV22_drenthe/PV22_drenthe.derived.ad @@ -1,6 +1,6 @@ - area = PV22_drenthe -- id = 128472 -- parent_id = 128472 +- id = 129200 +- parent_id = 129200 - group = province - enabled.etengine = true - enabled.etmodel = true @@ -141,7 +141,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 = 130.0 +- area_per_building_residence_equivalent = 1560.0 - electric_vehicle_profile_1_share = 0.24 - electric_vehicle_profile_2_share = 0.56 - electric_vehicle_profile_3_share = 0.08 diff --git a/datasets/PV22_drenthe/graph_values.yml b/datasets/PV22_drenthe/graph_values.yml index ec6b8aaf8e..115b9f49d6 100644 --- a/datasets/PV22_drenthe/graph_values.yml +++ b/datasets/PV22_drenthe/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 51337.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1517368409257958 - :network_gas: 0.16544737490812306 - :ambient_heat: 0.6828157841660812 + :electricity: 0.18343328738549816 + :network_gas: 0.1745489898853592 + :ambient_heat: 0.6420177227291427 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 223763.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1401.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2114350508081594 - :network_gas: 0.15425979676736012 - :ambient_heat: 0.6343051524244805 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853152 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649668 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324305 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.51830499 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.51830499 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324305 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: From 80e0e67ab9231a92ee310cc12d8fd17abafa1787 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Fri, 21 Aug 2026 15:23:09 +0200 Subject: [PATCH 3/6] Actual dataset changes which are incorrect --- .../GM0014_groningen.derived.ad | 4 ++-- datasets/GM0014_groningen/graph_values.yml | 18 +++++++++--------- .../GM0034_almere/GM0034_almere.derived.ad | 4 ++-- datasets/GM0034_almere/graph_values.yml | 18 +++++++++--------- .../GM0037_stadskanaal.derived.ad | 4 ++-- datasets/GM0037_stadskanaal/graph_values.yml | 18 +++++++++--------- .../GM0047_veendam/GM0047_veendam.derived.ad | 4 ++-- datasets/GM0047_veendam/graph_values.yml | 18 +++++++++--------- .../GM0050_zeewolde/GM0050_zeewolde.derived.ad | 4 ++-- datasets/GM0050_zeewolde/graph_values.yml | 18 +++++++++--------- .../GM0059_achtkarspelen.derived.ad | 4 ++-- datasets/GM0059_achtkarspelen/graph_values.yml | 18 +++++++++--------- .../GM0060_ameland/GM0060_ameland.derived.ad | 4 ++-- datasets/GM0060_ameland/graph_values.yml | 18 +++++++++--------- .../GM0072_harlingen.derived.ad | 4 ++-- datasets/GM0072_harlingen/graph_values.yml | 18 +++++++++--------- .../GM0074_heerenveen.derived.ad | 4 ++-- datasets/GM0074_heerenveen/graph_values.yml | 18 +++++++++--------- .../GM0080_leeuwarden.derived.ad | 4 ++-- datasets/GM0080_leeuwarden/graph_values.yml | 18 +++++++++--------- .../GM0085_ooststellingwerf.derived.ad | 4 ++-- .../GM0085_ooststellingwerf/graph_values.yml | 18 +++++++++--------- .../GM0086_opsterland.derived.ad | 4 ++-- datasets/GM0086_opsterland/graph_values.yml | 18 +++++++++--------- .../GM0088_schiermonnikoog.derived.ad | 4 ++-- .../GM0088_schiermonnikoog/graph_values.yml | 18 +++++++++--------- .../GM0090_smallingerland.derived.ad | 4 ++-- .../GM0090_smallingerland/graph_values.yml | 18 +++++++++--------- .../GM0093_terschelling.derived.ad | 4 ++-- datasets/GM0093_terschelling/graph_values.yml | 18 +++++++++--------- .../GM0096_vlieland/GM0096_vlieland.derived.ad | 4 ++-- datasets/GM0096_vlieland/graph_values.yml | 18 +++++++++--------- .../GM0098_weststellingwerf.derived.ad | 4 ++-- .../GM0098_weststellingwerf/graph_values.yml | 18 +++++++++--------- datasets/GM0106_assen/GM0106_assen.derived.ad | 4 ++-- datasets/GM0106_assen/graph_values.yml | 18 +++++++++--------- .../GM0109_coevorden.derived.ad | 4 ++-- datasets/GM0109_coevorden/graph_values.yml | 18 +++++++++--------- datasets/GM0114_emmen/GM0114_emmen.derived.ad | 4 ++-- datasets/GM0114_emmen/graph_values.yml | 18 +++++++++--------- .../GM0118_hoogeveen.derived.ad | 4 ++-- datasets/GM0118_hoogeveen/graph_values.yml | 18 +++++++++--------- .../GM0119_meppel/GM0119_meppel.derived.ad | 4 ++-- datasets/GM0119_meppel/graph_values.yml | 18 +++++++++--------- .../GM0141_almelo/GM0141_almelo.derived.ad | 4 ++-- datasets/GM0141_almelo/graph_values.yml | 18 +++++++++--------- datasets/GM0147_borne/GM0147_borne.derived.ad | 4 ++-- datasets/GM0147_borne/graph_values.yml | 18 +++++++++--------- .../GM0148_dalfsen/GM0148_dalfsen.derived.ad | 4 ++-- datasets/GM0148_dalfsen/graph_values.yml | 18 +++++++++--------- .../GM0150_deventer/GM0150_deventer.derived.ad | 4 ++-- datasets/GM0150_deventer/graph_values.yml | 18 +++++++++--------- .../GM0153_enschede/GM0153_enschede.derived.ad | 4 ++-- datasets/GM0153_enschede/graph_values.yml | 18 +++++++++--------- .../GM0158_haaksbergen.derived.ad | 4 ++-- datasets/GM0158_haaksbergen/graph_values.yml | 18 +++++++++--------- .../GM0160_hardenberg.derived.ad | 4 ++-- datasets/GM0160_hardenberg/graph_values.yml | 18 +++++++++--------- .../GM0163_hellendoorn.derived.ad | 4 ++-- datasets/GM0163_hellendoorn/graph_values.yml | 18 +++++++++--------- .../GM0164_hengelo/GM0164_hengelo.derived.ad | 4 ++-- datasets/GM0164_hengelo/graph_values.yml | 18 +++++++++--------- .../GM0166_kampen/GM0166_kampen.derived.ad | 4 ++-- datasets/GM0166_kampen/graph_values.yml | 18 +++++++++--------- .../GM0168_losser/GM0168_losser.derived.ad | 4 ++-- datasets/GM0168_losser/graph_values.yml | 18 +++++++++--------- .../GM0171_noordoostpolder.derived.ad | 4 ++-- .../GM0171_noordoostpolder/graph_values.yml | 18 +++++++++--------- .../GM0173_oldenzaal.derived.ad | 4 ++-- datasets/GM0173_oldenzaal/graph_values.yml | 18 +++++++++--------- datasets/GM0175_ommen/GM0175_ommen.derived.ad | 4 ++-- datasets/GM0175_ommen/graph_values.yml | 18 +++++++++--------- .../GM0177_raalte/GM0177_raalte.derived.ad | 4 ++-- datasets/GM0177_raalte/graph_values.yml | 18 +++++++++--------- .../GM0180_staphorst.derived.ad | 4 ++-- datasets/GM0180_staphorst/graph_values.yml | 18 +++++++++--------- .../GM0183_tubbergen.derived.ad | 4 ++-- datasets/GM0183_tubbergen/graph_values.yml | 18 +++++++++--------- datasets/GM0184_urk/GM0184_urk.derived.ad | 4 ++-- datasets/GM0184_urk/graph_values.yml | 18 +++++++++--------- .../GM0189_wierden/GM0189_wierden.derived.ad | 4 ++-- datasets/GM0189_wierden/graph_values.yml | 18 +++++++++--------- .../GM0193_zwolle/GM0193_zwolle.derived.ad | 4 ++-- datasets/GM0193_zwolle/graph_values.yml | 18 +++++++++--------- .../GM0197_aalten/GM0197_aalten.derived.ad | 4 ++-- datasets/GM0197_aalten/graph_values.yml | 18 +++++++++--------- .../GM0200_apeldoorn.derived.ad | 4 ++-- datasets/GM0200_apeldoorn/graph_values.yml | 18 +++++++++--------- .../GM0202_arnhem/GM0202_arnhem.derived.ad | 4 ++-- datasets/GM0202_arnhem/graph_values.yml | 18 +++++++++--------- .../GM0203_barneveld.derived.ad | 4 ++-- datasets/GM0203_barneveld/graph_values.yml | 18 +++++++++--------- .../GM0209_beuningen.derived.ad | 4 ++-- datasets/GM0209_beuningen/graph_values.yml | 18 +++++++++--------- .../GM0213_brummen/GM0213_brummen.derived.ad | 4 ++-- datasets/GM0213_brummen/graph_values.yml | 18 +++++++++--------- datasets/GM0214_buren/GM0214_buren.derived.ad | 4 ++-- datasets/GM0214_buren/graph_values.yml | 18 +++++++++--------- .../GM0216_culemborg.derived.ad | 4 ++-- datasets/GM0216_culemborg/graph_values.yml | 18 +++++++++--------- .../GM0221_doesburg/GM0221_doesburg.derived.ad | 4 ++-- datasets/GM0221_doesburg/graph_values.yml | 18 +++++++++--------- .../GM0222_doetinchem.derived.ad | 4 ++-- datasets/GM0222_doetinchem/graph_values.yml | 18 +++++++++--------- .../GM0225_druten/GM0225_druten.derived.ad | 4 ++-- datasets/GM0225_druten/graph_values.yml | 18 +++++++++--------- .../GM0226_duiven/GM0226_duiven.derived.ad | 4 ++-- datasets/GM0226_duiven/graph_values.yml | 18 +++++++++--------- datasets/GM0228_ede/GM0228_ede.derived.ad | 4 ++-- datasets/GM0228_ede/graph_values.yml | 18 +++++++++--------- .../GM0230_elburg/GM0230_elburg.derived.ad | 4 ++-- datasets/GM0230_elburg/graph_values.yml | 18 +++++++++--------- datasets/GM0232_epe/GM0232_epe.derived.ad | 4 ++-- datasets/GM0232_epe/graph_values.yml | 18 +++++++++--------- .../GM0233_ermelo/GM0233_ermelo.derived.ad | 4 ++-- datasets/GM0233_ermelo/graph_values.yml | 18 +++++++++--------- .../GM0243_harderwijk.derived.ad | 4 ++-- datasets/GM0243_harderwijk/graph_values.yml | 18 +++++++++--------- .../GM0244_hattem/GM0244_hattem.derived.ad | 4 ++-- datasets/GM0244_hattem/graph_values.yml | 18 +++++++++--------- .../GM0246_heerde/GM0246_heerde.derived.ad | 4 ++-- datasets/GM0246_heerde/graph_values.yml | 18 +++++++++--------- .../GM0252_heumen/GM0252_heumen.derived.ad | 4 ++-- datasets/GM0252_heumen/graph_values.yml | 18 +++++++++--------- .../GM0262_lochem/GM0262_lochem.derived.ad | 4 ++-- datasets/GM0262_lochem/graph_values.yml | 18 +++++++++--------- .../GM0263_maasdriel.derived.ad | 4 ++-- datasets/GM0263_maasdriel/graph_values.yml | 18 +++++++++--------- .../GM0267_nijkerk/GM0267_nijkerk.derived.ad | 4 ++-- datasets/GM0267_nijkerk/graph_values.yml | 18 +++++++++--------- .../GM0268_nijmegen/GM0268_nijmegen.derived.ad | 4 ++-- datasets/GM0268_nijmegen/graph_values.yml | 18 +++++++++--------- .../GM0269_oldebroek.derived.ad | 4 ++-- datasets/GM0269_oldebroek/graph_values.yml | 18 +++++++++--------- .../GM0273_putten/GM0273_putten.derived.ad | 4 ++-- datasets/GM0273_putten/graph_values.yml | 18 +++++++++--------- .../GM0274_renkum/GM0274_renkum.derived.ad | 4 ++-- datasets/GM0274_renkum/graph_values.yml | 18 +++++++++--------- .../GM0275_rheden/GM0275_rheden.derived.ad | 4 ++-- datasets/GM0275_rheden/graph_values.yml | 18 +++++++++--------- .../GM0277_rozendaal.derived.ad | 4 ++-- datasets/GM0277_rozendaal/graph_values.yml | 18 +++++++++--------- .../GM0279_scherpenzeel.derived.ad | 4 ++-- datasets/GM0279_scherpenzeel/graph_values.yml | 18 +++++++++--------- datasets/GM0281_tiel/GM0281_tiel.derived.ad | 4 ++-- datasets/GM0281_tiel/graph_values.yml | 18 +++++++++--------- .../GM0285_voorst/GM0285_voorst.derived.ad | 4 ++-- datasets/GM0285_voorst/graph_values.yml | 18 +++++++++--------- .../GM0289_wageningen.derived.ad | 4 ++-- datasets/GM0289_wageningen/graph_values.yml | 18 +++++++++--------- .../GM0293_westervoort.derived.ad | 4 ++-- datasets/GM0293_westervoort/graph_values.yml | 18 +++++++++--------- .../GM0294_winterswijk.derived.ad | 4 ++-- datasets/GM0294_winterswijk/graph_values.yml | 18 +++++++++--------- .../GM0296_wijchen/GM0296_wijchen.derived.ad | 4 ++-- datasets/GM0296_wijchen/graph_values.yml | 18 +++++++++--------- .../GM0297_zaltbommel.derived.ad | 4 ++-- datasets/GM0297_zaltbommel/graph_values.yml | 18 +++++++++--------- .../GM0299_zevenaar/GM0299_zevenaar.derived.ad | 4 ++-- datasets/GM0299_zevenaar/graph_values.yml | 18 +++++++++--------- .../GM0301_zutphen/GM0301_zutphen.derived.ad | 4 ++-- datasets/GM0301_zutphen/graph_values.yml | 18 +++++++++--------- .../GM0302_nunspeet/GM0302_nunspeet.derived.ad | 4 ++-- datasets/GM0302_nunspeet/graph_values.yml | 18 +++++++++--------- .../GM0303_dronten/GM0303_dronten.derived.ad | 4 ++-- datasets/GM0303_dronten/graph_values.yml | 18 +++++++++--------- .../GM0307_amersfoort.derived.ad | 4 ++-- datasets/GM0307_amersfoort/graph_values.yml | 18 +++++++++--------- datasets/GM0308_baarn/GM0308_baarn.derived.ad | 4 ++-- datasets/GM0308_baarn/graph_values.yml | 18 +++++++++--------- .../GM0310_de_bilt/GM0310_de_bilt.derived.ad | 4 ++-- datasets/GM0310_de_bilt/graph_values.yml | 18 +++++++++--------- .../GM0312_bunnik/GM0312_bunnik.derived.ad | 4 ++-- datasets/GM0312_bunnik/graph_values.yml | 18 +++++++++--------- .../GM0313_bunschoten.derived.ad | 4 ++-- datasets/GM0313_bunschoten/graph_values.yml | 18 +++++++++--------- .../GM0317_eemnes/GM0317_eemnes.derived.ad | 4 ++-- datasets/GM0317_eemnes/graph_values.yml | 18 +++++++++--------- .../GM0321_houten/GM0321_houten.derived.ad | 4 ++-- datasets/GM0321_houten/graph_values.yml | 18 +++++++++--------- .../GM0327_leusden/GM0327_leusden.derived.ad | 4 ++-- datasets/GM0327_leusden/graph_values.yml | 18 +++++++++--------- datasets/GM0331_lopik/GM0331_lopik.derived.ad | 4 ++-- datasets/GM0331_lopik/graph_values.yml | 18 +++++++++--------- .../GM0335_montfoort.derived.ad | 4 ++-- datasets/GM0335_montfoort/graph_values.yml | 18 +++++++++--------- .../GM0339_renswoude.derived.ad | 4 ++-- datasets/GM0339_renswoude/graph_values.yml | 18 +++++++++--------- .../GM0340_rhenen/GM0340_rhenen.derived.ad | 4 ++-- datasets/GM0340_rhenen/graph_values.yml | 18 +++++++++--------- datasets/GM0342_soest/GM0342_soest.derived.ad | 4 ++-- datasets/GM0342_soest/graph_values.yml | 18 +++++++++--------- .../GM0344_utrecht/GM0344_utrecht.derived.ad | 4 ++-- datasets/GM0344_utrecht/graph_values.yml | 18 +++++++++--------- .../GM0345_veenendaal.derived.ad | 4 ++-- datasets/GM0345_veenendaal/graph_values.yml | 18 +++++++++--------- .../GM0351_woudenberg.derived.ad | 4 ++-- datasets/GM0351_woudenberg/graph_values.yml | 18 +++++++++--------- .../GM0352_wijk_bij_duurstede.derived.ad | 4 ++-- .../GM0352_wijk_bij_duurstede/graph_values.yml | 18 +++++++++--------- .../GM0353_ijsselstein.derived.ad | 4 ++-- datasets/GM0353_ijsselstein/graph_values.yml | 18 +++++++++--------- datasets/GM0355_zeist/GM0355_zeist.derived.ad | 4 ++-- datasets/GM0355_zeist/graph_values.yml | 18 +++++++++--------- .../GM0356_nieuwegein.derived.ad | 4 ++-- datasets/GM0356_nieuwegein/graph_values.yml | 18 +++++++++--------- .../GM0358_aalsmeer/GM0358_aalsmeer.derived.ad | 4 ++-- datasets/GM0358_aalsmeer/graph_values.yml | 18 +++++++++--------- .../GM0361_alkmaar/GM0361_alkmaar.derived.ad | 4 ++-- datasets/GM0361_alkmaar/graph_values.yml | 18 +++++++++--------- .../GM0362_amstelveen.derived.ad | 4 ++-- datasets/GM0362_amstelveen/graph_values.yml | 18 +++++++++--------- .../GM0363_amsterdam.derived.ad | 4 ++-- datasets/GM0363_amsterdam/graph_values.yml | 18 +++++++++--------- .../GM0373_bergen/GM0373_bergen.derived.ad | 4 ++-- datasets/GM0373_bergen/graph_values.yml | 18 +++++++++--------- .../GM0375_beverwijk.derived.ad | 4 ++-- datasets/GM0375_beverwijk/graph_values.yml | 18 +++++++++--------- .../GM0376_blaricum/GM0376_blaricum.derived.ad | 4 ++-- datasets/GM0376_blaricum/graph_values.yml | 18 +++++++++--------- .../GM0377_bloemendaal.derived.ad | 4 ++-- datasets/GM0377_bloemendaal/graph_values.yml | 18 +++++++++--------- .../GM0383_castricum.derived.ad | 4 ++-- datasets/GM0383_castricum/graph_values.yml | 18 +++++++++--------- .../GM0384_diemen/GM0384_diemen.derived.ad | 4 ++-- datasets/GM0384_diemen/graph_values.yml | 18 +++++++++--------- .../GM0385_edam_volendam.derived.ad | 4 ++-- datasets/GM0385_edam_volendam/graph_values.yml | 18 +++++++++--------- .../GM0388_enkhuizen.derived.ad | 4 ++-- datasets/GM0388_enkhuizen/graph_values.yml | 18 +++++++++--------- .../GM0392_haarlem/GM0392_haarlem.derived.ad | 4 ++-- datasets/GM0392_haarlem/graph_values.yml | 18 +++++++++--------- .../GM0394_haarlemmermeer.derived.ad | 4 ++-- .../GM0394_haarlemmermeer/graph_values.yml | 18 +++++++++--------- .../GM0396_heemskerk.derived.ad | 4 ++-- datasets/GM0396_heemskerk/graph_values.yml | 18 +++++++++--------- .../GM0397_heemstede.derived.ad | 4 ++-- datasets/GM0397_heemstede/graph_values.yml | 18 +++++++++--------- .../GM0399_heiloo/GM0399_heiloo.derived.ad | 4 ++-- datasets/GM0399_heiloo/graph_values.yml | 18 +++++++++--------- .../GM0400_den_helder.derived.ad | 4 ++-- datasets/GM0400_den_helder/graph_values.yml | 18 +++++++++--------- .../GM0402_hilversum.derived.ad | 4 ++-- datasets/GM0402_hilversum/graph_values.yml | 18 +++++++++--------- datasets/GM0405_hoorn/GM0405_hoorn.derived.ad | 4 ++-- datasets/GM0405_hoorn/graph_values.yml | 18 +++++++++--------- .../GM0406_huizen/GM0406_huizen.derived.ad | 4 ++-- datasets/GM0406_huizen/graph_values.yml | 18 +++++++++--------- .../GM0415_landsmeer.derived.ad | 4 ++-- datasets/GM0415_landsmeer/graph_values.yml | 18 +++++++++--------- datasets/GM0417_laren/GM0417_laren.derived.ad | 4 ++-- datasets/GM0417_laren/graph_values.yml | 18 +++++++++--------- .../GM0420_medemblik.derived.ad | 4 ++-- datasets/GM0420_medemblik/graph_values.yml | 18 +++++++++--------- .../GM0431_oostzaan/GM0431_oostzaan.derived.ad | 4 ++-- datasets/GM0431_oostzaan/graph_values.yml | 18 +++++++++--------- .../GM0432_opmeer/GM0432_opmeer.derived.ad | 4 ++-- datasets/GM0432_opmeer/graph_values.yml | 18 +++++++++--------- .../GM0437_ouder_amstel.derived.ad | 4 ++-- datasets/GM0437_ouder_amstel/graph_values.yml | 18 +++++++++--------- .../GM0439_purmerend.derived.ad | 4 ++-- datasets/GM0439_purmerend/graph_values.yml | 18 +++++++++--------- .../GM0441_schagen/GM0441_schagen.derived.ad | 4 ++-- datasets/GM0441_schagen/graph_values.yml | 18 +++++++++--------- datasets/GM0448_texel/GM0448_texel.derived.ad | 4 ++-- datasets/GM0448_texel/graph_values.yml | 18 +++++++++--------- .../GM0450_uitgeest/GM0450_uitgeest.derived.ad | 4 ++-- datasets/GM0450_uitgeest/graph_values.yml | 18 +++++++++--------- .../GM0451_uithoorn/GM0451_uithoorn.derived.ad | 4 ++-- datasets/GM0451_uithoorn/graph_values.yml | 18 +++++++++--------- .../GM0453_velsen/GM0453_velsen.derived.ad | 4 ++-- datasets/GM0453_velsen/graph_values.yml | 18 +++++++++--------- .../GM0473_zandvoort.derived.ad | 4 ++-- datasets/GM0473_zandvoort/graph_values.yml | 18 +++++++++--------- .../GM0479_zaanstad/GM0479_zaanstad.derived.ad | 4 ++-- datasets/GM0479_zaanstad/graph_values.yml | 18 +++++++++--------- .../GM0482_alblasserdam.derived.ad | 4 ++-- datasets/GM0482_alblasserdam/graph_values.yml | 18 +++++++++--------- .../GM0484_alphen_aan_den_rijn.derived.ad | 4 ++-- .../graph_values.yml | 18 +++++++++--------- .../GM0489_barendrecht.derived.ad | 4 ++-- datasets/GM0489_barendrecht/graph_values.yml | 18 +++++++++--------- .../GM0498_drechterland.derived.ad | 4 ++-- datasets/GM0498_drechterland/graph_values.yml | 18 +++++++++--------- .../GM0502_capelle_aan_den_ijssel.derived.ad | 4 ++-- .../graph_values.yml | 18 +++++++++--------- datasets/GM0503_delft/GM0503_delft.derived.ad | 4 ++-- datasets/GM0503_delft/graph_values.yml | 18 +++++++++--------- .../GM0505_dordrecht.derived.ad | 4 ++-- datasets/GM0505_dordrecht/graph_values.yml | 18 +++++++++--------- .../GM0512_gorinchem.derived.ad | 4 ++-- datasets/GM0512_gorinchem/graph_values.yml | 18 +++++++++--------- datasets/GM0513_gouda/GM0513_gouda.derived.ad | 4 ++-- datasets/GM0513_gouda/graph_values.yml | 18 +++++++++--------- .../GM0518_s_gravenhage.derived.ad | 4 ++-- datasets/GM0518_s_gravenhage/graph_values.yml | 18 +++++++++--------- .../GM0523_hardinxveld_giessendam.derived.ad | 4 ++-- .../graph_values.yml | 18 +++++++++--------- .../GM0531_hendrik_ido_ambacht.derived.ad | 4 ++-- .../graph_values.yml | 18 +++++++++--------- .../GM0532_stede_broec.derived.ad | 4 ++-- datasets/GM0532_stede_broec/graph_values.yml | 18 +++++++++--------- .../GM0534_hillegom/GM0534_hillegom.derived.ad | 4 ++-- datasets/GM0534_hillegom/graph_values.yml | 18 +++++++++--------- .../GM0537_katwijk/GM0537_katwijk.derived.ad | 4 ++-- datasets/GM0537_katwijk/graph_values.yml | 18 +++++++++--------- .../GM0542_krimpen_aan_den_ijssel.derived.ad | 4 ++-- .../graph_values.yml | 18 +++++++++--------- .../GM0546_leiden/GM0546_leiden.derived.ad | 4 ++-- datasets/GM0546_leiden/graph_values.yml | 18 +++++++++--------- .../GM0547_leiderdorp.derived.ad | 4 ++-- datasets/GM0547_leiderdorp/graph_values.yml | 18 +++++++++--------- datasets/GM0553_lisse/GM0553_lisse.derived.ad | 4 ++-- datasets/GM0553_lisse/graph_values.yml | 18 +++++++++--------- .../GM0556_maassluis.derived.ad | 4 ++-- datasets/GM0556_maassluis/graph_values.yml | 18 +++++++++--------- .../GM0569_nieuwkoop.derived.ad | 4 ++-- datasets/GM0569_nieuwkoop/graph_values.yml | 18 +++++++++--------- .../GM0575_noordwijk.derived.ad | 4 ++-- datasets/GM0575_noordwijk/graph_values.yml | 18 +++++++++--------- .../GM0579_oegstgeest.derived.ad | 4 ++-- datasets/GM0579_oegstgeest/graph_values.yml | 18 +++++++++--------- .../GM0589_oudewater.derived.ad | 4 ++-- datasets/GM0589_oudewater/graph_values.yml | 18 +++++++++--------- .../GM0590_papendrecht.derived.ad | 4 ++-- datasets/GM0590_papendrecht/graph_values.yml | 18 +++++++++--------- .../GM0597_ridderkerk.derived.ad | 4 ++-- datasets/GM0597_ridderkerk/graph_values.yml | 18 +++++++++--------- .../GM0599_rotterdam.derived.ad | 4 ++-- datasets/GM0599_rotterdam/graph_values.yml | 18 +++++++++--------- .../GM0603_rijswijk/GM0603_rijswijk.derived.ad | 4 ++-- datasets/GM0603_rijswijk/graph_values.yml | 18 +++++++++--------- .../GM0606_schiedam/GM0606_schiedam.derived.ad | 4 ++-- datasets/GM0606_schiedam/graph_values.yml | 18 +++++++++--------- .../GM0610_sliedrecht.derived.ad | 4 ++-- datasets/GM0610_sliedrecht/graph_values.yml | 18 +++++++++--------- .../GM0613_albrandswaard.derived.ad | 4 ++-- datasets/GM0613_albrandswaard/graph_values.yml | 18 +++++++++--------- .../GM0622_vlaardingen.derived.ad | 4 ++-- datasets/GM0622_vlaardingen/graph_values.yml | 18 +++++++++--------- .../GM0626_voorschoten.derived.ad | 4 ++-- datasets/GM0626_voorschoten/graph_values.yml | 18 +++++++++--------- .../GM0627_waddinxveen.derived.ad | 4 ++-- datasets/GM0627_waddinxveen/graph_values.yml | 18 +++++++++--------- .../GM0629_wassenaar.derived.ad | 4 ++-- datasets/GM0629_wassenaar/graph_values.yml | 18 +++++++++--------- .../GM0632_woerden/GM0632_woerden.derived.ad | 4 ++-- datasets/GM0632_woerden/graph_values.yml | 18 +++++++++--------- .../GM0637_zoetermeer.derived.ad | 4 ++-- datasets/GM0637_zoetermeer/graph_values.yml | 18 +++++++++--------- .../GM0638_zoeterwoude.derived.ad | 4 ++-- datasets/GM0638_zoeterwoude/graph_values.yml | 18 +++++++++--------- .../GM0642_zwijndrecht.derived.ad | 4 ++-- datasets/GM0642_zwijndrecht/graph_values.yml | 18 +++++++++--------- .../GM0654_borsele/GM0654_borsele.derived.ad | 4 ++-- datasets/GM0654_borsele/graph_values.yml | 18 +++++++++--------- datasets/GM0664_goes/GM0664_goes.derived.ad | 4 ++-- datasets/GM0664_goes/graph_values.yml | 18 +++++++++--------- .../GM0668_west_maas_en_waal.derived.ad | 4 ++-- .../GM0668_west_maas_en_waal/graph_values.yml | 18 +++++++++--------- datasets/GM0677_hulst/GM0677_hulst.derived.ad | 4 ++-- datasets/GM0677_hulst/graph_values.yml | 18 +++++++++--------- .../GM0678_kapelle/GM0678_kapelle.derived.ad | 4 ++-- datasets/GM0678_kapelle/graph_values.yml | 18 +++++++++--------- .../GM0687_middelburg.derived.ad | 4 ++-- datasets/GM0687_middelburg/graph_values.yml | 18 +++++++++--------- .../GM0703_reimerswaal.derived.ad | 4 ++-- datasets/GM0703_reimerswaal/graph_values.yml | 18 +++++++++--------- .../GM0715_terneuzen.derived.ad | 4 ++-- datasets/GM0715_terneuzen/graph_values.yml | 18 +++++++++--------- .../GM0716_tholen/GM0716_tholen.derived.ad | 4 ++-- datasets/GM0716_tholen/graph_values.yml | 18 +++++++++--------- datasets/GM0717_veere/GM0717_veere.derived.ad | 4 ++-- datasets/GM0717_veere/graph_values.yml | 18 +++++++++--------- .../GM0718_vlissingen.derived.ad | 4 ++-- datasets/GM0718_vlissingen/graph_values.yml | 18 +++++++++--------- .../GM0736_de_ronde_venen.derived.ad | 4 ++-- .../GM0736_de_ronde_venen/graph_values.yml | 18 +++++++++--------- .../GM0737_tytsjerksteradiel.derived.ad | 4 ++-- .../GM0737_tytsjerksteradiel/graph_values.yml | 18 +++++++++--------- datasets/GM0743_asten/GM0743_asten.derived.ad | 4 ++-- datasets/GM0743_asten/graph_values.yml | 18 +++++++++--------- .../GM0744_baarle_nassau.derived.ad | 4 ++-- datasets/GM0744_baarle_nassau/graph_values.yml | 18 +++++++++--------- .../GM0748_bergen_op_zoom.derived.ad | 4 ++-- .../GM0748_bergen_op_zoom/graph_values.yml | 18 +++++++++--------- datasets/GM0753_best/GM0753_best.derived.ad | 4 ++-- datasets/GM0753_best/graph_values.yml | 18 +++++++++--------- .../GM0755_boekel/GM0755_boekel.derived.ad | 4 ++-- datasets/GM0755_boekel/graph_values.yml | 18 +++++++++--------- .../GM0757_boxtel/GM0757_boxtel.derived.ad | 4 ++-- datasets/GM0757_boxtel/graph_values.yml | 18 +++++++++--------- datasets/GM0758_breda/GM0758_breda.derived.ad | 4 ++-- datasets/GM0758_breda/graph_values.yml | 18 +++++++++--------- .../GM0762_deurne/GM0762_deurne.derived.ad | 4 ++-- datasets/GM0762_deurne/graph_values.yml | 18 +++++++++--------- .../GM0765_pekela/GM0765_pekela.derived.ad | 4 ++-- datasets/GM0765_pekela/graph_values.yml | 18 +++++++++--------- .../GM0766_dongen/GM0766_dongen.derived.ad | 4 ++-- datasets/GM0766_dongen/graph_values.yml | 18 +++++++++--------- .../GM0770_eersel/GM0770_eersel.derived.ad | 4 ++-- datasets/GM0770_eersel/graph_values.yml | 18 +++++++++--------- .../GM0772_eindhoven.derived.ad | 4 ++-- datasets/GM0772_eindhoven/graph_values.yml | 18 +++++++++--------- .../GM0777_etten_leur.derived.ad | 4 ++-- datasets/GM0777_etten_leur/graph_values.yml | 18 +++++++++--------- .../GM0779_geertruidenberg.derived.ad | 4 ++-- .../GM0779_geertruidenberg/graph_values.yml | 18 +++++++++--------- .../GM0784_gilze_en_rijen.derived.ad | 4 ++-- .../GM0784_gilze_en_rijen/graph_values.yml | 18 +++++++++--------- .../GM0785_goirle/GM0785_goirle.derived.ad | 4 ++-- datasets/GM0785_goirle/graph_values.yml | 18 +++++++++--------- .../GM0794_helmond/GM0794_helmond.derived.ad | 4 ++-- datasets/GM0794_helmond/graph_values.yml | 18 +++++++++--------- .../GM0796_s_hertogenbosch.derived.ad | 4 ++-- .../GM0796_s_hertogenbosch/graph_values.yml | 18 +++++++++--------- .../GM0797_heusden/GM0797_heusden.derived.ad | 4 ++-- datasets/GM0797_heusden/graph_values.yml | 18 +++++++++--------- .../GM0798_hilvarenbeek.derived.ad | 4 ++-- datasets/GM0798_hilvarenbeek/graph_values.yml | 18 +++++++++--------- .../GM0809_loon_op_zand.derived.ad | 4 ++-- datasets/GM0809_loon_op_zand/graph_values.yml | 18 +++++++++--------- ...820_nuenen_gerwen_en_nederwetten.derived.ad | 4 ++-- .../graph_values.yml | 18 +++++++++--------- .../GM0823_oirschot/GM0823_oirschot.derived.ad | 4 ++-- datasets/GM0823_oirschot/graph_values.yml | 18 +++++++++--------- .../GM0824_oisterwijk.derived.ad | 4 ++-- datasets/GM0824_oisterwijk/graph_values.yml | 18 +++++++++--------- .../GM0826_oosterhout.derived.ad | 4 ++-- datasets/GM0826_oosterhout/graph_values.yml | 18 +++++++++--------- datasets/GM0828_oss/GM0828_oss.derived.ad | 4 ++-- datasets/GM0828_oss/graph_values.yml | 18 +++++++++--------- .../GM0840_rucphen/GM0840_rucphen.derived.ad | 4 ++-- datasets/GM0840_rucphen/graph_values.yml | 18 +++++++++--------- .../GM0845_sint_michielsgestel.derived.ad | 4 ++-- .../graph_values.yml | 18 +++++++++--------- .../GM0847_someren/GM0847_someren.derived.ad | 4 ++-- datasets/GM0847_someren/graph_values.yml | 18 +++++++++--------- .../GM0848_son_en_breugel.derived.ad | 4 ++-- .../GM0848_son_en_breugel/graph_values.yml | 18 +++++++++--------- .../GM0851_steenbergen.derived.ad | 4 ++-- datasets/GM0851_steenbergen/graph_values.yml | 18 +++++++++--------- .../GM0852_waterland.derived.ad | 4 ++-- datasets/GM0852_waterland/graph_values.yml | 18 +++++++++--------- .../GM0855_tilburg/GM0855_tilburg.derived.ad | 4 ++-- datasets/GM0855_tilburg/graph_values.yml | 18 +++++++++--------- .../GM0858_valkenswaard.derived.ad | 4 ++-- datasets/GM0858_valkenswaard/graph_values.yml | 18 +++++++++--------- .../GM0861_veldhoven.derived.ad | 4 ++-- datasets/GM0861_veldhoven/graph_values.yml | 18 +++++++++--------- datasets/GM0865_vught/GM0865_vught.derived.ad | 4 ++-- datasets/GM0865_vught/graph_values.yml | 18 +++++++++--------- .../GM0866_waalre/GM0866_waalre.derived.ad | 4 ++-- datasets/GM0866_waalre/graph_values.yml | 18 +++++++++--------- .../GM0867_waalwijk/GM0867_waalwijk.derived.ad | 4 ++-- datasets/GM0867_waalwijk/graph_values.yml | 18 +++++++++--------- .../GM0873_woensdrecht.derived.ad | 4 ++-- datasets/GM0873_woensdrecht/graph_values.yml | 18 +++++++++--------- .../GM0879_zundert/GM0879_zundert.derived.ad | 4 ++-- datasets/GM0879_zundert/graph_values.yml | 18 +++++++++--------- .../GM0880_wormerland.derived.ad | 4 ++-- datasets/GM0880_wormerland/graph_values.yml | 18 +++++++++--------- .../GM0882_landgraaf.derived.ad | 4 ++-- datasets/GM0882_landgraaf/graph_values.yml | 18 +++++++++--------- datasets/GM0888_beek/GM0888_beek.derived.ad | 4 ++-- datasets/GM0888_beek/graph_values.yml | 18 +++++++++--------- .../GM0889_beesel/GM0889_beesel.derived.ad | 4 ++-- datasets/GM0889_beesel/graph_values.yml | 18 +++++++++--------- .../GM0893_bergen/GM0893_bergen.derived.ad | 4 ++-- datasets/GM0893_bergen/graph_values.yml | 18 +++++++++--------- .../GM0899_brunssum/GM0899_brunssum.derived.ad | 4 ++-- datasets/GM0899_brunssum/graph_values.yml | 18 +++++++++--------- .../GM0907_gennep/GM0907_gennep.derived.ad | 4 ++-- datasets/GM0907_gennep/graph_values.yml | 18 +++++++++--------- .../GM0917_heerlen/GM0917_heerlen.derived.ad | 4 ++-- datasets/GM0917_heerlen/graph_values.yml | 18 +++++++++--------- .../GM0928_kerkrade/GM0928_kerkrade.derived.ad | 4 ++-- datasets/GM0928_kerkrade/graph_values.yml | 18 +++++++++--------- .../GM0935_maastricht.derived.ad | 4 ++-- datasets/GM0935_maastricht/graph_values.yml | 18 +++++++++--------- .../GM0938_meerssen/GM0938_meerssen.derived.ad | 4 ++-- datasets/GM0938_meerssen/graph_values.yml | 18 +++++++++--------- .../GM0944_mook_en_middelaar.derived.ad | 4 ++-- .../GM0944_mook_en_middelaar/graph_values.yml | 18 +++++++++--------- .../GM0946_nederweert.derived.ad | 4 ++-- datasets/GM0946_nederweert/graph_values.yml | 18 +++++++++--------- .../GM0957_roermond/GM0957_roermond.derived.ad | 4 ++-- datasets/GM0957_roermond/graph_values.yml | 18 +++++++++--------- .../GM0965_simpelveld.derived.ad | 4 ++-- datasets/GM0965_simpelveld/graph_values.yml | 18 +++++++++--------- datasets/GM0971_stein/GM0971_stein.derived.ad | 4 ++-- datasets/GM0971_stein/graph_values.yml | 18 +++++++++--------- datasets/GM0981_vaals/GM0981_vaals.derived.ad | 4 ++-- datasets/GM0981_vaals/graph_values.yml | 18 +++++++++--------- datasets/GM0983_venlo/GM0983_venlo.derived.ad | 4 ++-- datasets/GM0983_venlo/graph_values.yml | 18 +++++++++--------- .../GM0984_venray/GM0984_venray.derived.ad | 4 ++-- datasets/GM0984_venray/graph_values.yml | 18 +++++++++--------- .../GM0986_voerendaal.derived.ad | 4 ++-- datasets/GM0986_voerendaal/graph_values.yml | 18 +++++++++--------- datasets/GM0988_weert/GM0988_weert.derived.ad | 4 ++-- datasets/GM0988_weert/graph_values.yml | 18 +++++++++--------- .../GM0994_valkenburg_aan_de_geul.derived.ad | 4 ++-- .../graph_values.yml | 18 +++++++++--------- .../GM0995_lelystad/GM0995_lelystad.derived.ad | 4 ++-- datasets/GM0995_lelystad/graph_values.yml | 18 +++++++++--------- .../GM1507_horst_aan_de_maas.derived.ad | 4 ++-- .../GM1507_horst_aan_de_maas/graph_values.yml | 18 +++++++++--------- .../GM1509_oude_ijsselstreek.derived.ad | 4 ++-- .../GM1509_oude_ijsselstreek/graph_values.yml | 18 +++++++++--------- .../GM1525_teylingen.derived.ad | 4 ++-- datasets/GM1525_teylingen/graph_values.yml | 18 +++++++++--------- .../GM1581_utrechtse_heuvelrug.derived.ad | 4 ++-- .../graph_values.yml | 18 +++++++++--------- .../GM1586_oost_gelre.derived.ad | 4 ++-- datasets/GM1586_oost_gelre/graph_values.yml | 18 +++++++++--------- .../GM1598_koggenland.derived.ad | 4 ++-- datasets/GM1598_koggenland/graph_values.yml | 18 +++++++++--------- .../GM1621_lansingerland.derived.ad | 4 ++-- datasets/GM1621_lansingerland/graph_values.yml | 18 +++++++++--------- .../GM1640_leudal/GM1640_leudal.derived.ad | 4 ++-- datasets/GM1640_leudal/graph_values.yml | 18 +++++++++--------- .../GM1641_maasgouw/GM1641_maasgouw.derived.ad | 4 ++-- datasets/GM1641_maasgouw/graph_values.yml | 18 +++++++++--------- .../GM1652_gemert_bakel.derived.ad | 4 ++-- datasets/GM1652_gemert_bakel/graph_values.yml | 18 +++++++++--------- .../GM1655_halderberge.derived.ad | 4 ++-- datasets/GM1655_halderberge/graph_values.yml | 18 +++++++++--------- .../GM1658_heeze_leende.derived.ad | 4 ++-- datasets/GM1658_heeze_leende/graph_values.yml | 18 +++++++++--------- .../GM1659_laarbeek/GM1659_laarbeek.derived.ad | 4 ++-- datasets/GM1659_laarbeek/graph_values.yml | 18 +++++++++--------- .../GM1667_reusel_de_mierden.derived.ad | 4 ++-- .../GM1667_reusel_de_mierden/graph_values.yml | 18 +++++++++--------- .../GM1669_roerdalen.derived.ad | 4 ++-- datasets/GM1669_roerdalen/graph_values.yml | 18 +++++++++--------- .../GM1674_roosendaal.derived.ad | 4 ++-- datasets/GM1674_roosendaal/graph_values.yml | 18 +++++++++--------- .../GM1676_schouwen_duiveland.derived.ad | 4 ++-- .../GM1676_schouwen_duiveland/graph_values.yml | 18 +++++++++--------- .../GM1680_aa_en_hunze.derived.ad | 4 ++-- datasets/GM1680_aa_en_hunze/graph_values.yml | 18 +++++++++--------- .../GM1681_borger_odoorn.derived.ad | 4 ++-- datasets/GM1681_borger_odoorn/graph_values.yml | 18 +++++++++--------- .../GM1690_de_wolden.derived.ad | 4 ++-- datasets/GM1690_de_wolden/graph_values.yml | 18 +++++++++--------- .../GM1695_noord_beveland.derived.ad | 4 ++-- .../GM1695_noord_beveland/graph_values.yml | 18 +++++++++--------- .../GM1696_wijdemeren.derived.ad | 4 ++-- datasets/GM1696_wijdemeren/graph_values.yml | 18 +++++++++--------- .../GM1699_noordenveld.derived.ad | 4 ++-- datasets/GM1699_noordenveld/graph_values.yml | 18 +++++++++--------- .../GM1700_twenterand.derived.ad | 4 ++-- datasets/GM1700_twenterand/graph_values.yml | 18 +++++++++--------- .../GM1701_westerveld.derived.ad | 4 ++-- datasets/GM1701_westerveld/graph_values.yml | 18 +++++++++--------- .../GM1705_lingewaard.derived.ad | 4 ++-- datasets/GM1705_lingewaard/graph_values.yml | 18 +++++++++--------- .../GM1706_cranendonck.derived.ad | 4 ++-- datasets/GM1706_cranendonck/graph_values.yml | 18 +++++++++--------- .../GM1708_steenwijkerland.derived.ad | 4 ++-- .../GM1708_steenwijkerland/graph_values.yml | 18 +++++++++--------- .../GM1709_moerdijk/GM1709_moerdijk.derived.ad | 4 ++-- datasets/GM1709_moerdijk/graph_values.yml | 18 +++++++++--------- .../GM1711_echt_susteren.derived.ad | 4 ++-- datasets/GM1711_echt_susteren/graph_values.yml | 18 +++++++++--------- datasets/GM1714_sluis/GM1714_sluis.derived.ad | 4 ++-- datasets/GM1714_sluis/graph_values.yml | 18 +++++++++--------- .../GM1719_drimmelen.derived.ad | 4 ++-- datasets/GM1719_drimmelen/graph_values.yml | 18 +++++++++--------- .../GM1721_bernheze/GM1721_bernheze.derived.ad | 4 ++-- datasets/GM1721_bernheze/graph_values.yml | 18 +++++++++--------- .../GM1723_alphen_chaam.derived.ad | 4 ++-- datasets/GM1723_alphen_chaam/graph_values.yml | 18 +++++++++--------- .../GM1724_bergeijk/GM1724_bergeijk.derived.ad | 4 ++-- datasets/GM1724_bergeijk/graph_values.yml | 18 +++++++++--------- .../GM1728_bladel/GM1728_bladel.derived.ad | 4 ++-- datasets/GM1728_bladel/graph_values.yml | 18 +++++++++--------- .../GM1729_gulpen_wittem.derived.ad | 4 ++-- datasets/GM1729_gulpen_wittem/graph_values.yml | 18 +++++++++--------- .../GM1730_tynaarlo/GM1730_tynaarlo.derived.ad | 4 ++-- datasets/GM1730_tynaarlo/graph_values.yml | 18 +++++++++--------- .../GM1731_midden_drenthe.derived.ad | 4 ++-- .../GM1731_midden_drenthe/graph_values.yml | 18 +++++++++--------- .../GM1734_overbetuwe.derived.ad | 4 ++-- datasets/GM1734_overbetuwe/graph_values.yml | 18 +++++++++--------- .../GM1735_hof_van_twente.derived.ad | 4 ++-- .../GM1735_hof_van_twente/graph_values.yml | 18 +++++++++--------- .../GM1740_neder_betuwe.derived.ad | 4 ++-- datasets/GM1740_neder_betuwe/graph_values.yml | 18 +++++++++--------- .../GM1742_rijssen_holten.derived.ad | 4 ++-- .../GM1742_rijssen_holten/graph_values.yml | 18 +++++++++--------- .../GM1771_geldrop_mierlo.derived.ad | 4 ++-- .../GM1771_geldrop_mierlo/graph_values.yml | 18 +++++++++--------- .../GM1773_olst_wijhe.derived.ad | 4 ++-- datasets/GM1773_olst_wijhe/graph_values.yml | 18 +++++++++--------- .../GM1774_dinkelland.derived.ad | 4 ++-- datasets/GM1774_dinkelland/graph_values.yml | 18 +++++++++--------- .../GM1783_westland/GM1783_westland.derived.ad | 4 ++-- datasets/GM1783_westland/graph_values.yml | 18 +++++++++--------- .../GM1842_midden_delfland.derived.ad | 4 ++-- .../GM1842_midden_delfland/graph_values.yml | 18 +++++++++--------- .../GM1859_berkelland.derived.ad | 4 ++-- datasets/GM1859_berkelland/graph_values.yml | 18 +++++++++--------- .../GM1876_bronckhorst.derived.ad | 4 ++-- datasets/GM1876_bronckhorst/graph_values.yml | 18 +++++++++--------- .../GM1883_sittard_geleen.derived.ad | 4 ++-- .../GM1883_sittard_geleen/graph_values.yml | 18 +++++++++--------- .../GM1884_kaag_en_braassem.derived.ad | 4 ++-- .../GM1884_kaag_en_braassem/graph_values.yml | 18 +++++++++--------- .../GM1891_dantumadiel.derived.ad | 4 ++-- datasets/GM1891_dantumadiel/graph_values.yml | 18 +++++++++--------- .../GM1892_zuidplas/GM1892_zuidplas.derived.ad | 4 ++-- datasets/GM1892_zuidplas/graph_values.yml | 18 +++++++++--------- .../GM1894_peel_en_maas.derived.ad | 4 ++-- datasets/GM1894_peel_en_maas/graph_values.yml | 18 +++++++++--------- .../GM1895_oldambt/GM1895_oldambt.derived.ad | 4 ++-- datasets/GM1895_oldambt/graph_values.yml | 18 +++++++++--------- .../GM1896_zwartewaterland.derived.ad | 4 ++-- .../GM1896_zwartewaterland/graph_values.yml | 18 +++++++++--------- .../GM1900_sudwest_fryslan.derived.ad | 4 ++-- .../GM1900_sudwest_fryslan/graph_values.yml | 18 +++++++++--------- .../GM1901_bodegraven_reeuwijk.derived.ad | 4 ++-- .../graph_values.yml | 18 +++++++++--------- .../GM1903_eijsden_margraten.derived.ad | 4 ++-- .../GM1903_eijsden_margraten/graph_values.yml | 18 +++++++++--------- .../GM1904_stichtse_vecht.derived.ad | 4 ++-- .../GM1904_stichtse_vecht/graph_values.yml | 18 +++++++++--------- .../GM1911_hollands_kroon.derived.ad | 4 ++-- .../GM1911_hollands_kroon/graph_values.yml | 18 +++++++++--------- .../GM1916_leidschendam_voorburg.derived.ad | 4 ++-- .../graph_values.yml | 18 +++++++++--------- .../GM1924_goeree_overflakkee.derived.ad | 4 ++-- .../GM1924_goeree_overflakkee/graph_values.yml | 18 +++++++++--------- .../GM1926_pijnacker_nootdorp.derived.ad | 4 ++-- .../GM1926_pijnacker_nootdorp/graph_values.yml | 18 +++++++++--------- .../GM1930_nissewaard.derived.ad | 4 ++-- datasets/GM1930_nissewaard/graph_values.yml | 18 +++++++++--------- .../GM1931_krimpenerwaard.derived.ad | 4 ++-- .../GM1931_krimpenerwaard/graph_values.yml | 18 +++++++++--------- .../GM1940_de_fryske_marren.derived.ad | 4 ++-- .../GM1940_de_fryske_marren/graph_values.yml | 18 +++++++++--------- .../GM1942_gooise_meren.derived.ad | 4 ++-- datasets/GM1942_gooise_meren/graph_values.yml | 18 +++++++++--------- .../GM1945_berg_en_dal.derived.ad | 4 ++-- datasets/GM1945_berg_en_dal/graph_values.yml | 18 +++++++++--------- .../GM1948_meierijstad.derived.ad | 4 ++-- datasets/GM1948_meierijstad/graph_values.yml | 18 +++++++++--------- .../GM1949_waadhoeke.derived.ad | 4 ++-- datasets/GM1949_waadhoeke/graph_values.yml | 18 +++++++++--------- .../GM1950_westerwolde.derived.ad | 4 ++-- datasets/GM1950_westerwolde/graph_values.yml | 18 +++++++++--------- .../GM1952_midden_groningen.derived.ad | 4 ++-- .../GM1952_midden_groningen/graph_values.yml | 18 +++++++++--------- .../GM1954_beekdaelen.derived.ad | 4 ++-- datasets/GM1954_beekdaelen/graph_values.yml | 18 +++++++++--------- .../GM1955_montferland.derived.ad | 4 ++-- datasets/GM1955_montferland/graph_values.yml | 18 +++++++++--------- .../GM1959_altena/GM1959_altena.derived.ad | 4 ++-- datasets/GM1959_altena/graph_values.yml | 18 +++++++++--------- .../GM1960_west_betuwe.derived.ad | 4 ++-- datasets/GM1960_west_betuwe/graph_values.yml | 18 +++++++++--------- .../GM1961_vijfheerenlanden.derived.ad | 4 ++-- .../GM1961_vijfheerenlanden/graph_values.yml | 18 +++++++++--------- .../GM1963_hoeksche_waard.derived.ad | 4 ++-- .../GM1963_hoeksche_waard/graph_values.yml | 18 +++++++++--------- .../GM1966_het_hogeland.derived.ad | 4 ++-- datasets/GM1966_het_hogeland/graph_values.yml | 18 +++++++++--------- .../GM1969_westerkwartier.derived.ad | 4 ++-- .../GM1969_westerkwartier/graph_values.yml | 18 +++++++++--------- .../GM1970_noardeast_fryslan.derived.ad | 4 ++-- .../GM1970_noardeast_fryslan/graph_values.yml | 18 +++++++++--------- .../GM1978_molenlanden.derived.ad | 4 ++-- datasets/GM1978_molenlanden/graph_values.yml | 18 +++++++++--------- .../GM1979_eemsdelta.derived.ad | 4 ++-- datasets/GM1979_eemsdelta/graph_values.yml | 18 +++++++++--------- .../GM1980_dijk_en_waard.derived.ad | 4 ++-- datasets/GM1980_dijk_en_waard/graph_values.yml | 18 +++++++++--------- .../GM1982_land_van_cuijk.derived.ad | 4 ++-- .../GM1982_land_van_cuijk/graph_values.yml | 18 +++++++++--------- .../GM1991_maashorst.derived.ad | 4 ++-- datasets/GM1991_maashorst/graph_values.yml | 18 +++++++++--------- .../GM1992_voorne_aan_zee.derived.ad | 4 ++-- .../GM1992_voorne_aan_zee/graph_values.yml | 18 +++++++++--------- 684 files changed, 3762 insertions(+), 3762 deletions(-) diff --git a/datasets/GM0014_groningen/GM0014_groningen.derived.ad b/datasets/GM0014_groningen/GM0014_groningen.derived.ad index 78fa0e546e..8cc178fbf3 100644 --- a/datasets/GM0014_groningen/GM0014_groningen.derived.ad +++ b/datasets/GM0014_groningen/GM0014_groningen.derived.ad @@ -1,6 +1,6 @@ - area = GM0014_groningen -- id = 128958 -- parent_id = 128958 +- id = 129304 +- parent_id = 129304 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0014_groningen/graph_values.yml b/datasets/GM0014_groningen/graph_values.yml index 9428452f30..2e174b63ef 100644 --- a/datasets/GM0014_groningen/graph_values.yml +++ b/datasets/GM0014_groningen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 41967.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15359734259352323 - :network_gas: 0.15521461573562229 - :ambient_heat: 0.6911880416708545 + :electricity: 0.18147055227187414 + :network_gas: 0.18338131091727508 + :ambient_heat: 0.6351481368108508 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 118786.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 6253.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16033703950631645 - :network_gas: 0.3586518419747325 - :ambient_heat: 0.48101111851895106 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0034_almere/GM0034_almere.derived.ad b/datasets/GM0034_almere/GM0034_almere.derived.ad index 7079040541..315042435a 100644 --- a/datasets/GM0034_almere/GM0034_almere.derived.ad +++ b/datasets/GM0034_almere/GM0034_almere.derived.ad @@ -1,6 +1,6 @@ - area = GM0034_almere -- id = 128863 -- parent_id = 128863 +- id = 129209 +- parent_id = 129209 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0034_almere/graph_values.yml b/datasets/GM0034_almere/graph_values.yml index 3d7d0c04c1..8b6e33b078 100644 --- a/datasets/GM0034_almere/graph_values.yml +++ b/datasets/GM0034_almere/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 19386.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1723881661044069 - :network_gas: 0.05186508642576184 - :ambient_heat: 0.7757467474698312 + :electricity: 0.2082956294673982 + :network_gas: 0.06266828558227176 + :ambient_heat: 0.72903608495033 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 85128.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 0.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2143174775817544 - :network_gas: 0.1427300896729801 - :ambient_heat: 0.6429524327452655 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0037_stadskanaal/GM0037_stadskanaal.derived.ad b/datasets/GM0037_stadskanaal/GM0037_stadskanaal.derived.ad index 4b85833a57..74418223ec 100644 --- a/datasets/GM0037_stadskanaal/GM0037_stadskanaal.derived.ad +++ b/datasets/GM0037_stadskanaal/GM0037_stadskanaal.derived.ad @@ -1,6 +1,6 @@ - area = GM0037_stadskanaal -- id = 129103 -- parent_id = 129103 +- id = 129449 +- parent_id = 129449 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0037_stadskanaal/graph_values.yml b/datasets/GM0037_stadskanaal/graph_values.yml index 3e6d808d99..9c4223fbfe 100644 --- a/datasets/GM0037_stadskanaal/graph_values.yml +++ b/datasets/GM0037_stadskanaal/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3013.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15190362659467835 - :network_gas: 0.16453005372926902 - :ambient_heat: 0.6835663196760525 + :electricity: 0.1791110666961636 + :network_gas: 0.19399901166058714 + :ambient_heat: 0.6268899216432493 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15182.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 21.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15630987550389877 - :network_gas: 0.37476049798440336 - :ambient_heat: 0.46892962651169795 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0047_veendam/GM0047_veendam.derived.ad b/datasets/GM0047_veendam/GM0047_veendam.derived.ad index 4fd3bf5621..e64d64d2dc 100644 --- a/datasets/GM0047_veendam/GM0047_veendam.derived.ad +++ b/datasets/GM0047_veendam/GM0047_veendam.derived.ad @@ -1,6 +1,6 @@ - area = GM0047_veendam -- id = 129130 -- parent_id = 129130 +- id = 129476 +- parent_id = 129476 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0047_veendam/graph_values.yml b/datasets/GM0047_veendam/graph_values.yml index 0453a5a156..c8963a72c8 100644 --- a/datasets/GM0047_veendam/graph_values.yml +++ b/datasets/GM0047_veendam/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2545.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1523071388010245 - :network_gas: 0.1623107365943652 - :ambient_heat: 0.6853821246046103 + :electricity: 0.17967233680149178 + :network_gas: 0.191473292463195 + :ambient_heat: 0.6288543707353131 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12890.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 98.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15725886217803972 - :network_gas: 0.3709645512878395 - :ambient_heat: 0.47177658653412086 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0050_zeewolde/GM0050_zeewolde.derived.ad b/datasets/GM0050_zeewolde/GM0050_zeewolde.derived.ad index b38757f660..7818733e22 100644 --- a/datasets/GM0050_zeewolde/GM0050_zeewolde.derived.ad +++ b/datasets/GM0050_zeewolde/GM0050_zeewolde.derived.ad @@ -1,6 +1,6 @@ - area = GM0050_zeewolde -- id = 129168 -- parent_id = 129168 +- id = 129514 +- parent_id = 129514 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0050_zeewolde/graph_values.yml b/datasets/GM0050_zeewolde/graph_values.yml index 7fc1e10c9b..cec2a4589d 100644 --- a/datasets/GM0050_zeewolde/graph_values.yml +++ b/datasets/GM0050_zeewolde/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2749.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16334427787748151 - :network_gas: 0.10160647167385183 - :ambient_heat: 0.7350492504486668 + :electricity: 0.19523450566356218 + :network_gas: 0.12144342934585232 + :ambient_heat: 0.6833220649905856 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8836.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 0.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18598018416060721 - :network_gas: 0.2560792633575693 - :ambient_heat: 0.5579405524818236 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0059_achtkarspelen/GM0059_achtkarspelen.derived.ad b/datasets/GM0059_achtkarspelen/GM0059_achtkarspelen.derived.ad index ff402715a8..bf359869ee 100644 --- a/datasets/GM0059_achtkarspelen/GM0059_achtkarspelen.derived.ad +++ b/datasets/GM0059_achtkarspelen/GM0059_achtkarspelen.derived.ad @@ -1,6 +1,6 @@ - area = GM0059_achtkarspelen -- id = 128858 -- parent_id = 128858 +- id = 129204 +- parent_id = 129204 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0059_achtkarspelen/graph_values.yml b/datasets/GM0059_achtkarspelen/graph_values.yml index 169df1114a..55b38196ac 100644 --- a/datasets/GM0059_achtkarspelen/graph_values.yml +++ b/datasets/GM0059_achtkarspelen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2220.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1539862910546704 - :network_gas: 0.15307539919931296 - :ambient_heat: 0.6929383097460168 + :electricity: 0.18201372329290208 + :network_gas: 0.18093703771930172 + :ambient_heat: 0.6370492389877962 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12144.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 16.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16127833609490216 - :network_gas: 0.3548866556203897 - :ambient_heat: 0.4838350082847082 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0060_ameland/GM0060_ameland.derived.ad b/datasets/GM0060_ameland/GM0060_ameland.derived.ad index 9d2e62651b..0e54672266 100644 --- a/datasets/GM0060_ameland/GM0060_ameland.derived.ad +++ b/datasets/GM0060_ameland/GM0060_ameland.derived.ad @@ -1,6 +1,6 @@ - area = GM0060_ameland -- id = 128866 -- parent_id = 128866 +- id = 129212 +- parent_id = 129212 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0060_ameland/graph_values.yml b/datasets/GM0060_ameland/graph_values.yml index 1c466e038d..a554002e7d 100644 --- a/datasets/GM0060_ameland/graph_values.yml +++ b/datasets/GM0060_ameland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2193.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1524537410420842 - :network_gas: 0.16150442426853698 - :ambient_heat: 0.686041834689379 + :electricity: 0.17987638728883018 + :network_gas: 0.19055506391651975 + :ambient_heat: 0.6295685487946502 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 1748.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 13.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15760524660365682 - :network_gas: 0.36957901358537093 - :ambient_heat: 0.4728157398109722 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0072_harlingen/GM0072_harlingen.derived.ad b/datasets/GM0072_harlingen/GM0072_harlingen.derived.ad index c23f36c53d..7428048853 100644 --- a/datasets/GM0072_harlingen/GM0072_harlingen.derived.ad +++ b/datasets/GM0072_harlingen/GM0072_harlingen.derived.ad @@ -1,6 +1,6 @@ - area = GM0072_harlingen -- id = 128967 -- parent_id = 128967 +- id = 129313 +- parent_id = 129313 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0072_harlingen/graph_values.yml b/datasets/GM0072_harlingen/graph_values.yml index 6160ebd1e5..089d4a64a7 100644 --- a/datasets/GM0072_harlingen/graph_values.yml +++ b/datasets/GM0072_harlingen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1555.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15574949320637235 - :network_gas: 0.14337778736495219 - :ambient_heat: 0.7008727194286756 + :electricity: 0.18448233236549777 + :network_gas: 0.16982828051609075 + :ambient_heat: 0.6456893871184113 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7885.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 893.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16562530388094038 - :network_gas: 0.3374987844762367 - :ambient_heat: 0.4968759116428229 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0074_heerenveen/GM0074_heerenveen.derived.ad b/datasets/GM0074_heerenveen/GM0074_heerenveen.derived.ad index 0eb757a496..a3fb4871a0 100644 --- a/datasets/GM0074_heerenveen/GM0074_heerenveen.derived.ad +++ b/datasets/GM0074_heerenveen/GM0074_heerenveen.derived.ad @@ -1,6 +1,6 @@ - area = GM0074_heerenveen -- id = 128972 -- parent_id = 128972 +- id = 129318 +- parent_id = 129318 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0074_heerenveen/graph_values.yml b/datasets/GM0074_heerenveen/graph_values.yml index 89bdb4fa8a..dacffb3491 100644 --- a/datasets/GM0074_heerenveen/graph_values.yml +++ b/datasets/GM0074_heerenveen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 6577.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15552132997898807 - :network_gas: 0.1446326851155656 - :ambient_heat: 0.6998459849054464 + :electricity: 0.18416230687294702 + :network_gas: 0.17126839735558966 + :ambient_heat: 0.6445692957714634 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 23643.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 228.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16505530302078164 - :network_gas: 0.3397787879168716 - :ambient_heat: 0.4951659090623467 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0080_leeuwarden/GM0080_leeuwarden.derived.ad b/datasets/GM0080_leeuwarden/GM0080_leeuwarden.derived.ad index ee8538da42..f69ddf9017 100644 --- a/datasets/GM0080_leeuwarden/GM0080_leeuwarden.derived.ad +++ b/datasets/GM0080_leeuwarden/GM0080_leeuwarden.derived.ad @@ -1,6 +1,6 @@ - area = GM0080_leeuwarden -- id = 129007 -- parent_id = 129007 +- id = 129353 +- parent_id = 129353 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0080_leeuwarden/graph_values.yml b/datasets/GM0080_leeuwarden/graph_values.yml index 5f04716572..f079aa9de5 100644 --- a/datasets/GM0080_leeuwarden/graph_values.yml +++ b/datasets/GM0080_leeuwarden/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 20546.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1552386147666675 - :network_gas: 0.14618761878332862 - :ambient_heat: 0.6985737664500038 + :electricity: 0.18376600568028184 + :network_gas: 0.17305175535160913 + :ambient_heat: 0.6431822389681089 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 62935.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 8069.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16435214230099926 - :network_gas: 0.34259143079600124 - :ambient_heat: 0.4930564269029995 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0085_ooststellingwerf/GM0085_ooststellingwerf.derived.ad b/datasets/GM0085_ooststellingwerf/GM0085_ooststellingwerf.derived.ad index 909859d503..dd18d9ac24 100644 --- a/datasets/GM0085_ooststellingwerf/GM0085_ooststellingwerf.derived.ad +++ b/datasets/GM0085_ooststellingwerf/GM0085_ooststellingwerf.derived.ad @@ -1,6 +1,6 @@ - area = GM0085_ooststellingwerf -- id = 129057 -- parent_id = 129057 +- id = 129403 +- parent_id = 129403 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0085_ooststellingwerf/graph_values.yml b/datasets/GM0085_ooststellingwerf/graph_values.yml index 9dfc823997..92acef4a32 100644 --- a/datasets/GM0085_ooststellingwerf/graph_values.yml +++ b/datasets/GM0085_ooststellingwerf/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2637.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15340793373194986 - :network_gas: 0.1562563644742758 - :ambient_heat: 0.6903357017937743 + :electricity: 0.181206221309921 + :network_gas: 0.18457080199961187 + :ambient_heat: 0.6342229766904671 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11388.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 11.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15988090856577747 - :network_gas: 0.36047636573688846 - :ambient_heat: 0.47964272569733407 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0086_opsterland/GM0086_opsterland.derived.ad b/datasets/GM0086_opsterland/GM0086_opsterland.derived.ad index c977037aef..d650f6e026 100644 --- a/datasets/GM0086_opsterland/GM0086_opsterland.derived.ad +++ b/datasets/GM0086_opsterland/GM0086_opsterland.derived.ad @@ -1,6 +1,6 @@ - area = GM0086_opsterland -- id = 129060 -- parent_id = 129060 +- id = 129406 +- parent_id = 129406 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0086_opsterland/graph_values.yml b/datasets/GM0086_opsterland/graph_values.yml index 7d2332ec95..b6f39bbe04 100644 --- a/datasets/GM0086_opsterland/graph_values.yml +++ b/datasets/GM0086_opsterland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2168.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1552713958679266 - :network_gas: 0.14600732272640365 - :ambient_heat: 0.6987212814056698 + :electricity: 0.18381194358960307 + :network_gas: 0.172845034454916 + :ambient_heat: 0.6433430219554811 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13088.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 64.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16443349805634155 - :network_gas: 0.34226600777463195 - :ambient_heat: 0.49330049416902644 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0088_schiermonnikoog/GM0088_schiermonnikoog.derived.ad b/datasets/GM0088_schiermonnikoog/GM0088_schiermonnikoog.derived.ad index 10a47736c1..f35d60ce97 100644 --- a/datasets/GM0088_schiermonnikoog/GM0088_schiermonnikoog.derived.ad +++ b/datasets/GM0088_schiermonnikoog/GM0088_schiermonnikoog.derived.ad @@ -1,6 +1,6 @@ - area = GM0088_schiermonnikoog -- id = 129091 -- parent_id = 129091 +- id = 129437 +- parent_id = 129437 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0088_schiermonnikoog/graph_values.yml b/datasets/GM0088_schiermonnikoog/graph_values.yml index 435a099c5a..2baa743160 100644 --- a/datasets/GM0088_schiermonnikoog/graph_values.yml +++ b/datasets/GM0088_schiermonnikoog/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 592.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1508406677324896 - :network_gas: 0.17037632747130715 - :ambient_heat: 0.6787830047962033 + :electricity: 0.17763508478058265 + :network_gas: 0.20064094007223235 + :ambient_heat: 0.6217239751471849 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 586.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 26.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15384055525655851 - :network_gas: 0.38463777897376433 - :ambient_heat: 0.4615216657696772 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0090_smallingerland/GM0090_smallingerland.derived.ad b/datasets/GM0090_smallingerland/GM0090_smallingerland.derived.ad index 22a39229ab..21ab569543 100644 --- a/datasets/GM0090_smallingerland/GM0090_smallingerland.derived.ad +++ b/datasets/GM0090_smallingerland/GM0090_smallingerland.derived.ad @@ -1,6 +1,6 @@ - area = GM0090_smallingerland -- id = 129099 -- parent_id = 129099 +- id = 129445 +- parent_id = 129445 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0090_smallingerland/graph_values.yml b/datasets/GM0090_smallingerland/graph_values.yml index 682567ada6..57509d890b 100644 --- a/datasets/GM0090_smallingerland/graph_values.yml +++ b/datasets/GM0090_smallingerland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 7277.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1549711083764035 - :network_gas: 0.14765890392978068 - :ambient_heat: 0.6973699876938158 + :electricity: 0.1833912678898139 + :network_gas: 0.1747380778946917 + :ambient_heat: 0.6418706542154944 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 25777.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 159.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16368996941585395 - :network_gas: 0.34524012233658247 - :ambient_heat: 0.4910699082475636 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0093_terschelling/GM0093_terschelling.derived.ad b/datasets/GM0093_terschelling/GM0093_terschelling.derived.ad index 816d362ccd..f14703e8da 100644 --- a/datasets/GM0093_terschelling/GM0093_terschelling.derived.ad +++ b/datasets/GM0093_terschelling/GM0093_terschelling.derived.ad @@ -1,6 +1,6 @@ - area = GM0093_terschelling -- id = 129112 -- parent_id = 129112 +- id = 129458 +- parent_id = 129458 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0093_terschelling/graph_values.yml b/datasets/GM0093_terschelling/graph_values.yml index 0330477506..0dae9cb1b6 100644 --- a/datasets/GM0093_terschelling/graph_values.yml +++ b/datasets/GM0093_terschelling/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1498.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15148210686274377 - :network_gas: 0.16684841225490912 - :ambient_heat: 0.681669480882347 + :electricity: 0.17852531889367973 + :network_gas: 0.19663488065756274 + :ambient_heat: 0.6248398004487575 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 2281.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 171.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15532539390276967 - :network_gas: 0.3786984243889196 - :ambient_heat: 0.4659761817083107 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0096_vlieland/GM0096_vlieland.derived.ad b/datasets/GM0096_vlieland/GM0096_vlieland.derived.ad index 240e70fcb1..78b7b70a15 100644 --- a/datasets/GM0096_vlieland/GM0096_vlieland.derived.ad +++ b/datasets/GM0096_vlieland/GM0096_vlieland.derived.ad @@ -1,6 +1,6 @@ - area = GM0096_vlieland -- id = 129138 -- parent_id = 129138 +- id = 129484 +- parent_id = 129484 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0096_vlieland/graph_values.yml b/datasets/GM0096_vlieland/graph_values.yml index d5280e590c..3a463544f3 100644 --- a/datasets/GM0096_vlieland/graph_values.yml +++ b/datasets/GM0096_vlieland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 602.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15625207977179675 - :network_gas: 0.14061356125511776 - :ambient_heat: 0.7031343589730854 + :electricity: 0.18518787906555997 + :network_gas: 0.1666533156852778 + :ambient_heat: 0.6481588052491621 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 600.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 45.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16688888409982539 - :network_gas: 0.3324444636006967 - :ambient_heat: 0.5006666522994779 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0098_weststellingwerf/GM0098_weststellingwerf.derived.ad b/datasets/GM0098_weststellingwerf/GM0098_weststellingwerf.derived.ad index 13c611076f..b325f2914e 100644 --- a/datasets/GM0098_weststellingwerf/GM0098_weststellingwerf.derived.ad +++ b/datasets/GM0098_weststellingwerf/GM0098_weststellingwerf.derived.ad @@ -1,6 +1,6 @@ - area = GM0098_weststellingwerf -- id = 129155 -- parent_id = 129155 +- id = 129501 +- parent_id = 129501 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0098_weststellingwerf/graph_values.yml b/datasets/GM0098_weststellingwerf/graph_values.yml index 8ab1c98b5f..fba5eef4df 100644 --- a/datasets/GM0098_weststellingwerf/graph_values.yml +++ b/datasets/GM0098_weststellingwerf/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2100.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15576348849222865 - :network_gas: 0.1433008132927422 - :ambient_heat: 0.700935698215029 + :electricity: 0.18450196801402685 + :network_gas: 0.16973991996744894 + :ambient_heat: 0.6457581120185242 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11666.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 41.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16566034072640523 - :network_gas: 0.33735863709437725 - :ambient_heat: 0.4969810221792175 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0106_assen/GM0106_assen.derived.ad b/datasets/GM0106_assen/GM0106_assen.derived.ad index c3f3953cf5..c837a31c09 100644 --- a/datasets/GM0106_assen/GM0106_assen.derived.ad +++ b/datasets/GM0106_assen/GM0106_assen.derived.ad @@ -1,6 +1,6 @@ - area = GM0106_assen -- id = 128872 -- parent_id = 128872 +- id = 129218 +- parent_id = 129218 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0106_assen/graph_values.yml b/datasets/GM0106_assen/graph_values.yml index b091ee1f19..2009212a32 100644 --- a/datasets/GM0106_assen/graph_values.yml +++ b/datasets/GM0106_assen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 10273.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1562543562266615 - :network_gas: 0.14060104075336166 - :ambient_heat: 0.7031446030199767 + :electricity: 0.18519107673611573 + :network_gas: 0.1666389261465639 + :ambient_heat: 0.6481699971173204 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 32515.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 222.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16689463268773744 - :network_gas: 0.3324214692490485 - :ambient_heat: 0.500683898063214 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0109_coevorden/GM0109_coevorden.derived.ad b/datasets/GM0109_coevorden/GM0109_coevorden.derived.ad index 185ba26d22..71240c6196 100644 --- a/datasets/GM0109_coevorden/GM0109_coevorden.derived.ad +++ b/datasets/GM0109_coevorden/GM0109_coevorden.derived.ad @@ -1,6 +1,6 @@ - area = GM0109_coevorden -- id = 128908 -- parent_id = 128908 +- id = 129254 +- parent_id = 129254 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0109_coevorden/graph_values.yml b/datasets/GM0109_coevorden/graph_values.yml index 8b97908898..d33201d67d 100644 --- a/datasets/GM0109_coevorden/graph_values.yml +++ b/datasets/GM0109_coevorden/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3598.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15432397691168762 - :network_gas: 0.15121812698571793 - :ambient_heat: 0.6944578961025943 + :electricity: 0.1824857106915142 + :network_gas: 0.17881309129442527 + :ambient_heat: 0.6387011980140606 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15491.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 119.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1621006706608352 - :network_gas: 0.3515973173566575 - :ambient_heat: 0.4863020119825074 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0114_emmen/GM0114_emmen.derived.ad b/datasets/GM0114_emmen/GM0114_emmen.derived.ad index 49dab1c6ad..62305af9bb 100644 --- a/datasets/GM0114_emmen/GM0114_emmen.derived.ad +++ b/datasets/GM0114_emmen/GM0114_emmen.derived.ad @@ -1,6 +1,6 @@ - area = GM0114_emmen -- id = 128941 -- parent_id = 128941 +- id = 129287 +- parent_id = 129287 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0114_emmen/graph_values.yml b/datasets/GM0114_emmen/graph_values.yml index d62dcf885f..eee40e277f 100644 --- a/datasets/GM0114_emmen/graph_values.yml +++ b/datasets/GM0114_emmen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 9327.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15461980651175164 - :network_gas: 0.14959106418536597 - :ambient_heat: 0.6957891293028824 + :electricity: 0.18289950497602372 + :network_gas: 0.17695101426905846 + :ambient_heat: 0.6401494807549178 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 49357.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 69.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16282500537647762 - :network_gas: 0.34869997849408785 - :ambient_heat: 0.4884750161294346 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0118_hoogeveen/GM0118_hoogeveen.derived.ad b/datasets/GM0118_hoogeveen/GM0118_hoogeveen.derived.ad index 53a0263efe..1321ca6fa6 100644 --- a/datasets/GM0118_hoogeveen/GM0118_hoogeveen.derived.ad +++ b/datasets/GM0118_hoogeveen/GM0118_hoogeveen.derived.ad @@ -1,6 +1,6 @@ - area = GM0118_hoogeveen -- id = 128987 -- parent_id = 128987 +- id = 129333 +- parent_id = 129333 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0118_hoogeveen/graph_values.yml b/datasets/GM0118_hoogeveen/graph_values.yml index f6da151a55..daa7864c67 100644 --- a/datasets/GM0118_hoogeveen/graph_values.yml +++ b/datasets/GM0118_hoogeveen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 5856.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15436039542653152 - :network_gas: 0.1510178251540767 - :ambient_heat: 0.6946217794193918 + :electricity: 0.18253663578648205 + :network_gas: 0.17858392802923737 + :ambient_heat: 0.6388794361842806 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 25464.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 168.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1621896422121024 - :network_gas: 0.3512414311515887 - :ambient_heat: 0.48656892663630896 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0119_meppel/GM0119_meppel.derived.ad b/datasets/GM0119_meppel/GM0119_meppel.derived.ad index 28f87253f8..c8997da857 100644 --- a/datasets/GM0119_meppel/GM0119_meppel.derived.ad +++ b/datasets/GM0119_meppel/GM0119_meppel.derived.ad @@ -1,6 +1,6 @@ - area = GM0119_meppel -- id = 129026 -- parent_id = 129026 +- id = 129372 +- parent_id = 129372 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0119_meppel/graph_values.yml b/datasets/GM0119_meppel/graph_values.yml index 9d81e59f23..5f6287bfd1 100644 --- a/datasets/GM0119_meppel/graph_values.yml +++ b/datasets/GM0119_meppel/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4155.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15707052377491665 - :network_gas: 0.13611211923795838 - :ambient_heat: 0.706817356987125 + :electricity: 0.1863386369106657 + :network_gas: 0.16147489774827817 + :ambient_heat: 0.6521864653410562 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16069.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 709.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16897048286367103 - :network_gas: 0.32411806854531405 - :ambient_heat: 0.5069114485910149 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0141_almelo/GM0141_almelo.derived.ad b/datasets/GM0141_almelo/GM0141_almelo.derived.ad index 54c0caa1b6..712beb1c3b 100644 --- a/datasets/GM0141_almelo/GM0141_almelo.derived.ad +++ b/datasets/GM0141_almelo/GM0141_almelo.derived.ad @@ -1,6 +1,6 @@ - area = GM0141_almelo -- id = 128862 -- parent_id = 128862 +- id = 129208 +- parent_id = 129208 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0141_almelo/graph_values.yml b/datasets/GM0141_almelo/graph_values.yml index 3ffbd35e3c..85658aded8 100644 --- a/datasets/GM0141_almelo/graph_values.yml +++ b/datasets/GM0141_almelo/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 8339.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15571082239118816 - :network_gas: 0.1435904768484651 - :ambient_heat: 0.7006987007603468 + :electricity: 0.18442807987096102 + :network_gas: 0.17007241710141238 + :ambient_heat: 0.6454995030276265 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 33783.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1759.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1655285367769656 - :network_gas: 0.33788585289213585 - :ambient_heat: 0.4965856103308986 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0147_borne/GM0147_borne.derived.ad b/datasets/GM0147_borne/GM0147_borne.derived.ad index 67e4704a9f..3b0c5b5d5e 100644 --- a/datasets/GM0147_borne/GM0147_borne.derived.ad +++ b/datasets/GM0147_borne/GM0147_borne.derived.ad @@ -1,6 +1,6 @@ - area = GM0147_borne -- id = 128896 -- parent_id = 128896 +- id = 129242 +- parent_id = 129242 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0147_borne/graph_values.yml b/datasets/GM0147_borne/graph_values.yml index 65d67aced9..0837c5642a 100644 --- a/datasets/GM0147_borne/graph_values.yml +++ b/datasets/GM0147_borne/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1645.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1592229456687421 - :network_gas: 0.12427379882191854 - :ambient_heat: 0.7165032555093395 + :electricity: 0.18937570288878097 + :network_gas: 0.14780808069913728 + :ambient_heat: 0.6628162164120817 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10095.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 172.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17459064924801965 - :network_gas: 0.3016374030079196 - :ambient_heat: 0.5237719477440609 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0148_dalfsen/GM0148_dalfsen.derived.ad b/datasets/GM0148_dalfsen/GM0148_dalfsen.derived.ad index ea83012035..db258336ce 100644 --- a/datasets/GM0148_dalfsen/GM0148_dalfsen.derived.ad +++ b/datasets/GM0148_dalfsen/GM0148_dalfsen.derived.ad @@ -1,6 +1,6 @@ - area = GM0148_dalfsen -- id = 128911 -- parent_id = 128911 +- id = 129257 +- parent_id = 129257 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0148_dalfsen/graph_values.yml b/datasets/GM0148_dalfsen/graph_values.yml index 2ee5f49d45..9e2b6e0ec4 100644 --- a/datasets/GM0148_dalfsen/graph_values.yml +++ b/datasets/GM0148_dalfsen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2268.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1577912676985517 - :network_gas: 0.1321480276579657 - :ambient_heat: 0.7100607046434826 + :electricity: 0.18735387740563614 + :network_gas: 0.15690630878589723 + :ambient_heat: 0.6557398138084667 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12044.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 19.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17082856523954768 - :network_gas: 0.31668573904180736 - :ambient_heat: 0.5124856957186449 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0150_deventer/GM0150_deventer.derived.ad b/datasets/GM0150_deventer/GM0150_deventer.derived.ad index 7c159dbce0..aea50b1085 100644 --- a/datasets/GM0150_deventer/GM0150_deventer.derived.ad +++ b/datasets/GM0150_deventer/GM0150_deventer.derived.ad @@ -1,6 +1,6 @@ - area = GM0150_deventer -- id = 128921 -- parent_id = 128921 +- id = 129267 +- parent_id = 129267 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0150_deventer/graph_values.yml b/datasets/GM0150_deventer/graph_values.yml index f67e299a55..3c54ea27cd 100644 --- a/datasets/GM0150_deventer/graph_values.yml +++ b/datasets/GM0150_deventer/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 11379.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15755042459619686 - :network_gas: 0.1334726647209173 - :ambient_heat: 0.7089769106828858 + :electricity: 0.1870144323567505 + :network_gas: 0.15843381375773055 + :ambient_heat: 0.654551753885519 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 46167.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 4299.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17020503880679166 - :network_gas: 0.3191798447728315 - :ambient_heat: 0.5106151164203768 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0153_enschede/GM0153_enschede.derived.ad b/datasets/GM0153_enschede/GM0153_enschede.derived.ad index 4fd893e02b..6009b55a9c 100644 --- a/datasets/GM0153_enschede/GM0153_enschede.derived.ad +++ b/datasets/GM0153_enschede/GM0153_enschede.derived.ad @@ -1,6 +1,6 @@ - area = GM0153_enschede -- id = 128943 -- parent_id = 128943 +- id = 129289 +- parent_id = 129289 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0153_enschede/graph_values.yml b/datasets/GM0153_enschede/graph_values.yml index 0badb194fd..7e1bcb48e3 100644 --- a/datasets/GM0153_enschede/graph_values.yml +++ b/datasets/GM0153_enschede/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 18865.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15922476147721049 - :network_gas: 0.1242638118753423 - :ambient_heat: 0.7165114266474472 + :electricity: 0.18937827155800435 + :network_gas: 0.14779652167059176 + :ambient_heat: 0.6628252067714039 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 75890.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 3122.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17459548203942638 - :network_gas: 0.30161807184229267 - :ambient_heat: 0.523786446118281 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0158_haaksbergen/GM0158_haaksbergen.derived.ad b/datasets/GM0158_haaksbergen/GM0158_haaksbergen.derived.ad index e17ff1c7fd..689fda4500 100644 --- a/datasets/GM0158_haaksbergen/GM0158_haaksbergen.derived.ad +++ b/datasets/GM0158_haaksbergen/GM0158_haaksbergen.derived.ad @@ -1,6 +1,6 @@ - area = GM0158_haaksbergen -- id = 128960 -- parent_id = 128960 +- id = 129306 +- parent_id = 129306 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0158_haaksbergen/graph_values.yml b/datasets/GM0158_haaksbergen/graph_values.yml index 328d52fe10..a9f6bbee5d 100644 --- a/datasets/GM0158_haaksbergen/graph_values.yml +++ b/datasets/GM0158_haaksbergen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1921.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1581660377937043 - :network_gas: 0.13008679213462632 - :ambient_heat: 0.7117471700716693 + :electricity: 0.18788246585082677 + :network_gas: 0.15452765727593124 + :ambient_heat: 0.6575898768732419 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10563.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 30.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17180412324569683 - :network_gas: 0.31278350701721086 - :ambient_heat: 0.5154123697370923 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0160_hardenberg/GM0160_hardenberg.derived.ad b/datasets/GM0160_hardenberg/GM0160_hardenberg.derived.ad index 73cf560ba7..9153bb4d61 100644 --- a/datasets/GM0160_hardenberg/GM0160_hardenberg.derived.ad +++ b/datasets/GM0160_hardenberg/GM0160_hardenberg.derived.ad @@ -1,6 +1,6 @@ - area = GM0160_hardenberg -- id = 128964 -- parent_id = 128964 +- id = 129310 +- parent_id = 129310 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0160_hardenberg/graph_values.yml b/datasets/GM0160_hardenberg/graph_values.yml index 3c876000d8..b6a4699199 100644 --- a/datasets/GM0160_hardenberg/graph_values.yml +++ b/datasets/GM0160_hardenberg/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 6106.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.156972397380282 - :network_gas: 0.13665181440844884 - :ambient_heat: 0.7063757882112691 + :electricity: 0.18620055024802326 + :network_gas: 0.16209628864622372 + :ambient_heat: 0.6517031611057531 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 25102.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 90.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16871933248000362 - :network_gas: 0.32512267007998374 - :ambient_heat: 0.5061579974400127 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0163_hellendoorn/GM0163_hellendoorn.derived.ad b/datasets/GM0163_hellendoorn/GM0163_hellendoorn.derived.ad index b04e37afcb..2837bdfeef 100644 --- a/datasets/GM0163_hellendoorn/GM0163_hellendoorn.derived.ad +++ b/datasets/GM0163_hellendoorn/GM0163_hellendoorn.derived.ad @@ -1,6 +1,6 @@ - area = GM0163_hellendoorn -- id = 128976 -- parent_id = 128976 +- id = 129322 +- parent_id = 129322 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0163_hellendoorn/graph_values.yml b/datasets/GM0163_hellendoorn/graph_values.yml index 0d9a65b9c1..2cebdbf6d8 100644 --- a/datasets/GM0163_hellendoorn/graph_values.yml +++ b/datasets/GM0163_hellendoorn/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3741.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15797994649502028 - :network_gas: 0.1311102942773884 - :ambient_heat: 0.7109097592275913 + :electricity: 0.18761993756215414 + :network_gas: 0.155709036316547 + :ambient_heat: 0.6566710261212988 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14923.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 116.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17131890175648606 - :network_gas: 0.31472439297405397 - :ambient_heat: 0.51395670526946 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0164_hengelo/GM0164_hengelo.derived.ad b/datasets/GM0164_hengelo/GM0164_hengelo.derived.ad index 45d4131bfc..736f849bf9 100644 --- a/datasets/GM0164_hengelo/GM0164_hengelo.derived.ad +++ b/datasets/GM0164_hengelo/GM0164_hengelo.derived.ad @@ -1,6 +1,6 @@ - area = GM0164_hengelo -- id = 128979 -- parent_id = 128979 +- id = 129325 +- parent_id = 129325 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0164_hengelo/graph_values.yml b/datasets/GM0164_hengelo/graph_values.yml index afa7e3b962..23a2fe7941 100644 --- a/datasets/GM0164_hengelo/graph_values.yml +++ b/datasets/GM0164_hengelo/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 11134.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15681630277128183 - :network_gas: 0.13751033475795005 - :ambient_heat: 0.7056733624707683 + :electricity: 0.18598095505134735 + :network_gas: 0.1630844684880399 + :ambient_heat: 0.6509345764606127 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 38880.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1568.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16832070605154298 - :network_gas: 0.3267171757938262 - :ambient_heat: 0.5049621181546308 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0166_kampen/GM0166_kampen.derived.ad b/datasets/GM0166_kampen/GM0166_kampen.derived.ad index 954f74cad6..8d7eacc1ac 100644 --- a/datasets/GM0166_kampen/GM0166_kampen.derived.ad +++ b/datasets/GM0166_kampen/GM0166_kampen.derived.ad @@ -1,6 +1,6 @@ - area = GM0166_kampen -- id = 128995 -- parent_id = 128995 +- id = 129341 +- parent_id = 129341 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0166_kampen/graph_values.yml b/datasets/GM0166_kampen/graph_values.yml index 9b90f08a90..8ac6593a5c 100644 --- a/datasets/GM0166_kampen/graph_values.yml +++ b/datasets/GM0166_kampen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4327.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15656764318491623 - :network_gas: 0.1388779624829608 - :ambient_heat: 0.7045543943321231 + :electricity: 0.18563130654500087 + :network_gas: 0.16465788908613582 + :ambient_heat: 0.6497108043688633 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22766.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2705.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1676879422086138 - :network_gas: 0.329248231165543 - :ambient_heat: 0.5030638266258431 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0168_losser/GM0168_losser.derived.ad b/datasets/GM0168_losser/GM0168_losser.derived.ad index cf64c05b5f..1a31796969 100644 --- a/datasets/GM0168_losser/GM0168_losser.derived.ad +++ b/datasets/GM0168_losser/GM0168_losser.derived.ad @@ -1,6 +1,6 @@ - area = GM0168_losser -- id = 129019 -- parent_id = 129019 +- id = 129365 +- parent_id = 129365 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0168_losser/graph_values.yml b/datasets/GM0168_losser/graph_values.yml index 363e388d6a..034839ca20 100644 --- a/datasets/GM0168_losser/graph_values.yml +++ b/datasets/GM0168_losser/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1537.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15678101463705393 - :network_gas: 0.13770441949620318 - :ambient_heat: 0.7055145658667428 + :electricity: 0.18593132267743148 + :network_gas: 0.16330781449991802 + :ambient_heat: 0.6507608628226504 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9852.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 60.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1682307403006722 - :network_gas: 0.3270770387973093 - :ambient_heat: 0.5046922209020184 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0171_noordoostpolder/GM0171_noordoostpolder.derived.ad b/datasets/GM0171_noordoostpolder/GM0171_noordoostpolder.derived.ad index 8243ddc45f..049997c572 100644 --- a/datasets/GM0171_noordoostpolder/GM0171_noordoostpolder.derived.ad +++ b/datasets/GM0171_noordoostpolder/GM0171_noordoostpolder.derived.ad @@ -1,6 +1,6 @@ - area = GM0171_noordoostpolder -- id = 129043 -- parent_id = 129043 +- id = 129389 +- parent_id = 129389 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0171_noordoostpolder/graph_values.yml b/datasets/GM0171_noordoostpolder/graph_values.yml index e4eb0cc995..458523b396 100644 --- a/datasets/GM0171_noordoostpolder/graph_values.yml +++ b/datasets/GM0171_noordoostpolder/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4064.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15882766896694975 - :network_gas: 0.12644782068177646 - :ambient_heat: 0.7147245103512738 + :electricity: 0.18881680264656614 + :network_gas: 0.15032313549679804 + :ambient_heat: 0.6608600618566358 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19904.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 90.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17354234790345224 - :network_gas: 0.3058306083861892 - :ambient_heat: 0.5206270437103586 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0173_oldenzaal/GM0173_oldenzaal.derived.ad b/datasets/GM0173_oldenzaal/GM0173_oldenzaal.derived.ad index d4d527f0da..b27e081a14 100644 --- a/datasets/GM0173_oldenzaal/GM0173_oldenzaal.derived.ad +++ b/datasets/GM0173_oldenzaal/GM0173_oldenzaal.derived.ad @@ -1,6 +1,6 @@ - area = GM0173_oldenzaal -- id = 129052 -- parent_id = 129052 +- id = 129398 +- parent_id = 129398 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0173_oldenzaal/graph_values.yml b/datasets/GM0173_oldenzaal/graph_values.yml index ebf56c05c9..c8c3726248 100644 --- a/datasets/GM0173_oldenzaal/graph_values.yml +++ b/datasets/GM0173_oldenzaal/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3730.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15706370292850846 - :network_gas: 0.1361496338932034 - :ambient_heat: 0.706786663178288 + :electricity: 0.18632903735346934 + :network_gas: 0.16151809581934437 + :ambient_heat: 0.6521528668271863 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14655.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 254.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16895301117747744 - :network_gas: 0.3241879552900884 - :ambient_heat: 0.5068590335324342 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0175_ommen/GM0175_ommen.derived.ad b/datasets/GM0175_ommen/GM0175_ommen.derived.ad index a6d6f35805..92deff3831 100644 --- a/datasets/GM0175_ommen/GM0175_ommen.derived.ad +++ b/datasets/GM0175_ommen/GM0175_ommen.derived.ad @@ -1,6 +1,6 @@ - area = GM0175_ommen -- id = 129054 -- parent_id = 129054 +- id = 129400 +- parent_id = 129400 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0175_ommen/graph_values.yml b/datasets/GM0175_ommen/graph_values.yml index 3d62cab809..eca9c20df0 100644 --- a/datasets/GM0175_ommen/graph_values.yml +++ b/datasets/GM0175_ommen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2558.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15719734797031654 - :network_gas: 0.13541458616325897 - :ambient_heat: 0.7073880658664244 + :electricity: 0.1865171556894049 + :network_gas: 0.16067156205967414 + :ambient_heat: 0.6528112822509209 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7575.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 28.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16929572690114056 - :network_gas: 0.3228170923954359 - :ambient_heat: 0.5078871807034235 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0177_raalte/GM0177_raalte.derived.ad b/datasets/GM0177_raalte/GM0177_raalte.derived.ad index 2af00f9174..586028945d 100644 --- a/datasets/GM0177_raalte/GM0177_raalte.derived.ad +++ b/datasets/GM0177_raalte/GM0177_raalte.derived.ad @@ -1,6 +1,6 @@ - area = GM0177_raalte -- id = 129072 -- parent_id = 129072 +- id = 129418 +- parent_id = 129418 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0177_raalte/graph_values.yml b/datasets/GM0177_raalte/graph_values.yml index 6d1be62185..fcab4f7ec5 100644 --- a/datasets/GM0177_raalte/graph_values.yml +++ b/datasets/GM0177_raalte/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3286.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15785548680526415 - :network_gas: 0.13179482257104735 - :ambient_heat: 0.7103496906236886 + :electricity: 0.18744442080944587 + :network_gas: 0.15649886286809656 + :ambient_heat: 0.6560567163224575 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16027.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 43.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17099527326403385 - :network_gas: 0.31601890694386275 - :ambient_heat: 0.5129858197921033 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0180_staphorst/GM0180_staphorst.derived.ad b/datasets/GM0180_staphorst/GM0180_staphorst.derived.ad index 16903d529b..c919af692b 100644 --- a/datasets/GM0180_staphorst/GM0180_staphorst.derived.ad +++ b/datasets/GM0180_staphorst/GM0180_staphorst.derived.ad @@ -1,6 +1,6 @@ - area = GM0180_staphorst -- id = 129104 -- parent_id = 129104 +- id = 129450 +- parent_id = 129450 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0180_staphorst/graph_values.yml b/datasets/GM0180_staphorst/graph_values.yml index ddb3bf2541..c92a08dbf7 100644 --- a/datasets/GM0180_staphorst/graph_values.yml +++ b/datasets/GM0180_staphorst/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1335.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15618472832935973 - :network_gas: 0.14098399418852156 - :ambient_heat: 0.7028312774821188 + :electricity: 0.18509328024146185 + :network_gas: 0.16707901102127956 + :ambient_heat: 0.6478277087372587 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5945.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 25.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1667189090833969 - :network_gas: 0.3331243636664107 - :ambient_heat: 0.5001567272501924 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0183_tubbergen/GM0183_tubbergen.derived.ad b/datasets/GM0183_tubbergen/GM0183_tubbergen.derived.ad index bda26df3c8..499b2b5917 100644 --- a/datasets/GM0183_tubbergen/GM0183_tubbergen.derived.ad +++ b/datasets/GM0183_tubbergen/GM0183_tubbergen.derived.ad @@ -1,6 +1,6 @@ - area = GM0183_tubbergen -- id = 129118 -- parent_id = 129118 +- id = 129464 +- parent_id = 129464 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0183_tubbergen/graph_values.yml b/datasets/GM0183_tubbergen/graph_values.yml index c0961d215f..68dbb392ce 100644 --- a/datasets/GM0183_tubbergen/graph_values.yml +++ b/datasets/GM0183_tubbergen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1288.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1577681173368053 - :network_gas: 0.132275354647571 - :ambient_heat: 0.7099565280156237 + :electricity: 0.18732124077739004 + :network_gas: 0.15705317382951314 + :ambient_heat: 0.6556255853930968 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8606.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 15.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1707685150805339 - :network_gas: 0.31692593967786264 - :ambient_heat: 0.5123055452416035 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0184_urk/GM0184_urk.derived.ad b/datasets/GM0184_urk/GM0184_urk.derived.ad index f9c2e18700..87621fc9e4 100644 --- a/datasets/GM0184_urk/GM0184_urk.derived.ad +++ b/datasets/GM0184_urk/GM0184_urk.derived.ad @@ -1,6 +1,6 @@ - area = GM0184_urk -- id = 129124 -- parent_id = 129124 +- id = 129470 +- parent_id = 129470 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0184_urk/graph_values.yml b/datasets/GM0184_urk/graph_values.yml index 60c5500a3d..900d3c2601 100644 --- a/datasets/GM0184_urk/graph_values.yml +++ b/datasets/GM0184_urk/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1413.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16031287846312342 - :network_gas: 0.11827916845282123 - :ambient_heat: 0.7214079530840554 + :electricity: 0.19091953575106665 + :network_gas: 0.14086082257720364 + :ambient_heat: 0.6682196416717296 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6753.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 258.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17752008806202696 - :network_gas: 0.28991964775189016 - :ambient_heat: 0.5325602641860828 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0189_wierden/GM0189_wierden.derived.ad b/datasets/GM0189_wierden/GM0189_wierden.derived.ad index 03bbff226c..38dc5b4def 100644 --- a/datasets/GM0189_wierden/GM0189_wierden.derived.ad +++ b/datasets/GM0189_wierden/GM0189_wierden.derived.ad @@ -1,6 +1,6 @@ - area = GM0189_wierden -- id = 129156 -- parent_id = 129156 +- id = 129502 +- parent_id = 129502 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0189_wierden/graph_values.yml b/datasets/GM0189_wierden/graph_values.yml index 6de749852a..4142ba4882 100644 --- a/datasets/GM0189_wierden/graph_values.yml +++ b/datasets/GM0189_wierden/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2045.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1590943481080842 - :network_gas: 0.12498108540553683 - :ambient_heat: 0.7159245664863788 + :electricity: 0.18919381511073088 + :network_gas: 0.1486265769069899 + :ambient_heat: 0.6621796079822792 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9929.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 30.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17424878525790416 - :network_gas: 0.3030048589683814 - :ambient_heat: 0.5227463557737143 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0193_zwolle/GM0193_zwolle.derived.ad b/datasets/GM0193_zwolle/GM0193_zwolle.derived.ad index 7cd6b97259..2e049664fa 100644 --- a/datasets/GM0193_zwolle/GM0193_zwolle.derived.ad +++ b/datasets/GM0193_zwolle/GM0193_zwolle.derived.ad @@ -1,6 +1,6 @@ - area = GM0193_zwolle -- id = 129178 -- parent_id = 129178 +- id = 129524 +- parent_id = 129524 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0193_zwolle/graph_values.yml b/datasets/GM0193_zwolle/graph_values.yml index 76f330b085..2b9597f41b 100644 --- a/datasets/GM0193_zwolle/graph_values.yml +++ b/datasets/GM0193_zwolle/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 22273.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15806772368977465 - :network_gas: 0.13062751970623945 - :ambient_heat: 0.7113047566039858 + :electricity: 0.18774375477453448 + :network_gas: 0.15515185803944342 + :ambient_heat: 0.657104387186022 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 59462.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 4931.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1715475757075047 - :network_gas: 0.3138096971699794 - :ambient_heat: 0.5146427271225159 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0197_aalten/GM0197_aalten.derived.ad b/datasets/GM0197_aalten/GM0197_aalten.derived.ad index ca6bb99ac5..89741e5eae 100644 --- a/datasets/GM0197_aalten/GM0197_aalten.derived.ad +++ b/datasets/GM0197_aalten/GM0197_aalten.derived.ad @@ -1,6 +1,6 @@ - area = GM0197_aalten -- id = 128857 -- parent_id = 128857 +- id = 129203 +- parent_id = 129203 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0197_aalten/graph_values.yml b/datasets/GM0197_aalten/graph_values.yml index dacb38f7d6..1f2900f112 100644 --- a/datasets/GM0197_aalten/graph_values.yml +++ b/datasets/GM0197_aalten/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1913.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.157502538761992 - :network_gas: 0.13373603680904422 - :ambient_heat: 0.708761424428964 + :electricity: 0.18694696503605324 + :network_gas: 0.15873741714844036 + :ambient_heat: 0.6543156178155065 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12023.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 102.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17008138160856218 - :network_gas: 0.3196744735657494 - :ambient_heat: 0.5102441448256884 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0200_apeldoorn/GM0200_apeldoorn.derived.ad b/datasets/GM0200_apeldoorn/GM0200_apeldoorn.derived.ad index 93edbf7b3d..1f4aa9a70a 100644 --- a/datasets/GM0200_apeldoorn/GM0200_apeldoorn.derived.ad +++ b/datasets/GM0200_apeldoorn/GM0200_apeldoorn.derived.ad @@ -1,6 +1,6 @@ - area = GM0200_apeldoorn -- id = 128870 -- parent_id = 128870 +- id = 129216 +- parent_id = 129216 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0200_apeldoorn/graph_values.yml b/datasets/GM0200_apeldoorn/graph_values.yml index 130038b014..ffcfd4d3ad 100644 --- a/datasets/GM0200_apeldoorn/graph_values.yml +++ b/datasets/GM0200_apeldoorn/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 27746.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15628730416967035 - :network_gas: 0.14041982706681314 - :ambient_heat: 0.7032928687635165 + :electricity: 0.18523735969449714 + :network_gas: 0.1664306525268105 + :ambient_heat: 0.6483319877786924 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 73999.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 532.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16697785964651513 - :network_gas: 0.3320885614139377 - :ambient_heat: 0.5009335789395472 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0202_arnhem/GM0202_arnhem.derived.ad b/datasets/GM0202_arnhem/GM0202_arnhem.derived.ad index e3b92c4fb4..b390593573 100644 --- a/datasets/GM0202_arnhem/GM0202_arnhem.derived.ad +++ b/datasets/GM0202_arnhem/GM0202_arnhem.derived.ad @@ -1,6 +1,6 @@ - area = GM0202_arnhem -- id = 128871 -- parent_id = 128871 +- id = 129217 +- parent_id = 129217 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0202_arnhem/graph_values.yml b/datasets/GM0202_arnhem/graph_values.yml index a0d4c814aa..e75d638bc8 100644 --- a/datasets/GM0202_arnhem/graph_values.yml +++ b/datasets/GM0202_arnhem/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 25410.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15780123516739109 - :network_gas: 0.13209320657934903 - :ambient_heat: 0.7101055582532598 + :electricity: 0.18736792977209588 + :network_gas: 0.15684307304360634 + :ambient_heat: 0.6557889971842978 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 77777.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 5344.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1708544276230481 - :network_gas: 0.31658228950780576 - :ambient_heat: 0.512563282869146 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0203_barneveld/GM0203_barneveld.derived.ad b/datasets/GM0203_barneveld/GM0203_barneveld.derived.ad index ae2c97d593..babec2a1cf 100644 --- a/datasets/GM0203_barneveld/GM0203_barneveld.derived.ad +++ b/datasets/GM0203_barneveld/GM0203_barneveld.derived.ad @@ -1,6 +1,6 @@ - area = GM0203_barneveld -- id = 128877 -- parent_id = 128877 +- id = 129223 +- parent_id = 129223 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0203_barneveld/graph_values.yml b/datasets/GM0203_barneveld/graph_values.yml index 1e437f9163..8247a524e6 100644 --- a/datasets/GM0203_barneveld/graph_values.yml +++ b/datasets/GM0203_barneveld/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 7661.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15878900426920353 - :network_gas: 0.1266604765193806 - :ambient_heat: 0.7145505192114159 + :electricity: 0.18876216102087054 + :network_gas: 0.15056902317491583 + :ambient_heat: 0.6606688158042137 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 23121.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 63.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17344020373690416 - :network_gas: 0.3062391850523814 - :ambient_heat: 0.5203206112107144 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0209_beuningen/GM0209_beuningen.derived.ad b/datasets/GM0209_beuningen/GM0209_beuningen.derived.ad index ed8f62c06a..4ee77422dc 100644 --- a/datasets/GM0209_beuningen/GM0209_beuningen.derived.ad +++ b/datasets/GM0209_beuningen/GM0209_beuningen.derived.ad @@ -1,6 +1,6 @@ - area = GM0209_beuningen -- id = 128888 -- parent_id = 128888 +- id = 129234 +- parent_id = 129234 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0209_beuningen/graph_values.yml b/datasets/GM0209_beuningen/graph_values.yml index c33b227a18..46304b6bca 100644 --- a/datasets/GM0209_beuningen/graph_values.yml +++ b/datasets/GM0209_beuningen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2384.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15800481273956404 - :network_gas: 0.13097352993239778 - :ambient_heat: 0.7110216573280381 + :electricity: 0.18765501089811365 + :network_gas: 0.15555120607205586 + :ambient_heat: 0.6567937830298304 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11232.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 13.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17138364625563587 - :network_gas: 0.31446541497745456 - :ambient_heat: 0.5141509387669095 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0213_brummen/GM0213_brummen.derived.ad b/datasets/GM0213_brummen/GM0213_brummen.derived.ad index 0daeaaa9da..26461b056a 100644 --- a/datasets/GM0213_brummen/GM0213_brummen.derived.ad +++ b/datasets/GM0213_brummen/GM0213_brummen.derived.ad @@ -1,6 +1,6 @@ - area = GM0213_brummen -- id = 128901 -- parent_id = 128901 +- id = 129247 +- parent_id = 129247 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0213_brummen/graph_values.yml b/datasets/GM0213_brummen/graph_values.yml index 7d764d2aaf..547cc70af5 100644 --- a/datasets/GM0213_brummen/graph_values.yml +++ b/datasets/GM0213_brummen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1574.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15339707673802297 - :network_gas: 0.1563160779408737 - :ambient_heat: 0.6902868453211034 + :electricity: 0.1811910733344621 + :network_gas: 0.1846389679896672 + :ambient_heat: 0.6341699586758707 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9407.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 34.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15985480755693496 - :network_gas: 0.3605807697722584 - :ambient_heat: 0.47956442267080657 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0214_buren/GM0214_buren.derived.ad b/datasets/GM0214_buren/GM0214_buren.derived.ad index b628bb2f43..cf2daa4c80 100644 --- a/datasets/GM0214_buren/GM0214_buren.derived.ad +++ b/datasets/GM0214_buren/GM0214_buren.derived.ad @@ -1,6 +1,6 @@ - area = GM0214_buren -- id = 128905 -- parent_id = 128905 +- id = 129251 +- parent_id = 129251 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0214_buren/graph_values.yml b/datasets/GM0214_buren/graph_values.yml index 6d2084760b..34f4612654 100644 --- a/datasets/GM0214_buren/graph_values.yml +++ b/datasets/GM0214_buren/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1695.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15917492023698201 - :network_gas: 0.12453793869659895 - :ambient_heat: 0.7162871410664191 + :electricity: 0.1893077694375055 + :network_gas: 0.14811378168054143 + :ambient_heat: 0.662578448881953 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10903.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 99.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17446288618686454 - :network_gas: 0.30214845525254014 - :ambient_heat: 0.5233886585605955 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0216_culemborg/GM0216_culemborg.derived.ad b/datasets/GM0216_culemborg/GM0216_culemborg.derived.ad index 4d90669e05..8a15bed7a4 100644 --- a/datasets/GM0216_culemborg/GM0216_culemborg.derived.ad +++ b/datasets/GM0216_culemborg/GM0216_culemborg.derived.ad @@ -1,6 +1,6 @@ - area = GM0216_culemborg -- id = 128910 -- parent_id = 128910 +- id = 129256 +- parent_id = 129256 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0216_culemborg/graph_values.yml b/datasets/GM0216_culemborg/graph_values.yml index 2ba1f88c68..db65e6de03 100644 --- a/datasets/GM0216_culemborg/graph_values.yml +++ b/datasets/GM0216_culemborg/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3085.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16072778735289303 - :network_gas: 0.11599716955908834 - :ambient_heat: 0.7232750430880186 + :electricity: 0.1915082862680981 + :network_gas: 0.13821144134484445 + :ambient_heat: 0.6702802723870576 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12720.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 713.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17865049649101483 - :network_gas: 0.28539801403593873 - :ambient_heat: 0.5359514894730464 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0221_doesburg/GM0221_doesburg.derived.ad b/datasets/GM0221_doesburg/GM0221_doesburg.derived.ad index 32db19bb64..de66b2325c 100644 --- a/datasets/GM0221_doesburg/GM0221_doesburg.derived.ad +++ b/datasets/GM0221_doesburg/GM0221_doesburg.derived.ad @@ -1,6 +1,6 @@ - area = GM0221_doesburg -- id = 128924 -- parent_id = 128924 +- id = 129270 +- parent_id = 129270 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0221_doesburg/graph_values.yml b/datasets/GM0221_doesburg/graph_values.yml index 60303a0371..4877ebab90 100644 --- a/datasets/GM0221_doesburg/graph_values.yml +++ b/datasets/GM0221_doesburg/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 845.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15753504569381505 - :network_gas: 0.13355724868401733 - :ambient_heat: 0.7089077056221678 + :electricity: 0.18699276387396918 + :network_gas: 0.15853132207399323 + :ambient_heat: 0.6544759140520375 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5307.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 362.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17016531395144519 - :network_gas: 0.31933874419421754 - :ambient_heat: 0.5104959418543373 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0222_doetinchem/GM0222_doetinchem.derived.ad b/datasets/GM0222_doetinchem/GM0222_doetinchem.derived.ad index 2bc52a5194..e05a7d7b98 100644 --- a/datasets/GM0222_doetinchem/GM0222_doetinchem.derived.ad +++ b/datasets/GM0222_doetinchem/GM0222_doetinchem.derived.ad @@ -1,6 +1,6 @@ - area = GM0222_doetinchem -- id = 128925 -- parent_id = 128925 +- id = 129271 +- parent_id = 129271 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0222_doetinchem/graph_values.yml b/datasets/GM0222_doetinchem/graph_values.yml index 79e4d77926..ff501782a4 100644 --- a/datasets/GM0222_doetinchem/graph_values.yml +++ b/datasets/GM0222_doetinchem/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 8530.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15837985988080597 - :network_gas: 0.12891077065556722 - :ambient_heat: 0.7127093694636268 + :electricity: 0.1881842586815566 + :network_gas: 0.1531695875355805 + :ambient_heat: 0.6586461537828628 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 26492.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 156.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17236363458648216 - :network_gas: 0.3105454616540696 - :ambient_heat: 0.5170909037594483 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0225_druten/GM0225_druten.derived.ad b/datasets/GM0225_druten/GM0225_druten.derived.ad index 1baff70c3e..338aec441f 100644 --- a/datasets/GM0225_druten/GM0225_druten.derived.ad +++ b/datasets/GM0225_druten/GM0225_druten.derived.ad @@ -1,6 +1,6 @@ - area = GM0225_druten -- id = 128931 -- parent_id = 128931 +- id = 129277 +- parent_id = 129277 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0225_druten/graph_values.yml b/datasets/GM0225_druten/graph_values.yml index 58d9892394..1ca4b6211e 100644 --- a/datasets/GM0225_druten/graph_values.yml +++ b/datasets/GM0225_druten/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1716.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15954100596103696 - :network_gas: 0.1225244672142968 - :ambient_heat: 0.7179345268246663 + :electricity: 0.1898258049287775 + :network_gas: 0.14578261853321667 + :ambient_heat: 0.6643915765380058 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8189.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 21.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17543957618854558 - :network_gas: 0.29824169524581595 - :ambient_heat: 0.5263187285656385 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0226_duiven/GM0226_duiven.derived.ad b/datasets/GM0226_duiven/GM0226_duiven.derived.ad index 2abad03c4c..02efbc82ca 100644 --- a/datasets/GM0226_duiven/GM0226_duiven.derived.ad +++ b/datasets/GM0226_duiven/GM0226_duiven.derived.ad @@ -1,6 +1,6 @@ - area = GM0226_duiven -- id = 128932 -- parent_id = 128932 +- id = 129278 +- parent_id = 129278 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0226_duiven/graph_values.yml b/datasets/GM0226_duiven/graph_values.yml index 301d6087ac..c79df12689 100644 --- a/datasets/GM0226_duiven/graph_values.yml +++ b/datasets/GM0226_duiven/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2691.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17093812103285083 - :network_gas: 0.059840334319320385 - :ambient_heat: 0.7692215446478288 + :electricity: 0.20618230262562615 + :network_gas: 0.07217827038986606 + :ambient_heat: 0.7216394269845079 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10750.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20942849180700523 - :network_gas: 0.1622860327719768 - :ambient_heat: 0.628285475421018 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0228_ede/GM0228_ede.derived.ad b/datasets/GM0228_ede/GM0228_ede.derived.ad index b3755f7e3e..bab11597bf 100644 --- a/datasets/GM0228_ede/GM0228_ede.derived.ad +++ b/datasets/GM0228_ede/GM0228_ede.derived.ad @@ -1,6 +1,6 @@ - area = GM0228_ede -- id = 128935 -- parent_id = 128935 +- id = 129281 +- parent_id = 129281 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0228_ede/graph_values.yml b/datasets/GM0228_ede/graph_values.yml index bcb92bd1ad..8ba9552f2a 100644 --- a/datasets/GM0228_ede/graph_values.yml +++ b/datasets/GM0228_ede/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 12867.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15982723111384567 - :network_gas: 0.12095022887384888 - :ambient_heat: 0.7192225400123055 + :electricity: 0.19023114689560597 + :network_gas: 0.14395857699348646 + :ambient_heat: 0.6658102761109076 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 49897.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 203.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17620769326922928 - :network_gas: 0.29516922692308106 - :ambient_heat: 0.5286230798076896 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0230_elburg/GM0230_elburg.derived.ad b/datasets/GM0230_elburg/GM0230_elburg.derived.ad index ab8fa12243..9e4d0d7685 100644 --- a/datasets/GM0230_elburg/GM0230_elburg.derived.ad +++ b/datasets/GM0230_elburg/GM0230_elburg.derived.ad @@ -1,6 +1,6 @@ - area = GM0230_elburg -- id = 128940 -- parent_id = 128940 +- id = 129286 +- parent_id = 129286 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0230_elburg/graph_values.yml b/datasets/GM0230_elburg/graph_values.yml index c871ea3b5c..6424987a0d 100644 --- a/datasets/GM0230_elburg/graph_values.yml +++ b/datasets/GM0230_elburg/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2484.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15820887092283925 - :network_gas: 0.12985120992438418 - :ambient_heat: 0.7119399191527767 + :electricity: 0.18794290911813447 + :network_gas: 0.15425566217207137 + :ambient_heat: 0.6578014287097941 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9583.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 304.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17191603507588826 - :network_gas: 0.3123358596964452 - :ambient_heat: 0.5157481052276666 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0232_epe/GM0232_epe.derived.ad b/datasets/GM0232_epe/GM0232_epe.derived.ad index a52c2838b1..1e2496bf16 100644 --- a/datasets/GM0232_epe/GM0232_epe.derived.ad +++ b/datasets/GM0232_epe/GM0232_epe.derived.ad @@ -1,6 +1,6 @@ - area = GM0232_epe -- id = 128944 -- parent_id = 128944 +- id = 129290 +- parent_id = 129290 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0232_epe/graph_values.yml b/datasets/GM0232_epe/graph_values.yml index 0818f3bfa4..7a9443ca9a 100644 --- a/datasets/GM0232_epe/graph_values.yml +++ b/datasets/GM0232_epe/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2890.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15587147265269397 - :network_gas: 0.14270690041018322 - :ambient_heat: 0.7014216269371228 + :electricity: 0.18465349370897624 + :network_gas: 0.1690580533349688 + :ambient_heat: 0.6462884529560549 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14683.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 26.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1659309633065527 - :network_gas: 0.3362761467737876 - :ambient_heat: 0.49779288991965986 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0233_ermelo/GM0233_ermelo.derived.ad b/datasets/GM0233_ermelo/GM0233_ermelo.derived.ad index 8f27150793..8a1eb46108 100644 --- a/datasets/GM0233_ermelo/GM0233_ermelo.derived.ad +++ b/datasets/GM0233_ermelo/GM0233_ermelo.derived.ad @@ -1,6 +1,6 @@ - area = GM0233_ermelo -- id = 128945 -- parent_id = 128945 +- id = 129291 +- parent_id = 129291 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0233_ermelo/graph_values.yml b/datasets/GM0233_ermelo/graph_values.yml index ec98e8f629..82400f798b 100644 --- a/datasets/GM0233_ermelo/graph_values.yml +++ b/datasets/GM0233_ermelo/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3957.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15582683082242815 - :network_gas: 0.14295243047664521 - :ambient_heat: 0.7012207387009267 + :electricity: 0.1845908466329083 + :network_gas: 0.16933996559286965 + :ambient_heat: 0.6460691877742221 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11332.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 27.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16581902333412424 - :network_gas: 0.3367239066635013 - :ambient_heat: 0.4974570700023745 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0243_harderwijk/GM0243_harderwijk.derived.ad b/datasets/GM0243_harderwijk/GM0243_harderwijk.derived.ad index 3ddadbaebd..8da936db7b 100644 --- a/datasets/GM0243_harderwijk/GM0243_harderwijk.derived.ad +++ b/datasets/GM0243_harderwijk/GM0243_harderwijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0243_harderwijk -- id = 128965 -- parent_id = 128965 +- id = 129311 +- parent_id = 129311 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0243_harderwijk/graph_values.yml b/datasets/GM0243_harderwijk/graph_values.yml index 92b1961d68..566612c102 100644 --- a/datasets/GM0243_harderwijk/graph_values.yml +++ b/datasets/GM0243_harderwijk/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4652.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15774341772147205 - :network_gas: 0.1324112025319037 - :ambient_heat: 0.7098453797466242 + :electricity: 0.18728642203995133 + :network_gas: 0.15720985837897164 + :ambient_heat: 0.655503719581077 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20668.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 428.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17070447340324937 - :network_gas: 0.31718210638700084 - :ambient_heat: 0.5121134202097499 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0244_hattem/GM0244_hattem.derived.ad b/datasets/GM0244_hattem/GM0244_hattem.derived.ad index e47278af20..754baa9bb6 100644 --- a/datasets/GM0244_hattem/GM0244_hattem.derived.ad +++ b/datasets/GM0244_hattem/GM0244_hattem.derived.ad @@ -1,6 +1,6 @@ - area = GM0244_hattem -- id = 128968 -- parent_id = 128968 +- id = 129314 +- parent_id = 129314 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0244_hattem/graph_values.yml b/datasets/GM0244_hattem/graph_values.yml index e9bd744716..e01f0dc5d2 100644 --- a/datasets/GM0244_hattem/graph_values.yml +++ b/datasets/GM0244_hattem/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 908.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15700187886943337 - :network_gas: 0.13648966621811637 - :ambient_heat: 0.7065084549124502 + :electricity: 0.18624203418274765 + :network_gas: 0.1619096106647631 + :ambient_heat: 0.6518483551524892 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5259.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 226.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1687947435903823 - :network_gas: 0.32482102563846904 - :ambient_heat: 0.5063842307711487 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0246_heerde/GM0246_heerde.derived.ad b/datasets/GM0246_heerde/GM0246_heerde.derived.ad index 67f519d485..0fa9ac2d83 100644 --- a/datasets/GM0246_heerde/GM0246_heerde.derived.ad +++ b/datasets/GM0246_heerde/GM0246_heerde.derived.ad @@ -1,6 +1,6 @@ - area = GM0246_heerde -- id = 128971 -- parent_id = 128971 +- id = 129317 +- parent_id = 129317 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0246_heerde/graph_values.yml b/datasets/GM0246_heerde/graph_values.yml index 9f959b1f00..66a1783b62 100644 --- a/datasets/GM0246_heerde/graph_values.yml +++ b/datasets/GM0246_heerde/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1290.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15745014279726938 - :network_gas: 0.13402421461501823 - :ambient_heat: 0.7085256425877123 + :electricity: 0.1868731520875415 + :network_gas: 0.1590695759064117 + :ambient_heat: 0.6540572720060469 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8005.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 11.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16994619746822595 - :network_gas: 0.32021521012709436 - :ambient_heat: 0.5098385924046797 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0252_heumen/GM0252_heumen.derived.ad b/datasets/GM0252_heumen/GM0252_heumen.derived.ad index 80c57dc44a..4e04878aa5 100644 --- a/datasets/GM0252_heumen/GM0252_heumen.derived.ad +++ b/datasets/GM0252_heumen/GM0252_heumen.derived.ad @@ -1,6 +1,6 @@ - area = GM0252_heumen -- id = 128980 -- parent_id = 128980 +- id = 129326 +- parent_id = 129326 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0252_heumen/graph_values.yml b/datasets/GM0252_heumen/graph_values.yml index fabe161599..347a5c6531 100644 --- a/datasets/GM0252_heumen/graph_values.yml +++ b/datasets/GM0252_heumen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 959.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15857853115966733 - :network_gas: 0.12781807862182976 - :ambient_heat: 0.7136033902185028 + :electricity: 0.1884648048189953 + :network_gas: 0.1519071280559885 + :ambient_heat: 0.6596280671250162 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7265.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 7.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1728854117013979 - :network_gas: 0.3084583531944066 - :ambient_heat: 0.5186562351041955 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0262_lochem/GM0262_lochem.derived.ad b/datasets/GM0262_lochem/GM0262_lochem.derived.ad index bbc0288f5b..3f90d1ec1c 100644 --- a/datasets/GM0262_lochem/GM0262_lochem.derived.ad +++ b/datasets/GM0262_lochem/GM0262_lochem.derived.ad @@ -1,6 +1,6 @@ - area = GM0262_lochem -- id = 129016 -- parent_id = 129016 +- id = 129362 +- parent_id = 129362 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0262_lochem/graph_values.yml b/datasets/GM0262_lochem/graph_values.yml index 2c1bee3c33..2719047a32 100644 --- a/datasets/GM0262_lochem/graph_values.yml +++ b/datasets/GM0262_lochem/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3215.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15399249343802737 - :network_gas: 0.15304128609084944 - :ambient_heat: 0.6929662204711232 + :electricity: 0.18202238903859155 + :network_gas: 0.18089804180621127 + :ambient_heat: 0.6370795691551971 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15122.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 85.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1612933973065925 - :network_gas: 0.3548264107736283 - :ambient_heat: 0.4838801919197792 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0263_maasdriel/GM0263_maasdriel.derived.ad b/datasets/GM0263_maasdriel/GM0263_maasdriel.derived.ad index b3248d5ed6..cf0021c240 100644 --- a/datasets/GM0263_maasdriel/GM0263_maasdriel.derived.ad +++ b/datasets/GM0263_maasdriel/GM0263_maasdriel.derived.ad @@ -1,6 +1,6 @@ - area = GM0263_maasdriel -- id = 129020 -- parent_id = 129020 +- id = 129366 +- parent_id = 129366 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0263_maasdriel/graph_values.yml b/datasets/GM0263_maasdriel/graph_values.yml index 25354eb2d7..5b041709a9 100644 --- a/datasets/GM0263_maasdriel/graph_values.yml +++ b/datasets/GM0263_maasdriel/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1460.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15948269666854867 - :network_gas: 0.12284516832298228 - :ambient_heat: 0.717672135008469 + :electricity: 0.18974326321329116 + :network_gas: 0.14615405680047938 + :ambient_heat: 0.6641026799862294 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10195.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 60.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17528358108191713 - :network_gas: 0.2988656756723295 - :ambient_heat: 0.5258507432457533 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0267_nijkerk/GM0267_nijkerk.derived.ad b/datasets/GM0267_nijkerk/GM0267_nijkerk.derived.ad index 76f84f348a..caf3aadfc3 100644 --- a/datasets/GM0267_nijkerk/GM0267_nijkerk.derived.ad +++ b/datasets/GM0267_nijkerk/GM0267_nijkerk.derived.ad @@ -1,6 +1,6 @@ - area = GM0267_nijkerk -- id = 129038 -- parent_id = 129038 +- id = 129384 +- parent_id = 129384 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0267_nijkerk/graph_values.yml b/datasets/GM0267_nijkerk/graph_values.yml index 6c95066bbd..3475a8de7c 100644 --- a/datasets/GM0267_nijkerk/graph_values.yml +++ b/datasets/GM0267_nijkerk/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4728.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1590088450461901 - :network_gas: 0.12545135224595458 - :ambient_heat: 0.7155398027078553 + :electricity: 0.1890729107743081 + :network_gas: 0.14917064722296086 + :ambient_heat: 0.661756442002731 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 17338.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 337.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17402191914037426 - :network_gas: 0.30391232343850105 - :ambient_heat: 0.5220657574211247 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0268_nijmegen/GM0268_nijmegen.derived.ad b/datasets/GM0268_nijmegen/GM0268_nijmegen.derived.ad index 75fe2e290f..7bb1de4c86 100644 --- a/datasets/GM0268_nijmegen/GM0268_nijmegen.derived.ad +++ b/datasets/GM0268_nijmegen/GM0268_nijmegen.derived.ad @@ -1,6 +1,6 @@ - area = GM0268_nijmegen -- id = 129039 -- parent_id = 129039 +- id = 129385 +- parent_id = 129385 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0268_nijmegen/graph_values.yml b/datasets/GM0268_nijmegen/graph_values.yml index bc6632150c..784247871d 100644 --- a/datasets/GM0268_nijmegen/graph_values.yml +++ b/datasets/GM0268_nijmegen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 24758.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15707373674642175 - :network_gas: 0.13609444789468048 - :ambient_heat: 0.7068318153588978 + :electricity: 0.18634315885252264 + :network_gas: 0.1614545489799238 + :ambient_heat: 0.6522022921675535 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 82196.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 5934.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16897871365789954 - :network_gas: 0.3240851453683999 - :ambient_heat: 0.5069361409737005 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0269_oldebroek/GM0269_oldebroek.derived.ad b/datasets/GM0269_oldebroek/GM0269_oldebroek.derived.ad index b58def816b..b7e9ea7e7d 100644 --- a/datasets/GM0269_oldebroek/GM0269_oldebroek.derived.ad +++ b/datasets/GM0269_oldebroek/GM0269_oldebroek.derived.ad @@ -1,6 +1,6 @@ - area = GM0269_oldebroek -- id = 129051 -- parent_id = 129051 +- id = 129397 +- parent_id = 129397 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0269_oldebroek/graph_values.yml b/datasets/GM0269_oldebroek/graph_values.yml index f95d11cf17..8ef58bc3c9 100644 --- a/datasets/GM0269_oldebroek/graph_values.yml +++ b/datasets/GM0269_oldebroek/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1605.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15744847752152952 - :network_gas: 0.13403337363158763 - :ambient_heat: 0.7085181488468828 + :electricity: 0.18687080627663363 + :network_gas: 0.15908013207105892 + :ambient_heat: 0.6540490616523075 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9451.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 18.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16994190302512532 - :network_gas: 0.320232387899497 - :ambient_heat: 0.5098257090753778 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0273_putten/GM0273_putten.derived.ad b/datasets/GM0273_putten/GM0273_putten.derived.ad index bb807ffc21..dcd679cb10 100644 --- a/datasets/GM0273_putten/GM0273_putten.derived.ad +++ b/datasets/GM0273_putten/GM0273_putten.derived.ad @@ -1,6 +1,6 @@ - area = GM0273_putten -- id = 129071 -- parent_id = 129071 +- id = 129417 +- parent_id = 129417 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0273_putten/graph_values.yml b/datasets/GM0273_putten/graph_values.yml index 1923c80958..c8be9ce517 100644 --- a/datasets/GM0273_putten/graph_values.yml +++ b/datasets/GM0273_putten/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2683.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15859770653214128 - :network_gas: 0.12771261407322293 - :ambient_heat: 0.7136896793946358 + :electricity: 0.18849188960710542 + :network_gas: 0.15178524632981513 + :ambient_heat: 0.6597228640630796 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9898.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 18.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17293587042272218 - :network_gas: 0.3082565183091096 - :ambient_heat: 0.5188076112681683 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0274_renkum/GM0274_renkum.derived.ad b/datasets/GM0274_renkum/GM0274_renkum.derived.ad index a46f45ec44..f67b387401 100644 --- a/datasets/GM0274_renkum/GM0274_renkum.derived.ad +++ b/datasets/GM0274_renkum/GM0274_renkum.derived.ad @@ -1,6 +1,6 @@ - area = GM0274_renkum -- id = 129074 -- parent_id = 129074 +- id = 129420 +- parent_id = 129420 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0274_renkum/graph_values.yml b/datasets/GM0274_renkum/graph_values.yml index 547bceddd3..960af97574 100644 --- a/datasets/GM0274_renkum/graph_values.yml +++ b/datasets/GM0274_renkum/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2150.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1537700555933527 - :network_gas: 0.15426469423656025 - :ambient_heat: 0.6919652501700871 + :electricity: 0.18171168634038537 + :network_gas: 0.1822962060093127 + :ambient_heat: 0.6359921076503018 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14987.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 422.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16075425091303272 - :network_gas: 0.3569829963478673 - :ambient_heat: 0.4822627527390999 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0275_rheden/GM0275_rheden.derived.ad b/datasets/GM0275_rheden/GM0275_rheden.derived.ad index 455fbd47d1..94f27465d4 100644 --- a/datasets/GM0275_rheden/GM0275_rheden.derived.ad +++ b/datasets/GM0275_rheden/GM0275_rheden.derived.ad @@ -1,6 +1,6 @@ - area = GM0275_rheden -- id = 129077 -- parent_id = 129077 +- id = 129423 +- parent_id = 129423 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0275_rheden/graph_values.yml b/datasets/GM0275_rheden/graph_values.yml index 3f4b2b2686..abb3ef935b 100644 --- a/datasets/GM0275_rheden/graph_values.yml +++ b/datasets/GM0275_rheden/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3994.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1531803849243356 - :network_gas: 0.15750788291615395 - :ambient_heat: 0.6893117321595102 + :electricity: 0.1808888202172389 + :network_gas: 0.18599910902229158 + :ambient_heat: 0.6331120707604695 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 21217.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 577.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1593348725048036 - :network_gas: 0.36266050998078375 - :ambient_heat: 0.47800461751441253 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0277_rozendaal/GM0277_rozendaal.derived.ad b/datasets/GM0277_rozendaal/GM0277_rozendaal.derived.ad index d535ef2c39..935f2e32c7 100644 --- a/datasets/GM0277_rozendaal/GM0277_rozendaal.derived.ad +++ b/datasets/GM0277_rozendaal/GM0277_rozendaal.derived.ad @@ -1,6 +1,6 @@ - area = GM0277_rozendaal -- id = 129086 -- parent_id = 129086 +- id = 129432 +- parent_id = 129432 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0277_rozendaal/graph_values.yml b/datasets/GM0277_rozendaal/graph_values.yml index d56d610e13..c838fa3f7d 100644 --- a/datasets/GM0277_rozendaal/graph_values.yml +++ b/datasets/GM0277_rozendaal/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 185.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15766972074412194 - :network_gas: 0.13281653590732925 - :ambient_heat: 0.7095137433485488 + :electricity: 0.18718254447257499 + :network_gas: 0.1576773081212795 + :ambient_heat: 0.6551401474061455 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 694.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 7.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17051355656232803 - :network_gas: 0.3179457737506859 - :ambient_heat: 0.511540669686986 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0279_scherpenzeel/GM0279_scherpenzeel.derived.ad b/datasets/GM0279_scherpenzeel/GM0279_scherpenzeel.derived.ad index 43d9b43d79..47c7b34c18 100644 --- a/datasets/GM0279_scherpenzeel/GM0279_scherpenzeel.derived.ad +++ b/datasets/GM0279_scherpenzeel/GM0279_scherpenzeel.derived.ad @@ -1,6 +1,6 @@ - area = GM0279_scherpenzeel -- id = 129089 -- parent_id = 129089 +- id = 129435 +- parent_id = 129435 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0279_scherpenzeel/graph_values.yml b/datasets/GM0279_scherpenzeel/graph_values.yml index bcca81e10b..5cac6e68c3 100644 --- a/datasets/GM0279_scherpenzeel/graph_values.yml +++ b/datasets/GM0279_scherpenzeel/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 812.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1580398365213299 - :network_gas: 0.13078089913268567 - :ambient_heat: 0.7111792643459846 + :electricity: 0.18770441474917743 + :network_gas: 0.15532888841452844 + :ambient_heat: 0.6569666968362943 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4112.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 68.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17147488648037967 - :network_gas: 0.3141004540784795 - :ambient_heat: 0.5144246594411409 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0281_tiel/GM0281_tiel.derived.ad b/datasets/GM0281_tiel/GM0281_tiel.derived.ad index 59bc06461a..b51e456659 100644 --- a/datasets/GM0281_tiel/GM0281_tiel.derived.ad +++ b/datasets/GM0281_tiel/GM0281_tiel.derived.ad @@ -1,6 +1,6 @@ - area = GM0281_tiel -- id = 129116 -- parent_id = 129116 +- id = 129462 +- parent_id = 129462 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0281_tiel/graph_values.yml b/datasets/GM0281_tiel/graph_values.yml index 86923b600f..79979c2dbd 100644 --- a/datasets/GM0281_tiel/graph_values.yml +++ b/datasets/GM0281_tiel/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 5216.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15834831368584848 - :network_gas: 0.1290842747278333 - :ambient_heat: 0.7125674115863182 + :electricity: 0.18813972409947843 + :network_gas: 0.15336999345037072 + :ambient_heat: 0.6584902824501507 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18255.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 980.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17228095338314078 - :network_gas: 0.31087618646743514 - :ambient_heat: 0.5168428601494242 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0285_voorst/GM0285_voorst.derived.ad b/datasets/GM0285_voorst/GM0285_voorst.derived.ad index 3670059e8d..08e2c69b20 100644 --- a/datasets/GM0285_voorst/GM0285_voorst.derived.ad +++ b/datasets/GM0285_voorst/GM0285_voorst.derived.ad @@ -1,6 +1,6 @@ - area = GM0285_voorst -- id = 129142 -- parent_id = 129142 +- id = 129488 +- parent_id = 129488 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0285_voorst/graph_values.yml b/datasets/GM0285_voorst/graph_values.yml index eaee06b254..277b1651bc 100644 --- a/datasets/GM0285_voorst/graph_values.yml +++ b/datasets/GM0285_voorst/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2787.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15620091752696674 - :network_gas: 0.140894953601683 - :ambient_heat: 0.7029041288713503 + :electricity: 0.18511601748573672 + :network_gas: 0.16697669327120565 + :ambient_heat: 0.6479072892430576 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10715.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 40.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16675974756242584 - :network_gas: 0.33296100975029497 - :ambient_heat: 0.5002792426872793 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0289_wageningen/GM0289_wageningen.derived.ad b/datasets/GM0289_wageningen/GM0289_wageningen.derived.ad index bddea7f814..a8d60aad07 100644 --- a/datasets/GM0289_wageningen/GM0289_wageningen.derived.ad +++ b/datasets/GM0289_wageningen/GM0289_wageningen.derived.ad @@ -1,6 +1,6 @@ - area = GM0289_wageningen -- id = 129147 -- parent_id = 129147 +- id = 129493 +- parent_id = 129493 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0289_wageningen/graph_values.yml b/datasets/GM0289_wageningen/graph_values.yml index 438742948a..aa11501d40 100644 --- a/datasets/GM0289_wageningen/graph_values.yml +++ b/datasets/GM0289_wageningen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4715.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15851136584026687 - :network_gas: 0.12818748787853235 - :ambient_heat: 0.7133011462812009 + :electricity: 0.18836994502975082 + :network_gas: 0.1523339977368801 + :ambient_heat: 0.659296057233369 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18053.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 534.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1727088065326554 - :network_gas: 0.30916477386937635 - :ambient_heat: 0.5181264195979681 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0293_westervoort/GM0293_westervoort.derived.ad b/datasets/GM0293_westervoort/GM0293_westervoort.derived.ad index 494eaaaccd..d8873d78a1 100644 --- a/datasets/GM0293_westervoort/GM0293_westervoort.derived.ad +++ b/datasets/GM0293_westervoort/GM0293_westervoort.derived.ad @@ -1,6 +1,6 @@ - area = GM0293_westervoort -- id = 129153 -- parent_id = 129153 +- id = 129499 +- parent_id = 129499 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0293_westervoort/graph_values.yml b/datasets/GM0293_westervoort/graph_values.yml index 4b874ee139..710240e301 100644 --- a/datasets/GM0293_westervoort/graph_values.yml +++ b/datasets/GM0293_westervoort/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 620.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16668066954030633 - :network_gas: 0.08325631752831508 - :ambient_heat: 0.7500630129313786 + :electricity: 0.20001989906732007 + :network_gas: 0.09990912728307323 + :ambient_heat: 0.7000709736496067 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6739.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 5.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1958609998771615 - :network_gas: 0.21655600049135204 - :ambient_heat: 0.5875829996314865 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0294_winterswijk/GM0294_winterswijk.derived.ad b/datasets/GM0294_winterswijk/GM0294_winterswijk.derived.ad index 8fd5e5f184..7b75963e53 100644 --- a/datasets/GM0294_winterswijk/GM0294_winterswijk.derived.ad +++ b/datasets/GM0294_winterswijk/GM0294_winterswijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0294_winterswijk -- id = 129160 -- parent_id = 129160 +- id = 129506 +- parent_id = 129506 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0294_winterswijk/graph_values.yml b/datasets/GM0294_winterswijk/graph_values.yml index 39a6aed856..0f5fb038e3 100644 --- a/datasets/GM0294_winterswijk/graph_values.yml +++ b/datasets/GM0294_winterswijk/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4272.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15648989175256064 - :network_gas: 0.1393055953609165 - :ambient_heat: 0.7042045128865229 + :electricity: 0.18552201997898876 + :network_gas: 0.16514967935818758 + :ambient_heat: 0.6493283006628237 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13072.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 435.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16749065324157691 - :network_gas: 0.3300373870336906 - :ambient_heat: 0.5024719597247326 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0296_wijchen/GM0296_wijchen.derived.ad b/datasets/GM0296_wijchen/GM0296_wijchen.derived.ad index ca5317ad3d..1d9a5e9f1e 100644 --- a/datasets/GM0296_wijchen/GM0296_wijchen.derived.ad +++ b/datasets/GM0296_wijchen/GM0296_wijchen.derived.ad @@ -1,6 +1,6 @@ - area = GM0296_wijchen -- id = 129157 -- parent_id = 129157 +- id = 129503 +- parent_id = 129503 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0296_wijchen/graph_values.yml b/datasets/GM0296_wijchen/graph_values.yml index 817af07e98..fc3664bd41 100644 --- a/datasets/GM0296_wijchen/graph_values.yml +++ b/datasets/GM0296_wijchen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2977.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1592321330342562 - :network_gas: 0.12422326831159076 - :ambient_heat: 0.716544598654153 + :electricity: 0.18938869958439045 + :network_gas: 0.1477495954826759 + :ambient_heat: 0.6628617049329336 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18166.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 43.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17461510312402112 - :network_gas: 0.3015395875039137 - :ambient_heat: 0.5238453093720653 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0297_zaltbommel/GM0297_zaltbommel.derived.ad b/datasets/GM0297_zaltbommel/GM0297_zaltbommel.derived.ad index b25163bbf5..d9ce0d22c0 100644 --- a/datasets/GM0297_zaltbommel/GM0297_zaltbommel.derived.ad +++ b/datasets/GM0297_zaltbommel/GM0297_zaltbommel.derived.ad @@ -1,6 +1,6 @@ - area = GM0297_zaltbommel -- id = 129166 -- parent_id = 129166 +- id = 129512 +- parent_id = 129512 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0297_zaltbommel/graph_values.yml b/datasets/GM0297_zaltbommel/graph_values.yml index 8cfebbfba0..e364638793 100644 --- a/datasets/GM0297_zaltbommel/graph_values.yml +++ b/datasets/GM0297_zaltbommel/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 6215.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15917665001016973 - :network_gas: 0.12452842494406638 - :ambient_heat: 0.7162949250457639 + :electricity: 0.1893102161201953 + :network_gas: 0.14810277159220628 + :ambient_heat: 0.6625870122875984 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11803.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 458.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17446748602986603 - :network_gas: 0.30213005588053404 - :ambient_heat: 0.5234024580896 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0299_zevenaar/GM0299_zevenaar.derived.ad b/datasets/GM0299_zevenaar/GM0299_zevenaar.derived.ad index 6827389122..ac67c5cfa3 100644 --- a/datasets/GM0299_zevenaar/GM0299_zevenaar.derived.ad +++ b/datasets/GM0299_zevenaar/GM0299_zevenaar.derived.ad @@ -1,6 +1,6 @@ - area = GM0299_zevenaar -- id = 129170 -- parent_id = 129170 +- id = 129516 +- parent_id = 129516 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0299_zevenaar/graph_values.yml b/datasets/GM0299_zevenaar/graph_values.yml index 492fbe61e5..0ebbe67b4a 100644 --- a/datasets/GM0299_zevenaar/graph_values.yml +++ b/datasets/GM0299_zevenaar/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3853.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15946231120568938 - :network_gas: 0.12295728836870833 - :ambient_heat: 0.7175804004256021 + :electricity: 0.1897144085750715 + :network_gas: 0.1462839028638872 + :ambient_heat: 0.6640016885610414 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20189.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 174.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1752290823158986 - :network_gas: 0.2990836707364037 - :ambient_heat: 0.5256872469476976 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0301_zutphen/GM0301_zutphen.derived.ad b/datasets/GM0301_zutphen/GM0301_zutphen.derived.ad index 9330b0e142..f880ba5666 100644 --- a/datasets/GM0301_zutphen/GM0301_zutphen.derived.ad +++ b/datasets/GM0301_zutphen/GM0301_zutphen.derived.ad @@ -1,6 +1,6 @@ - area = GM0301_zutphen -- id = 129175 -- parent_id = 129175 +- id = 129521 +- parent_id = 129521 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0301_zutphen/graph_values.yml b/datasets/GM0301_zutphen/graph_values.yml index 792b651fca..6331e94d10 100644 --- a/datasets/GM0301_zutphen/graph_values.yml +++ b/datasets/GM0301_zutphen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 8095.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15604292050234958 - :network_gas: 0.14176393723707742 - :ambient_heat: 0.702193142260573 + :electricity: 0.18489415267123172 + :network_gas: 0.16797508640830924 + :ambient_heat: 0.647130760920459 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22588.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2097.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1663616806510125 - :network_gas: 0.33455327739594815 - :ambient_heat: 0.4990850419530394 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0302_nunspeet/GM0302_nunspeet.derived.ad b/datasets/GM0302_nunspeet/GM0302_nunspeet.derived.ad index c5d617cb04..1f95d669d6 100644 --- a/datasets/GM0302_nunspeet/GM0302_nunspeet.derived.ad +++ b/datasets/GM0302_nunspeet/GM0302_nunspeet.derived.ad @@ -1,6 +1,6 @@ - area = GM0302_nunspeet -- id = 129046 -- parent_id = 129046 +- id = 129392 +- parent_id = 129392 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0302_nunspeet/graph_values.yml b/datasets/GM0302_nunspeet/graph_values.yml index 0a37215d8a..6eb23b6298 100644 --- a/datasets/GM0302_nunspeet/graph_values.yml +++ b/datasets/GM0302_nunspeet/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3118.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15734642788481967 - :network_gas: 0.13459464663349177 - :ambient_heat: 0.7080589254816885 + :electricity: 0.1867270705089751 + :network_gas: 0.15972694397905243 + :ambient_heat: 0.6535459855119725 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11197.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 37.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16967897618927905 - :network_gas: 0.32128409524288193 - :ambient_heat: 0.509036928567839 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0303_dronten/GM0303_dronten.derived.ad b/datasets/GM0303_dronten/GM0303_dronten.derived.ad index 03a75c4efd..ccee532af5 100644 --- a/datasets/GM0303_dronten/GM0303_dronten.derived.ad +++ b/datasets/GM0303_dronten/GM0303_dronten.derived.ad @@ -1,6 +1,6 @@ - area = GM0303_dronten -- id = 128930 -- parent_id = 128930 +- id = 129276 +- parent_id = 129276 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0303_dronten/graph_values.yml b/datasets/GM0303_dronten/graph_values.yml index 872a905314..454b3513e0 100644 --- a/datasets/GM0303_dronten/graph_values.yml +++ b/datasets/GM0303_dronten/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3409.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15867375639088668 - :network_gas: 0.1272943398501233 - :ambient_heat: 0.7140319037589901 + :electricity: 0.18859932050306388 + :network_gas: 0.1513018065853151 + :ambient_heat: 0.6600988729116211 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 17696.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 0.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17313616056059616 - :network_gas: 0.30745535775761357 - :ambient_heat: 0.5194084816817903 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0307_amersfoort/GM0307_amersfoort.derived.ad b/datasets/GM0307_amersfoort/GM0307_amersfoort.derived.ad index 3821485eae..6c0a152ffd 100644 --- a/datasets/GM0307_amersfoort/GM0307_amersfoort.derived.ad +++ b/datasets/GM0307_amersfoort/GM0307_amersfoort.derived.ad @@ -1,6 +1,6 @@ - area = GM0307_amersfoort -- id = 128867 -- parent_id = 128867 +- id = 129213 +- parent_id = 129213 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0307_amersfoort/graph_values.yml b/datasets/GM0307_amersfoort/graph_values.yml index a8eaa9d8ad..53a019cb7c 100644 --- a/datasets/GM0307_amersfoort/graph_values.yml +++ b/datasets/GM0307_amersfoort/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 23078.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1593635007761815 - :network_gas: 0.12350074573100173 - :ambient_heat: 0.7171357534928168 + :electricity: 0.18957456701500008 + :network_gas: 0.14691319081190468 + :ambient_heat: 0.6635122421730952 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 68785.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 4819.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17496520379692387 - :network_gas: 0.30013918481230256 - :ambient_heat: 0.5248956113907735 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0308_baarn/GM0308_baarn.derived.ad b/datasets/GM0308_baarn/GM0308_baarn.derived.ad index 86d5245550..abdc60e75b 100644 --- a/datasets/GM0308_baarn/GM0308_baarn.derived.ad +++ b/datasets/GM0308_baarn/GM0308_baarn.derived.ad @@ -1,6 +1,6 @@ - area = GM0308_baarn -- id = 128875 -- parent_id = 128875 +- id = 129221 +- parent_id = 129221 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0308_baarn/graph_values.yml b/datasets/GM0308_baarn/graph_values.yml index aa4abe9a02..2e0cdf1cc5 100644 --- a/datasets/GM0308_baarn/graph_values.yml +++ b/datasets/GM0308_baarn/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3162.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15336820370083348 - :network_gas: 0.15647487964541587 - :ambient_heat: 0.6901569166537507 + :electricity: 0.18115079077214039 + :network_gas: 0.18482023978734602 + :ambient_heat: 0.6340289694405137 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11684.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 547.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15978541814698974 - :network_gas: 0.36085832741203944 - :ambient_heat: 0.4793562544409709 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0310_de_bilt/GM0310_de_bilt.derived.ad b/datasets/GM0310_de_bilt/GM0310_de_bilt.derived.ad index 33707ec42c..822b49de8b 100644 --- a/datasets/GM0310_de_bilt/GM0310_de_bilt.derived.ad +++ b/datasets/GM0310_de_bilt/GM0310_de_bilt.derived.ad @@ -1,6 +1,6 @@ - area = GM0310_de_bilt -- id = 128913 -- parent_id = 128913 +- id = 129259 +- parent_id = 129259 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0310_de_bilt/graph_values.yml b/datasets/GM0310_de_bilt/graph_values.yml index df9a3661b9..c11a9c2a0a 100644 --- a/datasets/GM0310_de_bilt/graph_values.yml +++ b/datasets/GM0310_de_bilt/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 5194.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1543573471496136 - :network_gas: 0.15103459067712527 - :ambient_heat: 0.6946080621732612 + :electricity: 0.1825323731217937 + :network_gas: 0.17860311004861312 + :ambient_heat: 0.6388645168295931 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19696.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 927.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1621821930434553 - :network_gas: 0.3512712278261771 - :ambient_heat: 0.48654657913036764 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0312_bunnik/GM0312_bunnik.derived.ad b/datasets/GM0312_bunnik/GM0312_bunnik.derived.ad index aeb3d76c32..60f2d88f17 100644 --- a/datasets/GM0312_bunnik/GM0312_bunnik.derived.ad +++ b/datasets/GM0312_bunnik/GM0312_bunnik.derived.ad @@ -1,6 +1,6 @@ - area = GM0312_bunnik -- id = 128903 -- parent_id = 128903 +- id = 129249 +- parent_id = 129249 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0312_bunnik/graph_values.yml b/datasets/GM0312_bunnik/graph_values.yml index 7d4dc8b3e4..24789c3ddf 100644 --- a/datasets/GM0312_bunnik/graph_values.yml +++ b/datasets/GM0312_bunnik/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1591.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15401033542669446 - :network_gas: 0.15294315515318052 - :ambient_heat: 0.693046509420125 + :electricity: 0.18204731792831497 + :network_gas: 0.18078586163707996 + :ambient_heat: 0.6371668204346052 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6470.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 69.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1613367318254764 - :network_gas: 0.35465307269809265 - :ambient_heat: 0.4840101954764309 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0313_bunschoten/GM0313_bunschoten.derived.ad b/datasets/GM0313_bunschoten/GM0313_bunschoten.derived.ad index 550614be16..5368a6fecc 100644 --- a/datasets/GM0313_bunschoten/GM0313_bunschoten.derived.ad +++ b/datasets/GM0313_bunschoten/GM0313_bunschoten.derived.ad @@ -1,6 +1,6 @@ - area = GM0313_bunschoten -- id = 128904 -- parent_id = 128904 +- id = 129250 +- parent_id = 129250 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0313_bunschoten/graph_values.yml b/datasets/GM0313_bunschoten/graph_values.yml index 6f9f3bd235..36da6f706a 100644 --- a/datasets/GM0313_bunschoten/graph_values.yml +++ b/datasets/GM0313_bunschoten/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1532.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15974394603393585 - :network_gas: 0.12140829681335297 - :ambient_heat: 0.7188477571527113 + :electricity: 0.1901131730165859 + :network_gas: 0.1444894602317049 + :ambient_heat: 0.6653973667517092 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8541.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 218.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17598378000375142 - :network_gas: 0.2960648799849926 - :ambient_heat: 0.5279513400112561 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0317_eemnes/GM0317_eemnes.derived.ad b/datasets/GM0317_eemnes/GM0317_eemnes.derived.ad index 4ecf90d122..2ebde83a24 100644 --- a/datasets/GM0317_eemnes/GM0317_eemnes.derived.ad +++ b/datasets/GM0317_eemnes/GM0317_eemnes.derived.ad @@ -1,6 +1,6 @@ - area = GM0317_eemnes -- id = 128936 -- parent_id = 128936 +- id = 129282 +- parent_id = 129282 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0317_eemnes/graph_values.yml b/datasets/GM0317_eemnes/graph_values.yml index 96ecc5d8ee..b60fffa3e3 100644 --- a/datasets/GM0317_eemnes/graph_values.yml +++ b/datasets/GM0317_eemnes/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 558.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15587333429012087 - :network_gas: 0.14269666140433518 - :ambient_heat: 0.7014300043055439 + :electricity: 0.18465610633856058 + :network_gas: 0.16904629648450728 + :ambient_heat: 0.646297597176932 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4079.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 5.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16593563327581634 - :network_gas: 0.3362574668967328 - :ambient_heat: 0.4978068998274508 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0321_houten/GM0321_houten.derived.ad b/datasets/GM0321_houten/GM0321_houten.derived.ad index fe19d10a1c..8abb3f49f2 100644 --- a/datasets/GM0321_houten/GM0321_houten.derived.ad +++ b/datasets/GM0321_houten/GM0321_houten.derived.ad @@ -1,6 +1,6 @@ - area = GM0321_houten -- id = 128990 -- parent_id = 128990 +- id = 129336 +- parent_id = 129336 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0321_houten/graph_values.yml b/datasets/GM0321_houten/graph_values.yml index 0df58751d1..983704e1ec 100644 --- a/datasets/GM0321_houten/graph_values.yml +++ b/datasets/GM0321_houten/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 5052.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1639176974795091 - :network_gas: 0.09845266386269991 - :ambient_heat: 0.737629638657791 + :electricity: 0.19605424465149396 + :network_gas: 0.11775459846208469 + :ambient_heat: 0.6861911568864213 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20672.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 46.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18763447693238586 - :network_gas: 0.24946209227045452 - :ambient_heat: 0.5629034307971595 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0327_leusden/GM0327_leusden.derived.ad b/datasets/GM0327_leusden/GM0327_leusden.derived.ad index 21181cf18a..9da981dbb7 100644 --- a/datasets/GM0327_leusden/GM0327_leusden.derived.ad +++ b/datasets/GM0327_leusden/GM0327_leusden.derived.ad @@ -1,6 +1,6 @@ - area = GM0327_leusden -- id = 129013 -- parent_id = 129013 +- id = 129359 +- parent_id = 129359 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0327_leusden/graph_values.yml b/datasets/GM0327_leusden/graph_values.yml index b565ee76fd..7bc0908e7d 100644 --- a/datasets/GM0327_leusden/graph_values.yml +++ b/datasets/GM0327_leusden/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3709.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15951581407334203 - :network_gas: 0.12266302259661886 - :ambient_heat: 0.7178211633300391 + :electricity: 0.18979014228444266 + :network_gas: 0.14594310066930627 + :ambient_heat: 0.664266757046251 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13220.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 12.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17537216016152288 - :network_gas: 0.2985113593539066 - :ambient_heat: 0.5261164804845706 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0331_lopik/GM0331_lopik.derived.ad b/datasets/GM0331_lopik/GM0331_lopik.derived.ad index 688b0e9a5c..6073319300 100644 --- a/datasets/GM0331_lopik/GM0331_lopik.derived.ad +++ b/datasets/GM0331_lopik/GM0331_lopik.derived.ad @@ -1,6 +1,6 @@ - area = GM0331_lopik -- id = 129018 -- parent_id = 129018 +- id = 129364 +- parent_id = 129364 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0331_lopik/graph_values.yml b/datasets/GM0331_lopik/graph_values.yml index 91d5b3dde6..af9b08ce16 100644 --- a/datasets/GM0331_lopik/graph_values.yml +++ b/datasets/GM0331_lopik/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 684.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15885430512010215 - :network_gas: 0.12630132183943835 - :ambient_heat: 0.7148443730404596 + :electricity: 0.1888544482453988 + :network_gas: 0.15015373005231356 + :ambient_heat: 0.6609918217022877 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5822.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 73.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17361275618520233 - :network_gas: 0.30554897525918895 - :ambient_heat: 0.5208382685556088 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0335_montfoort/GM0335_montfoort.derived.ad b/datasets/GM0335_montfoort/GM0335_montfoort.derived.ad index f9564ac0f2..dcda81d2e1 100644 --- a/datasets/GM0335_montfoort/GM0335_montfoort.derived.ad +++ b/datasets/GM0335_montfoort/GM0335_montfoort.derived.ad @@ -1,6 +1,6 @@ - area = GM0335_montfoort -- id = 129032 -- parent_id = 129032 +- id = 129378 +- parent_id = 129378 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0335_montfoort/graph_values.yml b/datasets/GM0335_montfoort/graph_values.yml index 7a96a45bbd..755b7344f4 100644 --- a/datasets/GM0335_montfoort/graph_values.yml +++ b/datasets/GM0335_montfoort/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1010.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1586475512001348 - :network_gas: 0.1274384683992587 - :ambient_heat: 0.7139139804006066 + :electricity: 0.1885622998701334 + :network_gas: 0.15146839967909392 + :ambient_heat: 0.6599693004507727 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5746.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 171.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1730671140911642 - :network_gas: 0.3077315436353414 - :ambient_heat: 0.5192013422734945 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0339_renswoude/GM0339_renswoude.derived.ad b/datasets/GM0339_renswoude/GM0339_renswoude.derived.ad index 6af9d54b31..5cc91d1e63 100644 --- a/datasets/GM0339_renswoude/GM0339_renswoude.derived.ad +++ b/datasets/GM0339_renswoude/GM0339_renswoude.derived.ad @@ -1,6 +1,6 @@ - area = GM0339_renswoude -- id = 129075 -- parent_id = 129075 +- id = 129421 +- parent_id = 129421 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0339_renswoude/graph_values.yml b/datasets/GM0339_renswoude/graph_values.yml index 96e5733a39..dbfeb2d09d 100644 --- a/datasets/GM0339_renswoude/graph_values.yml +++ b/datasets/GM0339_renswoude/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 320.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15872086467064567 - :network_gas: 0.12703524431144897 - :ambient_heat: 0.7142438910179054 + :electricity: 0.1886658771760401 + :network_gas: 0.15100230111539112 + :ambient_heat: 0.6603318217085689 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 2149.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 8.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17326036451436033 - :network_gas: 0.30695854194255695 - :ambient_heat: 0.5197810935430828 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0340_rhenen/GM0340_rhenen.derived.ad b/datasets/GM0340_rhenen/GM0340_rhenen.derived.ad index 26182b3ff9..7adf4449b6 100644 --- a/datasets/GM0340_rhenen/GM0340_rhenen.derived.ad +++ b/datasets/GM0340_rhenen/GM0340_rhenen.derived.ad @@ -1,6 +1,6 @@ - area = GM0340_rhenen -- id = 129078 -- parent_id = 129078 +- id = 129424 +- parent_id = 129424 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0340_rhenen/graph_values.yml b/datasets/GM0340_rhenen/graph_values.yml index 4311765498..05fa37a742 100644 --- a/datasets/GM0340_rhenen/graph_values.yml +++ b/datasets/GM0340_rhenen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1258.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15784643478408672 - :network_gas: 0.13184460868752307 - :ambient_heat: 0.7103089565283902 + :electricity: 0.18743165740397333 + :network_gas: 0.1565562982773943 + :ambient_heat: 0.6560120443186324 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8269.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 219.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17097176341219847 - :network_gas: 0.3161129463512044 - :ambient_heat: 0.5129152902365972 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0342_soest/GM0342_soest.derived.ad b/datasets/GM0342_soest/GM0342_soest.derived.ad index 7a0c99b8dd..9af315c6b8 100644 --- a/datasets/GM0342_soest/GM0342_soest.derived.ad +++ b/datasets/GM0342_soest/GM0342_soest.derived.ad @@ -1,6 +1,6 @@ - area = GM0342_soest -- id = 129100 -- parent_id = 129100 +- id = 129446 +- parent_id = 129446 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0342_soest/graph_values.yml b/datasets/GM0342_soest/graph_values.yml index e3585df51e..0cf3a2c88b 100644 --- a/datasets/GM0342_soest/graph_values.yml +++ b/datasets/GM0342_soest/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4067.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15672713241776004 - :network_gas: 0.13800077170231975 - :ambient_heat: 0.7052720958799202 + :electricity: 0.18585554594038076 + :network_gas: 0.16364881031934247 + :ambient_heat: 0.6504956437402768 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20935.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 301.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16809347703512656 - :network_gas: 0.3276260918594919 - :ambient_heat: 0.5042804311053816 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0344_utrecht/GM0344_utrecht.derived.ad b/datasets/GM0344_utrecht/GM0344_utrecht.derived.ad index ca55116e64..de27647a4a 100644 --- a/datasets/GM0344_utrecht/GM0344_utrecht.derived.ad +++ b/datasets/GM0344_utrecht/GM0344_utrecht.derived.ad @@ -1,6 +1,6 @@ - area = GM0344_utrecht -- id = 129125 -- parent_id = 129125 +- id = 129471 +- parent_id = 129471 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0344_utrecht/graph_values.yml b/datasets/GM0344_utrecht/graph_values.yml index 15bb4c7a47..5932aa10b1 100644 --- a/datasets/GM0344_utrecht/graph_values.yml +++ b/datasets/GM0344_utrecht/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 37480.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16319944973790793 - :network_gas: 0.10240302644150644 - :ambient_heat: 0.7343975238205857 + :electricity: 0.1950276425368375 + :network_gas: 0.12237431478842468 + :ambient_heat: 0.6825980426747378 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 159409.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 22086.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1855651501182519 - :network_gas: 0.25773939952699043 - :ambient_heat: 0.5566954503547576 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0345_veenendaal/GM0345_veenendaal.derived.ad b/datasets/GM0345_veenendaal/GM0345_veenendaal.derived.ad index 6231bc6503..4102a5e5ad 100644 --- a/datasets/GM0345_veenendaal/GM0345_veenendaal.derived.ad +++ b/datasets/GM0345_veenendaal/GM0345_veenendaal.derived.ad @@ -1,6 +1,6 @@ - area = GM0345_veenendaal -- id = 129131 -- parent_id = 129131 +- id = 129477 +- parent_id = 129477 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0345_veenendaal/graph_values.yml b/datasets/GM0345_veenendaal/graph_values.yml index 8eefb14860..aaefa0e65a 100644 --- a/datasets/GM0345_veenendaal/graph_values.yml +++ b/datasets/GM0345_veenendaal/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 7140.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1607677316650938 - :network_gas: 0.11577747584198415 - :ambient_heat: 0.7234547924929221 + :electricity: 0.1915649974665845 + :network_gas: 0.13795624057543865 + :ambient_heat: 0.670478761957977 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 28601.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 522.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1787597736546155 - :network_gas: 0.284960905381536 - :ambient_heat: 0.5362793209638484 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0351_woudenberg/GM0351_woudenberg.derived.ad b/datasets/GM0351_woudenberg/GM0351_woudenberg.derived.ad index 9b57040b4b..1724f5bcf8 100644 --- a/datasets/GM0351_woudenberg/GM0351_woudenberg.derived.ad +++ b/datasets/GM0351_woudenberg/GM0351_woudenberg.derived.ad @@ -1,6 +1,6 @@ - area = GM0351_woudenberg -- id = 129164 -- parent_id = 129164 +- id = 129510 +- parent_id = 129510 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0351_woudenberg/graph_values.yml b/datasets/GM0351_woudenberg/graph_values.yml index fdb75ccb00..0ddd8c5b8a 100644 --- a/datasets/GM0351_woudenberg/graph_values.yml +++ b/datasets/GM0351_woudenberg/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 789.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16012791285976974 - :network_gas: 0.11929647927126649 - :ambient_heat: 0.7205756078689637 + :electricity: 0.19065725933901254 + :network_gas: 0.14204106817136528 + :ambient_heat: 0.6673016724896221 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5279.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 27.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17701888591890844 - :network_gas: 0.2919244563243643 - :ambient_heat: 0.5310566577567272 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0352_wijk_bij_duurstede/GM0352_wijk_bij_duurstede.derived.ad b/datasets/GM0352_wijk_bij_duurstede/GM0352_wijk_bij_duurstede.derived.ad index 017f72026f..2b5cf7f608 100644 --- a/datasets/GM0352_wijk_bij_duurstede/GM0352_wijk_bij_duurstede.derived.ad +++ b/datasets/GM0352_wijk_bij_duurstede/GM0352_wijk_bij_duurstede.derived.ad @@ -1,6 +1,6 @@ - area = GM0352_wijk_bij_duurstede -- id = 129159 -- parent_id = 129159 +- id = 129505 +- parent_id = 129505 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0352_wijk_bij_duurstede/graph_values.yml b/datasets/GM0352_wijk_bij_duurstede/graph_values.yml index c32acfed90..fba5d4c97a 100644 --- a/datasets/GM0352_wijk_bij_duurstede/graph_values.yml +++ b/datasets/GM0352_wijk_bij_duurstede/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1091.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15718716226605509 - :network_gas: 0.13547060753669704 - :ambient_heat: 0.7073422301972478 + :electricity: 0.18650281622428044 + :network_gas: 0.16073608974786105 + :ambient_heat: 0.6527610940278585 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10238.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 232.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16926957856998556 - :network_gas: 0.3229216857200559 - :ambient_heat: 0.5078087357099585 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0353_ijsselstein/GM0353_ijsselstein.derived.ad b/datasets/GM0353_ijsselstein/GM0353_ijsselstein.derived.ad index 571061e3de..95142b32a8 100644 --- a/datasets/GM0353_ijsselstein/GM0353_ijsselstein.derived.ad +++ b/datasets/GM0353_ijsselstein/GM0353_ijsselstein.derived.ad @@ -1,6 +1,6 @@ - area = GM0353_ijsselstein -- id = 128993 -- parent_id = 128993 +- id = 129339 +- parent_id = 129339 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0353_ijsselstein/graph_values.yml b/datasets/GM0353_ijsselstein/graph_values.yml index 7e33b28cac..baef60d84a 100644 --- a/datasets/GM0353_ijsselstein/graph_values.yml +++ b/datasets/GM0353_ijsselstein/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2120.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1598538721239244 - :network_gas: 0.12080370331841553 - :ambient_heat: 0.71934242455766 + :electricity: 0.19026888900413239 + :network_gas: 0.1437887372547398 + :ambient_heat: 0.6659423737411277 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14438.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 168.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17627938902483323 - :network_gas: 0.29488244390066537 - :ambient_heat: 0.5288381670745015 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0355_zeist/GM0355_zeist.derived.ad b/datasets/GM0355_zeist/GM0355_zeist.derived.ad index 5df251c880..829d26942b 100644 --- a/datasets/GM0355_zeist/GM0355_zeist.derived.ad +++ b/datasets/GM0355_zeist/GM0355_zeist.derived.ad @@ -1,6 +1,6 @@ - area = GM0355_zeist -- id = 129169 -- parent_id = 129169 +- id = 129515 +- parent_id = 129515 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0355_zeist/graph_values.yml b/datasets/GM0355_zeist/graph_values.yml index d6ed36458e..fe879bca41 100644 --- a/datasets/GM0355_zeist/graph_values.yml +++ b/datasets/GM0355_zeist/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 8964.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1552837876276778 - :network_gas: 0.1459391680477721 - :ambient_heat: 0.6987770443245501 + :electricity: 0.18382930975350603 + :network_gas: 0.17276688660214687 + :ambient_heat: 0.6434038036443471 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 29560.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1509.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16446426380913864 - :network_gas: 0.3421429447634437 - :ambient_heat: 0.4933927914274177 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0356_nieuwegein/GM0356_nieuwegein.derived.ad b/datasets/GM0356_nieuwegein/GM0356_nieuwegein.derived.ad index 6095a89e6d..36dc906262 100644 --- a/datasets/GM0356_nieuwegein/GM0356_nieuwegein.derived.ad +++ b/datasets/GM0356_nieuwegein/GM0356_nieuwegein.derived.ad @@ -1,6 +1,6 @@ - area = GM0356_nieuwegein -- id = 129036 -- parent_id = 129036 +- id = 129382 +- parent_id = 129382 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0356_nieuwegein/graph_values.yml b/datasets/GM0356_nieuwegein/graph_values.yml index 584b605d9a..aa90a32264 100644 --- a/datasets/GM0356_nieuwegein/graph_values.yml +++ b/datasets/GM0356_nieuwegein/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 12644.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1694958496951503 - :network_gas: 0.06777282667667334 - :ambient_heat: 0.7627313236281763 + :electricity: 0.20408762575441264 + :network_gas: 0.08160433020622415 + :ambient_heat: 0.714308044039363 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 29444.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 245.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2047045713303622 - :network_gas: 0.18118171467854893 - :ambient_heat: 0.6141137139910888 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0358_aalsmeer/GM0358_aalsmeer.derived.ad b/datasets/GM0358_aalsmeer/GM0358_aalsmeer.derived.ad index 4609ba5677..0549fe544c 100644 --- a/datasets/GM0358_aalsmeer/GM0358_aalsmeer.derived.ad +++ b/datasets/GM0358_aalsmeer/GM0358_aalsmeer.derived.ad @@ -1,6 +1,6 @@ - area = GM0358_aalsmeer -- id = 128856 -- parent_id = 128856 +- id = 129202 +- parent_id = 129202 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0358_aalsmeer/graph_values.yml b/datasets/GM0358_aalsmeer/graph_values.yml index e1fea48be3..04d5790456 100644 --- a/datasets/GM0358_aalsmeer/graph_values.yml +++ b/datasets/GM0358_aalsmeer/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2787.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15767426548121957 - :network_gas: 0.1327915398532923 - :ambient_heat: 0.7095341946654881 + :electricity: 0.18718894985708004 + :network_gas: 0.15764848384851415 + :ambient_heat: 0.6551625662944057 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13276.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 204.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17052532280325605 - :network_gas: 0.31789870878697396 - :ambient_heat: 0.51157596840977 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0361_alkmaar/GM0361_alkmaar.derived.ad b/datasets/GM0361_alkmaar/GM0361_alkmaar.derived.ad index 7cfa9b4558..3660de89fd 100644 --- a/datasets/GM0361_alkmaar/GM0361_alkmaar.derived.ad +++ b/datasets/GM0361_alkmaar/GM0361_alkmaar.derived.ad @@ -1,6 +1,6 @@ - area = GM0361_alkmaar -- id = 128861 -- parent_id = 128861 +- id = 129207 +- parent_id = 129207 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0361_alkmaar/graph_values.yml b/datasets/GM0361_alkmaar/graph_values.yml index 7a0f7606e5..33283fa5cd 100644 --- a/datasets/GM0361_alkmaar/graph_values.yml +++ b/datasets/GM0361_alkmaar/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 14134.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1568058957084228 - :network_gas: 0.13756757360367472 - :ambient_heat: 0.7056265306879026 + :electricity: 0.18596631719961296 + :network_gas: 0.1631503389179511 + :ambient_heat: 0.6508833438824361 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 51588.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 4510.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1682941678503001 - :network_gas: 0.3268233285987978 - :ambient_heat: 0.504882503550902 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0362_amstelveen/GM0362_amstelveen.derived.ad b/datasets/GM0362_amstelveen/GM0362_amstelveen.derived.ad index 815147fd87..6bcbdc3abb 100644 --- a/datasets/GM0362_amstelveen/GM0362_amstelveen.derived.ad +++ b/datasets/GM0362_amstelveen/GM0362_amstelveen.derived.ad @@ -1,6 +1,6 @@ - area = GM0362_amstelveen -- id = 128868 -- parent_id = 128868 +- id = 129214 +- parent_id = 129214 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0362_amstelveen/graph_values.yml b/datasets/GM0362_amstelveen/graph_values.yml index 66126484c7..fb2ae289db 100644 --- a/datasets/GM0362_amstelveen/graph_values.yml +++ b/datasets/GM0362_amstelveen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 11718.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15710741603081818 - :network_gas: 0.13590921183050003 - :ambient_heat: 0.7069833721386819 + :electricity: 0.18639056121239672 + :network_gas: 0.16124123804602733 + :ambient_heat: 0.6523682007415759 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 42242.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1997.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1690650191920607 - :network_gas: 0.3237399232317554 - :ambient_heat: 0.5071950575761839 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0363_amsterdam/GM0363_amsterdam.derived.ad b/datasets/GM0363_amsterdam/GM0363_amsterdam.derived.ad index 9f26a71edf..6c32bb5a5e 100644 --- a/datasets/GM0363_amsterdam/GM0363_amsterdam.derived.ad +++ b/datasets/GM0363_amsterdam/GM0363_amsterdam.derived.ad @@ -1,6 +1,6 @@ - area = GM0363_amsterdam -- id = 128869 -- parent_id = 128869 +- id = 129215 +- parent_id = 129215 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0363_amsterdam/graph_values.yml b/datasets/GM0363_amsterdam/graph_values.yml index 92826f544e..3c1393ea10 100644 --- a/datasets/GM0363_amsterdam/graph_values.yml +++ b/datasets/GM0363_amsterdam/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 163872.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15669874074730736 - :network_gas: 0.13815692588980943 - :ambient_heat: 0.7051443333628831 + :electricity: 0.18581562148516684 + :network_gas: 0.1638284706326602 + :ambient_heat: 0.650355907882173 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 457831.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 10186.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16802120230255863 - :network_gas: 0.32791519078976383 - :ambient_heat: 0.5040636069076776 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0373_bergen/GM0373_bergen.derived.ad b/datasets/GM0373_bergen/GM0373_bergen.derived.ad index 75967de9de..fb624c8c18 100644 --- a/datasets/GM0373_bergen/GM0373_bergen.derived.ad +++ b/datasets/GM0373_bergen/GM0373_bergen.derived.ad @@ -1,6 +1,6 @@ - area = GM0373_bergen -- id = 128883 -- parent_id = 128883 +- id = 129229 +- parent_id = 129229 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0373_bergen/graph_values.yml b/datasets/GM0373_bergen/graph_values.yml index 017f2dbf75..910a931f0f 100644 --- a/datasets/GM0373_bergen/graph_values.yml +++ b/datasets/GM0373_bergen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 8034.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1533068952591767 - :network_gas: 0.15681207607452805 - :ambient_heat: 0.6898810286662952 + :electricity: 0.1810652646785893 + :network_gas: 0.1852051077756982 + :ambient_heat: 0.6337296275457125 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15239.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 273.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1596381911368398 - :network_gas: 0.36144723545263924 - :ambient_heat: 0.47891457341052107 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0375_beverwijk/GM0375_beverwijk.derived.ad b/datasets/GM0375_beverwijk/GM0375_beverwijk.derived.ad index 5597492030..372d797c48 100644 --- a/datasets/GM0375_beverwijk/GM0375_beverwijk.derived.ad +++ b/datasets/GM0375_beverwijk/GM0375_beverwijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0375_beverwijk -- id = 128889 -- parent_id = 128889 +- id = 129235 +- parent_id = 129235 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0375_beverwijk/graph_values.yml b/datasets/GM0375_beverwijk/graph_values.yml index 3364d2f610..1410fdaf17 100644 --- a/datasets/GM0375_beverwijk/graph_values.yml +++ b/datasets/GM0375_beverwijk/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4888.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15612591026622158 - :network_gas: 0.1413074935357814 - :ambient_heat: 0.7025665961979971 + :electricity: 0.1850106793719058 + :network_gas: 0.16745071548224832 + :ambient_heat: 0.6475386051458458 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19501.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1514.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1665706331185661 - :network_gas: 0.3337174675257338 - :ambient_heat: 0.4997118993557 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0376_blaricum/GM0376_blaricum.derived.ad b/datasets/GM0376_blaricum/GM0376_blaricum.derived.ad index 55202f3442..e964bfc62a 100644 --- a/datasets/GM0376_blaricum/GM0376_blaricum.derived.ad +++ b/datasets/GM0376_blaricum/GM0376_blaricum.derived.ad @@ -1,6 +1,6 @@ - area = GM0376_blaricum -- id = 128891 -- parent_id = 128891 +- id = 129237 +- parent_id = 129237 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0376_blaricum/graph_values.yml b/datasets/GM0376_blaricum/graph_values.yml index 0c36c05cd2..39bf8aad61 100644 --- a/datasets/GM0376_blaricum/graph_values.yml +++ b/datasets/GM0376_blaricum/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 721.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15887322545755914 - :network_gas: 0.12619725998342485 - :ambient_heat: 0.7149295145590161 + :electricity: 0.18888119032060055 + :network_gas: 0.15003339053650122 + :ambient_heat: 0.6610854191428983 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5136.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 21.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1736627893383379 - :network_gas: 0.30534884264664663 - :ambient_heat: 0.5209883680150156 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0377_bloemendaal/GM0377_bloemendaal.derived.ad b/datasets/GM0377_bloemendaal/GM0377_bloemendaal.derived.ad index 5c11a03b80..e60ee2a511 100644 --- a/datasets/GM0377_bloemendaal/GM0377_bloemendaal.derived.ad +++ b/datasets/GM0377_bloemendaal/GM0377_bloemendaal.derived.ad @@ -1,6 +1,6 @@ - area = GM0377_bloemendaal -- id = 128892 -- parent_id = 128892 +- id = 129238 +- parent_id = 129238 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0377_bloemendaal/graph_values.yml b/datasets/GM0377_bloemendaal/graph_values.yml index 9d74904757..33b0d8e4ff 100644 --- a/datasets/GM0377_bloemendaal/graph_values.yml +++ b/datasets/GM0377_bloemendaal/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1509.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15112709634292337 - :network_gas: 0.16880097011392148 - :ambient_heat: 0.6800719335431551 + :electricity: 0.17803244420101969 + :network_gas: 0.1988528200442192 + :ambient_heat: 0.6231147357547612 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10145.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1312.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15450162884429225 - :network_gas: 0.3819934846228294 - :ambient_heat: 0.46350488653287836 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0383_castricum/GM0383_castricum.derived.ad b/datasets/GM0383_castricum/GM0383_castricum.derived.ad index 90cd63e30f..b29303e784 100644 --- a/datasets/GM0383_castricum/GM0383_castricum.derived.ad +++ b/datasets/GM0383_castricum/GM0383_castricum.derived.ad @@ -1,6 +1,6 @@ - area = GM0383_castricum -- id = 128907 -- parent_id = 128907 +- id = 129253 +- parent_id = 129253 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0383_castricum/graph_values.yml b/datasets/GM0383_castricum/graph_values.yml index 63ad56ddde..e831ad813b 100644 --- a/datasets/GM0383_castricum/graph_values.yml +++ b/datasets/GM0383_castricum/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2495.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15603796500254774 - :network_gas: 0.14179119248598737 - :ambient_heat: 0.7021708425114648 + :electricity: 0.18488719533285022 + :network_gas: 0.1680063944771804 + :ambient_heat: 0.6471064101899693 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16223.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 363.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16634921320607798 - :network_gas: 0.3346031471756864 - :ambient_heat: 0.49904763961823567 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0384_diemen/GM0384_diemen.derived.ad b/datasets/GM0384_diemen/GM0384_diemen.derived.ad index d2d5817eea..ad71df910e 100644 --- a/datasets/GM0384_diemen/GM0384_diemen.derived.ad +++ b/datasets/GM0384_diemen/GM0384_diemen.derived.ad @@ -1,6 +1,6 @@ - area = GM0384_diemen -- id = 128922 -- parent_id = 128922 +- id = 129268 +- parent_id = 129268 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0384_diemen/graph_values.yml b/datasets/GM0384_diemen/graph_values.yml index 0bb6d080cd..c07265ebd6 100644 --- a/datasets/GM0384_diemen/graph_values.yml +++ b/datasets/GM0384_diemen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3072.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16193110414940312 - :network_gas: 0.10937892717828268 - :ambient_heat: 0.7286899686723141 + :electricity: 0.1932190746944467 + :network_gas: 0.13051288207705924 + :ambient_heat: 0.6762680432284939 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15467.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 185.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18197763805799871 - :network_gas: 0.27208944776800315 - :ambient_heat: 0.5459329141739981 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0385_edam_volendam/GM0385_edam_volendam.derived.ad b/datasets/GM0385_edam_volendam/GM0385_edam_volendam.derived.ad index be2de4998d..0864c8015a 100644 --- a/datasets/GM0385_edam_volendam/GM0385_edam_volendam.derived.ad +++ b/datasets/GM0385_edam_volendam/GM0385_edam_volendam.derived.ad @@ -1,6 +1,6 @@ - area = GM0385_edam_volendam -- id = 128934 -- parent_id = 128934 +- id = 129280 +- parent_id = 129280 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0385_edam_volendam/graph_values.yml b/datasets/GM0385_edam_volendam/graph_values.yml index 63ae472e3a..814c57629b 100644 --- a/datasets/GM0385_edam_volendam/graph_values.yml +++ b/datasets/GM0385_edam_volendam/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2558.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15637314363745866 - :network_gas: 0.13994770999397735 - :ambient_heat: 0.703679146368564 + :electricity: 0.18535795793387702 + :network_gas: 0.16588795964956307 + :ambient_heat: 0.6487540824165599 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15416.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 652.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16719491644891266 - :network_gas: 0.33122033420434766 - :ambient_heat: 0.5015847493467397 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0388_enkhuizen/GM0388_enkhuizen.derived.ad b/datasets/GM0388_enkhuizen/GM0388_enkhuizen.derived.ad index dcd54cc42a..6386d67a11 100644 --- a/datasets/GM0388_enkhuizen/GM0388_enkhuizen.derived.ad +++ b/datasets/GM0388_enkhuizen/GM0388_enkhuizen.derived.ad @@ -1,6 +1,6 @@ - area = GM0388_enkhuizen -- id = 128942 -- parent_id = 128942 +- id = 129288 +- parent_id = 129288 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0388_enkhuizen/graph_values.yml b/datasets/GM0388_enkhuizen/graph_values.yml index fab2bd7897..63bb120d29 100644 --- a/datasets/GM0388_enkhuizen/graph_values.yml +++ b/datasets/GM0388_enkhuizen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1381.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1555218921656375 - :network_gas: 0.14462959308899376 - :ambient_heat: 0.6998485147453688 + :electricity: 0.1841630951926599 + :network_gas: 0.17126484991165195 + :ambient_heat: 0.6445720548956881 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8878.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 904.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16505670471079978 - :network_gas: 0.3397731811567992 - :ambient_heat: 0.4951701141324011 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0392_haarlem/GM0392_haarlem.derived.ad b/datasets/GM0392_haarlem/GM0392_haarlem.derived.ad index 37dfb7725b..6ad608a931 100644 --- a/datasets/GM0392_haarlem/GM0392_haarlem.derived.ad +++ b/datasets/GM0392_haarlem/GM0392_haarlem.derived.ad @@ -1,6 +1,6 @@ - area = GM0392_haarlem -- id = 128961 -- parent_id = 128961 +- id = 129307 +- parent_id = 129307 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0392_haarlem/graph_values.yml b/datasets/GM0392_haarlem/graph_values.yml index ace2acafb9..01c3dd0f87 100644 --- a/datasets/GM0392_haarlem/graph_values.yml +++ b/datasets/GM0392_haarlem/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 15954.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15312227381452098 - :network_gas: 0.15782749402013463 - :ambient_heat: 0.6890502321653444 + :electricity: 0.1808077900924109 + :network_gas: 0.18636374512156414 + :ambient_heat: 0.632828464786025 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 77093.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 21955.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15919576508848443 - :network_gas: 0.3632169396460606 - :ambient_heat: 0.477587295265455 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0394_haarlemmermeer/GM0394_haarlemmermeer.derived.ad b/datasets/GM0394_haarlemmermeer/GM0394_haarlemmermeer.derived.ad index ccad19a451..4b59a98e5c 100644 --- a/datasets/GM0394_haarlemmermeer/GM0394_haarlemmermeer.derived.ad +++ b/datasets/GM0394_haarlemmermeer/GM0394_haarlemmermeer.derived.ad @@ -1,6 +1,6 @@ - area = GM0394_haarlemmermeer -- id = 128962 -- parent_id = 128962 +- id = 129308 +- parent_id = 129308 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0394_haarlemmermeer/graph_values.yml b/datasets/GM0394_haarlemmermeer/graph_values.yml index eef8fd2403..d420bb64d2 100644 --- a/datasets/GM0394_haarlemmermeer/graph_values.yml +++ b/datasets/GM0394_haarlemmermeer/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 30566.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1589005951349067 - :network_gas: 0.12604672675801304 - :ambient_heat: 0.7150526781070802 + :electricity: 0.18891987685315542 + :network_gas: 0.14985930088336125 + :ambient_heat: 0.6612208222634833 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 65149.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 794.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17373519596506173 - :network_gas: 0.3050592161397512 - :ambient_heat: 0.5212055878951871 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0396_heemskerk/GM0396_heemskerk.derived.ad b/datasets/GM0396_heemskerk/GM0396_heemskerk.derived.ad index ee24296069..1edd9d7458 100644 --- a/datasets/GM0396_heemskerk/GM0396_heemskerk.derived.ad +++ b/datasets/GM0396_heemskerk/GM0396_heemskerk.derived.ad @@ -1,6 +1,6 @@ - area = GM0396_heemskerk -- id = 128969 -- parent_id = 128969 +- id = 129315 +- parent_id = 129315 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0396_heemskerk/graph_values.yml b/datasets/GM0396_heemskerk/graph_values.yml index 77ce9a5b2f..5ac743e6f3 100644 --- a/datasets/GM0396_heemskerk/graph_values.yml +++ b/datasets/GM0396_heemskerk/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3510.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1572558270170332 - :network_gas: 0.13509295140631758 - :ambient_heat: 0.7076512215766493 + :electricity: 0.1865994893751799 + :network_gas: 0.16030105992749263 + :ambient_heat: 0.6530994506973276 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 17591.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 89.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16944594276051098 - :network_gas: 0.3222162289579543 - :ambient_heat: 0.5083378282815348 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0397_heemstede/GM0397_heemstede.derived.ad b/datasets/GM0397_heemstede/GM0397_heemstede.derived.ad index 7264fc7428..699afeaac5 100644 --- a/datasets/GM0397_heemstede/GM0397_heemstede.derived.ad +++ b/datasets/GM0397_heemstede/GM0397_heemstede.derived.ad @@ -1,6 +1,6 @@ - area = GM0397_heemstede -- id = 128970 -- parent_id = 128970 +- id = 129316 +- parent_id = 129316 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0397_heemstede/graph_values.yml b/datasets/GM0397_heemstede/graph_values.yml index 18789fffcc..67d05e3f74 100644 --- a/datasets/GM0397_heemstede/graph_values.yml +++ b/datasets/GM0397_heemstede/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2575.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15200139497185594 - :network_gas: 0.1639923276547924 - :ambient_heat: 0.6840062773733517 + :electricity: 0.17924700975263844 + :network_gas: 0.19338726700461634 + :ambient_heat: 0.6273657232427452 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12813.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2159.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1565392169559117 - :network_gas: 0.3738431321763517 - :ambient_heat: 0.4696176508677367 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0399_heiloo/GM0399_heiloo.derived.ad b/datasets/GM0399_heiloo/GM0399_heiloo.derived.ad index 4b2c35f4d0..92fe4a822b 100644 --- a/datasets/GM0399_heiloo/GM0399_heiloo.derived.ad +++ b/datasets/GM0399_heiloo/GM0399_heiloo.derived.ad @@ -1,6 +1,6 @@ - area = GM0399_heiloo -- id = 128975 -- parent_id = 128975 +- id = 129321 +- parent_id = 129321 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0399_heiloo/graph_values.yml b/datasets/GM0399_heiloo/graph_values.yml index 0f90d6cb79..67250b0dcf 100644 --- a/datasets/GM0399_heiloo/graph_values.yml +++ b/datasets/GM0399_heiloo/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1702.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15589750828694715 - :network_gas: 0.14256370442179073 - :ambient_heat: 0.7015387872912622 + :electricity: 0.18469003327105454 + :network_gas: 0.16889362506321634 + :ambient_heat: 0.646416341665729 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10934.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 96.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16599628816149023 - :network_gas: 0.3360148473540372 - :ambient_heat: 0.4979888644844725 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0400_den_helder/GM0400_den_helder.derived.ad b/datasets/GM0400_den_helder/GM0400_den_helder.derived.ad index ddcb2dc832..4f46f01ba2 100644 --- a/datasets/GM0400_den_helder/GM0400_den_helder.derived.ad +++ b/datasets/GM0400_den_helder/GM0400_den_helder.derived.ad @@ -1,6 +1,6 @@ - area = GM0400_den_helder -- id = 128919 -- parent_id = 128919 +- id = 129265 +- parent_id = 129265 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0400_den_helder/graph_values.yml b/datasets/GM0400_den_helder/graph_values.yml index 4aadfa0e1c..baafbd1216 100644 --- a/datasets/GM0400_den_helder/graph_values.yml +++ b/datasets/GM0400_den_helder/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 8805.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15284587848914238 - :network_gas: 0.15934766830971675 - :ambient_heat: 0.6878064532011409 + :electricity: 0.18042253666224353 + :network_gas: 0.18809738811305388 + :ambient_heat: 0.6314800752247025 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 28369.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 3822.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1585360015726182 - :network_gas: 0.3658559937095254 - :ambient_heat: 0.4756080047178563 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0402_hilversum/GM0402_hilversum.derived.ad b/datasets/GM0402_hilversum/GM0402_hilversum.derived.ad index 614498bfa5..f83b2d596d 100644 --- a/datasets/GM0402_hilversum/GM0402_hilversum.derived.ad +++ b/datasets/GM0402_hilversum/GM0402_hilversum.derived.ad @@ -1,6 +1,6 @@ - area = GM0402_hilversum -- id = 128984 -- parent_id = 128984 +- id = 129330 +- parent_id = 129330 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0402_hilversum/graph_values.yml b/datasets/GM0402_hilversum/graph_values.yml index 61dd00fc2f..6ef8aa2fc9 100644 --- a/datasets/GM0402_hilversum/graph_values.yml +++ b/datasets/GM0402_hilversum/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 15277.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1528546752398501 - :network_gas: 0.15929928618082434 - :ambient_heat: 0.6878460385793255 + :electricity: 0.18043479413392283 + :network_gas: 0.18804222940918194 + :ambient_heat: 0.6315229764568951 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 42918.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 8091.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1585569520203167 - :network_gas: 0.3657721919187315 - :ambient_heat: 0.4756708560609518 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0405_hoorn/GM0405_hoorn.derived.ad b/datasets/GM0405_hoorn/GM0405_hoorn.derived.ad index 791018294b..d6ef9fb124 100644 --- a/datasets/GM0405_hoorn/GM0405_hoorn.derived.ad +++ b/datasets/GM0405_hoorn/GM0405_hoorn.derived.ad @@ -1,6 +1,6 @@ - area = GM0405_hoorn -- id = 128988 -- parent_id = 128988 +- id = 129334 +- parent_id = 129334 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0405_hoorn/graph_values.yml b/datasets/GM0405_hoorn/graph_values.yml index 05c6b8fb31..1c7ba8727a 100644 --- a/datasets/GM0405_hoorn/graph_values.yml +++ b/datasets/GM0405_hoorn/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 7788.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15760477531523923 - :network_gas: 0.13317373576618424 - :ambient_heat: 0.7092214889185765 + :electricity: 0.18709101747798548 + :network_gas: 0.1580891802041143 + :ambient_heat: 0.6548198023179004 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 33643.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1483.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1703455172738297 - :network_gas: 0.31861793090467916 - :ambient_heat: 0.511036551821491 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0406_huizen/GM0406_huizen.derived.ad b/datasets/GM0406_huizen/GM0406_huizen.derived.ad index ea5a044c12..139af52cb3 100644 --- a/datasets/GM0406_huizen/GM0406_huizen.derived.ad +++ b/datasets/GM0406_huizen/GM0406_huizen.derived.ad @@ -1,6 +1,6 @@ - area = GM0406_huizen -- id = 128991 -- parent_id = 128991 +- id = 129337 +- parent_id = 129337 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0406_huizen/graph_values.yml b/datasets/GM0406_huizen/graph_values.yml index b03a12adeb..8b8f956dee 100644 --- a/datasets/GM0406_huizen/graph_values.yml +++ b/datasets/GM0406_huizen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3184.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1556746537848842 - :network_gas: 0.14378940418313688 - :ambient_heat: 0.7005359420319789 + :electricity: 0.18437734230106761 + :network_gas: 0.17030073650252125 + :ambient_heat: 0.6453219211964111 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19010.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 422.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16543808986504474 - :network_gas: 0.33824764053981926 - :ambient_heat: 0.49631426959513597 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0415_landsmeer/GM0415_landsmeer.derived.ad b/datasets/GM0415_landsmeer/GM0415_landsmeer.derived.ad index 47dcecd1a7..7dd39a0252 100644 --- a/datasets/GM0415_landsmeer/GM0415_landsmeer.derived.ad +++ b/datasets/GM0415_landsmeer/GM0415_landsmeer.derived.ad @@ -1,6 +1,6 @@ - area = GM0415_landsmeer -- id = 129004 -- parent_id = 129004 +- id = 129350 +- parent_id = 129350 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0415_landsmeer/graph_values.yml b/datasets/GM0415_landsmeer/graph_values.yml index 1be72a7964..d298ab4fbb 100644 --- a/datasets/GM0415_landsmeer/graph_values.yml +++ b/datasets/GM0415_landsmeer/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 508.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15793956102885 - :network_gas: 0.13133241434132503 - :ambient_heat: 0.710728024629825 + :electricity: 0.18756297909142297 + :network_gas: 0.15596534981269478 + :ambient_heat: 0.6564716710958822 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4888.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 7.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1712138105013312 - :network_gas: 0.31514475799467345 - :ambient_heat: 0.5136414315039954 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0417_laren/GM0417_laren.derived.ad b/datasets/GM0417_laren/GM0417_laren.derived.ad index 34d458881d..d64138d8bd 100644 --- a/datasets/GM0417_laren/GM0417_laren.derived.ad +++ b/datasets/GM0417_laren/GM0417_laren.derived.ad @@ -1,6 +1,6 @@ - area = GM0417_laren -- id = 129006 -- parent_id = 129006 +- id = 129352 +- parent_id = 129352 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0417_laren/graph_values.yml b/datasets/GM0417_laren/graph_values.yml index 7c10fde529..7abf522b82 100644 --- a/datasets/GM0417_laren/graph_values.yml +++ b/datasets/GM0417_laren/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1436.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15062545030019178 - :network_gas: 0.17156002334894518 - :ambient_heat: 0.677814526350863 + :electricity: 0.17733669221932696 + :network_gas: 0.2019837085773924 + :ambient_heat: 0.6206795992032806 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5427.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 257.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15334590986223148 - :network_gas: 0.38661636055107257 - :ambient_heat: 0.46003772958669603 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0420_medemblik/GM0420_medemblik.derived.ad b/datasets/GM0420_medemblik/GM0420_medemblik.derived.ad index da42e141be..ecab87ec3c 100644 --- a/datasets/GM0420_medemblik/GM0420_medemblik.derived.ad +++ b/datasets/GM0420_medemblik/GM0420_medemblik.derived.ad @@ -1,6 +1,6 @@ - area = GM0420_medemblik -- id = 129024 -- parent_id = 129024 +- id = 129370 +- parent_id = 129370 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0420_medemblik/graph_values.yml b/datasets/GM0420_medemblik/graph_values.yml index 5d71c33315..abef42d8eb 100644 --- a/datasets/GM0420_medemblik/graph_values.yml +++ b/datasets/GM0420_medemblik/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3263.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15707395955432346 - :network_gas: 0.13609322245122105 - :ambient_heat: 0.7068328179944555 + :electricity: 0.18634347243404115 + :network_gas: 0.16145313786101026 + :ambient_heat: 0.6522033897049486 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19174.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 305.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1689792844508241 - :network_gas: 0.32408286219670174 - :ambient_heat: 0.5069378533524741 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0431_oostzaan/GM0431_oostzaan.derived.ad b/datasets/GM0431_oostzaan/GM0431_oostzaan.derived.ad index 1aaa948788..366bbd0965 100644 --- a/datasets/GM0431_oostzaan/GM0431_oostzaan.derived.ad +++ b/datasets/GM0431_oostzaan/GM0431_oostzaan.derived.ad @@ -1,6 +1,6 @@ - area = GM0431_oostzaan -- id = 129058 -- parent_id = 129058 +- id = 129404 +- parent_id = 129404 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0431_oostzaan/graph_values.yml b/datasets/GM0431_oostzaan/graph_values.yml index 8b59f05aa7..481032500d 100644 --- a/datasets/GM0431_oostzaan/graph_values.yml +++ b/datasets/GM0431_oostzaan/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 432.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15793066846374276 - :network_gas: 0.13138132344941483 - :ambient_heat: 0.7106880080868424 + :electricity: 0.18755043801373383 + :network_gas: 0.15602178474549233 + :ambient_heat: 0.6564277772407738 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4100.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 37.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17119068032959547 - :network_gas: 0.3152372786816163 - :ambient_heat: 0.5135720409887883 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0432_opmeer/GM0432_opmeer.derived.ad b/datasets/GM0432_opmeer/GM0432_opmeer.derived.ad index 5db458be95..fbda741511 100644 --- a/datasets/GM0432_opmeer/GM0432_opmeer.derived.ad +++ b/datasets/GM0432_opmeer/GM0432_opmeer.derived.ad @@ -1,6 +1,6 @@ - area = GM0432_opmeer -- id = 129059 -- parent_id = 129059 +- id = 129405 +- parent_id = 129405 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0432_opmeer/graph_values.yml b/datasets/GM0432_opmeer/graph_values.yml index 8a0c5ebc00..d76fb4abe5 100644 --- a/datasets/GM0432_opmeer/graph_values.yml +++ b/datasets/GM0432_opmeer/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 768.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15761401322398003 - :network_gas: 0.1331229272681099 - :ambient_heat: 0.7092630595079101 + :electricity: 0.18710403551672475 + :network_gas: 0.15803059894342708 + :ambient_heat: 0.6548653655398482 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4957.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 9.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17036940760026395 - :network_gas: 0.3185223695989424 - :ambient_heat: 0.5111082228007937 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0437_ouder_amstel/GM0437_ouder_amstel.derived.ad b/datasets/GM0437_ouder_amstel/GM0437_ouder_amstel.derived.ad index 9c68f7c60a..41d1d4ef83 100644 --- a/datasets/GM0437_ouder_amstel/GM0437_ouder_amstel.derived.ad +++ b/datasets/GM0437_ouder_amstel/GM0437_ouder_amstel.derived.ad @@ -1,6 +1,6 @@ - area = GM0437_ouder_amstel -- id = 129063 -- parent_id = 129063 +- id = 129409 +- parent_id = 129409 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0437_ouder_amstel/graph_values.yml b/datasets/GM0437_ouder_amstel/graph_values.yml index b21665080b..d3a805ec72 100644 --- a/datasets/GM0437_ouder_amstel/graph_values.yml +++ b/datasets/GM0437_ouder_amstel/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3428.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15776213993045682 - :network_gas: 0.13230823038248749 - :ambient_heat: 0.7099296296870558 + :electricity: 0.1873128143154464 + :network_gas: 0.15709109296415982 + :ambient_heat: 0.6555960927203937 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6296.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 135.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17075301416953437 - :network_gas: 0.31698794332186064 - :ambient_heat: 0.512259042508605 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0439_purmerend/GM0439_purmerend.derived.ad b/datasets/GM0439_purmerend/GM0439_purmerend.derived.ad index 98f117ba74..fdbf3c2163 100644 --- a/datasets/GM0439_purmerend/GM0439_purmerend.derived.ad +++ b/datasets/GM0439_purmerend/GM0439_purmerend.derived.ad @@ -1,6 +1,6 @@ - area = GM0439_purmerend -- id = 129070 -- parent_id = 129070 +- id = 129416 +- parent_id = 129416 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0439_purmerend/graph_values.yml b/datasets/GM0439_purmerend/graph_values.yml index 62296e7dd5..a6faa5a6ff 100644 --- a/datasets/GM0439_purmerend/graph_values.yml +++ b/datasets/GM0439_purmerend/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 5815.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1714382065293504 - :network_gas: 0.057089864088572764 - :ambient_heat: 0.7714719293820769 + :electricity: 0.20691030235776242 + :network_gas: 0.06890226676576812 + :ambient_heat: 0.7241874308764695 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 41148.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 463.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2110984624907338 - :network_gas: 0.15560615003706252 - :ambient_heat: 0.6332953874722037 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0441_schagen/GM0441_schagen.derived.ad b/datasets/GM0441_schagen/GM0441_schagen.derived.ad index 12286a4fdc..697cd0c13b 100644 --- a/datasets/GM0441_schagen/GM0441_schagen.derived.ad +++ b/datasets/GM0441_schagen/GM0441_schagen.derived.ad @@ -1,6 +1,6 @@ - area = GM0441_schagen -- id = 129088 -- parent_id = 129088 +- id = 129434 +- parent_id = 129434 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0441_schagen/graph_values.yml b/datasets/GM0441_schagen/graph_values.yml index 0ae0eef0ae..2405296710 100644 --- a/datasets/GM0441_schagen/graph_values.yml +++ b/datasets/GM0441_schagen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 5314.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15666963772308637 - :network_gas: 0.1383169925230251 - :ambient_heat: 0.7050133697538886 + :electricity: 0.18577469951212863 + :network_gas: 0.16401261978280476 + :ambient_heat: 0.6502126807050665 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20529.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 251.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16794715405153243 - :network_gas: 0.32821138379386855 - :ambient_heat: 0.5038414621545991 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0448_texel/GM0448_texel.derived.ad b/datasets/GM0448_texel/GM0448_texel.derived.ad index 20836a5645..c6a8c5276a 100644 --- a/datasets/GM0448_texel/GM0448_texel.derived.ad +++ b/datasets/GM0448_texel/GM0448_texel.derived.ad @@ -1,6 +1,6 @@ - area = GM0448_texel -- id = 129113 -- parent_id = 129113 +- id = 129459 +- parent_id = 129459 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0448_texel/graph_values.yml b/datasets/GM0448_texel/graph_values.yml index bbee56cd6e..005ed6a0b4 100644 --- a/datasets/GM0448_texel/graph_values.yml +++ b/datasets/GM0448_texel/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4968.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1551654294009777 - :network_gas: 0.14659013829462283 - :ambient_heat: 0.6982444323043995 + :electricity: 0.18366345997931652 + :network_gas: 0.17351321168623207 + :ambient_heat: 0.6428233283344513 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6770.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 304.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16417067817738237 - :network_gas: 0.34331728729046873 - :ambient_heat: 0.49251203453214887 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0450_uitgeest/GM0450_uitgeest.derived.ad b/datasets/GM0450_uitgeest/GM0450_uitgeest.derived.ad index dca4c4eeb8..658d5313d7 100644 --- a/datasets/GM0450_uitgeest/GM0450_uitgeest.derived.ad +++ b/datasets/GM0450_uitgeest/GM0450_uitgeest.derived.ad @@ -1,6 +1,6 @@ - area = GM0450_uitgeest -- id = 129122 -- parent_id = 129122 +- id = 129468 +- parent_id = 129468 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0450_uitgeest/graph_values.yml b/datasets/GM0450_uitgeest/graph_values.yml index 94e8870233..1a9387ed04 100644 --- a/datasets/GM0450_uitgeest/graph_values.yml +++ b/datasets/GM0450_uitgeest/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 875.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15785627556855017 - :network_gas: 0.13179048437297416 - :ambient_heat: 0.7103532400584758 + :electricity: 0.187445532983521 + :network_gas: 0.15649385807738042 + :ambient_heat: 0.6560606089390986 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5720.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 124.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17099732201353815 - :network_gas: 0.3160107119458457 - :ambient_heat: 0.5129919660406163 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0451_uithoorn/GM0451_uithoorn.derived.ad b/datasets/GM0451_uithoorn/GM0451_uithoorn.derived.ad index 83d32ee299..65359256f9 100644 --- a/datasets/GM0451_uithoorn/GM0451_uithoorn.derived.ad +++ b/datasets/GM0451_uithoorn/GM0451_uithoorn.derived.ad @@ -1,6 +1,6 @@ - area = GM0451_uithoorn -- id = 129123 -- parent_id = 129123 +- id = 129469 +- parent_id = 129469 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0451_uithoorn/graph_values.yml b/datasets/GM0451_uithoorn/graph_values.yml index 1f222c0472..e63415c90c 100644 --- a/datasets/GM0451_uithoorn/graph_values.yml +++ b/datasets/GM0451_uithoorn/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2155.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15860404130205252 - :network_gas: 0.1276777728387111 - :ambient_heat: 0.7137181858592363 + :electricity: 0.18850083760031625 + :network_gas: 0.15174498030100628 + :ambient_heat: 0.6597541820986775 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13250.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 82.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1729525437403862 - :network_gas: 0.3081898250384534 - :ambient_heat: 0.5188576312211605 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0453_velsen/GM0453_velsen.derived.ad b/datasets/GM0453_velsen/GM0453_velsen.derived.ad index 5630ab4380..e69bb885e1 100644 --- a/datasets/GM0453_velsen/GM0453_velsen.derived.ad +++ b/datasets/GM0453_velsen/GM0453_velsen.derived.ad @@ -1,6 +1,6 @@ - area = GM0453_velsen -- id = 129134 -- parent_id = 129134 +- id = 129480 +- parent_id = 129480 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0453_velsen/graph_values.yml b/datasets/GM0453_velsen/graph_values.yml index 08868e7fd6..99393791bb 100644 --- a/datasets/GM0453_velsen/graph_values.yml +++ b/datasets/GM0453_velsen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 6907.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15464316762770722 - :network_gas: 0.14946257804761026 - :ambient_heat: 0.6958942543246824 + :electricity: 0.18293219388272108 + :network_gas: 0.17680391397206496 + :ambient_heat: 0.6402638921452138 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 31435.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 4067.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16288236194691455 - :network_gas: 0.3484705522123399 - :ambient_heat: 0.48864708584074545 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0473_zandvoort/GM0473_zandvoort.derived.ad b/datasets/GM0473_zandvoort/GM0473_zandvoort.derived.ad index 1bb57aac4f..74e67ecfe7 100644 --- a/datasets/GM0473_zandvoort/GM0473_zandvoort.derived.ad +++ b/datasets/GM0473_zandvoort/GM0473_zandvoort.derived.ad @@ -1,6 +1,6 @@ - area = GM0473_zandvoort -- id = 129167 -- parent_id = 129167 +- id = 129513 +- parent_id = 129513 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0473_zandvoort/graph_values.yml b/datasets/GM0473_zandvoort/graph_values.yml index d16c364c1f..754b0b8080 100644 --- a/datasets/GM0473_zandvoort/graph_values.yml +++ b/datasets/GM0473_zandvoort/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1395.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15356136814279 - :network_gas: 0.155412475214655 - :ambient_heat: 0.6910261566425551 + :electricity: 0.1814203387559564 + :network_gas: 0.18360727207201688 + :ambient_heat: 0.6349723891720268 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9695.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 723.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16025029310180414 - :network_gas: 0.3589988275927818 - :ambient_heat: 0.48075087930541405 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0479_zaanstad/GM0479_zaanstad.derived.ad b/datasets/GM0479_zaanstad/GM0479_zaanstad.derived.ad index 506a8e7445..2a7d396987 100644 --- a/datasets/GM0479_zaanstad/GM0479_zaanstad.derived.ad +++ b/datasets/GM0479_zaanstad/GM0479_zaanstad.derived.ad @@ -1,6 +1,6 @@ - area = GM0479_zaanstad -- id = 129165 -- parent_id = 129165 +- id = 129511 +- parent_id = 129511 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0479_zaanstad/graph_values.yml b/datasets/GM0479_zaanstad/graph_values.yml index 9a7e66a9ed..50a1cf81d8 100644 --- a/datasets/GM0479_zaanstad/graph_values.yml +++ b/datasets/GM0479_zaanstad/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 14450.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15672692864729568 - :network_gas: 0.13800189243987365 - :ambient_heat: 0.7052711789128305 + :electricity: 0.18585525938814249 + :network_gas: 0.1636500998063157 + :ambient_heat: 0.650494640805542 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 69079.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 4437.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16809295818240547 - :network_gas: 0.3276281672703764 - :ambient_heat: 0.5042788745472182 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0482_alblasserdam/GM0482_alblasserdam.derived.ad b/datasets/GM0482_alblasserdam/GM0482_alblasserdam.derived.ad index 3fb1201b1c..5bbb8c880f 100644 --- a/datasets/GM0482_alblasserdam/GM0482_alblasserdam.derived.ad +++ b/datasets/GM0482_alblasserdam/GM0482_alblasserdam.derived.ad @@ -1,6 +1,6 @@ - area = GM0482_alblasserdam -- id = 128859 -- parent_id = 128859 +- id = 129205 +- parent_id = 129205 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0482_alblasserdam/graph_values.yml b/datasets/GM0482_alblasserdam/graph_values.yml index 67bd46a45a..ab7f9fb724 100644 --- a/datasets/GM0482_alblasserdam/graph_values.yml +++ b/datasets/GM0482_alblasserdam/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1419.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15909122257651379 - :network_gas: 0.12499827582917422 - :ambient_heat: 0.715910501594312 + :electricity: 0.18918939506622126 + :network_gas: 0.14864646713660545 + :ambient_heat: 0.6621641377971733 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8406.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 245.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17424048613787685 - :network_gas: 0.30303805544849066 - :ambient_heat: 0.5227214584136324 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0484_alphen_aan_den_rijn/GM0484_alphen_aan_den_rijn.derived.ad b/datasets/GM0484_alphen_aan_den_rijn/GM0484_alphen_aan_den_rijn.derived.ad index 300893b057..f3871b7907 100644 --- a/datasets/GM0484_alphen_aan_den_rijn/GM0484_alphen_aan_den_rijn.derived.ad +++ b/datasets/GM0484_alphen_aan_den_rijn/GM0484_alphen_aan_den_rijn.derived.ad @@ -1,6 +1,6 @@ - area = GM0484_alphen_aan_den_rijn -- id = 128864 -- parent_id = 128864 +- id = 129210 +- parent_id = 129210 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0484_alphen_aan_den_rijn/graph_values.yml b/datasets/GM0484_alphen_aan_den_rijn/graph_values.yml index f8d8317823..66ca2ab4f1 100644 --- a/datasets/GM0484_alphen_aan_den_rijn/graph_values.yml +++ b/datasets/GM0484_alphen_aan_den_rijn/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 10512.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15904129502970427 - :network_gas: 0.12527287733662648 - :ambient_heat: 0.7156858276336693 + :electricity: 0.18911879329744855 + :network_gas: 0.14896417556444833 + :ambient_heat: 0.6619170311381031 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 48847.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1649.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1741079781240857 - :network_gas: 0.3035680875036554 - :ambient_heat: 0.522323934372259 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0489_barendrecht/GM0489_barendrecht.derived.ad b/datasets/GM0489_barendrecht/GM0489_barendrecht.derived.ad index 2aecdcaee2..d0c7860f15 100644 --- a/datasets/GM0489_barendrecht/GM0489_barendrecht.derived.ad +++ b/datasets/GM0489_barendrecht/GM0489_barendrecht.derived.ad @@ -1,6 +1,6 @@ - area = GM0489_barendrecht -- id = 128876 -- parent_id = 128876 +- id = 129222 +- parent_id = 129222 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0489_barendrecht/graph_values.yml b/datasets/GM0489_barendrecht/graph_values.yml index 962992560b..127dfd260b 100644 --- a/datasets/GM0489_barendrecht/graph_values.yml +++ b/datasets/GM0489_barendrecht/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4769.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16156035243859032 - :network_gas: 0.11141806158775312 - :ambient_heat: 0.7270215859736564 + :electricity: 0.1926914434285919 + :network_gas: 0.13288722627366428 + :ambient_heat: 0.6744213302977439 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19420.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 151.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1809447047311239 - :network_gas: 0.2762211810755025 - :ambient_heat: 0.5428341141933736 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0498_drechterland/GM0498_drechterland.derived.ad b/datasets/GM0498_drechterland/GM0498_drechterland.derived.ad index 6755a07b4b..432e34fb26 100644 --- a/datasets/GM0498_drechterland/GM0498_drechterland.derived.ad +++ b/datasets/GM0498_drechterland/GM0498_drechterland.derived.ad @@ -1,6 +1,6 @@ - area = GM0498_drechterland -- id = 128928 -- parent_id = 128928 +- id = 129274 +- parent_id = 129274 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0498_drechterland/graph_values.yml b/datasets/GM0498_drechterland/graph_values.yml index 7ca37fdae0..854cd5f1a8 100644 --- a/datasets/GM0498_drechterland/graph_values.yml +++ b/datasets/GM0498_drechterland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 879.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1588385829538498 - :network_gas: 0.12638779375382608 - :ambient_heat: 0.7147736232923241 + :electricity: 0.18883222739242772 + :network_gas: 0.1502537240380946 + :ambient_heat: 0.6609140485694778 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8399.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 11.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1735711931777485 - :network_gas: 0.30571522728900424 - :ambient_heat: 0.5207135795332474 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0502_capelle_aan_den_ijssel/GM0502_capelle_aan_den_ijssel.derived.ad b/datasets/GM0502_capelle_aan_den_ijssel/GM0502_capelle_aan_den_ijssel.derived.ad index 8fd7019369..48a5d292b4 100644 --- a/datasets/GM0502_capelle_aan_den_ijssel/GM0502_capelle_aan_den_ijssel.derived.ad +++ b/datasets/GM0502_capelle_aan_den_ijssel/GM0502_capelle_aan_den_ijssel.derived.ad @@ -1,6 +1,6 @@ - area = GM0502_capelle_aan_den_ijssel -- id = 128906 -- parent_id = 128906 +- id = 129252 +- parent_id = 129252 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0502_capelle_aan_den_ijssel/graph_values.yml b/datasets/GM0502_capelle_aan_den_ijssel/graph_values.yml index eac023c71d..f4903a28af 100644 --- a/datasets/GM0502_capelle_aan_den_ijssel/graph_values.yml +++ b/datasets/GM0502_capelle_aan_den_ijssel/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 8475.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16378207889004973 - :network_gas: 0.0991985661047264 - :ambient_heat: 0.7370193550052238 + :electricity: 0.19586026793999736 + :network_gas: 0.1186274949506434 + :ambient_heat: 0.6855122371093592 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 31546.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 271.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1872416218942203 - :network_gas: 0.2510335124231167 - :ambient_heat: 0.5617248656826629 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0503_delft/GM0503_delft.derived.ad b/datasets/GM0503_delft/GM0503_delft.derived.ad index bf1a6d35d2..cc6d824e74 100644 --- a/datasets/GM0503_delft/GM0503_delft.derived.ad +++ b/datasets/GM0503_delft/GM0503_delft.derived.ad @@ -1,6 +1,6 @@ - area = GM0503_delft -- id = 128917 -- parent_id = 128917 +- id = 129263 +- parent_id = 129263 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0503_delft/graph_values.yml b/datasets/GM0503_delft/graph_values.yml index 6e7ca6a002..0d0d399eff 100644 --- a/datasets/GM0503_delft/graph_values.yml +++ b/datasets/GM0503_delft/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 20472.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15885496009618283 - :network_gas: 0.12629771947099452 - :ambient_heat: 0.7148473204328227 + :electricity: 0.1888553739709205 + :network_gas: 0.15014956428132473 + :ambient_heat: 0.6609950617477548 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 51465.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 5113.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17361448792867668 - :network_gas: 0.3055420482852916 - :ambient_heat: 0.5208434637860319 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0505_dordrecht/GM0505_dordrecht.derived.ad b/datasets/GM0505_dordrecht/GM0505_dordrecht.derived.ad index 79a0dd2046..285bd7fbc1 100644 --- a/datasets/GM0505_dordrecht/GM0505_dordrecht.derived.ad +++ b/datasets/GM0505_dordrecht/GM0505_dordrecht.derived.ad @@ -1,6 +1,6 @@ - area = GM0505_dordrecht -- id = 128927 -- parent_id = 128927 +- id = 129273 +- parent_id = 129273 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0505_dordrecht/graph_values.yml b/datasets/GM0505_dordrecht/graph_values.yml index 8f9eb74d78..f34ff8721a 100644 --- a/datasets/GM0505_dordrecht/graph_values.yml +++ b/datasets/GM0505_dordrecht/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 14753.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15736066794101888 - :network_gas: 0.1345163263243961 - :ambient_heat: 0.708123005734585 + :electricity: 0.18674712537819257 + :network_gas: 0.15963669693453142 + :ambient_heat: 0.6536161776872759 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 55783.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 6233.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1697156367253386 - :network_gas: 0.3211374530986439 - :ambient_heat: 0.5091469101760177 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0512_gorinchem/GM0512_gorinchem.derived.ad b/datasets/GM0512_gorinchem/GM0512_gorinchem.derived.ad index e065175397..0fcede9bdb 100644 --- a/datasets/GM0512_gorinchem/GM0512_gorinchem.derived.ad +++ b/datasets/GM0512_gorinchem/GM0512_gorinchem.derived.ad @@ -1,6 +1,6 @@ - area = GM0512_gorinchem -- id = 128956 -- parent_id = 128956 +- id = 129302 +- parent_id = 129302 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0512_gorinchem/graph_values.yml b/datasets/GM0512_gorinchem/graph_values.yml index 1276c38a1d..23dcd53fdc 100644 --- a/datasets/GM0512_gorinchem/graph_values.yml +++ b/datasets/GM0512_gorinchem/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 7948.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.159626699403917 - :network_gas: 0.12205315327845648 - :ambient_heat: 0.7183201473176265 + :electricity: 0.18994713200233837 + :network_gas: 0.14523664589731985 + :ambient_heat: 0.6648162221003419 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 17273.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 805.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17566912922559386 - :network_gas: 0.29732348309762263 - :ambient_heat: 0.5270073876767835 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0513_gouda/GM0513_gouda.derived.ad b/datasets/GM0513_gouda/GM0513_gouda.derived.ad index ff082f3de5..b879e82f20 100644 --- a/datasets/GM0513_gouda/GM0513_gouda.derived.ad +++ b/datasets/GM0513_gouda/GM0513_gouda.derived.ad @@ -1,6 +1,6 @@ - area = GM0513_gouda -- id = 128957 -- parent_id = 128957 +- id = 129303 +- parent_id = 129303 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0513_gouda/graph_values.yml b/datasets/GM0513_gouda/graph_values.yml index fef26746e0..d4f4c9167d 100644 --- a/datasets/GM0513_gouda/graph_values.yml +++ b/datasets/GM0513_gouda/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 9994.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15716270174043823 - :network_gas: 0.1356051404275898 - :ambient_heat: 0.7072321578319719 + :electricity: 0.18646838203819746 + :network_gas: 0.1608910438136677 + :ambient_heat: 0.6526405741481348 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 33708.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 4726.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16920680363767218 - :network_gas: 0.3231727854493096 - :ambient_heat: 0.5076204109130183 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0518_s_gravenhage/GM0518_s_gravenhage.derived.ad b/datasets/GM0518_s_gravenhage/GM0518_s_gravenhage.derived.ad index e064f59821..bf8ba4d91e 100644 --- a/datasets/GM0518_s_gravenhage/GM0518_s_gravenhage.derived.ad +++ b/datasets/GM0518_s_gravenhage/GM0518_s_gravenhage.derived.ad @@ -1,6 +1,6 @@ - area = GM0518_s_gravenhage -- id = 128918 -- parent_id = 128918 +- id = 129264 +- parent_id = 129264 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0518_s_gravenhage/graph_values.yml b/datasets/GM0518_s_gravenhage/graph_values.yml index 8c21c9d7c8..eb8ad129da 100644 --- a/datasets/GM0518_s_gravenhage/graph_values.yml +++ b/datasets/GM0518_s_gravenhage/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 77160.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15541724629686265 - :network_gas: 0.1452051453672554 - :ambient_heat: 0.699377608335882 + :electricity: 0.184016374819548 + :network_gas: 0.17192509256398536 + :ambient_heat: 0.6440585326164667 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 265826.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 16816.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16479602840901392 - :network_gas: 0.34081588636394256 - :ambient_heat: 0.49438808522704353 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0523_hardinxveld_giessendam/GM0523_hardinxveld_giessendam.derived.ad b/datasets/GM0523_hardinxveld_giessendam/GM0523_hardinxveld_giessendam.derived.ad index 4bb2270ad4..8bf256f197 100644 --- a/datasets/GM0523_hardinxveld_giessendam/GM0523_hardinxveld_giessendam.derived.ad +++ b/datasets/GM0523_hardinxveld_giessendam/GM0523_hardinxveld_giessendam.derived.ad @@ -1,6 +1,6 @@ - area = GM0523_hardinxveld_giessendam -- id = 128966 -- parent_id = 128966 +- id = 129312 +- parent_id = 129312 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0523_hardinxveld_giessendam/graph_values.yml b/datasets/GM0523_hardinxveld_giessendam/graph_values.yml index c63556ef1f..2ba3f86d73 100644 --- a/datasets/GM0523_hardinxveld_giessendam/graph_values.yml +++ b/datasets/GM0523_hardinxveld_giessendam/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1962.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15855686253712992 - :network_gas: 0.1279372560457855 - :ambient_heat: 0.7135058814170846 + :electricity: 0.18843419985613477 + :network_gas: 0.1520448505918917 + :ambient_heat: 0.6595209495519736 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7508.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 129.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.172828412909169 - :network_gas: 0.30868634836332226 - :ambient_heat: 0.5184852387275087 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0531_hendrik_ido_ambacht/GM0531_hendrik_ido_ambacht.derived.ad b/datasets/GM0531_hendrik_ido_ambacht/GM0531_hendrik_ido_ambacht.derived.ad index aa9055e349..07dd4dc588 100644 --- a/datasets/GM0531_hendrik_ido_ambacht/GM0531_hendrik_ido_ambacht.derived.ad +++ b/datasets/GM0531_hendrik_ido_ambacht/GM0531_hendrik_ido_ambacht.derived.ad @@ -1,6 +1,6 @@ - area = GM0531_hendrik_ido_ambacht -- id = 128978 -- parent_id = 128978 +- id = 129324 +- parent_id = 129324 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0531_hendrik_ido_ambacht/graph_values.yml b/datasets/GM0531_hendrik_ido_ambacht/graph_values.yml index 4c04d216a0..ec4873107a 100644 --- a/datasets/GM0531_hendrik_ido_ambacht/graph_values.yml +++ b/datasets/GM0531_hendrik_ido_ambacht/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1615.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16120962056175014 - :network_gas: 0.11334708691037433 - :ambient_heat: 0.7254432925278756 + :electricity: 0.1921927325027001 + :network_gas: 0.13513142874858072 + :ambient_heat: 0.6726758387487192 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12330.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 78.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1799739815795985 - :network_gas: 0.280104073681604 - :ambient_heat: 0.5399219447387974 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0532_stede_broec/GM0532_stede_broec.derived.ad b/datasets/GM0532_stede_broec/GM0532_stede_broec.derived.ad index cbf3369251..0c3226b779 100644 --- a/datasets/GM0532_stede_broec/GM0532_stede_broec.derived.ad +++ b/datasets/GM0532_stede_broec/GM0532_stede_broec.derived.ad @@ -1,6 +1,6 @@ - area = GM0532_stede_broec -- id = 129105 -- parent_id = 129105 +- id = 129451 +- parent_id = 129451 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0532_stede_broec/graph_values.yml b/datasets/GM0532_stede_broec/graph_values.yml index 000a5ff85f..7ab0f2a687 100644 --- a/datasets/GM0532_stede_broec/graph_values.yml +++ b/datasets/GM0532_stede_broec/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1870.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15780397905894245 - :network_gas: 0.13207811517581655 - :ambient_heat: 0.710117905765241 + :electricity: 0.18737179823180064 + :network_gas: 0.1568256649492719 + :ambient_heat: 0.6558025368189275 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9251.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 38.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17086154794222633 - :network_gas: 0.31655380823109275 - :ambient_heat: 0.5125846438266809 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0534_hillegom/GM0534_hillegom.derived.ad b/datasets/GM0534_hillegom/GM0534_hillegom.derived.ad index b21d2411c7..4537774779 100644 --- a/datasets/GM0534_hillegom/GM0534_hillegom.derived.ad +++ b/datasets/GM0534_hillegom/GM0534_hillegom.derived.ad @@ -1,6 +1,6 @@ - area = GM0534_hillegom -- id = 128982 -- parent_id = 128982 +- id = 129328 +- parent_id = 129328 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0534_hillegom/graph_values.yml b/datasets/GM0534_hillegom/graph_values.yml index 39f85fe61b..fdba52499e 100644 --- a/datasets/GM0534_hillegom/graph_values.yml +++ b/datasets/GM0534_hillegom/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1472.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15792524491003912 - :network_gas: 0.13141115299478467 - :ambient_heat: 0.7106636020951761 + :electricity: 0.18754278937116825 + :network_gas: 0.15605620368777784 + :ambient_heat: 0.656401006941054 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9858.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 832.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17117657508388343 - :network_gas: 0.3152936996644645 - :ambient_heat: 0.5135297252516521 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0537_katwijk/GM0537_katwijk.derived.ad b/datasets/GM0537_katwijk/GM0537_katwijk.derived.ad index 821ffdf82f..beb39a0eca 100644 --- a/datasets/GM0537_katwijk/GM0537_katwijk.derived.ad +++ b/datasets/GM0537_katwijk/GM0537_katwijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0537_katwijk -- id = 128997 -- parent_id = 128997 +- id = 129343 +- parent_id = 129343 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0537_katwijk/graph_values.yml b/datasets/GM0537_katwijk/graph_values.yml index f65c9ddb90..8d21660b47 100644 --- a/datasets/GM0537_katwijk/graph_values.yml +++ b/datasets/GM0537_katwijk/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4824.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15889573793710038 - :network_gas: 0.12607344134594792 - :ambient_heat: 0.7150308207169517 + :electricity: 0.18891301111016295 + :network_gas: 0.14989019677237392 + :ambient_heat: 0.6611967921174631 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 27160.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1783.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17372234363709455 - :network_gas: 0.3051106254516199 - :ambient_heat: 0.5211670309112855 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0542_krimpen_aan_den_ijssel/GM0542_krimpen_aan_den_ijssel.derived.ad b/datasets/GM0542_krimpen_aan_den_ijssel/GM0542_krimpen_aan_den_ijssel.derived.ad index 733fab7c91..5f8af053f3 100644 --- a/datasets/GM0542_krimpen_aan_den_ijssel/GM0542_krimpen_aan_den_ijssel.derived.ad +++ b/datasets/GM0542_krimpen_aan_den_ijssel/GM0542_krimpen_aan_den_ijssel.derived.ad @@ -1,6 +1,6 @@ - area = GM0542_krimpen_aan_den_ijssel -- id = 129000 -- parent_id = 129000 +- id = 129346 +- parent_id = 129346 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0542_krimpen_aan_den_ijssel/graph_values.yml b/datasets/GM0542_krimpen_aan_den_ijssel/graph_values.yml index 6d2bf55312..8cb96dba1d 100644 --- a/datasets/GM0542_krimpen_aan_den_ijssel/graph_values.yml +++ b/datasets/GM0542_krimpen_aan_den_ijssel/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1847.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15876604984532558 - :network_gas: 0.12678672585070935 - :ambient_heat: 0.7144472243039651 + :electricity: 0.18872972380454003 + :network_gas: 0.1507149908635887 + :ambient_heat: 0.6605552853318712 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12643.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 113.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17337959623447094 - :network_gas: 0.30648161506211447 - :ambient_heat: 0.5201387887034146 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0546_leiden/GM0546_leiden.derived.ad b/datasets/GM0546_leiden/GM0546_leiden.derived.ad index 12687ce36d..f30d1d810c 100644 --- a/datasets/GM0546_leiden/GM0546_leiden.derived.ad +++ b/datasets/GM0546_leiden/GM0546_leiden.derived.ad @@ -1,6 +1,6 @@ - area = GM0546_leiden -- id = 129008 -- parent_id = 129008 +- id = 129354 +- parent_id = 129354 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0546_leiden/graph_values.yml b/datasets/GM0546_leiden/graph_values.yml index ff9147dde3..7c5329add5 100644 --- a/datasets/GM0546_leiden/graph_values.yml +++ b/datasets/GM0546_leiden/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 21275.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15910071017805025 - :network_gas: 0.12494609402072368 - :ambient_heat: 0.7159531958012261 + :electricity: 0.18920281228419186 + :network_gas: 0.148586089566729 + :ambient_heat: 0.6622110981490791 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 60499.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 9342.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17426567968573867 - :network_gas: 0.30293728125704356 - :ambient_heat: 0.5227970390572179 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0547_leiderdorp/GM0547_leiderdorp.derived.ad b/datasets/GM0547_leiderdorp/GM0547_leiderdorp.derived.ad index 2ac333867b..a720a81af0 100644 --- a/datasets/GM0547_leiderdorp/GM0547_leiderdorp.derived.ad +++ b/datasets/GM0547_leiderdorp/GM0547_leiderdorp.derived.ad @@ -1,6 +1,6 @@ - area = GM0547_leiderdorp -- id = 129009 -- parent_id = 129009 +- id = 129355 +- parent_id = 129355 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0547_leiderdorp/graph_values.yml b/datasets/GM0547_leiderdorp/graph_values.yml index 4ee7183ba8..861b760b15 100644 --- a/datasets/GM0547_leiderdorp/graph_values.yml +++ b/datasets/GM0547_leiderdorp/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3246.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15913704039838372 - :network_gas: 0.12474627780888967 - :ambient_heat: 0.7161166817927267 + :electricity: 0.18925419271408916 + :network_gas: 0.14835487729133798 + :ambient_heat: 0.6623909299945727 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12376.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 379.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1743621911961533 - :network_gas: 0.302551235215385 - :ambient_heat: 0.5230865735884617 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0553_lisse/GM0553_lisse.derived.ad b/datasets/GM0553_lisse/GM0553_lisse.derived.ad index 7b80b3da23..d78a5177c0 100644 --- a/datasets/GM0553_lisse/GM0553_lisse.derived.ad +++ b/datasets/GM0553_lisse/GM0553_lisse.derived.ad @@ -1,6 +1,6 @@ - area = GM0553_lisse -- id = 129015 -- parent_id = 129015 +- id = 129361 +- parent_id = 129361 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0553_lisse/graph_values.yml b/datasets/GM0553_lisse/graph_values.yml index a39e91bac9..ff36aefcbc 100644 --- a/datasets/GM0553_lisse/graph_values.yml +++ b/datasets/GM0553_lisse/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2689.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15877706333357028 - :network_gas: 0.1267261516653634 - :ambient_heat: 0.7144967850010663 + :electricity: 0.18874528689737402 + :network_gas: 0.15064495684259174 + :ambient_heat: 0.6606097562600343 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10408.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 487.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17340867249702602 - :network_gas: 0.3063653100118942 - :ambient_heat: 0.5202260174910799 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0556_maassluis/GM0556_maassluis.derived.ad b/datasets/GM0556_maassluis/GM0556_maassluis.derived.ad index 01a1e5fd37..274ba015aa 100644 --- a/datasets/GM0556_maassluis/GM0556_maassluis.derived.ad +++ b/datasets/GM0556_maassluis/GM0556_maassluis.derived.ad @@ -1,6 +1,6 @@ - area = GM0556_maassluis -- id = 129022 -- parent_id = 129022 +- id = 129368 +- parent_id = 129368 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0556_maassluis/graph_values.yml b/datasets/GM0556_maassluis/graph_values.yml index 47f7a8b2d5..54107a507e 100644 --- a/datasets/GM0556_maassluis/graph_values.yml +++ b/datasets/GM0556_maassluis/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2200.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1595957600487831 - :network_gas: 0.12222331973169298 - :ambient_heat: 0.718180920219524 + :electricity: 0.18990332438001817 + :network_gas: 0.14543378048837674 + :ambient_heat: 0.6646628951316051 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15387.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 792.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17558620899173716 - :network_gas: 0.2976551640330495 - :ambient_heat: 0.5267586269752133 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0569_nieuwkoop/GM0569_nieuwkoop.derived.ad b/datasets/GM0569_nieuwkoop/GM0569_nieuwkoop.derived.ad index 6a2ffd790f..c5602a7f4e 100644 --- a/datasets/GM0569_nieuwkoop/GM0569_nieuwkoop.derived.ad +++ b/datasets/GM0569_nieuwkoop/GM0569_nieuwkoop.derived.ad @@ -1,6 +1,6 @@ - area = GM0569_nieuwkoop -- id = 129037 -- parent_id = 129037 +- id = 129383 +- parent_id = 129383 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0569_nieuwkoop/graph_values.yml b/datasets/GM0569_nieuwkoop/graph_values.yml index 3b09cc6c64..c1fd8776fb 100644 --- a/datasets/GM0569_nieuwkoop/graph_values.yml +++ b/datasets/GM0569_nieuwkoop/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1932.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1597067181352013 - :network_gas: 0.12161305025639293 - :ambient_heat: 0.7186802316084059 + :electricity: 0.19006044700909522 + :network_gas: 0.1447267276151925 + :ambient_heat: 0.6652128253757122 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11633.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 26.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17588380079226718 - :network_gas: 0.29646479683092947 - :ambient_heat: 0.5276514023768034 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0575_noordwijk/GM0575_noordwijk.derived.ad b/datasets/GM0575_noordwijk/GM0575_noordwijk.derived.ad index 167476e869..47dadc5a54 100644 --- a/datasets/GM0575_noordwijk/GM0575_noordwijk.derived.ad +++ b/datasets/GM0575_noordwijk/GM0575_noordwijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0575_noordwijk -- id = 129044 -- parent_id = 129044 +- id = 129390 +- parent_id = 129390 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0575_noordwijk/graph_values.yml b/datasets/GM0575_noordwijk/graph_values.yml index 1b95be21c5..0e6f23e945 100644 --- a/datasets/GM0575_noordwijk/graph_values.yml +++ b/datasets/GM0575_noordwijk/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 5595.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15729912463234297 - :network_gas: 0.13485481452211384 - :ambient_heat: 0.7078460608455434 + :electricity: 0.1866604562170364 + :network_gas: 0.16002670873468966 + :ambient_heat: 0.6533128350482739 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20093.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 864.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1695572616298163 - :network_gas: 0.3217709534807329 - :ambient_heat: 0.5086717848894508 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0579_oegstgeest/GM0579_oegstgeest.derived.ad b/datasets/GM0579_oegstgeest/GM0579_oegstgeest.derived.ad index efa3758483..8fde179088 100644 --- a/datasets/GM0579_oegstgeest/GM0579_oegstgeest.derived.ad +++ b/datasets/GM0579_oegstgeest/GM0579_oegstgeest.derived.ad @@ -1,6 +1,6 @@ - area = GM0579_oegstgeest -- id = 129047 -- parent_id = 129047 +- id = 129393 +- parent_id = 129393 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0579_oegstgeest/graph_values.yml b/datasets/GM0579_oegstgeest/graph_values.yml index 55b0c4de4b..660aa2b877 100644 --- a/datasets/GM0579_oegstgeest/graph_values.yml +++ b/datasets/GM0579_oegstgeest/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2024.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15818838833255072 - :network_gas: 0.1299638641709711 - :ambient_heat: 0.7118477474964783 + :electricity: 0.1879140046795567 + :network_gas: 0.1543857323374207 + :ambient_heat: 0.6577002629830225 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11008.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 700.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17186250876994447 - :network_gas: 0.3125499649202203 - :ambient_heat: 0.5155875263098352 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0589_oudewater/GM0589_oudewater.derived.ad b/datasets/GM0589_oudewater/GM0589_oudewater.derived.ad index 746bf65eb9..7d1f6a750c 100644 --- a/datasets/GM0589_oudewater/GM0589_oudewater.derived.ad +++ b/datasets/GM0589_oudewater/GM0589_oudewater.derived.ad @@ -1,6 +1,6 @@ - area = GM0589_oudewater -- id = 129064 -- parent_id = 129064 +- id = 129410 +- parent_id = 129410 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0589_oudewater/graph_values.yml b/datasets/GM0589_oudewater/graph_values.yml index 44664cb9e8..c4c9588fdb 100644 --- a/datasets/GM0589_oudewater/graph_values.yml +++ b/datasets/GM0589_oudewater/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 670.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15758752280525742 - :network_gas: 0.13326862457108407 - :ambient_heat: 0.7091438526236585 + :electricity: 0.18706670604700104 + :network_gas: 0.15819858180482424 + :ambient_heat: 0.6547347121481748 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4315.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 304.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17030091068023995 - :network_gas: 0.3187963572790383 - :ambient_heat: 0.5109027320407217 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0590_papendrecht/GM0590_papendrecht.derived.ad b/datasets/GM0590_papendrecht/GM0590_papendrecht.derived.ad index 66264656f3..7b5c0606e1 100644 --- a/datasets/GM0590_papendrecht/GM0590_papendrecht.derived.ad +++ b/datasets/GM0590_papendrecht/GM0590_papendrecht.derived.ad @@ -1,6 +1,6 @@ - area = GM0590_papendrecht -- id = 129066 -- parent_id = 129066 +- id = 129412 +- parent_id = 129412 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0590_papendrecht/graph_values.yml b/datasets/GM0590_papendrecht/graph_values.yml index afceaa2eb0..13295b9977 100644 --- a/datasets/GM0590_papendrecht/graph_values.yml +++ b/datasets/GM0590_papendrecht/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2482.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16012070007834264 - :network_gas: 0.11933614956911551 - :ambient_heat: 0.7205431503525418 + :electricity: 0.19064703414286496 + :network_gas: 0.14208708162186232 + :ambient_heat: 0.6672658842352726 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14474.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 112.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1769993753524582 - :network_gas: 0.2920024985901653 - :ambient_heat: 0.5309981260573765 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0597_ridderkerk/GM0597_ridderkerk.derived.ad b/datasets/GM0597_ridderkerk/GM0597_ridderkerk.derived.ad index 904267734f..2fdfb30c86 100644 --- a/datasets/GM0597_ridderkerk/GM0597_ridderkerk.derived.ad +++ b/datasets/GM0597_ridderkerk/GM0597_ridderkerk.derived.ad @@ -1,6 +1,6 @@ - area = GM0597_ridderkerk -- id = 129079 -- parent_id = 129079 +- id = 129425 +- parent_id = 129425 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0597_ridderkerk/graph_values.yml b/datasets/GM0597_ridderkerk/graph_values.yml index 3554ebb75b..9a6390edf1 100644 --- a/datasets/GM0597_ridderkerk/graph_values.yml +++ b/datasets/GM0597_ridderkerk/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4254.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15977601383215326 - :network_gas: 0.12123192392315713 - :ambient_heat: 0.7189920622446897 + :electricity: 0.19015859450077194 + :network_gas: 0.14428506325154564 + :ambient_heat: 0.6655563422476825 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 21285.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 656.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17606995501328598 - :network_gas: 0.2957201799468542 - :ambient_heat: 0.5282098650398599 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0599_rotterdam/GM0599_rotterdam.derived.ad b/datasets/GM0599_rotterdam/GM0599_rotterdam.derived.ad index f2e9009402..3e22b0e921 100644 --- a/datasets/GM0599_rotterdam/GM0599_rotterdam.derived.ad +++ b/datasets/GM0599_rotterdam/GM0599_rotterdam.derived.ad @@ -1,6 +1,6 @@ - area = GM0599_rotterdam -- id = 129085 -- parent_id = 129085 +- id = 129431 +- parent_id = 129431 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0599_rotterdam/graph_values.yml b/datasets/GM0599_rotterdam/graph_values.yml index 26097df03f..d06f648003 100644 --- a/datasets/GM0599_rotterdam/graph_values.yml +++ b/datasets/GM0599_rotterdam/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 111958.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1591237161828218 - :network_gas: 0.12481956099448005 - :ambient_heat: 0.716056722822698 + :electricity: 0.1892353482741809 + :network_gas: 0.14843967739593755 + :ambient_heat: 0.6623249743298816 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 317566.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 14168.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.174326788022107 - :network_gas: 0.30269284791157025 - :ambient_heat: 0.5229803640663228 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0603_rijswijk/GM0603_rijswijk.derived.ad b/datasets/GM0603_rijswijk/GM0603_rijswijk.derived.ad index f6590a23f1..b3fc86dec0 100644 --- a/datasets/GM0603_rijswijk/GM0603_rijswijk.derived.ad +++ b/datasets/GM0603_rijswijk/GM0603_rijswijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0603_rijswijk -- id = 129081 -- parent_id = 129081 +- id = 129427 +- parent_id = 129427 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0603_rijswijk/graph_values.yml b/datasets/GM0603_rijswijk/graph_values.yml index 9f6a91ba40..7e0de3da15 100644 --- a/datasets/GM0603_rijswijk/graph_values.yml +++ b/datasets/GM0603_rijswijk/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 18055.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1572846402694224 - :network_gas: 0.13493447851817686 - :ambient_heat: 0.7077808812124008 + :electricity: 0.18664006026566843 + :network_gas: 0.1601184906511504 + :ambient_heat: 0.653241449083181 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 27201.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1518.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16952001264490746 - :network_gas: 0.3219199494203684 - :ambient_heat: 0.5085600379347242 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0606_schiedam/GM0606_schiedam.derived.ad b/datasets/GM0606_schiedam/GM0606_schiedam.derived.ad index c6ac63f7e2..7c05272487 100644 --- a/datasets/GM0606_schiedam/GM0606_schiedam.derived.ad +++ b/datasets/GM0606_schiedam/GM0606_schiedam.derived.ad @@ -1,6 +1,6 @@ - area = GM0606_schiedam -- id = 129090 -- parent_id = 129090 +- id = 129436 +- parent_id = 129436 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0606_schiedam/graph_values.yml b/datasets/GM0606_schiedam/graph_values.yml index e67d232907..250d133c9f 100644 --- a/datasets/GM0606_schiedam/graph_values.yml +++ b/datasets/GM0606_schiedam/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 8634.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1567923612437058 - :network_gas: 0.13764201315961805 - :ambient_heat: 0.7055656255966761 + :electricity: 0.18594728110216752 + :network_gas: 0.16323600148273917 + :ambient_heat: 0.6508167174150933 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 37452.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 3154.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16825966196555642 - :network_gas: 0.3269613521377724 - :ambient_heat: 0.5047789858966711 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0610_sliedrecht/GM0610_sliedrecht.derived.ad b/datasets/GM0610_sliedrecht/GM0610_sliedrecht.derived.ad index 0b1fe25b95..96d9bc6ce5 100644 --- a/datasets/GM0610_sliedrecht/GM0610_sliedrecht.derived.ad +++ b/datasets/GM0610_sliedrecht/GM0610_sliedrecht.derived.ad @@ -1,6 +1,6 @@ - area = GM0610_sliedrecht -- id = 129097 -- parent_id = 129097 +- id = 129443 +- parent_id = 129443 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0610_sliedrecht/graph_values.yml b/datasets/GM0610_sliedrecht/graph_values.yml index f9ca604601..45340fc0a7 100644 --- a/datasets/GM0610_sliedrecht/graph_values.yml +++ b/datasets/GM0610_sliedrecht/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3206.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15926325724530208 - :network_gas: 0.1240520851508385 - :ambient_heat: 0.7166846576038594 + :electricity: 0.18943273084577597 + :network_gas: 0.14755145451434157 + :ambient_heat: 0.6630158146398825 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11078.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 522.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17469797592471634 - :network_gas: 0.30120809630113277 - :ambient_heat: 0.5240939277741509 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0613_albrandswaard/GM0613_albrandswaard.derived.ad b/datasets/GM0613_albrandswaard/GM0613_albrandswaard.derived.ad index dc456a912d..1e26daf650 100644 --- a/datasets/GM0613_albrandswaard/GM0613_albrandswaard.derived.ad +++ b/datasets/GM0613_albrandswaard/GM0613_albrandswaard.derived.ad @@ -1,6 +1,6 @@ - area = GM0613_albrandswaard -- id = 128860 -- parent_id = 128860 +- id = 129206 +- parent_id = 129206 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0613_albrandswaard/graph_values.yml b/datasets/GM0613_albrandswaard/graph_values.yml index 2bb4fcfdb2..2e08d704e0 100644 --- a/datasets/GM0613_albrandswaard/graph_values.yml +++ b/datasets/GM0613_albrandswaard/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1574.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15984616748373065 - :network_gas: 0.12084607883948144 - :ambient_heat: 0.7193077536767879 + :electricity: 0.19025797365521765 + :network_gas: 0.14383785639726748 + :ambient_heat: 0.6659041699475148 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10558.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 55.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.176258650911438 - :network_gas: 0.2949653963542462 - :ambient_heat: 0.5287759527343159 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0622_vlaardingen/GM0622_vlaardingen.derived.ad b/datasets/GM0622_vlaardingen/GM0622_vlaardingen.derived.ad index bbc86aa727..bb1b8e6a04 100644 --- a/datasets/GM0622_vlaardingen/GM0622_vlaardingen.derived.ad +++ b/datasets/GM0622_vlaardingen/GM0622_vlaardingen.derived.ad @@ -1,6 +1,6 @@ - area = GM0622_vlaardingen -- id = 129137 -- parent_id = 129137 +- id = 129483 +- parent_id = 129483 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0622_vlaardingen/graph_values.yml b/datasets/GM0622_vlaardingen/graph_values.yml index 70527dec85..08150c0c3d 100644 --- a/datasets/GM0622_vlaardingen/graph_values.yml +++ b/datasets/GM0622_vlaardingen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 6581.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15652947441011497 - :network_gas: 0.13908789074436775 - :ambient_heat: 0.7043826348455173 + :electricity: 0.18557765441342303 + :network_gas: 0.16489932403415944 + :ambient_heat: 0.6495230215524175 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 35541.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2660.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1675910579881122 - :network_gas: 0.32963576804754946 - :ambient_heat: 0.5027731739643384 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0626_voorschoten/GM0626_voorschoten.derived.ad b/datasets/GM0626_voorschoten/GM0626_voorschoten.derived.ad index 3d07cec2cc..217777096a 100644 --- a/datasets/GM0626_voorschoten/GM0626_voorschoten.derived.ad +++ b/datasets/GM0626_voorschoten/GM0626_voorschoten.derived.ad @@ -1,6 +1,6 @@ - area = GM0626_voorschoten -- id = 129141 -- parent_id = 129141 +- id = 129487 +- parent_id = 129487 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0626_voorschoten/graph_values.yml b/datasets/GM0626_voorschoten/graph_values.yml index bf76653ce4..dc21731ef9 100644 --- a/datasets/GM0626_voorschoten/graph_values.yml +++ b/datasets/GM0626_voorschoten/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1911.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15632732968648327 - :network_gas: 0.14019968672434213 - :ambient_heat: 0.7034729835891746 + :electricity: 0.18529358959507097 + :network_gas: 0.16617761760120406 + :ambient_heat: 0.648528792803725 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11502.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 696.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1670790291141504 - :network_gas: 0.33168388354339656 - :ambient_heat: 0.501237087342453 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0627_waddinxveen/GM0627_waddinxveen.derived.ad b/datasets/GM0627_waddinxveen/GM0627_waddinxveen.derived.ad index 5154f583c6..664194bd05 100644 --- a/datasets/GM0627_waddinxveen/GM0627_waddinxveen.derived.ad +++ b/datasets/GM0627_waddinxveen/GM0627_waddinxveen.derived.ad @@ -1,6 +1,6 @@ - area = GM0627_waddinxveen -- id = 129146 -- parent_id = 129146 +- id = 129492 +- parent_id = 129492 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0627_waddinxveen/graph_values.yml b/datasets/GM0627_waddinxveen/graph_values.yml index f8c2a8b45c..eee560dd89 100644 --- a/datasets/GM0627_waddinxveen/graph_values.yml +++ b/datasets/GM0627_waddinxveen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2681.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16254745764685183 - :network_gas: 0.10598898294231489 - :ambient_heat: 0.7314635594108333 + :electricity: 0.1940972653687841 + :network_gas: 0.12656101821670332 + :ambient_heat: 0.6793417164145126 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12786.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 221.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18371049089201183 - :network_gas: 0.26515803643195074 - :ambient_heat: 0.5511314726760375 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0629_wassenaar/GM0629_wassenaar.derived.ad b/datasets/GM0629_wassenaar/GM0629_wassenaar.derived.ad index fd24293e94..e64caaaf30 100644 --- a/datasets/GM0629_wassenaar/GM0629_wassenaar.derived.ad +++ b/datasets/GM0629_wassenaar/GM0629_wassenaar.derived.ad @@ -1,6 +1,6 @@ - area = GM0629_wassenaar -- id = 129148 -- parent_id = 129148 +- id = 129494 +- parent_id = 129494 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0629_wassenaar/graph_values.yml b/datasets/GM0629_wassenaar/graph_values.yml index 0f656fc24b..e7117fefc6 100644 --- a/datasets/GM0629_wassenaar/graph_values.yml +++ b/datasets/GM0629_wassenaar/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3085.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1509327553293369 - :network_gas: 0.16986984568864708 - :ambient_heat: 0.6791973989820161 + :electricity: 0.177762807701468 + :network_gas: 0.200066186080946 + :ambient_heat: 0.6221710062175859 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12255.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1596.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15405274763146404 - :network_gas: 0.38378900947414213 - :ambient_heat: 0.46215824289439383 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0632_woerden/GM0632_woerden.derived.ad b/datasets/GM0632_woerden/GM0632_woerden.derived.ad index 104fb33f01..1ada58332f 100644 --- a/datasets/GM0632_woerden/GM0632_woerden.derived.ad +++ b/datasets/GM0632_woerden/GM0632_woerden.derived.ad @@ -1,6 +1,6 @@ - area = GM0632_woerden -- id = 129162 -- parent_id = 129162 +- id = 129508 +- parent_id = 129508 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0632_woerden/graph_values.yml b/datasets/GM0632_woerden/graph_values.yml index f928ec8a09..c42c49bb3d 100644 --- a/datasets/GM0632_woerden/graph_values.yml +++ b/datasets/GM0632_woerden/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 5840.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15850255197071408 - :network_gas: 0.12823596416107266 - :ambient_heat: 0.7132614838682133 + :electricity: 0.1883574980358847 + :network_gas: 0.15239000929184982 + :ambient_heat: 0.6592524926722655 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22411.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 901.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17268564693716867 - :network_gas: 0.30925741225132347 - :ambient_heat: 0.5180569408115079 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0637_zoetermeer/GM0637_zoetermeer.derived.ad b/datasets/GM0637_zoetermeer/GM0637_zoetermeer.derived.ad index 6129b968f2..4c1a9ca56b 100644 --- a/datasets/GM0637_zoetermeer/GM0637_zoetermeer.derived.ad +++ b/datasets/GM0637_zoetermeer/GM0637_zoetermeer.derived.ad @@ -1,6 +1,6 @@ - area = GM0637_zoetermeer -- id = 129171 -- parent_id = 129171 +- id = 129517 +- parent_id = 129517 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0637_zoetermeer/graph_values.yml b/datasets/GM0637_zoetermeer/graph_values.yml index 5649708530..eb7b98ea96 100644 --- a/datasets/GM0637_zoetermeer/graph_values.yml +++ b/datasets/GM0637_zoetermeer/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 14283.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16155749507374378 - :network_gas: 0.11143377709440926 - :ambient_heat: 0.727008727831847 + :electricity: 0.19268737881286171 + :network_gas: 0.13290551707141454 + :ambient_heat: 0.6744071041157239 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 56357.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 142.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1809367711950276 - :network_gas: 0.2762529152198877 - :ambient_heat: 0.5428103135850847 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0638_zoeterwoude/GM0638_zoeterwoude.derived.ad b/datasets/GM0638_zoeterwoude/GM0638_zoeterwoude.derived.ad index a5f83cd209..67f3ae503d 100644 --- a/datasets/GM0638_zoeterwoude/GM0638_zoeterwoude.derived.ad +++ b/datasets/GM0638_zoeterwoude/GM0638_zoeterwoude.derived.ad @@ -1,6 +1,6 @@ - area = GM0638_zoeterwoude -- id = 129172 -- parent_id = 129172 +- id = 129518 +- parent_id = 129518 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0638_zoeterwoude/graph_values.yml b/datasets/GM0638_zoeterwoude/graph_values.yml index 28c4b99525..ead87f226f 100644 --- a/datasets/GM0638_zoeterwoude/graph_values.yml +++ b/datasets/GM0638_zoeterwoude/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1553.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16091261940209498 - :network_gas: 0.11498059328847769 - :ambient_heat: 0.7241067873094273 + :electricity: 0.19177074809065908 + :network_gas: 0.13703036140217173 + :ambient_heat: 0.6711988905071691 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 3732.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 99.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17915681530146635 - :network_gas: 0.28337273879413266 - :ambient_heat: 0.537470445904401 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0642_zwijndrecht/GM0642_zwijndrecht.derived.ad b/datasets/GM0642_zwijndrecht/GM0642_zwijndrecht.derived.ad index e24e63b20e..fed48b5253 100644 --- a/datasets/GM0642_zwijndrecht/GM0642_zwijndrecht.derived.ad +++ b/datasets/GM0642_zwijndrecht/GM0642_zwijndrecht.derived.ad @@ -1,6 +1,6 @@ - area = GM0642_zwijndrecht -- id = 129177 -- parent_id = 129177 +- id = 129523 +- parent_id = 129523 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0642_zwijndrecht/graph_values.yml b/datasets/GM0642_zwijndrecht/graph_values.yml index 56c8d4a7bc..859f804242 100644 --- a/datasets/GM0642_zwijndrecht/graph_values.yml +++ b/datasets/GM0642_zwijndrecht/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3656.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1571144072161243 - :network_gas: 0.13587076031131634 - :ambient_heat: 0.7070148324725593 + :electricity: 0.1864004015245683 + :network_gas: 0.16119695657597563 + :ambient_heat: 0.6524026418994561 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20717.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 623.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16908294100587162 - :network_gas: 0.3236682359765117 - :ambient_heat: 0.5072488230176166 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0654_borsele/GM0654_borsele.derived.ad b/datasets/GM0654_borsele/GM0654_borsele.derived.ad index 07163c5854..8b3aa30985 100644 --- a/datasets/GM0654_borsele/GM0654_borsele.derived.ad +++ b/datasets/GM0654_borsele/GM0654_borsele.derived.ad @@ -1,6 +1,6 @@ - area = GM0654_borsele -- id = 128897 -- parent_id = 128897 +- id = 129243 +- parent_id = 129243 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0654_borsele/graph_values.yml b/datasets/GM0654_borsele/graph_values.yml index 9a9ab5322e..3938d018dd 100644 --- a/datasets/GM0654_borsele/graph_values.yml +++ b/datasets/GM0654_borsele/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1657.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15610471880342996 - :network_gas: 0.14142404658113514 - :ambient_heat: 0.7024712346154349 + :electricity: 0.18498092206261202 + :network_gas: 0.1675846235714776 + :ambient_heat: 0.6474344543659104 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9820.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 225.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16651724828706652 - :network_gas: 0.3339310068517322 - :ambient_heat: 0.4995517448612013 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0664_goes/GM0664_goes.derived.ad b/datasets/GM0664_goes/GM0664_goes.derived.ad index a39884207f..67ddc7816f 100644 --- a/datasets/GM0664_goes/GM0664_goes.derived.ad +++ b/datasets/GM0664_goes/GM0664_goes.derived.ad @@ -1,6 +1,6 @@ - area = GM0664_goes -- id = 128953 -- parent_id = 128953 +- id = 129299 +- parent_id = 129299 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0664_goes/graph_values.yml b/datasets/GM0664_goes/graph_values.yml index f06fce5676..34825ff27e 100644 --- a/datasets/GM0664_goes/graph_values.yml +++ b/datasets/GM0664_goes/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 6024.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1596210717779586 - :network_gas: 0.12208410522122784 - :ambient_heat: 0.7182948230008137 + :electricity: 0.18993916349954154 + :network_gas: 0.14527250421276797 + :ambient_heat: 0.6647883322876905 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18622.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 889.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17565404325140085 - :network_gas: 0.29738382699439486 - :ambient_heat: 0.5269621297542044 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0668_west_maas_en_waal/GM0668_west_maas_en_waal.derived.ad b/datasets/GM0668_west_maas_en_waal/GM0668_west_maas_en_waal.derived.ad index eef1064ec7..3d0d79252d 100644 --- a/datasets/GM0668_west_maas_en_waal/GM0668_west_maas_en_waal.derived.ad +++ b/datasets/GM0668_west_maas_en_waal/GM0668_west_maas_en_waal.derived.ad @@ -1,6 +1,6 @@ - area = GM0668_west_maas_en_waal -- id = 129151 -- parent_id = 129151 +- id = 129497 +- parent_id = 129497 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0668_west_maas_en_waal/graph_values.yml b/datasets/GM0668_west_maas_en_waal/graph_values.yml index 1431296e1c..4a58fe3308 100644 --- a/datasets/GM0668_west_maas_en_waal/graph_values.yml +++ b/datasets/GM0668_west_maas_en_waal/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1312.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15966857563483478 - :network_gas: 0.12182283400840865 - :ambient_heat: 0.7185085903567564 + :electricity: 0.1900064304932152 + :network_gas: 0.14496980229499334 + :ambient_heat: 0.6650237672117915 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8346.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 37.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.175781434808876 - :network_gas: 0.2968742607644941 - :ambient_heat: 0.5273443044266298 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0677_hulst/GM0677_hulst.derived.ad b/datasets/GM0677_hulst/GM0677_hulst.derived.ad index 10f9d256e6..db1c183006 100644 --- a/datasets/GM0677_hulst/GM0677_hulst.derived.ad +++ b/datasets/GM0677_hulst/GM0677_hulst.derived.ad @@ -1,6 +1,6 @@ - area = GM0677_hulst -- id = 128992 -- parent_id = 128992 +- id = 129338 +- parent_id = 129338 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0677_hulst/graph_values.yml b/datasets/GM0677_hulst/graph_values.yml index b3c35e6e1d..9ad21fb600 100644 --- a/datasets/GM0677_hulst/graph_values.yml +++ b/datasets/GM0677_hulst/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2020.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15685985324472035 - :network_gas: 0.13727080715403797 - :ambient_heat: 0.7058693396012415 + :electricity: 0.1860422140422789 + :network_gas: 0.1628088026224613 + :ambient_heat: 0.6511489833352597 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13607.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 391.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1684318131553256 - :network_gas: 0.3262727473786958 - :ambient_heat: 0.5052954394659787 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0678_kapelle/GM0678_kapelle.derived.ad b/datasets/GM0678_kapelle/GM0678_kapelle.derived.ad index a2ce07dd3d..f9e4fa0f4a 100644 --- a/datasets/GM0678_kapelle/GM0678_kapelle.derived.ad +++ b/datasets/GM0678_kapelle/GM0678_kapelle.derived.ad @@ -1,6 +1,6 @@ - area = GM0678_kapelle -- id = 128996 -- parent_id = 128996 +- id = 129342 +- parent_id = 129342 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0678_kapelle/graph_values.yml b/datasets/GM0678_kapelle/graph_values.yml index e547b19a2f..1985c88f74 100644 --- a/datasets/GM0678_kapelle/graph_values.yml +++ b/datasets/GM0678_kapelle/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 947.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1596456504119237 - :network_gas: 0.12194892273441967 - :ambient_heat: 0.7184054268536566 + :electricity: 0.18997396668860758 + :network_gas: 0.14511588963108954 + :ambient_heat: 0.6649101436803029 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5456.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 98.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1757199424184386 - :network_gas: 0.2971202303262436 - :ambient_heat: 0.5271598272553177 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0687_middelburg/GM0687_middelburg.derived.ad b/datasets/GM0687_middelburg/GM0687_middelburg.derived.ad index 4e5737f2e4..306409a6be 100644 --- a/datasets/GM0687_middelburg/GM0687_middelburg.derived.ad +++ b/datasets/GM0687_middelburg/GM0687_middelburg.derived.ad @@ -1,6 +1,6 @@ - area = GM0687_middelburg -- id = 129027 -- parent_id = 129027 +- id = 129373 +- parent_id = 129373 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0687_middelburg/graph_values.yml b/datasets/GM0687_middelburg/graph_values.yml index 2527c054c0..fa6a5241e8 100644 --- a/datasets/GM0687_middelburg/graph_values.yml +++ b/datasets/GM0687_middelburg/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 6622.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15506879362890708 - :network_gas: 0.14712163504101106 - :ambient_heat: 0.6978095713300819 + :electricity: 0.1835280833066845 + :network_gas: 0.17412240761115289 + :ambient_heat: 0.6423495090821626 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 23882.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2427.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1639314200874426 - :network_gas: 0.34427431965022787 - :ambient_heat: 0.49179426026232953 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0703_reimerswaal/GM0703_reimerswaal.derived.ad b/datasets/GM0703_reimerswaal/GM0703_reimerswaal.derived.ad index d3a2d7d3bf..52b4622685 100644 --- a/datasets/GM0703_reimerswaal/GM0703_reimerswaal.derived.ad +++ b/datasets/GM0703_reimerswaal/GM0703_reimerswaal.derived.ad @@ -1,6 +1,6 @@ - area = GM0703_reimerswaal -- id = 129073 -- parent_id = 129073 +- id = 129419 +- parent_id = 129419 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0703_reimerswaal/graph_values.yml b/datasets/GM0703_reimerswaal/graph_values.yml index e9e00a1ed8..8adecd87d7 100644 --- a/datasets/GM0703_reimerswaal/graph_values.yml +++ b/datasets/GM0703_reimerswaal/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1193.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15641175049092806 - :network_gas: 0.13973537229989558 - :ambient_heat: 0.7038528772091763 + :electricity: 0.1854122057701358 + :network_gas: 0.16564384402652335 + :ambient_heat: 0.6489439502033408 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9322.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 239.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16729264536320734 - :network_gas: 0.3308294185471689 - :ambient_heat: 0.5018779360896238 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0715_terneuzen/GM0715_terneuzen.derived.ad b/datasets/GM0715_terneuzen/GM0715_terneuzen.derived.ad index 0939c25db5..6046babffd 100644 --- a/datasets/GM0715_terneuzen/GM0715_terneuzen.derived.ad +++ b/datasets/GM0715_terneuzen/GM0715_terneuzen.derived.ad @@ -1,6 +1,6 @@ - area = GM0715_terneuzen -- id = 129111 -- parent_id = 129111 +- id = 129457 +- parent_id = 129457 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0715_terneuzen/graph_values.yml b/datasets/GM0715_terneuzen/graph_values.yml index a74745eefc..93a46cb191 100644 --- a/datasets/GM0715_terneuzen/graph_values.yml +++ b/datasets/GM0715_terneuzen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 10482.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1537166410343379 - :network_gas: 0.15455847431114147 - :ambient_heat: 0.6917248846545206 + :electricity: 0.18163710083956855 + :network_gas: 0.18263184125778203 + :ambient_heat: 0.6357310579026494 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 27046.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1594.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1606250893976883 - :network_gas: 0.3574996424092452 - :ambient_heat: 0.4818752681930666 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0716_tholen/GM0716_tholen.derived.ad b/datasets/GM0716_tholen/GM0716_tholen.derived.ad index 2b067b9642..046d30035c 100644 --- a/datasets/GM0716_tholen/GM0716_tholen.derived.ad +++ b/datasets/GM0716_tholen/GM0716_tholen.derived.ad @@ -1,6 +1,6 @@ - area = GM0716_tholen -- id = 129115 -- parent_id = 129115 +- id = 129461 +- parent_id = 129461 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0716_tholen/graph_values.yml b/datasets/GM0716_tholen/graph_values.yml index 6d17da1960..dd96fbfd5b 100644 --- a/datasets/GM0716_tholen/graph_values.yml +++ b/datasets/GM0716_tholen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2126.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15911597058868265 - :network_gas: 0.12486216176224528 - :ambient_heat: 0.7160218676490719 + :electricity: 0.18922439395380508 + :network_gas: 0.14848897191029883 + :ambient_heat: 0.6622866341358962 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11102.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1132.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1743062114353037 - :network_gas: 0.3027751542587833 - :ambient_heat: 0.5229186343059129 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0717_veere/GM0717_veere.derived.ad b/datasets/GM0717_veere/GM0717_veere.derived.ad index 5673c8bfc4..33d11bc53a 100644 --- a/datasets/GM0717_veere/GM0717_veere.derived.ad +++ b/datasets/GM0717_veere/GM0717_veere.derived.ad @@ -1,6 +1,6 @@ - area = GM0717_veere -- id = 129132 -- parent_id = 129132 +- id = 129478 +- parent_id = 129478 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0717_veere/graph_values.yml b/datasets/GM0717_veere/graph_values.yml index 427b8322c8..51fe6f1ffb 100644 --- a/datasets/GM0717_veere/graph_values.yml +++ b/datasets/GM0717_veere/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4753.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.156330600863882 - :network_gas: 0.14018169524864887 - :ambient_heat: 0.7034877038874691 + :electricity: 0.18529818534883186 + :network_gas: 0.1661569366787923 + :ambient_heat: 0.6485448779723758 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10972.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 248.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16708730054929802 - :network_gas: 0.3316507978028062 - :ambient_heat: 0.5012619016478959 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0718_vlissingen/GM0718_vlissingen.derived.ad b/datasets/GM0718_vlissingen/GM0718_vlissingen.derived.ad index a4914609e5..4348fa119e 100644 --- a/datasets/GM0718_vlissingen/GM0718_vlissingen.derived.ad +++ b/datasets/GM0718_vlissingen/GM0718_vlissingen.derived.ad @@ -1,6 +1,6 @@ - area = GM0718_vlissingen -- id = 129139 -- parent_id = 129139 +- id = 129485 +- parent_id = 129485 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0718_vlissingen/graph_values.yml b/datasets/GM0718_vlissingen/graph_values.yml index 4739e2d693..5d58dfbd63 100644 --- a/datasets/GM0718_vlissingen/graph_values.yml +++ b/datasets/GM0718_vlissingen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 5922.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15650986483032023 - :network_gas: 0.13919574343323876 - :ambient_heat: 0.7042943917364409 + :electricity: 0.1855500919964024 + :network_gas: 0.16502335509359878 + :ambient_heat: 0.6494265529099987 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22881.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1741.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16754130794271327 - :network_gas: 0.3298347682291452 - :ambient_heat: 0.5026239238281416 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0736_de_ronde_venen/GM0736_de_ronde_venen.derived.ad b/datasets/GM0736_de_ronde_venen/GM0736_de_ronde_venen.derived.ad index 6d4bc3c992..c91376be71 100644 --- a/datasets/GM0736_de_ronde_venen/GM0736_de_ronde_venen.derived.ad +++ b/datasets/GM0736_de_ronde_venen/GM0736_de_ronde_venen.derived.ad @@ -1,6 +1,6 @@ - area = GM0736_de_ronde_venen -- id = 128915 -- parent_id = 128915 +- id = 129261 +- parent_id = 129261 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0736_de_ronde_venen/graph_values.yml b/datasets/GM0736_de_ronde_venen/graph_values.yml index 5dc7857a76..65340be439 100644 --- a/datasets/GM0736_de_ronde_venen/graph_values.yml +++ b/datasets/GM0736_de_ronde_venen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3547.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1584566574980744 - :network_gas: 0.12848838376059085 - :ambient_heat: 0.7130549587413348 + :electricity: 0.1882926898288056 + :network_gas: 0.15268164665363762 + :ambient_heat: 0.6590256635175568 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18550.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 162.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1725651119386649 - :network_gas: 0.30973955224533856 - :ambient_heat: 0.5176953358159966 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0737_tytsjerksteradiel/GM0737_tytsjerksteradiel.derived.ad b/datasets/GM0737_tytsjerksteradiel/GM0737_tytsjerksteradiel.derived.ad index 7a6e5124a0..4ea6e051af 100644 --- a/datasets/GM0737_tytsjerksteradiel/GM0737_tytsjerksteradiel.derived.ad +++ b/datasets/GM0737_tytsjerksteradiel/GM0737_tytsjerksteradiel.derived.ad @@ -1,6 +1,6 @@ - area = GM0737_tytsjerksteradiel -- id = 129121 -- parent_id = 129121 +- id = 129467 +- parent_id = 129467 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0737_tytsjerksteradiel/graph_values.yml b/datasets/GM0737_tytsjerksteradiel/graph_values.yml index ed6959e2d5..d34100fc14 100644 --- a/datasets/GM0737_tytsjerksteradiel/graph_values.yml +++ b/datasets/GM0737_tytsjerksteradiel/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2519.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15534854191885578 - :network_gas: 0.1455830194462933 - :ambient_heat: 0.6990684386348509 + :electricity: 0.18392006654389098 + :network_gas: 0.17235848044334226 + :ambient_heat: 0.6437214530127667 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14018.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 47.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1646251405479638 - :network_gas: 0.3414994378081431 - :ambient_heat: 0.4938754216438932 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0743_asten/GM0743_asten.derived.ad b/datasets/GM0743_asten/GM0743_asten.derived.ad index 44e6911b22..77352f4201 100644 --- a/datasets/GM0743_asten/GM0743_asten.derived.ad +++ b/datasets/GM0743_asten/GM0743_asten.derived.ad @@ -1,6 +1,6 @@ - area = GM0743_asten -- id = 128873 -- parent_id = 128873 +- id = 129219 +- parent_id = 129219 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0743_asten/graph_values.yml b/datasets/GM0743_asten/graph_values.yml index 2f72e8851a..33b096ecd0 100644 --- a/datasets/GM0743_asten/graph_values.yml +++ b/datasets/GM0743_asten/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1560.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15951051995973572 - :network_gas: 0.1226921402214535 - :ambient_heat: 0.7177973398188108 + :electricity: 0.18978264799720335 + :network_gas: 0.1459768250115997 + :ambient_heat: 0.6642405269911971 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7040.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 58.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17535799646213365 - :network_gas: 0.2985680141514636 - :ambient_heat: 0.5260739893864028 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0744_baarle_nassau/GM0744_baarle_nassau.derived.ad b/datasets/GM0744_baarle_nassau/GM0744_baarle_nassau.derived.ad index 8fa4868fad..f937df9484 100644 --- a/datasets/GM0744_baarle_nassau/GM0744_baarle_nassau.derived.ad +++ b/datasets/GM0744_baarle_nassau/GM0744_baarle_nassau.derived.ad @@ -1,6 +1,6 @@ - area = GM0744_baarle_nassau -- id = 128874 -- parent_id = 128874 +- id = 129220 +- parent_id = 129220 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0744_baarle_nassau/graph_values.yml b/datasets/GM0744_baarle_nassau/graph_values.yml index 507e86bdd6..af025e868f 100644 --- a/datasets/GM0744_baarle_nassau/graph_values.yml +++ b/datasets/GM0744_baarle_nassau/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1393.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1566578951987514 - :network_gas: 0.1383815764068675 - :ambient_heat: 0.7049605283943812 + :electricity: 0.18575818906333766 + :network_gas: 0.16408691691189323 + :ambient_heat: 0.6501548940247692 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 2911.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 37.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16791728766406416 - :network_gas: 0.32833084934374146 - :ambient_heat: 0.5037518629921942 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0748_bergen_op_zoom/GM0748_bergen_op_zoom.derived.ad b/datasets/GM0748_bergen_op_zoom/GM0748_bergen_op_zoom.derived.ad index 90cfb85fdc..e834c1da87 100644 --- a/datasets/GM0748_bergen_op_zoom/GM0748_bergen_op_zoom.derived.ad +++ b/datasets/GM0748_bergen_op_zoom/GM0748_bergen_op_zoom.derived.ad @@ -1,6 +1,6 @@ - area = GM0748_bergen_op_zoom -- id = 128884 -- parent_id = 128884 +- id = 129230 +- parent_id = 129230 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0748_bergen_op_zoom/graph_values.yml b/datasets/GM0748_bergen_op_zoom/graph_values.yml index 881f449e91..b3e763dd2a 100644 --- a/datasets/GM0748_bergen_op_zoom/graph_values.yml +++ b/datasets/GM0748_bergen_op_zoom/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 10317.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15881747897200912 - :network_gas: 0.12650386565394972 - :ambient_heat: 0.7146786553740411 + :electricity: 0.18880240148039268 + :network_gas: 0.15038794084011473 + :ambient_heat: 0.6608096576794927 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 30883.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2761.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1735154211899666 - :network_gas: 0.30593831524013165 - :ambient_heat: 0.5205462635699016 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0753_best/GM0753_best.derived.ad b/datasets/GM0753_best/GM0753_best.derived.ad index 0c84fd8fbd..c268712072 100644 --- a/datasets/GM0753_best/GM0753_best.derived.ad +++ b/datasets/GM0753_best/GM0753_best.derived.ad @@ -1,6 +1,6 @@ - area = GM0753_best -- id = 128887 -- parent_id = 128887 +- id = 129233 +- parent_id = 129233 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0753_best/graph_values.yml b/datasets/GM0753_best/graph_values.yml index ad9637bcf3..1057cbe093 100644 --- a/datasets/GM0753_best/graph_values.yml +++ b/datasets/GM0753_best/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3948.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16015029248937804 - :network_gas: 0.11917339130842067 - :ambient_heat: 0.7206763162022012 + :electricity: 0.1906889869281303 + :network_gas: 0.14189829380985752 + :ambient_heat: 0.6674127192620122 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12967.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 35.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17707943898647452 - :network_gas: 0.2916822440541001 - :ambient_heat: 0.5312383169594255 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0755_boekel/GM0755_boekel.derived.ad b/datasets/GM0755_boekel/GM0755_boekel.derived.ad index 38d6845829..5bdf7fe716 100644 --- a/datasets/GM0755_boekel/GM0755_boekel.derived.ad +++ b/datasets/GM0755_boekel/GM0755_boekel.derived.ad @@ -1,6 +1,6 @@ - area = GM0755_boekel -- id = 128894 -- parent_id = 128894 +- id = 129240 +- parent_id = 129240 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0755_boekel/graph_values.yml b/datasets/GM0755_boekel/graph_values.yml index 7a9cdca3cd..8d7591a4f0 100644 --- a/datasets/GM0755_boekel/graph_values.yml +++ b/datasets/GM0755_boekel/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 632.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16062012715431234 - :network_gas: 0.11658930065128223 - :ambient_heat: 0.7227905721944055 + :electricity: 0.1913554618756593 + :network_gas: 0.1388991521246423 + :ambient_heat: 0.6697453859996985 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4373.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 11.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17835636104190414 - :network_gas: 0.28657455583238156 - :ambient_heat: 0.5350690831257143 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0757_boxtel/GM0757_boxtel.derived.ad b/datasets/GM0757_boxtel/GM0757_boxtel.derived.ad index 8f30323c47..44eb07ac35 100644 --- a/datasets/GM0757_boxtel/GM0757_boxtel.derived.ad +++ b/datasets/GM0757_boxtel/GM0757_boxtel.derived.ad @@ -1,6 +1,6 @@ - area = GM0757_boxtel -- id = 128898 -- parent_id = 128898 +- id = 129244 +- parent_id = 129244 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0757_boxtel/graph_values.yml b/datasets/GM0757_boxtel/graph_values.yml index 58a82620fb..a2909e90fd 100644 --- a/datasets/GM0757_boxtel/graph_values.yml +++ b/datasets/GM0757_boxtel/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2429.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15888230312237095 - :network_gas: 0.1261473328269598 - :ambient_heat: 0.7149703640506693 + :electricity: 0.18889402115282355 + :network_gas: 0.1499756517063789 + :ambient_heat: 0.6611303271407974 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14342.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 240.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17368680042324836 - :network_gas: 0.30525279830700475 - :ambient_heat: 0.521060401269747 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0758_breda/GM0758_breda.derived.ad b/datasets/GM0758_breda/GM0758_breda.derived.ad index a79143a2ca..69b11edfa7 100644 --- a/datasets/GM0758_breda/GM0758_breda.derived.ad +++ b/datasets/GM0758_breda/GM0758_breda.derived.ad @@ -1,6 +1,6 @@ - area = GM0758_breda -- id = 128899 -- parent_id = 128899 +- id = 129245 +- parent_id = 129245 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0758_breda/graph_values.yml b/datasets/GM0758_breda/graph_values.yml index 30cc70186f..85eedf05cb 100644 --- a/datasets/GM0758_breda/graph_values.yml +++ b/datasets/GM0758_breda/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 28914.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1607858777538068 - :network_gas: 0.11567767235406252 - :ambient_heat: 0.7235364498921305 + :electricity: 0.19159076227801455 + :network_gas: 0.137840298753082 + :ambient_heat: 0.6705689389689035 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 85127.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 6239.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1788094428110102 - :network_gas: 0.28476222875595736 - :ambient_heat: 0.5364283284330325 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0762_deurne/GM0762_deurne.derived.ad b/datasets/GM0762_deurne/GM0762_deurne.derived.ad index c0dfeece4e..3c3b29dbca 100644 --- a/datasets/GM0762_deurne/GM0762_deurne.derived.ad +++ b/datasets/GM0762_deurne/GM0762_deurne.derived.ad @@ -1,6 +1,6 @@ - area = GM0762_deurne -- id = 128920 -- parent_id = 128920 +- id = 129266 +- parent_id = 129266 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0762_deurne/graph_values.yml b/datasets/GM0762_deurne/graph_values.yml index f16cb1f736..12b3043ecf 100644 --- a/datasets/GM0762_deurne/graph_values.yml +++ b/datasets/GM0762_deurne/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3042.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15852820598845246 - :network_gas: 0.12809486706351145 - :ambient_heat: 0.7133769269480361 + :electricity: 0.188393727502391 + :network_gas: 0.15222697645222846 + :ambient_heat: 0.6593792960453806 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13959.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 37.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17275306633770954 - :network_gas: 0.3089877346491599 - :ambient_heat: 0.5182591990131304 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0765_pekela/GM0765_pekela.derived.ad b/datasets/GM0765_pekela/GM0765_pekela.derived.ad index 724bbc2092..01a3be458a 100644 --- a/datasets/GM0765_pekela/GM0765_pekela.derived.ad +++ b/datasets/GM0765_pekela/GM0765_pekela.derived.ad @@ -1,6 +1,6 @@ - area = GM0765_pekela -- id = 129068 -- parent_id = 129068 +- id = 129414 +- parent_id = 129414 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0765_pekela/graph_values.yml b/datasets/GM0765_pekela/graph_values.yml index 03c3ca84bc..45c544b00d 100644 --- a/datasets/GM0765_pekela/graph_values.yml +++ b/datasets/GM0765_pekela/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 921.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.14975224878771565 - :network_gas: 0.17636263166756388 - :ambient_heat: 0.6738851195447204 + :electricity: 0.1761275741117888 + :network_gas: 0.2074247480824946 + :ambient_heat: 0.6164476778057165 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5751.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 41.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15135703314244456 - :network_gas: 0.3945718674302202 - :ambient_heat: 0.45407109942733526 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0766_dongen/GM0766_dongen.derived.ad b/datasets/GM0766_dongen/GM0766_dongen.derived.ad index 93bbff3e6e..223f6619a7 100644 --- a/datasets/GM0766_dongen/GM0766_dongen.derived.ad +++ b/datasets/GM0766_dongen/GM0766_dongen.derived.ad @@ -1,6 +1,6 @@ - area = GM0766_dongen -- id = 128926 -- parent_id = 128926 +- id = 129272 +- parent_id = 129272 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0766_dongen/graph_values.yml b/datasets/GM0766_dongen/graph_values.yml index 65db6a3f2d..33e1326e00 100644 --- a/datasets/GM0766_dongen/graph_values.yml +++ b/datasets/GM0766_dongen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1534.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15787721488964265 - :network_gas: 0.13167531810696548 - :ambient_heat: 0.710447467003392 + :electricity: 0.18747505866169187 + :network_gas: 0.156360992329741 + :ambient_heat: 0.6561639490085672 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11447.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 152.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17105172069054997 - :network_gas: 0.3157931172377983 - :ambient_heat: 0.5131551620716518 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0770_eersel/GM0770_eersel.derived.ad b/datasets/GM0770_eersel/GM0770_eersel.derived.ad index f393e7a057..1da5ec62be 100644 --- a/datasets/GM0770_eersel/GM0770_eersel.derived.ad +++ b/datasets/GM0770_eersel/GM0770_eersel.derived.ad @@ -1,6 +1,6 @@ - area = GM0770_eersel -- id = 128937 -- parent_id = 128937 +- id = 129283 +- parent_id = 129283 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0770_eersel/graph_values.yml b/datasets/GM0770_eersel/graph_values.yml index aa11ea342b..4687b1305c 100644 --- a/datasets/GM0770_eersel/graph_values.yml +++ b/datasets/GM0770_eersel/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1950.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15924772931283737 - :network_gas: 0.12413748877939453 - :ambient_heat: 0.7166147819077681 + :electricity: 0.18941076315203456 + :network_gas: 0.14765030928190953 + :ambient_heat: 0.6629389275660558 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8482.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 13.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1746566247338939 - :network_gas: 0.30137350106442257 - :ambient_heat: 0.5239698742016835 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0772_eindhoven/GM0772_eindhoven.derived.ad b/datasets/GM0772_eindhoven/GM0772_eindhoven.derived.ad index 772764bf54..dcbdb63629 100644 --- a/datasets/GM0772_eindhoven/GM0772_eindhoven.derived.ad +++ b/datasets/GM0772_eindhoven/GM0772_eindhoven.derived.ad @@ -1,6 +1,6 @@ - area = GM0772_eindhoven -- id = 128939 -- parent_id = 128939 +- id = 129285 +- parent_id = 129285 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0772_eindhoven/graph_values.yml b/datasets/GM0772_eindhoven/graph_values.yml index 47a4972b91..8a75a36ab5 100644 --- a/datasets/GM0772_eindhoven/graph_values.yml +++ b/datasets/GM0772_eindhoven/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 40802.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15766055903300352 - :network_gas: 0.13286692531848068 - :ambient_heat: 0.7094725156485158 + :electricity: 0.18716963210244647 + :network_gas: 0.15773541387251735 + :ambient_heat: 0.6550949540250361 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 114315.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 8656.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17048983993429212 - :network_gas: 0.3180406402628296 - :ambient_heat: 0.5114695198028782 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0777_etten_leur/GM0777_etten_leur.derived.ad b/datasets/GM0777_etten_leur/GM0777_etten_leur.derived.ad index bb65ac11ed..556ec28a34 100644 --- a/datasets/GM0777_etten_leur/GM0777_etten_leur.derived.ad +++ b/datasets/GM0777_etten_leur/GM0777_etten_leur.derived.ad @@ -1,6 +1,6 @@ - area = GM0777_etten_leur -- id = 128946 -- parent_id = 128946 +- id = 129292 +- parent_id = 129292 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0777_etten_leur/graph_values.yml b/datasets/GM0777_etten_leur/graph_values.yml index 8b6e7b919c..f0321ac8d4 100644 --- a/datasets/GM0777_etten_leur/graph_values.yml +++ b/datasets/GM0777_etten_leur/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3353.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1609124742774997 - :network_gas: 0.11498139147375167 - :ambient_heat: 0.7241061342487486 + :electricity: 0.19177054196813018 + :network_gas: 0.13703128895491942 + :ambient_heat: 0.6711981690769505 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19146.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 56.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17915641708684726 - :network_gas: 0.28337433165260906 - :ambient_heat: 0.5374692512605437 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0779_geertruidenberg/GM0779_geertruidenberg.derived.ad b/datasets/GM0779_geertruidenberg/GM0779_geertruidenberg.derived.ad index 88fe4f46f8..8dea5e62e9 100644 --- a/datasets/GM0779_geertruidenberg/GM0779_geertruidenberg.derived.ad +++ b/datasets/GM0779_geertruidenberg/GM0779_geertruidenberg.derived.ad @@ -1,6 +1,6 @@ - area = GM0779_geertruidenberg -- id = 128947 -- parent_id = 128947 +- id = 129293 +- parent_id = 129293 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0779_geertruidenberg/graph_values.yml b/datasets/GM0779_geertruidenberg/graph_values.yml index 07d91163d3..1926c89369 100644 --- a/datasets/GM0779_geertruidenberg/graph_values.yml +++ b/datasets/GM0779_geertruidenberg/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1575.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15985559986471506 - :network_gas: 0.12079420074406709 - :ambient_heat: 0.7193501993912178 + :electricity: 0.19027133676351096 + :network_gas: 0.14377772232129804 + :ambient_heat: 0.665950940915191 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9636.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 275.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17628403987550917 - :network_gas: 0.2948638404979615 - :ambient_heat: 0.5288521196265294 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0784_gilze_en_rijen/GM0784_gilze_en_rijen.derived.ad b/datasets/GM0784_gilze_en_rijen/GM0784_gilze_en_rijen.derived.ad index cd40bbc7ae..5be6758808 100644 --- a/datasets/GM0784_gilze_en_rijen/GM0784_gilze_en_rijen.derived.ad +++ b/datasets/GM0784_gilze_en_rijen/GM0784_gilze_en_rijen.derived.ad @@ -1,6 +1,6 @@ - area = GM0784_gilze_en_rijen -- id = 128951 -- parent_id = 128951 +- id = 129297 +- parent_id = 129297 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0784_gilze_en_rijen/graph_values.yml b/datasets/GM0784_gilze_en_rijen/graph_values.yml index babcaa7ee1..13d3a7a9e3 100644 --- a/datasets/GM0784_gilze_en_rijen/graph_values.yml +++ b/datasets/GM0784_gilze_en_rijen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3488.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1595212928005728 - :network_gas: 0.12263288959684959 - :ambient_heat: 0.7178458176025777 + :electricity: 0.18979789800804414 + :network_gas: 0.14590819986164894 + :ambient_heat: 0.664293902130307 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11376.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 83.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1753868191893737 - :network_gas: 0.2984527232425032 - :ambient_heat: 0.526160457568123 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0785_goirle/GM0785_goirle.derived.ad b/datasets/GM0785_goirle/GM0785_goirle.derived.ad index 58cf8d9681..0b1cf153c1 100644 --- a/datasets/GM0785_goirle/GM0785_goirle.derived.ad +++ b/datasets/GM0785_goirle/GM0785_goirle.derived.ad @@ -1,6 +1,6 @@ - area = GM0785_goirle -- id = 128954 -- parent_id = 128954 +- id = 129300 +- parent_id = 129300 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0785_goirle/graph_values.yml b/datasets/GM0785_goirle/graph_values.yml index 5fe6e3b156..3c6986ff7b 100644 --- a/datasets/GM0785_goirle/graph_values.yml +++ b/datasets/GM0785_goirle/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1610.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1602479339250744 - :network_gas: 0.11863636341209097 - :ambient_heat: 0.7211157026628346 + :electricity: 0.19082743292445786 + :network_gas: 0.14127528590794522 + :ambient_heat: 0.667897281167597 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10411.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 222.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17734391647199246 - :network_gas: 0.29062433411202837 - :ambient_heat: 0.5320317494159792 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0794_helmond/GM0794_helmond.derived.ad b/datasets/GM0794_helmond/GM0794_helmond.derived.ad index 6b4c3aab86..2dd5bd9565 100644 --- a/datasets/GM0794_helmond/GM0794_helmond.derived.ad +++ b/datasets/GM0794_helmond/GM0794_helmond.derived.ad @@ -1,6 +1,6 @@ - area = GM0794_helmond -- id = 128977 -- parent_id = 128977 +- id = 129323 +- parent_id = 129323 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0794_helmond/graph_values.yml b/datasets/GM0794_helmond/graph_values.yml index 6e4ab72178..895f3cee1c 100644 --- a/datasets/GM0794_helmond/graph_values.yml +++ b/datasets/GM0794_helmond/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 8631.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16166675526820004 - :network_gas: 0.11083284602489984 - :ambient_heat: 0.7275003987069002 + :electricity: 0.19284282171027697 + :network_gas: 0.13220602300185144 + :ambient_heat: 0.6749511552878715 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 41212.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1187.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18124043032980036 - :network_gas: 0.27503827868079656 - :ambient_heat: 0.543721290989403 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0796_s_hertogenbosch/GM0796_s_hertogenbosch.derived.ad b/datasets/GM0796_s_hertogenbosch/GM0796_s_hertogenbosch.derived.ad index 1f0c64249a..3ca204f82e 100644 --- a/datasets/GM0796_s_hertogenbosch/GM0796_s_hertogenbosch.derived.ad +++ b/datasets/GM0796_s_hertogenbosch/GM0796_s_hertogenbosch.derived.ad @@ -1,6 +1,6 @@ - area = GM0796_s_hertogenbosch -- id = 129093 -- parent_id = 129093 +- id = 129439 +- parent_id = 129439 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0796_s_hertogenbosch/graph_values.yml b/datasets/GM0796_s_hertogenbosch/graph_values.yml index afd353a949..ad0a40a0a7 100644 --- a/datasets/GM0796_s_hertogenbosch/graph_values.yml +++ b/datasets/GM0796_s_hertogenbosch/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 29304.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15906001270686593 - :network_gas: 0.1251699301122374 - :ambient_heat: 0.7157700571808967 + :electricity: 0.18914526069179877 + :network_gas: 0.1488450721142902 + :ambient_heat: 0.6620096671939111 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 73387.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2551.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17415764107658796 - :network_gas: 0.30336943569364627 - :ambient_heat: 0.5224729232297658 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0797_heusden/GM0797_heusden.derived.ad b/datasets/GM0797_heusden/GM0797_heusden.derived.ad index 7e40bfefc4..22696c6aff 100644 --- a/datasets/GM0797_heusden/GM0797_heusden.derived.ad +++ b/datasets/GM0797_heusden/GM0797_heusden.derived.ad @@ -1,6 +1,6 @@ - area = GM0797_heusden -- id = 128981 -- parent_id = 128981 +- id = 129327 +- parent_id = 129327 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0797_heusden/graph_values.yml b/datasets/GM0797_heusden/graph_values.yml index 7461f20261..11e0aba936 100644 --- a/datasets/GM0797_heusden/graph_values.yml +++ b/datasets/GM0797_heusden/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2826.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1593305706414281 - :network_gas: 0.12368186147214535 - :ambient_heat: 0.7169875678864265 + :electricity: 0.18952796991183804 + :network_gas: 0.14712287808525468 + :ambient_heat: 0.6633491520029071 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19327.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 173.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17487736606394505 - :network_gas: 0.3004905357442179 - :ambient_heat: 0.5246320981918371 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0798_hilvarenbeek/GM0798_hilvarenbeek.derived.ad b/datasets/GM0798_hilvarenbeek/GM0798_hilvarenbeek.derived.ad index e4a59a44a4..149b7937c6 100644 --- a/datasets/GM0798_hilvarenbeek/GM0798_hilvarenbeek.derived.ad +++ b/datasets/GM0798_hilvarenbeek/GM0798_hilvarenbeek.derived.ad @@ -1,6 +1,6 @@ - area = GM0798_hilvarenbeek -- id = 128983 -- parent_id = 128983 +- id = 129329 +- parent_id = 129329 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0798_hilvarenbeek/graph_values.yml b/datasets/GM0798_hilvarenbeek/graph_values.yml index 9ab55bc67b..5de908ee95 100644 --- a/datasets/GM0798_hilvarenbeek/graph_values.yml +++ b/datasets/GM0798_hilvarenbeek/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1565.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15603747441176982 - :network_gas: 0.1417938907352659 - :ambient_heat: 0.7021686348529642 + :electricity: 0.18488650656599318 + :network_gas: 0.16800949393260634 + :ambient_heat: 0.6471039995014004 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6840.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 75.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16634797899692405 - :network_gas: 0.3346080840123021 - :ambient_heat: 0.49904393699077393 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0809_loon_op_zand/GM0809_loon_op_zand.derived.ad b/datasets/GM0809_loon_op_zand/GM0809_loon_op_zand.derived.ad index 8fca2e25fc..c013aaa5de 100644 --- a/datasets/GM0809_loon_op_zand/GM0809_loon_op_zand.derived.ad +++ b/datasets/GM0809_loon_op_zand/GM0809_loon_op_zand.derived.ad @@ -1,6 +1,6 @@ - area = GM0809_loon_op_zand -- id = 129017 -- parent_id = 129017 +- id = 129363 +- parent_id = 129363 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0809_loon_op_zand/graph_values.yml b/datasets/GM0809_loon_op_zand/graph_values.yml index da48fddd23..25eaa71e59 100644 --- a/datasets/GM0809_loon_op_zand/graph_values.yml +++ b/datasets/GM0809_loon_op_zand/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2233.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15738584682682752 - :network_gas: 0.13437784245244852 - :ambient_heat: 0.7082363107207239 + :electricity: 0.1867825875194615 + :network_gas: 0.15947711706356876 + :ambient_heat: 0.6537402954169698 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10472.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 112.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16978048143565044 - :network_gas: 0.3208780742573964 - :ambient_heat: 0.509341444306953 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0820_nuenen_gerwen_en_nederwetten/GM0820_nuenen_gerwen_en_nederwetten.derived.ad b/datasets/GM0820_nuenen_gerwen_en_nederwetten/GM0820_nuenen_gerwen_en_nederwetten.derived.ad index e942ed1432..e639a50bdc 100644 --- a/datasets/GM0820_nuenen_gerwen_en_nederwetten/GM0820_nuenen_gerwen_en_nederwetten.derived.ad +++ b/datasets/GM0820_nuenen_gerwen_en_nederwetten/GM0820_nuenen_gerwen_en_nederwetten.derived.ad @@ -1,6 +1,6 @@ - area = GM0820_nuenen_gerwen_en_nederwetten -- id = 129045 -- parent_id = 129045 +- id = 129391 +- parent_id = 129391 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0820_nuenen_gerwen_en_nederwetten/graph_values.yml b/datasets/GM0820_nuenen_gerwen_en_nederwetten/graph_values.yml index e9d76e81ad..f3ae3e1aa0 100644 --- a/datasets/GM0820_nuenen_gerwen_en_nederwetten/graph_values.yml +++ b/datasets/GM0820_nuenen_gerwen_en_nederwetten/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1784.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1577083380050072 - :network_gas: 0.13260414097246045 - :ambient_heat: 0.7096875210225324 + :electricity: 0.18723697411400242 + :network_gas: 0.15743237437377477 + :ambient_heat: 0.6553306515122227 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10435.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 83.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1706135660676789 - :network_gas: 0.3175457357292824 - :ambient_heat: 0.5118406982030386 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0823_oirschot/GM0823_oirschot.derived.ad b/datasets/GM0823_oirschot/GM0823_oirschot.derived.ad index 0d5382d16d..3533871e20 100644 --- a/datasets/GM0823_oirschot/GM0823_oirschot.derived.ad +++ b/datasets/GM0823_oirschot/GM0823_oirschot.derived.ad @@ -1,6 +1,6 @@ - area = GM0823_oirschot -- id = 129048 -- parent_id = 129048 +- id = 129394 +- parent_id = 129394 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0823_oirschot/graph_values.yml b/datasets/GM0823_oirschot/graph_values.yml index df5339ebb8..9840fe7a42 100644 --- a/datasets/GM0823_oirschot/graph_values.yml +++ b/datasets/GM0823_oirschot/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2143.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15996476592986897 - :network_gas: 0.1201937873857207 - :ambient_heat: 0.7198414466844104 + :electricity: 0.1904260171043947 + :network_gas: 0.14308165976118573 + :ambient_heat: 0.6664923231344195 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8010.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 81.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17657819459931504 - :network_gas: 0.2936872216027379 - :ambient_heat: 0.529734583797947 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0824_oisterwijk/GM0824_oisterwijk.derived.ad b/datasets/GM0824_oisterwijk/GM0824_oisterwijk.derived.ad index b20cafca6c..570069bb6e 100644 --- a/datasets/GM0824_oisterwijk/GM0824_oisterwijk.derived.ad +++ b/datasets/GM0824_oisterwijk/GM0824_oisterwijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0824_oisterwijk -- id = 129049 -- parent_id = 129049 +- id = 129395 +- parent_id = 129395 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0824_oisterwijk/graph_values.yml b/datasets/GM0824_oisterwijk/graph_values.yml index 502994c7d9..d19908646b 100644 --- a/datasets/GM0824_oisterwijk/graph_values.yml +++ b/datasets/GM0824_oisterwijk/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 5683.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.158069152151595 - :network_gas: 0.13061966316622753 - :ambient_heat: 0.7113111846821775 + :electricity: 0.18774576995513761 + :network_gas: 0.15514278971336068 + :ambient_heat: 0.6571114403315017 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14096.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 259.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17155130002936222 - :network_gas: 0.3137947998825493 - :ambient_heat: 0.5146539000880885 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0826_oosterhout/GM0826_oosterhout.derived.ad b/datasets/GM0826_oosterhout/GM0826_oosterhout.derived.ad index d22ef8ddca..b9570889c3 100644 --- a/datasets/GM0826_oosterhout/GM0826_oosterhout.derived.ad +++ b/datasets/GM0826_oosterhout/GM0826_oosterhout.derived.ad @@ -1,6 +1,6 @@ - area = GM0826_oosterhout -- id = 129056 -- parent_id = 129056 +- id = 129402 +- parent_id = 129402 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0826_oosterhout/graph_values.yml b/datasets/GM0826_oosterhout/graph_values.yml index 1fbeb3c25d..5008402e57 100644 --- a/datasets/GM0826_oosterhout/graph_values.yml +++ b/datasets/GM0826_oosterhout/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 6409.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15949986214580314 - :network_gas: 0.12275075819808264 - :ambient_heat: 0.7177493796561142 + :electricity: 0.18976756120288907 + :network_gas: 0.14604471568609823 + :ambient_heat: 0.6641877231110127 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 25176.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 400.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1753294869804834 - :network_gas: 0.2986820520780646 - :ambient_heat: 0.525988460941452 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0828_oss/GM0828_oss.derived.ad b/datasets/GM0828_oss/GM0828_oss.derived.ad index 94ad59f467..76bc0cd009 100644 --- a/datasets/GM0828_oss/GM0828_oss.derived.ad +++ b/datasets/GM0828_oss/GM0828_oss.derived.ad @@ -1,6 +1,6 @@ - area = GM0828_oss -- id = 129061 -- parent_id = 129061 +- id = 129407 +- parent_id = 129407 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0828_oss/graph_values.yml b/datasets/GM0828_oss/graph_values.yml index 3eb42d8ca3..045fb1d828 100644 --- a/datasets/GM0828_oss/graph_values.yml +++ b/datasets/GM0828_oss/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 7684.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15867908091138527 - :network_gas: 0.127265054987381 - :ambient_heat: 0.7140558641012338 + :electricity: 0.18860684284884513 + :network_gas: 0.151267955979397 + :ambient_heat: 0.660125201171758 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 40708.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 364.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17315019376274438 - :network_gas: 0.3073992249490207 - :ambient_heat: 0.519450581288235 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0840_rucphen/GM0840_rucphen.derived.ad b/datasets/GM0840_rucphen/GM0840_rucphen.derived.ad index b9a9ab8e35..d685564b7a 100644 --- a/datasets/GM0840_rucphen/GM0840_rucphen.derived.ad +++ b/datasets/GM0840_rucphen/GM0840_rucphen.derived.ad @@ -1,6 +1,6 @@ - area = GM0840_rucphen -- id = 129087 -- parent_id = 129087 +- id = 129433 +- parent_id = 129433 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0840_rucphen/graph_values.yml b/datasets/GM0840_rucphen/graph_values.yml index 46e2e8d8ee..312182563c 100644 --- a/datasets/GM0840_rucphen/graph_values.yml +++ b/datasets/GM0840_rucphen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1207.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15905709469954982 - :network_gas: 0.12518597915247598 - :ambient_heat: 0.7157569261479743 + :electricity: 0.1891411344585748 + :network_gas: 0.14886364019117104 + :ambient_heat: 0.6619952253502541 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9868.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 19.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17414989773587977 - :network_gas: 0.3034004090564792 - :ambient_heat: 0.5224496932076412 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0845_sint_michielsgestel/GM0845_sint_michielsgestel.derived.ad b/datasets/GM0845_sint_michielsgestel/GM0845_sint_michielsgestel.derived.ad index 3f3afffa56..058822343e 100644 --- a/datasets/GM0845_sint_michielsgestel/GM0845_sint_michielsgestel.derived.ad +++ b/datasets/GM0845_sint_michielsgestel/GM0845_sint_michielsgestel.derived.ad @@ -1,6 +1,6 @@ - area = GM0845_sint_michielsgestel -- id = 129095 -- parent_id = 129095 +- id = 129441 +- parent_id = 129441 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0845_sint_michielsgestel/graph_values.yml b/datasets/GM0845_sint_michielsgestel/graph_values.yml index ace3af8cf5..52fe02e360 100644 --- a/datasets/GM0845_sint_michielsgestel/graph_values.yml +++ b/datasets/GM0845_sint_michielsgestel/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1607.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15891651024271794 - :network_gas: 0.1259591936650514 - :ambient_heat: 0.7151242960922307 + :electricity: 0.18894237372128603 + :network_gas: 0.14975806482753123 + :ambient_heat: 0.6612995614511827 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12248.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 88.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17377731575803276 - :network_gas: 0.304890736967867 - :ambient_heat: 0.5213319472741001 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0847_someren/GM0847_someren.derived.ad b/datasets/GM0847_someren/GM0847_someren.derived.ad index e90d511263..043fcb0814 100644 --- a/datasets/GM0847_someren/GM0847_someren.derived.ad +++ b/datasets/GM0847_someren/GM0847_someren.derived.ad @@ -1,6 +1,6 @@ - area = GM0847_someren -- id = 129101 -- parent_id = 129101 +- id = 129447 +- parent_id = 129447 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0847_someren/graph_values.yml b/datasets/GM0847_someren/graph_values.yml index 4faad7bd09..b32b07723a 100644 --- a/datasets/GM0847_someren/graph_values.yml +++ b/datasets/GM0847_someren/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3250.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15885928486492149 - :network_gas: 0.1262739332429318 - :ambient_heat: 0.7148667818921466 + :electricity: 0.18886148651856394 + :network_gas: 0.15012205777637908 + :ambient_heat: 0.661016455705057 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8163.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 10.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1736259230382525 - :network_gas: 0.3054963078469882 - :ambient_heat: 0.5208777691147594 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0848_son_en_breugel/GM0848_son_en_breugel.derived.ad b/datasets/GM0848_son_en_breugel/GM0848_son_en_breugel.derived.ad index 7762cc523f..d540fb542f 100644 --- a/datasets/GM0848_son_en_breugel/GM0848_son_en_breugel.derived.ad +++ b/datasets/GM0848_son_en_breugel/GM0848_son_en_breugel.derived.ad @@ -1,6 +1,6 @@ - area = GM0848_son_en_breugel -- id = 129102 -- parent_id = 129102 +- id = 129448 +- parent_id = 129448 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0848_son_en_breugel/graph_values.yml b/datasets/GM0848_son_en_breugel/graph_values.yml index a79082acff..822b4eb8ca 100644 --- a/datasets/GM0848_son_en_breugel/graph_values.yml +++ b/datasets/GM0848_son_en_breugel/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2757.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15815931418519277 - :network_gas: 0.1301237719814399 - :ambient_heat: 0.7117169138333674 + :electricity: 0.18787297849952841 + :network_gas: 0.15457035041971212 + :ambient_heat: 0.6575566710807595 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7308.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 12.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.171786563934383 - :network_gas: 0.31285374426246626 - :ambient_heat: 0.5153596918031508 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0851_steenbergen/GM0851_steenbergen.derived.ad b/datasets/GM0851_steenbergen/GM0851_steenbergen.derived.ad index 26d3decbec..ac52d48866 100644 --- a/datasets/GM0851_steenbergen/GM0851_steenbergen.derived.ad +++ b/datasets/GM0851_steenbergen/GM0851_steenbergen.derived.ad @@ -1,6 +1,6 @@ - area = GM0851_steenbergen -- id = 129106 -- parent_id = 129106 +- id = 129452 +- parent_id = 129452 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0851_steenbergen/graph_values.yml b/datasets/GM0851_steenbergen/graph_values.yml index a976f27923..8663029dec 100644 --- a/datasets/GM0851_steenbergen/graph_values.yml +++ b/datasets/GM0851_steenbergen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1337.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15942598695352742 - :network_gas: 0.12315707175559931 - :ambient_heat: 0.7174169412908733 + :electricity: 0.18966299681903656 + :network_gas: 0.14651525610710525 + :ambient_heat: 0.6638217470738582 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10458.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 261.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17513202203252945 - :network_gas: 0.2994719118698803 - :ambient_heat: 0.5253960660975902 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0852_waterland/GM0852_waterland.derived.ad b/datasets/GM0852_waterland/GM0852_waterland.derived.ad index bb22c44c33..f216c6f601 100644 --- a/datasets/GM0852_waterland/GM0852_waterland.derived.ad +++ b/datasets/GM0852_waterland/GM0852_waterland.derived.ad @@ -1,6 +1,6 @@ - area = GM0852_waterland -- id = 129149 -- parent_id = 129149 +- id = 129495 +- parent_id = 129495 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0852_waterland/graph_values.yml b/datasets/GM0852_waterland/graph_values.yml index b28ec174b6..a22d401d9e 100644 --- a/datasets/GM0852_waterland/graph_values.yml +++ b/datasets/GM0852_waterland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 965.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15546237377083594 - :network_gas: 0.1449569442604024 - :ambient_heat: 0.6995806819687617 + :electricity: 0.18407964203955207 + :network_gas: 0.17164038965425796 + :ambient_heat: 0.6442799683061899 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7391.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 367.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16490838441458786 - :network_gas: 0.3403664623416468 - :ambient_heat: 0.4947251532437653 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0855_tilburg/GM0855_tilburg.derived.ad b/datasets/GM0855_tilburg/GM0855_tilburg.derived.ad index 1b30f00a34..8791685469 100644 --- a/datasets/GM0855_tilburg/GM0855_tilburg.derived.ad +++ b/datasets/GM0855_tilburg/GM0855_tilburg.derived.ad @@ -1,6 +1,6 @@ - area = GM0855_tilburg -- id = 129117 -- parent_id = 129117 +- id = 129463 +- parent_id = 129463 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0855_tilburg/graph_values.yml b/datasets/GM0855_tilburg/graph_values.yml index d3d2710de3..b8d8d7cebe 100644 --- a/datasets/GM0855_tilburg/graph_values.yml +++ b/datasets/GM0855_tilburg/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 26666.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16330462212938154 - :network_gas: 0.10182457828840152 - :ambient_heat: 0.7348707995822169 + :electricity: 0.1951778568436938 + :network_gas: 0.12169834941106322 + :ambient_heat: 0.683123793745243 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 102395.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 10266.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18586643147148357 - :network_gas: 0.2565342741140637 - :ambient_heat: 0.5575992944144528 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0858_valkenswaard/GM0858_valkenswaard.derived.ad b/datasets/GM0858_valkenswaard/GM0858_valkenswaard.derived.ad index e116f0af05..91ec4c35ec 100644 --- a/datasets/GM0858_valkenswaard/GM0858_valkenswaard.derived.ad +++ b/datasets/GM0858_valkenswaard/GM0858_valkenswaard.derived.ad @@ -1,6 +1,6 @@ - area = GM0858_valkenswaard -- id = 129129 -- parent_id = 129129 +- id = 129475 +- parent_id = 129475 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0858_valkenswaard/graph_values.yml b/datasets/GM0858_valkenswaard/graph_values.yml index 2123c84d44..d91eaf44fb 100644 --- a/datasets/GM0858_valkenswaard/graph_values.yml +++ b/datasets/GM0858_valkenswaard/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2681.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15835709845140758 - :network_gas: 0.12903595851725833 - :ambient_heat: 0.7126069430313342 + :electricity: 0.18815212544560306 + :network_gas: 0.1533141873105406 + :ambient_heat: 0.6585336872438564 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14873.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 163.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17230397320980406 - :network_gas: 0.31078410716078186 - :ambient_heat: 0.5169119196294141 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0861_veldhoven/GM0861_veldhoven.derived.ad b/datasets/GM0861_veldhoven/GM0861_veldhoven.derived.ad index b52b3691bd..5d67e624eb 100644 --- a/datasets/GM0861_veldhoven/GM0861_veldhoven.derived.ad +++ b/datasets/GM0861_veldhoven/GM0861_veldhoven.derived.ad @@ -1,6 +1,6 @@ - area = GM0861_veldhoven -- id = 129133 -- parent_id = 129133 +- id = 129479 +- parent_id = 129479 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0861_veldhoven/graph_values.yml b/datasets/GM0861_veldhoven/graph_values.yml index 99a8ec1201..f3485a247d 100644 --- a/datasets/GM0861_veldhoven/graph_values.yml +++ b/datasets/GM0861_veldhoven/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4424.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15896890374831474 - :network_gas: 0.12567102938426897 - :ambient_heat: 0.7153600668674163 + :electricity: 0.18901644079848212 + :network_gas: 0.14942476248879463 + :ambient_heat: 0.6615587967127233 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20078.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 49.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17391606139277016 - :network_gas: 0.30433575442891747 - :ambient_heat: 0.5217481841783124 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0865_vught/GM0865_vught.derived.ad b/datasets/GM0865_vught/GM0865_vught.derived.ad index 26a7b72832..cb358b0cdb 100644 --- a/datasets/GM0865_vught/GM0865_vught.derived.ad +++ b/datasets/GM0865_vught/GM0865_vught.derived.ad @@ -1,6 +1,6 @@ - area = GM0865_vught -- id = 129143 -- parent_id = 129143 +- id = 129489 +- parent_id = 129489 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0865_vught/graph_values.yml b/datasets/GM0865_vught/graph_values.yml index a2fe0ba89b..0d2d401abc 100644 --- a/datasets/GM0865_vught/graph_values.yml +++ b/datasets/GM0865_vught/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3782.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15704235250098317 - :network_gas: 0.13626706124459254 - :ambient_heat: 0.7066905862544244 + :electricity: 0.18629899008536058 + :network_gas: 0.16165330872516465 + :ambient_heat: 0.6520477011894747 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13714.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 537.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16889833532664134 - :network_gas: 0.3244066586934329 - :ambient_heat: 0.5066950059799258 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0866_waalre/GM0866_waalre.derived.ad b/datasets/GM0866_waalre/GM0866_waalre.derived.ad index 5ece39b55a..8cc85f362b 100644 --- a/datasets/GM0866_waalre/GM0866_waalre.derived.ad +++ b/datasets/GM0866_waalre/GM0866_waalre.derived.ad @@ -1,6 +1,6 @@ - area = GM0866_waalre -- id = 129144 -- parent_id = 129144 +- id = 129490 +- parent_id = 129490 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0866_waalre/graph_values.yml b/datasets/GM0866_waalre/graph_values.yml index 2ebffcc4e8..e1b8f4d427 100644 --- a/datasets/GM0866_waalre/graph_values.yml +++ b/datasets/GM0866_waalre/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1767.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15706548652889976 - :network_gas: 0.13613982409105144 - :ambient_heat: 0.7067946893800489 + :electricity: 0.1863315475509772 + :network_gas: 0.1615067999139067 + :ambient_heat: 0.6521616525351162 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7789.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 145.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1689575796905512 - :network_gas: 0.3241696812377933 - :ambient_heat: 0.5068727390716554 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0867_waalwijk/GM0867_waalwijk.derived.ad b/datasets/GM0867_waalwijk/GM0867_waalwijk.derived.ad index 85723f0b27..73e513021a 100644 --- a/datasets/GM0867_waalwijk/GM0867_waalwijk.derived.ad +++ b/datasets/GM0867_waalwijk/GM0867_waalwijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0867_waalwijk -- id = 129145 -- parent_id = 129145 +- id = 129491 +- parent_id = 129491 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0867_waalwijk/graph_values.yml b/datasets/GM0867_waalwijk/graph_values.yml index 21cf551bf9..53f8f8a0f3 100644 --- a/datasets/GM0867_waalwijk/graph_values.yml +++ b/datasets/GM0867_waalwijk/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 5142.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15824104952966717 - :network_gas: 0.12967422758683042 - :ambient_heat: 0.7120847228835022 + :electricity: 0.1879883214775672 + :network_gas: 0.1540513062533627 + :ambient_heat: 0.6579603722690701 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 21972.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 371.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17200016544526864 - :network_gas: 0.3119993382189236 - :ambient_heat: 0.5160004963358078 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0873_woensdrecht/GM0873_woensdrecht.derived.ad b/datasets/GM0873_woensdrecht/GM0873_woensdrecht.derived.ad index 78309fec4a..7def67b406 100644 --- a/datasets/GM0873_woensdrecht/GM0873_woensdrecht.derived.ad +++ b/datasets/GM0873_woensdrecht/GM0873_woensdrecht.derived.ad @@ -1,6 +1,6 @@ - area = GM0873_woensdrecht -- id = 129161 -- parent_id = 129161 +- id = 129507 +- parent_id = 129507 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0873_woensdrecht/graph_values.yml b/datasets/GM0873_woensdrecht/graph_values.yml index f04552c6bd..2f5bae1ef5 100644 --- a/datasets/GM0873_woensdrecht/graph_values.yml +++ b/datasets/GM0873_woensdrecht/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3236.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15855362115146715 - :network_gas: 0.12795508366693079 - :ambient_heat: 0.7134912951816021 + :electricity: 0.18842962182857867 + :network_gas: 0.15206545174626437 + :ambient_heat: 0.659504926425157 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9912.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 62.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17281988841430554 - :network_gas: 0.308720446342776 - :ambient_heat: 0.5184596652429184 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0879_zundert/GM0879_zundert.derived.ad b/datasets/GM0879_zundert/GM0879_zundert.derived.ad index 0ab99443b4..6a2e878de6 100644 --- a/datasets/GM0879_zundert/GM0879_zundert.derived.ad +++ b/datasets/GM0879_zundert/GM0879_zundert.derived.ad @@ -1,6 +1,6 @@ - area = GM0879_zundert -- id = 129174 -- parent_id = 129174 +- id = 129520 +- parent_id = 129520 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0879_zundert/graph_values.yml b/datasets/GM0879_zundert/graph_values.yml index a4f8a1f16e..888e8bf010 100644 --- a/datasets/GM0879_zundert/graph_values.yml +++ b/datasets/GM0879_zundert/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1394.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15761353397578617 - :network_gas: 0.13312556313317592 - :ambient_heat: 0.7092609028910378 + :electricity: 0.18710336015430282 + :network_gas: 0.15803363807880605 + :ambient_heat: 0.6548630017668912 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9626.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 70.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17036816811173816 - :network_gas: 0.3185273275530454 - :ambient_heat: 0.5111045043352164 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0880_wormerland/GM0880_wormerland.derived.ad b/datasets/GM0880_wormerland/GM0880_wormerland.derived.ad index b3844cda3c..5cd8a6bd2f 100644 --- a/datasets/GM0880_wormerland/GM0880_wormerland.derived.ad +++ b/datasets/GM0880_wormerland/GM0880_wormerland.derived.ad @@ -1,6 +1,6 @@ - area = GM0880_wormerland -- id = 129163 -- parent_id = 129163 +- id = 129509 +- parent_id = 129509 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0880_wormerland/graph_values.yml b/datasets/GM0880_wormerland/graph_values.yml index 9512a18964..f16fee0c86 100644 --- a/datasets/GM0880_wormerland/graph_values.yml +++ b/datasets/GM0880_wormerland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 976.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1574674290205407 - :network_gas: 0.13392914038702602 - :ambient_heat: 0.7086034305924332 + :electricity: 0.1868975030837415 + :network_gas: 0.1589599962619692 + :ambient_heat: 0.6541425006542892 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6911.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 130.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16999078294770764 - :network_gas: 0.3200368682091676 - :ambient_heat: 0.5099723488431248 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0882_landgraaf/GM0882_landgraaf.derived.ad b/datasets/GM0882_landgraaf/GM0882_landgraaf.derived.ad index 789be2fcb0..d4f439e04c 100644 --- a/datasets/GM0882_landgraaf/GM0882_landgraaf.derived.ad +++ b/datasets/GM0882_landgraaf/GM0882_landgraaf.derived.ad @@ -1,6 +1,6 @@ - area = GM0882_landgraaf -- id = 129003 -- parent_id = 129003 +- id = 129349 +- parent_id = 129349 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0882_landgraaf/graph_values.yml b/datasets/GM0882_landgraaf/graph_values.yml index 979c7faf2b..e31561f776 100644 --- a/datasets/GM0882_landgraaf/graph_values.yml +++ b/datasets/GM0882_landgraaf/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3100.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15741930346053148 - :network_gas: 0.13419383096707674 - :ambient_heat: 0.7083868655723917 + :electricity: 0.1868297113852374 + :network_gas: 0.15926505935496174 + :ambient_heat: 0.6539052292598009 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18136.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 892.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16986668889683634 - :network_gas: 0.32053324441265285 - :ambient_heat: 0.5096000666905108 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0888_beek/GM0888_beek.derived.ad b/datasets/GM0888_beek/GM0888_beek.derived.ad index 5f52ab26fe..f21867f4e5 100644 --- a/datasets/GM0888_beek/GM0888_beek.derived.ad +++ b/datasets/GM0888_beek/GM0888_beek.derived.ad @@ -1,6 +1,6 @@ - area = GM0888_beek -- id = 128878 -- parent_id = 128878 +- id = 129224 +- parent_id = 129224 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0888_beek/graph_values.yml b/datasets/GM0888_beek/graph_values.yml index d0804bec65..ab2df3eea8 100644 --- a/datasets/GM0888_beek/graph_values.yml +++ b/datasets/GM0888_beek/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2372.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15778728404040732 - :network_gas: 0.13216993777775976 - :ambient_heat: 0.7100427781818329 + :electricity: 0.18734826124593634 + :network_gas: 0.15693158154180348 + :ambient_heat: 0.6557201572122602 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7484.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 281.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1708182302009983 - :network_gas: 0.31672707919600496 - :ambient_heat: 0.5124546906029968 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0889_beesel/GM0889_beesel.derived.ad b/datasets/GM0889_beesel/GM0889_beesel.derived.ad index 602bf7fbcb..8814a42f0b 100644 --- a/datasets/GM0889_beesel/GM0889_beesel.derived.ad +++ b/datasets/GM0889_beesel/GM0889_beesel.derived.ad @@ -1,6 +1,6 @@ - area = GM0889_beesel -- id = 128879 -- parent_id = 128879 +- id = 129225 +- parent_id = 129225 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0889_beesel/graph_values.yml b/datasets/GM0889_beesel/graph_values.yml index e6467f41f5..6c47e44e88 100644 --- a/datasets/GM0889_beesel/graph_values.yml +++ b/datasets/GM0889_beesel/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1025.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15905079675136194 - :network_gas: 0.12522061786750932 - :ambient_heat: 0.7157285853811287 + :electricity: 0.18913222888862463 + :network_gas: 0.14890371531502544 + :ambient_heat: 0.6619640557963498 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6031.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 51.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17413318662758864 - :network_gas: 0.30346725348964354 - :ambient_heat: 0.5223995598827678 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0893_bergen/GM0893_bergen.derived.ad b/datasets/GM0893_bergen/GM0893_bergen.derived.ad index 82a07cb5b8..ae9b4422d9 100644 --- a/datasets/GM0893_bergen/GM0893_bergen.derived.ad +++ b/datasets/GM0893_bergen/GM0893_bergen.derived.ad @@ -1,6 +1,6 @@ - area = GM0893_bergen -- id = 128882 -- parent_id = 128882 +- id = 129228 +- parent_id = 129228 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0893_bergen/graph_values.yml b/datasets/GM0893_bergen/graph_values.yml index 7e98cd9a61..edcf7ec9bb 100644 --- a/datasets/GM0893_bergen/graph_values.yml +++ b/datasets/GM0893_bergen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 715.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15907265720595437 - :network_gas: 0.1251003853672511 - :ambient_heat: 0.7158269574267946 + :electricity: 0.189163141084866 + :network_gas: 0.14876461022687076 + :ambient_heat: 0.6620722486882633 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5772.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 24.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1741911996984823 - :network_gas: 0.30323520120606895 - :ambient_heat: 0.5225735990954488 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0899_brunssum/GM0899_brunssum.derived.ad b/datasets/GM0899_brunssum/GM0899_brunssum.derived.ad index 0dca1fafa8..7b102fdc56 100644 --- a/datasets/GM0899_brunssum/GM0899_brunssum.derived.ad +++ b/datasets/GM0899_brunssum/GM0899_brunssum.derived.ad @@ -1,6 +1,6 @@ - area = GM0899_brunssum -- id = 128902 -- parent_id = 128902 +- id = 129248 +- parent_id = 129248 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0899_brunssum/graph_values.yml b/datasets/GM0899_brunssum/graph_values.yml index e066aaba04..0ca37a403f 100644 --- a/datasets/GM0899_brunssum/graph_values.yml +++ b/datasets/GM0899_brunssum/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3086.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15832560933996784 - :network_gas: 0.12920914863017685 - :ambient_heat: 0.7124652420298553 + :electricity: 0.18810767385112878 + :network_gas: 0.15351421978056268 + :ambient_heat: 0.6583781063683085 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14436.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1202.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1722214749872402 - :network_gas: 0.31111410005103735 - :ambient_heat: 0.5166644249617224 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0907_gennep/GM0907_gennep.derived.ad b/datasets/GM0907_gennep/GM0907_gennep.derived.ad index 97453aee08..38bed9e8ac 100644 --- a/datasets/GM0907_gennep/GM0907_gennep.derived.ad +++ b/datasets/GM0907_gennep/GM0907_gennep.derived.ad @@ -1,6 +1,6 @@ - area = GM0907_gennep -- id = 128950 -- parent_id = 128950 +- id = 129296 +- parent_id = 129296 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0907_gennep/graph_values.yml b/datasets/GM0907_gennep/graph_values.yml index a03a2bface..cc3be8bc1f 100644 --- a/datasets/GM0907_gennep/graph_values.yml +++ b/datasets/GM0907_gennep/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1945.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15803030207234425 - :network_gas: 0.13083333860210652 - :ambient_heat: 0.7111363593255492 + :electricity: 0.1876909652376238 + :network_gas: 0.15538941130574252 + :ambient_heat: 0.6569196234566337 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7484.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 139.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17145004273484893 - :network_gas: 0.3141998290606025 - :ambient_heat: 0.5143501282045486 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0917_heerlen/GM0917_heerlen.derived.ad b/datasets/GM0917_heerlen/GM0917_heerlen.derived.ad index 43ef237c6b..a8f05681be 100644 --- a/datasets/GM0917_heerlen/GM0917_heerlen.derived.ad +++ b/datasets/GM0917_heerlen/GM0917_heerlen.derived.ad @@ -1,6 +1,6 @@ - area = GM0917_heerlen -- id = 128973 -- parent_id = 128973 +- id = 129319 +- parent_id = 129319 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0917_heerlen/graph_values.yml b/datasets/GM0917_heerlen/graph_values.yml index 7bc07412f2..078e7a4cb2 100644 --- a/datasets/GM0917_heerlen/graph_values.yml +++ b/datasets/GM0917_heerlen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 16292.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15689401553124108 - :network_gas: 0.13708291457817423 - :ambient_heat: 0.7060230698905847 + :electricity: 0.1860902718458124 + :network_gas: 0.16259254218774938 + :ambient_heat: 0.6513171859664382 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 45956.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 3851.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16851902834132773 - :network_gas: 0.32592388663468713 - :ambient_heat: 0.505557085023985 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0928_kerkrade/GM0928_kerkrade.derived.ad b/datasets/GM0928_kerkrade/GM0928_kerkrade.derived.ad index 914c67c6dc..b3f8b77f74 100644 --- a/datasets/GM0928_kerkrade/GM0928_kerkrade.derived.ad +++ b/datasets/GM0928_kerkrade/GM0928_kerkrade.derived.ad @@ -1,6 +1,6 @@ - area = GM0928_kerkrade -- id = 128998 -- parent_id = 128998 +- id = 129344 +- parent_id = 129344 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0928_kerkrade/graph_values.yml b/datasets/GM0928_kerkrade/graph_values.yml index b70df0c573..a184afae09 100644 --- a/datasets/GM0928_kerkrade/graph_values.yml +++ b/datasets/GM0928_kerkrade/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 5001.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15607107683018465 - :network_gas: 0.14160907743398457 - :ambient_heat: 0.7023198457358308 + :electricity: 0.18493368466478105 + :network_gas: 0.16779719217508574 + :ambient_heat: 0.6472691231601332 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 23908.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2171.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16643253905194763 - :network_gas: 0.33426984379220775 - :ambient_heat: 0.4992976171558447 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0935_maastricht/GM0935_maastricht.derived.ad b/datasets/GM0935_maastricht/GM0935_maastricht.derived.ad index aa8fdae074..1fa468c6f2 100644 --- a/datasets/GM0935_maastricht/GM0935_maastricht.derived.ad +++ b/datasets/GM0935_maastricht/GM0935_maastricht.derived.ad @@ -1,6 +1,6 @@ - area = GM0935_maastricht -- id = 129023 -- parent_id = 129023 +- id = 129369 +- parent_id = 129369 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0935_maastricht/graph_values.yml b/datasets/GM0935_maastricht/graph_values.yml index 4c02e4a28c..630a6d1b37 100644 --- a/datasets/GM0935_maastricht/graph_values.yml +++ b/datasets/GM0935_maastricht/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 23072.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15520766841349046 - :network_gas: 0.14635782372580253 - :ambient_heat: 0.6984345078607069 + :electricity: 0.18372264217288928 + :network_gas: 0.17324689142254548 + :ambient_heat: 0.6430304664045653 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 62599.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 5445.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1642753823492168 - :network_gas: 0.34289847060313106 - :ambient_heat: 0.4928261470476521 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0938_meerssen/GM0938_meerssen.derived.ad b/datasets/GM0938_meerssen/GM0938_meerssen.derived.ad index dc342d8f51..d31a9b747f 100644 --- a/datasets/GM0938_meerssen/GM0938_meerssen.derived.ad +++ b/datasets/GM0938_meerssen/GM0938_meerssen.derived.ad @@ -1,6 +1,6 @@ - area = GM0938_meerssen -- id = 129025 -- parent_id = 129025 +- id = 129371 +- parent_id = 129371 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0938_meerssen/graph_values.yml b/datasets/GM0938_meerssen/graph_values.yml index 2de528bc36..d1f113559d 100644 --- a/datasets/GM0938_meerssen/graph_values.yml +++ b/datasets/GM0938_meerssen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1146.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15749833919006112 - :network_gas: 0.1337591344546638 - :ambient_heat: 0.708742526355275 + :electricity: 0.18694104853998011 + :network_gas: 0.1587640414200188 + :ambient_heat: 0.6542949100400011 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8632.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 385.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17007054189887436 - :network_gas: 0.3197178324045007 - :ambient_heat: 0.5102116256966249 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0944_mook_en_middelaar/GM0944_mook_en_middelaar.derived.ad b/datasets/GM0944_mook_en_middelaar/GM0944_mook_en_middelaar.derived.ad index 6cbafba7fa..fd2a3b520b 100644 --- a/datasets/GM0944_mook_en_middelaar/GM0944_mook_en_middelaar.derived.ad +++ b/datasets/GM0944_mook_en_middelaar/GM0944_mook_en_middelaar.derived.ad @@ -1,6 +1,6 @@ - area = GM0944_mook_en_middelaar -- id = 129033 -- parent_id = 129033 +- id = 129379 +- parent_id = 129379 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0944_mook_en_middelaar/graph_values.yml b/datasets/GM0944_mook_en_middelaar/graph_values.yml index 3a551733f6..455659baeb 100644 --- a/datasets/GM0944_mook_en_middelaar/graph_values.yml +++ b/datasets/GM0944_mook_en_middelaar/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 633.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15751033365094452 - :network_gas: 0.1336931649198052 - :ambient_heat: 0.7087965014292503 + :electricity: 0.18695794689020812 + :network_gas: 0.1586879987318908 + :ambient_heat: 0.6543540543779011 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 3661.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 8.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17010150348802064 - :network_gas: 0.3195939860479156 - :ambient_heat: 0.5103045104640638 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0946_nederweert/GM0946_nederweert.derived.ad b/datasets/GM0946_nederweert/GM0946_nederweert.derived.ad index 823c78f5ab..b34498470e 100644 --- a/datasets/GM0946_nederweert/GM0946_nederweert.derived.ad +++ b/datasets/GM0946_nederweert/GM0946_nederweert.derived.ad @@ -1,6 +1,6 @@ - area = GM0946_nederweert -- id = 129035 -- parent_id = 129035 +- id = 129381 +- parent_id = 129381 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0946_nederweert/graph_values.yml b/datasets/GM0946_nederweert/graph_values.yml index bfdb7e4c8c..7b0c4b717e 100644 --- a/datasets/GM0946_nederweert/graph_values.yml +++ b/datasets/GM0946_nederweert/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1204.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16018657971303807 - :network_gas: 0.11897381157829057 - :ambient_heat: 0.7208396087086714 + :electricity: 0.19074043489973774 + :network_gas: 0.1416667775963228 + :ambient_heat: 0.6675927875039395 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7513.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 31.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17717767422498276 - :network_gas: 0.29128930310006707 - :ambient_heat: 0.5315330226749502 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0957_roermond/GM0957_roermond.derived.ad b/datasets/GM0957_roermond/GM0957_roermond.derived.ad index 651c028542..a9b0e6f65a 100644 --- a/datasets/GM0957_roermond/GM0957_roermond.derived.ad +++ b/datasets/GM0957_roermond/GM0957_roermond.derived.ad @@ -1,6 +1,6 @@ - area = GM0957_roermond -- id = 129083 -- parent_id = 129083 +- id = 129429 +- parent_id = 129429 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0957_roermond/graph_values.yml b/datasets/GM0957_roermond/graph_values.yml index d249082f32..002f16a437 100644 --- a/datasets/GM0957_roermond/graph_values.yml +++ b/datasets/GM0957_roermond/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 12116.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15802879714550644 - :network_gas: 0.13084161569971456 - :ambient_heat: 0.7111295871547789 + :electricity: 0.18768884238127995 + :network_gas: 0.15539896417337265 + :ambient_heat: 0.6569121934453475 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 27685.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1646.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17144612175745153 - :network_gas: 0.314215512970192 - :ambient_heat: 0.5143383652723564 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0965_simpelveld/GM0965_simpelveld.derived.ad b/datasets/GM0965_simpelveld/GM0965_simpelveld.derived.ad index 5146588570..3cbbcf3be9 100644 --- a/datasets/GM0965_simpelveld/GM0965_simpelveld.derived.ad +++ b/datasets/GM0965_simpelveld/GM0965_simpelveld.derived.ad @@ -1,6 +1,6 @@ - area = GM0965_simpelveld -- id = 129094 -- parent_id = 129094 +- id = 129440 +- parent_id = 129440 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0965_simpelveld/graph_values.yml b/datasets/GM0965_simpelveld/graph_values.yml index 6a9500ebc1..90ea31ad4f 100644 --- a/datasets/GM0965_simpelveld/graph_values.yml +++ b/datasets/GM0965_simpelveld/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 790.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15549166217650004 - :network_gas: 0.14479585802924985 - :ambient_heat: 0.6997124797942501 + :electricity: 0.184120707029933 + :network_gas: 0.17145559692512236 + :ambient_heat: 0.6444236960449446 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5176.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 348.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16498135220903454 - :network_gas: 0.34007459116386013 - :ambient_heat: 0.49494405662710533 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0971_stein/GM0971_stein.derived.ad b/datasets/GM0971_stein/GM0971_stein.derived.ad index 7d8ed98d24..dee2eaf22a 100644 --- a/datasets/GM0971_stein/GM0971_stein.derived.ad +++ b/datasets/GM0971_stein/GM0971_stein.derived.ad @@ -1,6 +1,6 @@ - area = GM0971_stein -- id = 129108 -- parent_id = 129108 +- id = 129454 +- parent_id = 129454 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0971_stein/graph_values.yml b/datasets/GM0971_stein/graph_values.yml index 5db0d2ecbb..276da8a99e 100644 --- a/datasets/GM0971_stein/graph_values.yml +++ b/datasets/GM0971_stein/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1843.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1596310290598478 - :network_gas: 0.12202934017083701 - :ambient_heat: 0.7183396307693151 + :electricity: 0.18995326270193288 + :network_gas: 0.14520905770847403 + :ambient_heat: 0.6648376795895931 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11803.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 251.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17568073677187188 - :network_gas: 0.29727705291251055 - :ambient_heat: 0.5270422103156175 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0981_vaals/GM0981_vaals.derived.ad b/datasets/GM0981_vaals/GM0981_vaals.derived.ad index a459993cc8..898d84e143 100644 --- a/datasets/GM0981_vaals/GM0981_vaals.derived.ad +++ b/datasets/GM0981_vaals/GM0981_vaals.derived.ad @@ -1,6 +1,6 @@ - area = GM0981_vaals -- id = 129127 -- parent_id = 129127 +- id = 129473 +- parent_id = 129473 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0981_vaals/graph_values.yml b/datasets/GM0981_vaals/graph_values.yml index 693096139e..b11c2a881b 100644 --- a/datasets/GM0981_vaals/graph_values.yml +++ b/datasets/GM0981_vaals/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1128.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15206143223046245 - :network_gas: 0.16366212273245642 - :ambient_heat: 0.6842764450370811 + :electricity: 0.17933050471885326 + :network_gas: 0.19301153910275162 + :ambient_heat: 0.6276579561783951 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5816.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 184.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1566802373337816 - :network_gas: 0.3732790506648718 - :ambient_heat: 0.4700407120013465 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0983_venlo/GM0983_venlo.derived.ad b/datasets/GM0983_venlo/GM0983_venlo.derived.ad index 72f2b31aba..9f2086befa 100644 --- a/datasets/GM0983_venlo/GM0983_venlo.derived.ad +++ b/datasets/GM0983_venlo/GM0983_venlo.derived.ad @@ -1,6 +1,6 @@ - area = GM0983_venlo -- id = 129135 -- parent_id = 129135 +- id = 129481 +- parent_id = 129481 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0983_venlo/graph_values.yml b/datasets/GM0983_venlo/graph_values.yml index 9b5f035e7b..8cbc056c45 100644 --- a/datasets/GM0983_venlo/graph_values.yml +++ b/datasets/GM0983_venlo/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 12644.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15773742362906795 - :network_gas: 0.1324441700401263 - :ambient_heat: 0.7098184063308057 + :electricity: 0.1872779725511167 + :network_gas: 0.15724788113478058 + :ambient_heat: 0.6554741463141026 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 47741.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2292.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17068893601525276 - :network_gas: 0.3172442559389872 - :ambient_heat: 0.5120668080457601 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0984_venray/GM0984_venray.derived.ad b/datasets/GM0984_venray/GM0984_venray.derived.ad index 11a9977dd9..27158e05ce 100644 --- a/datasets/GM0984_venray/GM0984_venray.derived.ad +++ b/datasets/GM0984_venray/GM0984_venray.derived.ad @@ -1,6 +1,6 @@ - area = GM0984_venray -- id = 129136 -- parent_id = 129136 +- id = 129482 +- parent_id = 129482 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0984_venray/graph_values.yml b/datasets/GM0984_venray/graph_values.yml index 96d86dbc6b..cdec114b3e 100644 --- a/datasets/GM0984_venray/graph_values.yml +++ b/datasets/GM0984_venray/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4681.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15895029771814143 - :network_gas: 0.125773362550222 - :ambient_heat: 0.7152763397316364 + :electricity: 0.18899013697286135 + :network_gas: 0.1495431298785852 + :ambient_heat: 0.6614667331485534 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19163.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 107.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1738667750288741 - :network_gas: 0.3045328998845017 - :ambient_heat: 0.5216003250866242 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0986_voerendaal/GM0986_voerendaal.derived.ad b/datasets/GM0986_voerendaal/GM0986_voerendaal.derived.ad index 5823d22974..3681377669 100644 --- a/datasets/GM0986_voerendaal/GM0986_voerendaal.derived.ad +++ b/datasets/GM0986_voerendaal/GM0986_voerendaal.derived.ad @@ -1,6 +1,6 @@ - area = GM0986_voerendaal -- id = 129140 -- parent_id = 129140 +- id = 129486 +- parent_id = 129486 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0986_voerendaal/graph_values.yml b/datasets/GM0986_voerendaal/graph_values.yml index 669b3638df..cc599a24b8 100644 --- a/datasets/GM0986_voerendaal/graph_values.yml +++ b/datasets/GM0986_voerendaal/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 649.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15719354419986123 - :network_gas: 0.13543550690076328 - :ambient_heat: 0.7073709488993755 + :electricity: 0.1865118006893575 + :network_gas: 0.16069565959541207 + :ambient_heat: 0.6527925397152303 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5803.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 200.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16928596146568253 - :network_gas: 0.3228561541372679 - :ambient_heat: 0.5078578843970495 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0988_weert/GM0988_weert.derived.ad b/datasets/GM0988_weert/GM0988_weert.derived.ad index 8fe2a78bb5..6204da53ac 100644 --- a/datasets/GM0988_weert/GM0988_weert.derived.ad +++ b/datasets/GM0988_weert/GM0988_weert.derived.ad @@ -1,6 +1,6 @@ - area = GM0988_weert -- id = 129150 -- parent_id = 129150 +- id = 129496 +- parent_id = 129496 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0988_weert/graph_values.yml b/datasets/GM0988_weert/graph_values.yml index ae785cbad6..f336783bda 100644 --- a/datasets/GM0988_weert/graph_values.yml +++ b/datasets/GM0988_weert/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 9149.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1582695945463456 - :network_gas: 0.12951722999509935 - :ambient_heat: 0.7122131754585551 + :electricity: 0.18802860880511604 + :network_gas: 0.15387001301213027 + :ambient_heat: 0.6581013781827536 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6030.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 12.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1720748361377713 - :network_gas: 0.31170065544891284 - :ambient_heat: 0.5162245084133158 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0994_valkenburg_aan_de_geul/GM0994_valkenburg_aan_de_geul.derived.ad b/datasets/GM0994_valkenburg_aan_de_geul/GM0994_valkenburg_aan_de_geul.derived.ad index 4eca547386..70d196400a 100644 --- a/datasets/GM0994_valkenburg_aan_de_geul/GM0994_valkenburg_aan_de_geul.derived.ad +++ b/datasets/GM0994_valkenburg_aan_de_geul/GM0994_valkenburg_aan_de_geul.derived.ad @@ -1,6 +1,6 @@ - area = GM0994_valkenburg_aan_de_geul -- id = 129128 -- parent_id = 129128 +- id = 129474 +- parent_id = 129474 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0994_valkenburg_aan_de_geul/graph_values.yml b/datasets/GM0994_valkenburg_aan_de_geul/graph_values.yml index 3351aa9818..28a4f699ba 100644 --- a/datasets/GM0994_valkenburg_aan_de_geul/graph_values.yml +++ b/datasets/GM0994_valkenburg_aan_de_geul/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3012.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15495657615194322 - :network_gas: 0.14773883116431225 - :ambient_heat: 0.6973045926837446 + :electricity: 0.18337091713807246 + :network_gas: 0.17482965641253326 + :ambient_heat: 0.6417994264493944 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8304.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 374.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1636540846137019 - :network_gas: 0.3453836615451907 - :ambient_heat: 0.4909622538411074 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM0995_lelystad/GM0995_lelystad.derived.ad b/datasets/GM0995_lelystad/GM0995_lelystad.derived.ad index 53e6679bdc..c3a5a9665f 100644 --- a/datasets/GM0995_lelystad/GM0995_lelystad.derived.ad +++ b/datasets/GM0995_lelystad/GM0995_lelystad.derived.ad @@ -1,6 +1,6 @@ - area = GM0995_lelystad -- id = 129011 -- parent_id = 129011 +- id = 129357 +- parent_id = 129357 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0995_lelystad/graph_values.yml b/datasets/GM0995_lelystad/graph_values.yml index ff80b2fbb1..c5efe3f737 100644 --- a/datasets/GM0995_lelystad/graph_values.yml +++ b/datasets/GM0995_lelystad/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 6714.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16107782052692612 - :network_gas: 0.11407198710190637 - :ambient_heat: 0.7248501923711675 + :electricity: 0.19200543184559873 + :network_gas: 0.13597428294807257 + :ambient_heat: 0.6720202852063287 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 33718.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 0.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17961080210613103 - :network_gas: 0.28155679157547403 - :ambient_heat: 0.538832406318395 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1507_horst_aan_de_maas/GM1507_horst_aan_de_maas.derived.ad b/datasets/GM1507_horst_aan_de_maas/GM1507_horst_aan_de_maas.derived.ad index 518d6bf0e6..3ff6fcf45f 100644 --- a/datasets/GM1507_horst_aan_de_maas/GM1507_horst_aan_de_maas.derived.ad +++ b/datasets/GM1507_horst_aan_de_maas/GM1507_horst_aan_de_maas.derived.ad @@ -1,6 +1,6 @@ - area = GM1507_horst_aan_de_maas -- id = 128989 -- parent_id = 128989 +- id = 129335 +- parent_id = 129335 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1507_horst_aan_de_maas/graph_values.yml b/datasets/GM1507_horst_aan_de_maas/graph_values.yml index 67a9983290..0343880ddc 100644 --- a/datasets/GM1507_horst_aan_de_maas/graph_values.yml +++ b/datasets/GM1507_horst_aan_de_maas/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4991.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15859695642675906 - :network_gas: 0.12771673965282512 - :ambient_heat: 0.7136863039204157 + :electricity: 0.18849083007669698 + :network_gas: 0.15179001422368188 + :ambient_heat: 0.6597191556996211 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 17884.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 118.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1729338962459677 - :network_gas: 0.3082644150161274 - :ambient_heat: 0.5188016887379049 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1509_oude_ijsselstreek/GM1509_oude_ijsselstreek.derived.ad b/datasets/GM1509_oude_ijsselstreek/GM1509_oude_ijsselstreek.derived.ad index 9cb90b46de..5a9d7c8550 100644 --- a/datasets/GM1509_oude_ijsselstreek/GM1509_oude_ijsselstreek.derived.ad +++ b/datasets/GM1509_oude_ijsselstreek/GM1509_oude_ijsselstreek.derived.ad @@ -1,6 +1,6 @@ - area = GM1509_oude_ijsselstreek -- id = 129062 -- parent_id = 129062 +- id = 129408 +- parent_id = 129408 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1509_oude_ijsselstreek/graph_values.yml b/datasets/GM1509_oude_ijsselstreek/graph_values.yml index 2853ca7fe8..a4711b8a98 100644 --- a/datasets/GM1509_oude_ijsselstreek/graph_values.yml +++ b/datasets/GM1509_oude_ijsselstreek/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2833.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15853987558232643 - :network_gas: 0.1280306842972046 - :ambient_heat: 0.7134294401204689 + :electricity: 0.1884102084262539 + :network_gas: 0.1521528121855125 + :ambient_heat: 0.6594369793882335 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 17403.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 162.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1727837445199936 - :network_gas: 0.3088650219200239 - :ambient_heat: 0.5183512335599826 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1525_teylingen/GM1525_teylingen.derived.ad b/datasets/GM1525_teylingen/GM1525_teylingen.derived.ad index dcf9aa9c6e..0d62a71c86 100644 --- a/datasets/GM1525_teylingen/GM1525_teylingen.derived.ad +++ b/datasets/GM1525_teylingen/GM1525_teylingen.derived.ad @@ -1,6 +1,6 @@ - area = GM1525_teylingen -- id = 129114 -- parent_id = 129114 +- id = 129460 +- parent_id = 129460 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1525_teylingen/graph_values.yml b/datasets/GM1525_teylingen/graph_values.yml index 1ca5eb6246..220d7907c3 100644 --- a/datasets/GM1525_teylingen/graph_values.yml +++ b/datasets/GM1525_teylingen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4502.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15926207998918723 - :network_gas: 0.12405856005947029 - :ambient_heat: 0.7166793599513425 + :electricity: 0.18943106532827858 + :network_gas: 0.1475589493541288 + :ambient_heat: 0.6630099853175927 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16273.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 577.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1746948404650197 - :network_gas: 0.3012206381399193 - :ambient_heat: 0.524084521395061 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1581_utrechtse_heuvelrug/GM1581_utrechtse_heuvelrug.derived.ad b/datasets/GM1581_utrechtse_heuvelrug/GM1581_utrechtse_heuvelrug.derived.ad index 7d2244018c..a187385de7 100644 --- a/datasets/GM1581_utrechtse_heuvelrug/GM1581_utrechtse_heuvelrug.derived.ad +++ b/datasets/GM1581_utrechtse_heuvelrug/GM1581_utrechtse_heuvelrug.derived.ad @@ -1,6 +1,6 @@ - area = GM1581_utrechtse_heuvelrug -- id = 129126 -- parent_id = 129126 +- id = 129472 +- parent_id = 129472 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1581_utrechtse_heuvelrug/graph_values.yml b/datasets/GM1581_utrechtse_heuvelrug/graph_values.yml index 444be8636e..d71a37935d 100644 --- a/datasets/GM1581_utrechtse_heuvelrug/graph_values.yml +++ b/datasets/GM1581_utrechtse_heuvelrug/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 5764.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1555571803805354 - :network_gas: 0.14443550790705525 - :ambient_heat: 0.7000073117124094 + :electricity: 0.1842125797837161 + :network_gas: 0.17104216892362265 + :ambient_heat: 0.6447452512926612 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 21833.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 148.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16514471556585433 - :network_gas: 0.33942113773658084 - :ambient_heat: 0.4954341466975648 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1586_oost_gelre/GM1586_oost_gelre.derived.ad b/datasets/GM1586_oost_gelre/GM1586_oost_gelre.derived.ad index a7950cd73e..9ec309f82f 100644 --- a/datasets/GM1586_oost_gelre/GM1586_oost_gelre.derived.ad +++ b/datasets/GM1586_oost_gelre/GM1586_oost_gelre.derived.ad @@ -1,6 +1,6 @@ - area = GM1586_oost_gelre -- id = 129055 -- parent_id = 129055 +- id = 129401 +- parent_id = 129401 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1586_oost_gelre/graph_values.yml b/datasets/GM1586_oost_gelre/graph_values.yml index cf4e5d4633..1400a74828 100644 --- a/datasets/GM1586_oost_gelre/graph_values.yml +++ b/datasets/GM1586_oost_gelre/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2984.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15846460464646278 - :network_gas: 0.12844467444445468 - :ambient_heat: 0.7130907209090824 + :electricity: 0.18830391159875534 + :network_gas: 0.15263114861441957 + :ambient_heat: 0.659064939786825 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12912.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 161.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17258597688902722 - :network_gas: 0.3096560924438893 - :ambient_heat: 0.5177579306670834 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1598_koggenland/GM1598_koggenland.derived.ad b/datasets/GM1598_koggenland/GM1598_koggenland.derived.ad index 7abf2792a2..93e8415f5b 100644 --- a/datasets/GM1598_koggenland/GM1598_koggenland.derived.ad +++ b/datasets/GM1598_koggenland/GM1598_koggenland.derived.ad @@ -1,6 +1,6 @@ - area = GM1598_koggenland -- id = 128999 -- parent_id = 128999 +- id = 129345 +- parent_id = 129345 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1598_koggenland/graph_values.yml b/datasets/GM1598_koggenland/graph_values.yml index a4cfea2a61..d865d8ad3c 100644 --- a/datasets/GM1598_koggenland/graph_values.yml +++ b/datasets/GM1598_koggenland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1085.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1590669121701131 - :network_gas: 0.12513198306437784 - :ambient_heat: 0.715801104765509 + :electricity: 0.1891550170507623 + :network_gas: 0.14880116843423138 + :ambient_heat: 0.6620438145150063 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9603.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 17.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17417595137660521 - :network_gas: 0.3032961944935772 - :ambient_heat: 0.5225278541298176 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1621_lansingerland/GM1621_lansingerland.derived.ad b/datasets/GM1621_lansingerland/GM1621_lansingerland.derived.ad index 86c6018bda..cd4d0a2eb9 100644 --- a/datasets/GM1621_lansingerland/GM1621_lansingerland.derived.ad +++ b/datasets/GM1621_lansingerland/GM1621_lansingerland.derived.ad @@ -1,6 +1,6 @@ - area = GM1621_lansingerland -- id = 129005 -- parent_id = 129005 +- id = 129351 +- parent_id = 129351 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1621_lansingerland/graph_values.yml b/datasets/GM1621_lansingerland/graph_values.yml index 1f73efc30b..69b10ec754 100644 --- a/datasets/GM1621_lansingerland/graph_values.yml +++ b/datasets/GM1621_lansingerland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3854.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16206456236131592 - :network_gas: 0.10864490701276226 - :ambient_heat: 0.7292905306259218 + :electricity: 0.19340911858278137 + :network_gas: 0.1296576833188196 + :ambient_heat: 0.6769331980983992 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 24648.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 287.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18235118386689467 - :network_gas: 0.27059526453241933 - :ambient_heat: 0.5470535516006859 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1640_leudal/GM1640_leudal.derived.ad b/datasets/GM1640_leudal/GM1640_leudal.derived.ad index 1175fbda70..0efd62f17d 100644 --- a/datasets/GM1640_leudal/GM1640_leudal.derived.ad +++ b/datasets/GM1640_leudal/GM1640_leudal.derived.ad @@ -1,6 +1,6 @@ - area = GM1640_leudal -- id = 129012 -- parent_id = 129012 +- id = 129358 +- parent_id = 129358 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1640_leudal/graph_values.yml b/datasets/GM1640_leudal/graph_values.yml index c896618ae1..a964c1d834 100644 --- a/datasets/GM1640_leudal/graph_values.yml +++ b/datasets/GM1640_leudal/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2657.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15927974830558733 - :network_gas: 0.12396138431926985 - :ambient_heat: 0.7167588673751429 + :electricity: 0.18945606198529982 + :network_gas: 0.14744646423170757 + :ambient_heat: 0.6630974737829926 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16118.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 124.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17474190455441063 - :network_gas: 0.3010323817823557 - :ambient_heat: 0.5242257136632338 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1641_maasgouw/GM1641_maasgouw.derived.ad b/datasets/GM1641_maasgouw/GM1641_maasgouw.derived.ad index 48508bb38f..3e11b75bdb 100644 --- a/datasets/GM1641_maasgouw/GM1641_maasgouw.derived.ad +++ b/datasets/GM1641_maasgouw/GM1641_maasgouw.derived.ad @@ -1,6 +1,6 @@ - area = GM1641_maasgouw -- id = 129021 -- parent_id = 129021 +- id = 129367 +- parent_id = 129367 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1641_maasgouw/graph_values.yml b/datasets/GM1641_maasgouw/graph_values.yml index 6c2a758b33..2d7187f947 100644 --- a/datasets/GM1641_maasgouw/graph_values.yml +++ b/datasets/GM1641_maasgouw/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1966.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15905308144421382 - :network_gas: 0.12520805205682398 - :ambient_heat: 0.7157388664989622 + :electricity: 0.18913545952728683 + :network_gas: 0.1488891774196139 + :ambient_heat: 0.6619753630530993 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10946.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 268.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17413924866194816 - :network_gas: 0.3034430053522055 - :ambient_heat: 0.5224177459858463 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1652_gemert_bakel/GM1652_gemert_bakel.derived.ad b/datasets/GM1652_gemert_bakel/GM1652_gemert_bakel.derived.ad index 2eb3bec628..c7637fdef1 100644 --- a/datasets/GM1652_gemert_bakel/GM1652_gemert_bakel.derived.ad +++ b/datasets/GM1652_gemert_bakel/GM1652_gemert_bakel.derived.ad @@ -1,6 +1,6 @@ - area = GM1652_gemert_bakel -- id = 128949 -- parent_id = 128949 +- id = 129295 +- parent_id = 129295 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1652_gemert_bakel/graph_values.yml b/datasets/GM1652_gemert_bakel/graph_values.yml index f350e07f16..32b95e74ec 100644 --- a/datasets/GM1652_gemert_bakel/graph_values.yml +++ b/datasets/GM1652_gemert_bakel/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2427.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1595147250202401 - :network_gas: 0.1226690123886793 - :ambient_heat: 0.7178162625910806 + :electricity: 0.1897886006254974 + :network_gas: 0.14595003814478696 + :ambient_heat: 0.6642613612297156 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12601.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 138.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17536924643415908 - :network_gas: 0.298523014263362 - :ambient_heat: 0.526107739302479 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1655_halderberge/GM1655_halderberge.derived.ad b/datasets/GM1655_halderberge/GM1655_halderberge.derived.ad index f4e56d4bea..b1c5af9072 100644 --- a/datasets/GM1655_halderberge/GM1655_halderberge.derived.ad +++ b/datasets/GM1655_halderberge/GM1655_halderberge.derived.ad @@ -1,6 +1,6 @@ - area = GM1655_halderberge -- id = 128963 -- parent_id = 128963 +- id = 129309 +- parent_id = 129309 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1655_halderberge/graph_values.yml b/datasets/GM1655_halderberge/graph_values.yml index 5589293293..73861ada05 100644 --- a/datasets/GM1655_halderberge/graph_values.yml +++ b/datasets/GM1655_halderberge/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1986.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15815196601761702 - :network_gas: 0.1301641869031065 - :ambient_heat: 0.7116838470792766 + :electricity: 0.18786261003715057 + :network_gas: 0.15461700856919594 + :ambient_heat: 0.6575203813936535 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13469.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 281.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1717673759281494 - :network_gas: 0.31293049628740066 - :ambient_heat: 0.51530212778445 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1658_heeze_leende/GM1658_heeze_leende.derived.ad b/datasets/GM1658_heeze_leende/GM1658_heeze_leende.derived.ad index c21d25dfd1..152cf21c26 100644 --- a/datasets/GM1658_heeze_leende/GM1658_heeze_leende.derived.ad +++ b/datasets/GM1658_heeze_leende/GM1658_heeze_leende.derived.ad @@ -1,6 +1,6 @@ - area = GM1658_heeze_leende -- id = 128974 -- parent_id = 128974 +- id = 129320 +- parent_id = 129320 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1658_heeze_leende/graph_values.yml b/datasets/GM1658_heeze_leende/graph_values.yml index 50a3cff225..01afbb0c11 100644 --- a/datasets/GM1658_heeze_leende/graph_values.yml +++ b/datasets/GM1658_heeze_leende/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1483.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15856306292170277 - :network_gas: 0.12790315393063473 - :ambient_heat: 0.7135337831476625 + :electricity: 0.1884429571756573 + :network_gas: 0.15200544259594498 + :ambient_heat: 0.6595516002283978 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6905.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 70.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17284472062409595 - :network_gas: 0.3086211175036145 - :ambient_heat: 0.5185341618722896 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1659_laarbeek/GM1659_laarbeek.derived.ad b/datasets/GM1659_laarbeek/GM1659_laarbeek.derived.ad index 75920c9057..8aa586e876 100644 --- a/datasets/GM1659_laarbeek/GM1659_laarbeek.derived.ad +++ b/datasets/GM1659_laarbeek/GM1659_laarbeek.derived.ad @@ -1,6 +1,6 @@ - area = GM1659_laarbeek -- id = 129002 -- parent_id = 129002 +- id = 129348 +- parent_id = 129348 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1659_laarbeek/graph_values.yml b/datasets/GM1659_laarbeek/graph_values.yml index 6d25c3041a..ce42f59f17 100644 --- a/datasets/GM1659_laarbeek/graph_values.yml +++ b/datasets/GM1659_laarbeek/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1407.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15869076744768137 - :network_gas: 0.1272007790377525 - :ambient_heat: 0.7141084535145662 + :electricity: 0.18862335362094831 + :network_gas: 0.1511936573954017 + :ambient_heat: 0.66018298898365 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9783.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 74.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17318099924355598 - :network_gas: 0.30727600302577424 - :ambient_heat: 0.5195429977306698 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1667_reusel_de_mierden/GM1667_reusel_de_mierden.derived.ad b/datasets/GM1667_reusel_de_mierden/GM1667_reusel_de_mierden.derived.ad index 0ae600947f..502fdd4a9c 100644 --- a/datasets/GM1667_reusel_de_mierden/GM1667_reusel_de_mierden.derived.ad +++ b/datasets/GM1667_reusel_de_mierden/GM1667_reusel_de_mierden.derived.ad @@ -1,6 +1,6 @@ - area = GM1667_reusel_de_mierden -- id = 129076 -- parent_id = 129076 +- id = 129422 +- parent_id = 129422 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1667_reusel_de_mierden/graph_values.yml b/datasets/GM1667_reusel_de_mierden/graph_values.yml index ab47e7b71d..fbef69d9bd 100644 --- a/datasets/GM1667_reusel_de_mierden/graph_values.yml +++ b/datasets/GM1667_reusel_de_mierden/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 854.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16063626416382087 - :network_gas: 0.11650054709898516 - :ambient_heat: 0.7228631887371939 + :electricity: 0.19137836597396973 + :network_gas: 0.13879608353030162 + :ambient_heat: 0.6698255504957287 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5509.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 16.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1784004118868342 - :network_gas: 0.2863983524526612 - :ambient_heat: 0.5352012356605046 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1669_roerdalen/GM1669_roerdalen.derived.ad b/datasets/GM1669_roerdalen/GM1669_roerdalen.derived.ad index 867642ab20..820d6cdbfa 100644 --- a/datasets/GM1669_roerdalen/GM1669_roerdalen.derived.ad +++ b/datasets/GM1669_roerdalen/GM1669_roerdalen.derived.ad @@ -1,6 +1,6 @@ - area = GM1669_roerdalen -- id = 129082 -- parent_id = 129082 +- id = 129428 +- parent_id = 129428 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1669_roerdalen/graph_values.yml b/datasets/GM1669_roerdalen/graph_values.yml index f8e0d83f14..60384d4abb 100644 --- a/datasets/GM1669_roerdalen/graph_values.yml +++ b/datasets/GM1669_roerdalen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2776.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15884382571463848 - :network_gas: 0.1263589585694883 - :ambient_heat: 0.7147972157158731 + :electricity: 0.18883963713249854 + :network_gas: 0.15022038015862013 + :ambient_heat: 0.6609399827088812 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9538.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 53.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17358505160560178 - :network_gas: 0.30565979357759104 - :ambient_heat: 0.5207551548168072 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1674_roosendaal/GM1674_roosendaal.derived.ad b/datasets/GM1674_roosendaal/GM1674_roosendaal.derived.ad index 09ea7927c4..46f1bd0602 100644 --- a/datasets/GM1674_roosendaal/GM1674_roosendaal.derived.ad +++ b/datasets/GM1674_roosendaal/GM1674_roosendaal.derived.ad @@ -1,6 +1,6 @@ - area = GM1674_roosendaal -- id = 129084 -- parent_id = 129084 +- id = 129430 +- parent_id = 129430 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1674_roosendaal/graph_values.yml b/datasets/GM1674_roosendaal/graph_values.yml index e46801d4bc..1f9a7a2531 100644 --- a/datasets/GM1674_roosendaal/graph_values.yml +++ b/datasets/GM1674_roosendaal/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 8527.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15637151505511587 - :network_gas: 0.13995666719686278 - :ambient_heat: 0.7036718177480215 + :electricity: 0.18535566966516837 + :network_gas: 0.16589825687393242 + :ambient_heat: 0.6487460734608993 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 35586.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 935.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1671907953253484 - :network_gas: 0.3312368186986046 - :ambient_heat: 0.501572385976047 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1676_schouwen_duiveland/GM1676_schouwen_duiveland.derived.ad b/datasets/GM1676_schouwen_duiveland/GM1676_schouwen_duiveland.derived.ad index 96a411b36d..0002812050 100644 --- a/datasets/GM1676_schouwen_duiveland/GM1676_schouwen_duiveland.derived.ad +++ b/datasets/GM1676_schouwen_duiveland/GM1676_schouwen_duiveland.derived.ad @@ -1,6 +1,6 @@ - area = GM1676_schouwen_duiveland -- id = 129092 -- parent_id = 129092 +- id = 129438 +- parent_id = 129438 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1676_schouwen_duiveland/graph_values.yml b/datasets/GM1676_schouwen_duiveland/graph_values.yml index 00fc2c7f17..f3bd4dafe1 100644 --- a/datasets/GM1676_schouwen_duiveland/graph_values.yml +++ b/datasets/GM1676_schouwen_duiveland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 6297.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15717075443473236 - :network_gas: 0.13556085060897208 - :ambient_heat: 0.7072683949562956 + :electricity: 0.18647971795877655 + :network_gas: 0.16084003209586045 + :ambient_heat: 0.652680249945363 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16968.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1124.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16922746690321283 - :network_gas: 0.3230901323871469 - :ambient_heat: 0.5076824007096402 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1680_aa_en_hunze/GM1680_aa_en_hunze.derived.ad b/datasets/GM1680_aa_en_hunze/GM1680_aa_en_hunze.derived.ad index adec542651..263d376874 100644 --- a/datasets/GM1680_aa_en_hunze/GM1680_aa_en_hunze.derived.ad +++ b/datasets/GM1680_aa_en_hunze/GM1680_aa_en_hunze.derived.ad @@ -1,6 +1,6 @@ - area = GM1680_aa_en_hunze -- id = 128855 -- parent_id = 128855 +- id = 129201 +- parent_id = 129201 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1680_aa_en_hunze/graph_values.yml b/datasets/GM1680_aa_en_hunze/graph_values.yml index fafb49846b..ff8996c145 100644 --- a/datasets/GM1680_aa_en_hunze/graph_values.yml +++ b/datasets/GM1680_aa_en_hunze/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2206.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15582247478102984 - :network_gas: 0.14297638870433582 - :ambient_heat: 0.7012011365146343 + :electricity: 0.1845847340381508 + :network_gas: 0.16936747230982896 + :ambient_heat: 0.6460477936520204 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11030.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 13.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16580810515877337 - :network_gas: 0.33676757936490476 - :ambient_heat: 0.4974243154763218 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1681_borger_odoorn/GM1681_borger_odoorn.derived.ad b/datasets/GM1681_borger_odoorn/GM1681_borger_odoorn.derived.ad index 20308e95a9..e45b5d73fa 100644 --- a/datasets/GM1681_borger_odoorn/GM1681_borger_odoorn.derived.ad +++ b/datasets/GM1681_borger_odoorn/GM1681_borger_odoorn.derived.ad @@ -1,6 +1,6 @@ - area = GM1681_borger_odoorn -- id = 128895 -- parent_id = 128895 +- id = 129241 +- parent_id = 129241 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1681_borger_odoorn/graph_values.yml b/datasets/GM1681_borger_odoorn/graph_values.yml index f9f9b0de09..930c8de303 100644 --- a/datasets/GM1681_borger_odoorn/graph_values.yml +++ b/datasets/GM1681_borger_odoorn/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1817.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15245186644365016 - :network_gas: 0.16151473455992404 - :ambient_heat: 0.6860333989964258 + :electricity: 0.17987377765586163 + :network_gas: 0.19056680728219022 + :ambient_heat: 0.6295594150619481 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11192.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 0.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1576008119793519 - :network_gas: 0.36959675208259063 - :ambient_heat: 0.4728024359380574 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1690_de_wolden/GM1690_de_wolden.derived.ad b/datasets/GM1690_de_wolden/GM1690_de_wolden.derived.ad index 00c502f5fc..68c3d69cae 100644 --- a/datasets/GM1690_de_wolden/GM1690_de_wolden.derived.ad +++ b/datasets/GM1690_de_wolden/GM1690_de_wolden.derived.ad @@ -1,6 +1,6 @@ - area = GM1690_de_wolden -- id = 128916 -- parent_id = 128916 +- id = 129262 +- parent_id = 129262 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1690_de_wolden/graph_values.yml b/datasets/GM1690_de_wolden/graph_values.yml index e26ccc40cb..a82a48eca0 100644 --- a/datasets/GM1690_de_wolden/graph_values.yml +++ b/datasets/GM1690_de_wolden/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1890.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15541336978409254 - :network_gas: 0.14522646618749113 - :ambient_heat: 0.6993601640284164 + :electricity: 0.1840109403926962 + :network_gas: 0.17194954752086988 + :ambient_heat: 0.644039512086434 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10429.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 6.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1647863809713314 - :network_gas: 0.34085447611467273 - :ambient_heat: 0.4943591429139959 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1695_noord_beveland/GM1695_noord_beveland.derived.ad b/datasets/GM1695_noord_beveland/GM1695_noord_beveland.derived.ad index c18f621153..b534a2483a 100644 --- a/datasets/GM1695_noord_beveland/GM1695_noord_beveland.derived.ad +++ b/datasets/GM1695_noord_beveland/GM1695_noord_beveland.derived.ad @@ -1,6 +1,6 @@ - area = GM1695_noord_beveland -- id = 129041 -- parent_id = 129041 +- id = 129387 +- parent_id = 129387 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1695_noord_beveland/graph_values.yml b/datasets/GM1695_noord_beveland/graph_values.yml index 1753853b57..239d840087 100644 --- a/datasets/GM1695_noord_beveland/graph_values.yml +++ b/datasets/GM1695_noord_beveland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2013.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15861064866138908 - :network_gas: 0.12764143236236028 - :ambient_heat: 0.7137479189762508 + :electricity: 0.18851017077527304 + :network_gas: 0.1517029809517852 + :ambient_heat: 0.6597868482729418 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4552.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 456.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.172969936528608 - :network_gas: 0.3081202538855662 - :ambient_heat: 0.5189098095858259 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1696_wijdemeren/GM1696_wijdemeren.derived.ad b/datasets/GM1696_wijdemeren/GM1696_wijdemeren.derived.ad index d19efbaea3..2e33d50311 100644 --- a/datasets/GM1696_wijdemeren/GM1696_wijdemeren.derived.ad +++ b/datasets/GM1696_wijdemeren/GM1696_wijdemeren.derived.ad @@ -1,6 +1,6 @@ - area = GM1696_wijdemeren -- id = 129158 -- parent_id = 129158 +- id = 129504 +- parent_id = 129504 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1696_wijdemeren/graph_values.yml b/datasets/GM1696_wijdemeren/graph_values.yml index 1626c032cf..0d337738f3 100644 --- a/datasets/GM1696_wijdemeren/graph_values.yml +++ b/datasets/GM1696_wijdemeren/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2219.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.155224249150963 - :network_gas: 0.1462666296697035 - :ambient_heat: 0.6985091211793336 + :electricity: 0.18374587549867719 + :network_gas: 0.173142341302372 + :ambient_heat: 0.6431117831989507 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10783.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 268.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1643165044286546 - :network_gas: 0.34273398228537993 - :ambient_heat: 0.4929495132859655 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1699_noordenveld/GM1699_noordenveld.derived.ad b/datasets/GM1699_noordenveld/GM1699_noordenveld.derived.ad index c1ef8dcf16..f853eeded4 100644 --- a/datasets/GM1699_noordenveld/GM1699_noordenveld.derived.ad +++ b/datasets/GM1699_noordenveld/GM1699_noordenveld.derived.ad @@ -1,6 +1,6 @@ - area = GM1699_noordenveld -- id = 129042 -- parent_id = 129042 +- id = 129388 +- parent_id = 129388 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1699_noordenveld/graph_values.yml b/datasets/GM1699_noordenveld/graph_values.yml index cc0395d9ef..a3348a8387 100644 --- a/datasets/GM1699_noordenveld/graph_values.yml +++ b/datasets/GM1699_noordenveld/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2946.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15370508570143024 - :network_gas: 0.15462202864213362 - :ambient_heat: 0.6916728856564361 + :electricity: 0.1816209667715617 + :network_gas: 0.18270444467084473 + :ambient_heat: 0.6356745885575935 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14831.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 26.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16059716300225313 - :network_gas: 0.3576113479909858 - :ambient_heat: 0.48179148900676105 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1700_twenterand/GM1700_twenterand.derived.ad b/datasets/GM1700_twenterand/GM1700_twenterand.derived.ad index 0f0c1d859e..635684a219 100644 --- a/datasets/GM1700_twenterand/GM1700_twenterand.derived.ad +++ b/datasets/GM1700_twenterand/GM1700_twenterand.derived.ad @@ -1,6 +1,6 @@ - area = GM1700_twenterand -- id = 129119 -- parent_id = 129119 +- id = 129465 +- parent_id = 129465 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1700_twenterand/graph_values.yml b/datasets/GM1700_twenterand/graph_values.yml index cf7075527c..828b9db9e9 100644 --- a/datasets/GM1700_twenterand/graph_values.yml +++ b/datasets/GM1700_twenterand/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2783.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15643667989131593 - :network_gas: 0.1395982605977624 - :ambient_heat: 0.7039650595109216 + :electricity: 0.18544723757839363 + :network_gas: 0.1654862006569653 + :ambient_heat: 0.6490665617646411 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13808.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 16.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16735578640463936 - :network_gas: 0.3305768543814407 - :ambient_heat: 0.5020673592139199 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1701_westerveld/GM1701_westerveld.derived.ad b/datasets/GM1701_westerveld/GM1701_westerveld.derived.ad index fc4b53b978..a0f8e811e9 100644 --- a/datasets/GM1701_westerveld/GM1701_westerveld.derived.ad +++ b/datasets/GM1701_westerveld/GM1701_westerveld.derived.ad @@ -1,6 +1,6 @@ - area = GM1701_westerveld -- id = 129152 -- parent_id = 129152 +- id = 129498 +- parent_id = 129498 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1701_westerveld/graph_values.yml b/datasets/GM1701_westerveld/graph_values.yml index d9cd18f3d0..bedd558c67 100644 --- a/datasets/GM1701_westerveld/graph_values.yml +++ b/datasets/GM1701_westerveld/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2027.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15600663780670657 - :network_gas: 0.14196349206311396 - :ambient_heat: 0.7020298701301795 + :electricity: 0.18484321499966241 + :network_gas: 0.1682043062682873 + :ambient_heat: 0.6469524787320504 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8415.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 27.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16627042264157213 - :network_gas: 0.3349183094337097 - :ambient_heat: 0.49881126792471814 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1705_lingewaard/GM1705_lingewaard.derived.ad b/datasets/GM1705_lingewaard/GM1705_lingewaard.derived.ad index 203904ad72..a8cfaf474f 100644 --- a/datasets/GM1705_lingewaard/GM1705_lingewaard.derived.ad +++ b/datasets/GM1705_lingewaard/GM1705_lingewaard.derived.ad @@ -1,6 +1,6 @@ - area = GM1705_lingewaard -- id = 129014 -- parent_id = 129014 +- id = 129360 +- parent_id = 129360 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1705_lingewaard/graph_values.yml b/datasets/GM1705_lingewaard/graph_values.yml index 7d3b68c697..1e6425a718 100644 --- a/datasets/GM1705_lingewaard/graph_values.yml +++ b/datasets/GM1705_lingewaard/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3198.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15935846069765472 - :network_gas: 0.12352846616289911 - :ambient_heat: 0.7171130731394462 + :electricity: 0.18956743491996006 + :network_gas: 0.14694528528689846 + :ambient_heat: 0.6634872797931415 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20045.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 69.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17495175654309023 - :network_gas: 0.30019297382763727 - :ambient_heat: 0.5248552696292725 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1706_cranendonck/GM1706_cranendonck.derived.ad b/datasets/GM1706_cranendonck/GM1706_cranendonck.derived.ad index 762c0a1629..a343fefb4a 100644 --- a/datasets/GM1706_cranendonck/GM1706_cranendonck.derived.ad +++ b/datasets/GM1706_cranendonck/GM1706_cranendonck.derived.ad @@ -1,6 +1,6 @@ - area = GM1706_cranendonck -- id = 128909 -- parent_id = 128909 +- id = 129255 +- parent_id = 129255 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1706_cranendonck/graph_values.yml b/datasets/GM1706_cranendonck/graph_values.yml index 9ee95f7b58..3cd724579a 100644 --- a/datasets/GM1706_cranendonck/graph_values.yml +++ b/datasets/GM1706_cranendonck/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1770.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15679473142034991 - :network_gas: 0.1376289771880753 - :ambient_heat: 0.7055762913915746 + :electricity: 0.1859506146892078 + :network_gas: 0.16322100031894327 + :ambient_heat: 0.6508283849918489 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9032.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 112.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16826570409827504 - :network_gas: 0.32693718360689794 - :ambient_heat: 0.5047971122948269 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1708_steenwijkerland/GM1708_steenwijkerland.derived.ad b/datasets/GM1708_steenwijkerland/GM1708_steenwijkerland.derived.ad index c4f96becb5..a4b79ef597 100644 --- a/datasets/GM1708_steenwijkerland/GM1708_steenwijkerland.derived.ad +++ b/datasets/GM1708_steenwijkerland/GM1708_steenwijkerland.derived.ad @@ -1,6 +1,6 @@ - area = GM1708_steenwijkerland -- id = 129107 -- parent_id = 129107 +- id = 129453 +- parent_id = 129453 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1708_steenwijkerland/graph_values.yml b/datasets/GM1708_steenwijkerland/graph_values.yml index 1a534cba41..bba51508cd 100644 --- a/datasets/GM1708_steenwijkerland/graph_values.yml +++ b/datasets/GM1708_steenwijkerland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4033.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15399594681210121 - :network_gas: 0.15302229253344324 - :ambient_heat: 0.6929817606544555 + :electricity: 0.18202721402300912 + :network_gas: 0.18087632934432377 + :ambient_heat: 0.6370964566326672 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20197.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 560.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16130178380822086 - :network_gas: 0.35479286476711486 - :ambient_heat: 0.48390535142466434 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1709_moerdijk/GM1709_moerdijk.derived.ad b/datasets/GM1709_moerdijk/GM1709_moerdijk.derived.ad index f323b2b7ea..a0be274100 100644 --- a/datasets/GM1709_moerdijk/GM1709_moerdijk.derived.ad +++ b/datasets/GM1709_moerdijk/GM1709_moerdijk.derived.ad @@ -1,6 +1,6 @@ - area = GM1709_moerdijk -- id = 129030 -- parent_id = 129030 +- id = 129376 +- parent_id = 129376 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1709_moerdijk/graph_values.yml b/datasets/GM1709_moerdijk/graph_values.yml index ceddb8e0ca..d8b3fda10f 100644 --- a/datasets/GM1709_moerdijk/graph_values.yml +++ b/datasets/GM1709_moerdijk/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3585.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1580841503436695 - :network_gas: 0.13053717310981783 - :ambient_heat: 0.7113786765465127 + :electricity: 0.18776692883738338 + :network_gas: 0.15504757460288865 + :ambient_heat: 0.6571854965597279 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16616.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 332.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.171590409395297 - :network_gas: 0.3136383624188101 - :ambient_heat: 0.5147712281858928 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1711_echt_susteren/GM1711_echt_susteren.derived.ad b/datasets/GM1711_echt_susteren/GM1711_echt_susteren.derived.ad index 5f6eaad74a..0d0f9e9625 100644 --- a/datasets/GM1711_echt_susteren/GM1711_echt_susteren.derived.ad +++ b/datasets/GM1711_echt_susteren/GM1711_echt_susteren.derived.ad @@ -1,6 +1,6 @@ - area = GM1711_echt_susteren -- id = 128933 -- parent_id = 128933 +- id = 129279 +- parent_id = 129279 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1711_echt_susteren/graph_values.yml b/datasets/GM1711_echt_susteren/graph_values.yml index 4056723eb7..e2aaac3729 100644 --- a/datasets/GM1711_echt_susteren/graph_values.yml +++ b/datasets/GM1711_echt_susteren/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3442.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15856651526883134 - :network_gas: 0.1278841660214275 - :ambient_heat: 0.7135493187097411 + :electricity: 0.18844783326896716 + :network_gas: 0.15198350014370282 + :ambient_heat: 0.6595686665873299 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14672.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 387.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17285380146978516 - :network_gas: 0.3085847941208575 - :ambient_heat: 0.5185614044093573 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1714_sluis/GM1714_sluis.derived.ad b/datasets/GM1714_sluis/GM1714_sluis.derived.ad index 935d660b11..1b1488b9c1 100644 --- a/datasets/GM1714_sluis/GM1714_sluis.derived.ad +++ b/datasets/GM1714_sluis/GM1714_sluis.derived.ad @@ -1,6 +1,6 @@ - area = GM1714_sluis -- id = 129098 -- parent_id = 129098 +- id = 129444 +- parent_id = 129444 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1714_sluis/graph_values.yml b/datasets/GM1714_sluis/graph_values.yml index 463884dd19..adfbcec5a4 100644 --- a/datasets/GM1714_sluis/graph_values.yml +++ b/datasets/GM1714_sluis/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 6303.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1537646946582374 - :network_gas: 0.15429417937969428 - :ambient_heat: 0.6919411259620682 + :electricity: 0.1817042001653975 + :network_gas: 0.18232989384642073 + :ambient_heat: 0.6359659059881817 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14123.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 747.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1607412823356689 - :network_gas: 0.3570348706573227 - :ambient_heat: 0.4822238470070084 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1719_drimmelen/GM1719_drimmelen.derived.ad b/datasets/GM1719_drimmelen/GM1719_drimmelen.derived.ad index 7c42bd8c37..7c24f4773c 100644 --- a/datasets/GM1719_drimmelen/GM1719_drimmelen.derived.ad +++ b/datasets/GM1719_drimmelen/GM1719_drimmelen.derived.ad @@ -1,6 +1,6 @@ - area = GM1719_drimmelen -- id = 128929 -- parent_id = 128929 +- id = 129275 +- parent_id = 129275 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1719_drimmelen/graph_values.yml b/datasets/GM1719_drimmelen/graph_values.yml index 19df8ffdf5..7c2ae85164 100644 --- a/datasets/GM1719_drimmelen/graph_values.yml +++ b/datasets/GM1719_drimmelen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1434.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15862578327789212 - :network_gas: 0.12755819197159335 - :ambient_heat: 0.7138160247505146 + :electricity: 0.18853154961463284 + :network_gas: 0.15160677603284065 + :ambient_heat: 0.6598616743525264 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11831.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 131.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17300978364351408 - :network_gas: 0.3079608654259418 - :ambient_heat: 0.5190293509305441 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1721_bernheze/GM1721_bernheze.derived.ad b/datasets/GM1721_bernheze/GM1721_bernheze.derived.ad index 8e2b4ae76b..2e0391d5ac 100644 --- a/datasets/GM1721_bernheze/GM1721_bernheze.derived.ad +++ b/datasets/GM1721_bernheze/GM1721_bernheze.derived.ad @@ -1,6 +1,6 @@ - area = GM1721_bernheze -- id = 128886 -- parent_id = 128886 +- id = 129232 +- parent_id = 129232 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1721_bernheze/graph_values.yml b/datasets/GM1721_bernheze/graph_values.yml index ad4cc711f7..97cc7b0a88 100644 --- a/datasets/GM1721_bernheze/graph_values.yml +++ b/datasets/GM1721_bernheze/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1844.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15971549322314837 - :network_gas: 0.12156478727268398 - :ambient_heat: 0.7187197195041678 + :electricity: 0.19007287477703444 + :network_gas: 0.14467080257702133 + :ambient_heat: 0.6652563226459443 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12775.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 21.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17590736112362876 - :network_gas: 0.296370555505483 - :ambient_heat: 0.5277220833708882 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1723_alphen_chaam/GM1723_alphen_chaam.derived.ad b/datasets/GM1723_alphen_chaam/GM1723_alphen_chaam.derived.ad index cac5bd13cc..e361326c06 100644 --- a/datasets/GM1723_alphen_chaam/GM1723_alphen_chaam.derived.ad +++ b/datasets/GM1723_alphen_chaam/GM1723_alphen_chaam.derived.ad @@ -1,6 +1,6 @@ - area = GM1723_alphen_chaam -- id = 128865 -- parent_id = 128865 +- id = 129211 +- parent_id = 129211 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1723_alphen_chaam/graph_values.yml b/datasets/GM1723_alphen_chaam/graph_values.yml index 51b4266072..2dda3f5d60 100644 --- a/datasets/GM1723_alphen_chaam/graph_values.yml +++ b/datasets/GM1723_alphen_chaam/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2734.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1585609147105515 - :network_gas: 0.12791496909196656 - :ambient_heat: 0.7135241161974818 + :electricity: 0.18843992306352625 + :network_gas: 0.1520190961206626 + :ambient_heat: 0.659540980815811 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4407.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 16.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17283907038102156 - :network_gas: 0.308643718475912 - :ambient_heat: 0.5185172111430665 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1724_bergeijk/GM1724_bergeijk.derived.ad b/datasets/GM1724_bergeijk/GM1724_bergeijk.derived.ad index ae2e8a183d..6b29dd3605 100644 --- a/datasets/GM1724_bergeijk/GM1724_bergeijk.derived.ad +++ b/datasets/GM1724_bergeijk/GM1724_bergeijk.derived.ad @@ -1,6 +1,6 @@ - area = GM1724_bergeijk -- id = 128881 -- parent_id = 128881 +- id = 129227 +- parent_id = 129227 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1724_bergeijk/graph_values.yml b/datasets/GM1724_bergeijk/graph_values.yml index 670113a338..93c1f9b4a5 100644 --- a/datasets/GM1724_bergeijk/graph_values.yml +++ b/datasets/GM1724_bergeijk/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1733.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15926944286745873 - :network_gas: 0.12401806422897722 - :ambient_heat: 0.7167124929035642 + :electricity: 0.18944148200198369 + :network_gas: 0.14751207425335244 + :ambient_heat: 0.6630464437446638 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7994.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 15.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17471445156605198 - :network_gas: 0.3011421937357902 - :ambient_heat: 0.5241433546981578 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1728_bladel/GM1728_bladel.derived.ad b/datasets/GM1728_bladel/GM1728_bladel.derived.ad index d0dadaf570..341b009ad3 100644 --- a/datasets/GM1728_bladel/GM1728_bladel.derived.ad +++ b/datasets/GM1728_bladel/GM1728_bladel.derived.ad @@ -1,6 +1,6 @@ - area = GM1728_bladel -- id = 128890 -- parent_id = 128890 +- id = 129236 +- parent_id = 129236 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1728_bladel/graph_values.yml b/datasets/GM1728_bladel/graph_values.yml index a87f85fa8e..b2431d4466 100644 --- a/datasets/GM1728_bladel/graph_values.yml +++ b/datasets/GM1728_bladel/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2347.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1594273716560766 - :network_gas: 0.12314945589157875 - :ambient_heat: 0.7174231724523447 + :electricity: 0.1896649565849317 + :network_gas: 0.1465064371475761 + :ambient_heat: 0.6638286062674922 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8820.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 24.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17513572086856924 - :network_gas: 0.2994571165257211 - :ambient_heat: 0.5254071626057096 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1729_gulpen_wittem/GM1729_gulpen_wittem.derived.ad b/datasets/GM1729_gulpen_wittem/GM1729_gulpen_wittem.derived.ad index 391ed8e9b3..1e9744958e 100644 --- a/datasets/GM1729_gulpen_wittem/GM1729_gulpen_wittem.derived.ad +++ b/datasets/GM1729_gulpen_wittem/GM1729_gulpen_wittem.derived.ad @@ -1,6 +1,6 @@ - area = GM1729_gulpen_wittem -- id = 128959 -- parent_id = 128959 +- id = 129305 +- parent_id = 129305 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1729_gulpen_wittem/graph_values.yml b/datasets/GM1729_gulpen_wittem/graph_values.yml index 2c74538751..7fc64e41df 100644 --- a/datasets/GM1729_gulpen_wittem/graph_values.yml +++ b/datasets/GM1729_gulpen_wittem/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1537.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15625194947590476 - :network_gas: 0.14061427788252384 - :ambient_heat: 0.7031337726415714 + :electricity: 0.18518769604319682 + :network_gas: 0.16665413928712622 + :ambient_heat: 0.6481581646696771 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6866.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 313.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16688855507874 - :network_gas: 0.3324457796850382 - :ambient_heat: 0.5006656652362218 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1730_tynaarlo/GM1730_tynaarlo.derived.ad b/datasets/GM1730_tynaarlo/GM1730_tynaarlo.derived.ad index 9f4ac3260a..41d95fa6f6 100644 --- a/datasets/GM1730_tynaarlo/GM1730_tynaarlo.derived.ad +++ b/datasets/GM1730_tynaarlo/GM1730_tynaarlo.derived.ad @@ -1,6 +1,6 @@ - area = GM1730_tynaarlo -- id = 129120 -- parent_id = 129120 +- id = 129466 +- parent_id = 129466 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1730_tynaarlo/graph_values.yml b/datasets/GM1730_tynaarlo/graph_values.yml index 6b790eb862..74d32b3b7b 100644 --- a/datasets/GM1730_tynaarlo/graph_values.yml +++ b/datasets/GM1730_tynaarlo/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3920.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15426184495832926 - :network_gas: 0.151559852729189 - :ambient_heat: 0.6941783023124817 + :electricity: 0.1823988398527457 + :network_gas: 0.17920401064517688 + :ambient_heat: 0.6383971495020774 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14575.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 22.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1619490087655907 - :network_gas: 0.3522039649376355 - :ambient_heat: 0.48584702629677384 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1731_midden_drenthe/GM1731_midden_drenthe.derived.ad b/datasets/GM1731_midden_drenthe/GM1731_midden_drenthe.derived.ad index c91b8e9d53..a873ac78aa 100644 --- a/datasets/GM1731_midden_drenthe/GM1731_midden_drenthe.derived.ad +++ b/datasets/GM1731_midden_drenthe/GM1731_midden_drenthe.derived.ad @@ -1,6 +1,6 @@ - area = GM1731_midden_drenthe -- id = 129029 -- parent_id = 129029 +- id = 129375 +- parent_id = 129375 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1731_midden_drenthe/graph_values.yml b/datasets/GM1731_midden_drenthe/graph_values.yml index 37cf06e4b3..7a3e1bda3e 100644 --- a/datasets/GM1731_midden_drenthe/graph_values.yml +++ b/datasets/GM1731_midden_drenthe/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3322.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1557506132972913 - :network_gas: 0.14337162686489777 - :ambient_heat: 0.7008777598378109 + :electricity: 0.18448390385009766 + :network_gas: 0.16982120882496626 + :ambient_heat: 0.6456948873249361 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14395.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 20.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16562810768648273 - :network_gas: 0.3374875692540673 - :ambient_heat: 0.49688432305945 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1734_overbetuwe/GM1734_overbetuwe.derived.ad b/datasets/GM1734_overbetuwe/GM1734_overbetuwe.derived.ad index 38158f2c74..1c2a706dc2 100644 --- a/datasets/GM1734_overbetuwe/GM1734_overbetuwe.derived.ad +++ b/datasets/GM1734_overbetuwe/GM1734_overbetuwe.derived.ad @@ -1,6 +1,6 @@ - area = GM1734_overbetuwe -- id = 129065 -- parent_id = 129065 +- id = 129411 +- parent_id = 129411 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1734_overbetuwe/graph_values.yml b/datasets/GM1734_overbetuwe/graph_values.yml index 9035c311a3..387fb2e54e 100644 --- a/datasets/GM1734_overbetuwe/graph_values.yml +++ b/datasets/GM1734_overbetuwe/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4017.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15670877660958712 - :network_gas: 0.13810172864727083 - :ambient_heat: 0.7051894947431421 + :electricity: 0.1858297336387081 + :network_gas: 0.16376496584810585 + :ambient_heat: 0.6504053005131861 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20053.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 37.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16804674579960602 - :network_gas: 0.3278130168015742 - :ambient_heat: 0.5041402373988197 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1735_hof_van_twente/GM1735_hof_van_twente.derived.ad b/datasets/GM1735_hof_van_twente/GM1735_hof_van_twente.derived.ad index b45e34c731..393b92e24c 100644 --- a/datasets/GM1735_hof_van_twente/GM1735_hof_van_twente.derived.ad +++ b/datasets/GM1735_hof_van_twente/GM1735_hof_van_twente.derived.ad @@ -1,6 +1,6 @@ - area = GM1735_hof_van_twente -- id = 128985 -- parent_id = 128985 +- id = 129331 +- parent_id = 129331 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1735_hof_van_twente/graph_values.yml b/datasets/GM1735_hof_van_twente/graph_values.yml index ccb575db26..3cb3408d29 100644 --- a/datasets/GM1735_hof_van_twente/graph_values.yml +++ b/datasets/GM1735_hof_van_twente/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3451.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15544854818147621 - :network_gas: 0.14503298500188094 - :ambient_heat: 0.699518466816643 + :electricity: 0.18406025830396994 + :network_gas: 0.17172761659296765 + :ambient_heat: 0.6442121251030626 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15251.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 266.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1648739528491106 - :network_gas: 0.3405041886035559 - :ambient_heat: 0.49462185854733354 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1740_neder_betuwe/GM1740_neder_betuwe.derived.ad b/datasets/GM1740_neder_betuwe/GM1740_neder_betuwe.derived.ad index f9b51a3c66..e1332be1f1 100644 --- a/datasets/GM1740_neder_betuwe/GM1740_neder_betuwe.derived.ad +++ b/datasets/GM1740_neder_betuwe/GM1740_neder_betuwe.derived.ad @@ -1,6 +1,6 @@ - area = GM1740_neder_betuwe -- id = 129034 -- parent_id = 129034 +- id = 129380 +- parent_id = 129380 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1740_neder_betuwe/graph_values.yml b/datasets/GM1740_neder_betuwe/graph_values.yml index 2ce6b406b8..4402466f37 100644 --- a/datasets/GM1740_neder_betuwe/graph_values.yml +++ b/datasets/GM1740_neder_betuwe/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1705.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15822832498209677 - :network_gas: 0.1297442125984678 - :ambient_heat: 0.7120274624194355 + :electricity: 0.18797036342594875 + :network_gas: 0.15413211760477788 + :ambient_heat: 0.6578975189692734 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8886.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 20.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1719668916022517 - :network_gas: 0.3121324335909914 - :ambient_heat: 0.5159006748067568 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1742_rijssen_holten/GM1742_rijssen_holten.derived.ad b/datasets/GM1742_rijssen_holten/GM1742_rijssen_holten.derived.ad index 6d10530beb..86f38a717f 100644 --- a/datasets/GM1742_rijssen_holten/GM1742_rijssen_holten.derived.ad +++ b/datasets/GM1742_rijssen_holten/GM1742_rijssen_holten.derived.ad @@ -1,6 +1,6 @@ - area = GM1742_rijssen_holten -- id = 129080 -- parent_id = 129080 +- id = 129426 +- parent_id = 129426 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1742_rijssen_holten/graph_values.yml b/datasets/GM1742_rijssen_holten/graph_values.yml index bd09a8dc67..2bbacd9c61 100644 --- a/datasets/GM1742_rijssen_holten/graph_values.yml +++ b/datasets/GM1742_rijssen_holten/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3086.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15625154756418067 - :network_gas: 0.14061648839700627 - :ambient_heat: 0.7031319640388131 + :electricity: 0.18518713149134491 + :network_gas: 0.16665667977420473 + :ambient_heat: 0.6481561887344502 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14849.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 37.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16688754018245147 - :network_gas: 0.3324498392701924 - :ambient_heat: 0.5006626205473562 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1771_geldrop_mierlo/GM1771_geldrop_mierlo.derived.ad b/datasets/GM1771_geldrop_mierlo/GM1771_geldrop_mierlo.derived.ad index d76780976a..ff83464f10 100644 --- a/datasets/GM1771_geldrop_mierlo/GM1771_geldrop_mierlo.derived.ad +++ b/datasets/GM1771_geldrop_mierlo/GM1771_geldrop_mierlo.derived.ad @@ -1,6 +1,6 @@ - area = GM1771_geldrop_mierlo -- id = 128948 -- parent_id = 128948 +- id = 129294 +- parent_id = 129294 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1771_geldrop_mierlo/graph_values.yml b/datasets/GM1771_geldrop_mierlo/graph_values.yml index 4687f2873d..ec568cac9c 100644 --- a/datasets/GM1771_geldrop_mierlo/graph_values.yml +++ b/datasets/GM1771_geldrop_mierlo/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3031.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1577328112744026 - :network_gas: 0.1324695379907858 - :ambient_heat: 0.7097976507348117 + :electricity: 0.18727147089150617 + :network_gas: 0.15727713864615941 + :ambient_heat: 0.6554513904623344 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18051.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 167.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17067698137461573 - :network_gas: 0.31729207450153524 - :ambient_heat: 0.512030944123849 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1773_olst_wijhe/GM1773_olst_wijhe.derived.ad b/datasets/GM1773_olst_wijhe/GM1773_olst_wijhe.derived.ad index a6f78ffbe2..edb0bfc1f9 100644 --- a/datasets/GM1773_olst_wijhe/GM1773_olst_wijhe.derived.ad +++ b/datasets/GM1773_olst_wijhe/GM1773_olst_wijhe.derived.ad @@ -1,6 +1,6 @@ - area = GM1773_olst_wijhe -- id = 129053 -- parent_id = 129053 +- id = 129399 +- parent_id = 129399 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1773_olst_wijhe/graph_values.yml b/datasets/GM1773_olst_wijhe/graph_values.yml index 896829949b..0348a93d95 100644 --- a/datasets/GM1773_olst_wijhe/graph_values.yml +++ b/datasets/GM1773_olst_wijhe/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1146.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1571603145203909 - :network_gas: 0.1356182701378501 - :ambient_heat: 0.707221415341759 + :electricity: 0.18646502154782274 + :network_gas: 0.16090616604264715 + :ambient_heat: 0.6526288124095301 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7821.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 88.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1692006785784417 - :network_gas: 0.3231972856862314 - :ambient_heat: 0.5076020357353269 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1774_dinkelland/GM1774_dinkelland.derived.ad b/datasets/GM1774_dinkelland/GM1774_dinkelland.derived.ad index 1aa4a72b74..035af0547d 100644 --- a/datasets/GM1774_dinkelland/GM1774_dinkelland.derived.ad +++ b/datasets/GM1774_dinkelland/GM1774_dinkelland.derived.ad @@ -1,6 +1,6 @@ - area = GM1774_dinkelland -- id = 128923 -- parent_id = 128923 +- id = 129269 +- parent_id = 129269 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1774_dinkelland/graph_values.yml b/datasets/GM1774_dinkelland/graph_values.yml index 1a50d4e302..5a301cce33 100644 --- a/datasets/GM1774_dinkelland/graph_values.yml +++ b/datasets/GM1774_dinkelland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3197.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15693017771429496 - :network_gas: 0.13688402257137774 - :ambient_heat: 0.7061857997143274 + :electricity: 0.18614114724757433 + :network_gas: 0.16236360254231794 + :ambient_heat: 0.6514952502101077 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11038.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 55.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1686114062200274 - :network_gas: 0.32555437511988855 - :ambient_heat: 0.505834218660084 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1783_westland/GM1783_westland.derived.ad b/datasets/GM1783_westland/GM1783_westland.derived.ad index a40062bf39..be1ded7601 100644 --- a/datasets/GM1783_westland/GM1783_westland.derived.ad +++ b/datasets/GM1783_westland/GM1783_westland.derived.ad @@ -1,6 +1,6 @@ - area = GM1783_westland -- id = 129154 -- parent_id = 129154 +- id = 129500 +- parent_id = 129500 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1783_westland/graph_values.yml b/datasets/GM1783_westland/graph_values.yml index 449104777a..ec09180064 100644 --- a/datasets/GM1783_westland/graph_values.yml +++ b/datasets/GM1783_westland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 9269.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15998128468212433 - :network_gas: 0.12010293424831624 - :ambient_heat: 0.7199157810695594 + :electricity: 0.1904494264718103 + :network_gas: 0.1429763174525199 + :ambient_heat: 0.6665742560756698 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 45912.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1775.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1766227558885366 - :network_gas: 0.2935089764458518 - :ambient_heat: 0.5298682676656116 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1842_midden_delfland/GM1842_midden_delfland.derived.ad b/datasets/GM1842_midden_delfland/GM1842_midden_delfland.derived.ad index 75eea6ef94..bfeb262bd5 100644 --- a/datasets/GM1842_midden_delfland/GM1842_midden_delfland.derived.ad +++ b/datasets/GM1842_midden_delfland/GM1842_midden_delfland.derived.ad @@ -1,6 +1,6 @@ - area = GM1842_midden_delfland -- id = 129028 -- parent_id = 129028 +- id = 129374 +- parent_id = 129374 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1842_midden_delfland/graph_values.yml b/datasets/GM1842_midden_delfland/graph_values.yml index 5b3de84ceb..7a0067cd2c 100644 --- a/datasets/GM1842_midden_delfland/graph_values.yml +++ b/datasets/GM1842_midden_delfland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1157.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16017789732214627 - :network_gas: 0.11902156472819543 - :ambient_heat: 0.7208005379496583 + :electricity: 0.19072812461425437 + :network_gas: 0.1417221739626631 + :ambient_heat: 0.6675497014230825 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7978.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 273.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17715416375713375 - :network_gas: 0.2913833449714631 - :ambient_heat: 0.5314624912714031 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1859_berkelland/GM1859_berkelland.derived.ad b/datasets/GM1859_berkelland/GM1859_berkelland.derived.ad index 151d4f0b00..c347a8f96f 100644 --- a/datasets/GM1859_berkelland/GM1859_berkelland.derived.ad +++ b/datasets/GM1859_berkelland/GM1859_berkelland.derived.ad @@ -1,6 +1,6 @@ - area = GM1859_berkelland -- id = 128885 -- parent_id = 128885 +- id = 129231 +- parent_id = 129231 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1859_berkelland/graph_values.yml b/datasets/GM1859_berkelland/graph_values.yml index e89934624a..9c70e1842f 100644 --- a/datasets/GM1859_berkelland/graph_values.yml +++ b/datasets/GM1859_berkelland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3522.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15490747041412464 - :network_gas: 0.14800891272231448 - :ambient_heat: 0.6970836168635609 + :electricity: 0.18330215523382337 + :network_gas: 0.17513908543781453 + :ambient_heat: 0.6415587593283621 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19547.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 86.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16353289312251126 - :network_gas: 0.3458684275099534 - :ambient_heat: 0.49059867936753554 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1876_bronckhorst/GM1876_bronckhorst.derived.ad b/datasets/GM1876_bronckhorst/GM1876_bronckhorst.derived.ad index b9db357196..710aa04590 100644 --- a/datasets/GM1876_bronckhorst/GM1876_bronckhorst.derived.ad +++ b/datasets/GM1876_bronckhorst/GM1876_bronckhorst.derived.ad @@ -1,6 +1,6 @@ - area = GM1876_bronckhorst -- id = 128900 -- parent_id = 128900 +- id = 129246 +- parent_id = 129246 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1876_bronckhorst/graph_values.yml b/datasets/GM1876_bronckhorst/graph_values.yml index 16b544d3db..7bcc671263 100644 --- a/datasets/GM1876_bronckhorst/graph_values.yml +++ b/datasets/GM1876_bronckhorst/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2734.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15669760628123247 - :network_gas: 0.13816316545322155 - :ambient_heat: 0.7051392282655461 + :electricity: 0.18581402625130175 + :network_gas: 0.1638356491956358 + :ambient_heat: 0.6503503245530625 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16139.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 66.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16801831511730356 - :network_gas: 0.32792673953078394 - :ambient_heat: 0.5040549453519125 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1883_sittard_geleen/GM1883_sittard_geleen.derived.ad b/datasets/GM1883_sittard_geleen/GM1883_sittard_geleen.derived.ad index 04a4090609..b4535aaed2 100644 --- a/datasets/GM1883_sittard_geleen/GM1883_sittard_geleen.derived.ad +++ b/datasets/GM1883_sittard_geleen/GM1883_sittard_geleen.derived.ad @@ -1,6 +1,6 @@ - area = GM1883_sittard_geleen -- id = 129096 -- parent_id = 129096 +- id = 129442 +- parent_id = 129442 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1883_sittard_geleen/graph_values.yml b/datasets/GM1883_sittard_geleen/graph_values.yml index 5b0a37059a..e472664aea 100644 --- a/datasets/GM1883_sittard_geleen/graph_values.yml +++ b/datasets/GM1883_sittard_geleen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 16157.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1584416079054245 - :network_gas: 0.12857115652016526 - :ambient_heat: 0.7129872355744102 + :electricity: 0.1882714396339715 + :network_gas: 0.15277727267136282 + :ambient_heat: 0.6589512876946656 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 46679.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1935.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17252560786612076 - :network_gas: 0.30989756853551514 - :ambient_heat: 0.5175768235983641 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1884_kaag_en_braassem/GM1884_kaag_en_braassem.derived.ad b/datasets/GM1884_kaag_en_braassem/GM1884_kaag_en_braassem.derived.ad index b1c4430b21..b43782830a 100644 --- a/datasets/GM1884_kaag_en_braassem/GM1884_kaag_en_braassem.derived.ad +++ b/datasets/GM1884_kaag_en_braassem/GM1884_kaag_en_braassem.derived.ad @@ -1,6 +1,6 @@ - area = GM1884_kaag_en_braassem -- id = 128994 -- parent_id = 128994 +- id = 129340 +- parent_id = 129340 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1884_kaag_en_braassem/graph_values.yml b/datasets/GM1884_kaag_en_braassem/graph_values.yml index b42b727a7b..912a5d9f0b 100644 --- a/datasets/GM1884_kaag_en_braassem/graph_values.yml +++ b/datasets/GM1884_kaag_en_braassem/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1969.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16029654144801467 - :network_gas: 0.11836902203591933 - :ambient_heat: 0.721334436516066 + :electricity: 0.19089636563675996 + :network_gas: 0.14096508824529239 + :ambient_heat: 0.6681385461179478 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11874.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 65.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17747575201497273 - :network_gas: 0.29009699194010724 - :ambient_heat: 0.5324272560449201 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1891_dantumadiel/GM1891_dantumadiel.derived.ad b/datasets/GM1891_dantumadiel/GM1891_dantumadiel.derived.ad index 7492673a0a..d939bcda14 100644 --- a/datasets/GM1891_dantumadiel/GM1891_dantumadiel.derived.ad +++ b/datasets/GM1891_dantumadiel/GM1891_dantumadiel.derived.ad @@ -1,6 +1,6 @@ - area = GM1891_dantumadiel -- id = 128912 -- parent_id = 128912 +- id = 129258 +- parent_id = 129258 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1891_dantumadiel/graph_values.yml b/datasets/GM1891_dantumadiel/graph_values.yml index 4ebd5350d6..5f3302dd8c 100644 --- a/datasets/GM1891_dantumadiel/graph_values.yml +++ b/datasets/GM1891_dantumadiel/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1158.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15539408997448298 - :network_gas: 0.14533250514034365 - :ambient_heat: 0.6992734048851734 + :electricity: 0.18398391304912845 + :network_gas: 0.1720711707462217 + :ambient_heat: 0.6439449162046499 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8148.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 8.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16473840913504215 - :network_gas: 0.34104636345982964 - :ambient_heat: 0.4942152274051282 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1892_zuidplas/GM1892_zuidplas.derived.ad b/datasets/GM1892_zuidplas/GM1892_zuidplas.derived.ad index 3e3e085f19..926664f218 100644 --- a/datasets/GM1892_zuidplas/GM1892_zuidplas.derived.ad +++ b/datasets/GM1892_zuidplas/GM1892_zuidplas.derived.ad @@ -1,6 +1,6 @@ - area = GM1892_zuidplas -- id = 129173 -- parent_id = 129173 +- id = 129519 +- parent_id = 129519 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1892_zuidplas/graph_values.yml b/datasets/GM1892_zuidplas/graph_values.yml index 4e42e0653d..cca105aa00 100644 --- a/datasets/GM1892_zuidplas/graph_values.yml +++ b/datasets/GM1892_zuidplas/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2882.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16087260691354424 - :network_gas: 0.11520066197550669 - :ambient_heat: 0.7239267311109491 + :electricity: 0.19171392048348618 + :network_gas: 0.13728608601143905 + :ambient_heat: 0.6709999935050747 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18549.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 123.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17904706286079025 - :network_gas: 0.28381174855683705 - :ambient_heat: 0.5371411885823727 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1894_peel_en_maas/GM1894_peel_en_maas.derived.ad b/datasets/GM1894_peel_en_maas/GM1894_peel_en_maas.derived.ad index 319f86333a..c52445a175 100644 --- a/datasets/GM1894_peel_en_maas/GM1894_peel_en_maas.derived.ad +++ b/datasets/GM1894_peel_en_maas/GM1894_peel_en_maas.derived.ad @@ -1,6 +1,6 @@ - area = GM1894_peel_en_maas -- id = 129067 -- parent_id = 129067 +- id = 129413 +- parent_id = 129413 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1894_peel_en_maas/graph_values.yml b/datasets/GM1894_peel_en_maas/graph_values.yml index b0736667da..e57d460a62 100644 --- a/datasets/GM1894_peel_en_maas/graph_values.yml +++ b/datasets/GM1894_peel_en_maas/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3735.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1601240849134403 - :network_gas: 0.11931753297607839 - :ambient_heat: 0.7205583821104813 + :electricity: 0.1906518326308554 + :network_gas: 0.1420654883940727 + :ambient_heat: 0.6672826789750719 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18491.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 82.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17700853101124944 - :network_gas: 0.29196587595500023 - :ambient_heat: 0.5310255930337503 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1895_oldambt/GM1895_oldambt.derived.ad b/datasets/GM1895_oldambt/GM1895_oldambt.derived.ad index 3344f8b448..d263364447 100644 --- a/datasets/GM1895_oldambt/GM1895_oldambt.derived.ad +++ b/datasets/GM1895_oldambt/GM1895_oldambt.derived.ad @@ -1,6 +1,6 @@ - area = GM1895_oldambt -- id = 129050 -- parent_id = 129050 +- id = 129396 +- parent_id = 129396 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1895_oldambt/graph_values.yml b/datasets/GM1895_oldambt/graph_values.yml index d985ee29af..bb21b37850 100644 --- a/datasets/GM1895_oldambt/graph_values.yml +++ b/datasets/GM1895_oldambt/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3360.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1542058065766916 - :network_gas: 0.1518680638281961 - :ambient_heat: 0.6939261295951122 + :electricity: 0.18232049979082224 + :network_gas: 0.17955654144353328 + :ambient_heat: 0.6381229587656444 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18399.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 325.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16181235971624003 - :network_gas: 0.3527505611350381 - :ambient_heat: 0.48543707914872186 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1896_zwartewaterland/GM1896_zwartewaterland.derived.ad b/datasets/GM1896_zwartewaterland/GM1896_zwartewaterland.derived.ad index 9057a1b7bb..e9edaa1976 100644 --- a/datasets/GM1896_zwartewaterland/GM1896_zwartewaterland.derived.ad +++ b/datasets/GM1896_zwartewaterland/GM1896_zwartewaterland.derived.ad @@ -1,6 +1,6 @@ - area = GM1896_zwartewaterland -- id = 129176 -- parent_id = 129176 +- id = 129522 +- parent_id = 129522 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1896_zwartewaterland/graph_values.yml b/datasets/GM1896_zwartewaterland/graph_values.yml index 45bce5ddda..26ae1d0d94 100644 --- a/datasets/GM1896_zwartewaterland/graph_values.yml +++ b/datasets/GM1896_zwartewaterland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 1963.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1575519989345851 - :network_gas: 0.13346400585978194 - :ambient_heat: 0.7089839952056329 + :electricity: 0.18701665060418443 + :network_gas: 0.15842383162956214 + :ambient_heat: 0.6545595177662534 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8961.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 505.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17020910604947506 - :network_gas: 0.3191635758020979 - :ambient_heat: 0.5106273181484271 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1900_sudwest_fryslan/GM1900_sudwest_fryslan.derived.ad b/datasets/GM1900_sudwest_fryslan/GM1900_sudwest_fryslan.derived.ad index 4b084b1d91..30e47ec455 100644 --- a/datasets/GM1900_sudwest_fryslan/GM1900_sudwest_fryslan.derived.ad +++ b/datasets/GM1900_sudwest_fryslan/GM1900_sudwest_fryslan.derived.ad @@ -1,6 +1,6 @@ - area = GM1900_sudwest_fryslan -- id = 129110 -- parent_id = 129110 +- id = 129456 +- parent_id = 129456 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1900_sudwest_fryslan/graph_values.yml b/datasets/GM1900_sudwest_fryslan/graph_values.yml index 8e750aa997..b0a6079b36 100644 --- a/datasets/GM1900_sudwest_fryslan/graph_values.yml +++ b/datasets/GM1900_sudwest_fryslan/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 9325.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1552281021407089 - :network_gas: 0.14624543822610098 - :ambient_heat: 0.69852645963319 + :electricity: 0.18375127453062326 + :network_gas: 0.17311804562279798 + :ambient_heat: 0.6431306798465787 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 42025.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2651.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16432606196296798 - :network_gas: 0.3426957521481263 - :ambient_heat: 0.4929781858889057 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1901_bodegraven_reeuwijk/GM1901_bodegraven_reeuwijk.derived.ad b/datasets/GM1901_bodegraven_reeuwijk/GM1901_bodegraven_reeuwijk.derived.ad index 9fa30cda92..ae856dc43e 100644 --- a/datasets/GM1901_bodegraven_reeuwijk/GM1901_bodegraven_reeuwijk.derived.ad +++ b/datasets/GM1901_bodegraven_reeuwijk/GM1901_bodegraven_reeuwijk.derived.ad @@ -1,6 +1,6 @@ - area = GM1901_bodegraven_reeuwijk -- id = 128893 -- parent_id = 128893 +- id = 129239 +- parent_id = 129239 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1901_bodegraven_reeuwijk/graph_values.yml b/datasets/GM1901_bodegraven_reeuwijk/graph_values.yml index 9094694305..69c807667c 100644 --- a/datasets/GM1901_bodegraven_reeuwijk/graph_values.yml +++ b/datasets/GM1901_bodegraven_reeuwijk/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2793.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1597330211230591 - :network_gas: 0.12146838382317487 - :ambient_heat: 0.718798595053766 + :electricity: 0.19009769954148775 + :network_gas: 0.1445590909722962 + :ambient_heat: 0.6653432094862161 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14665.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 367.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17595443312370881 - :network_gas: 0.2961822675051628 - :ambient_heat: 0.5278632993711284 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1903_eijsden_margraten/GM1903_eijsden_margraten.derived.ad b/datasets/GM1903_eijsden_margraten/GM1903_eijsden_margraten.derived.ad index 0aae577426..16c66a1453 100644 --- a/datasets/GM1903_eijsden_margraten/GM1903_eijsden_margraten.derived.ad +++ b/datasets/GM1903_eijsden_margraten/GM1903_eijsden_margraten.derived.ad @@ -1,6 +1,6 @@ - area = GM1903_eijsden_margraten -- id = 128938 -- parent_id = 128938 +- id = 129284 +- parent_id = 129284 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1903_eijsden_margraten/graph_values.yml b/datasets/GM1903_eijsden_margraten/graph_values.yml index f11088b3e3..616997aed4 100644 --- a/datasets/GM1903_eijsden_margraten/graph_values.yml +++ b/datasets/GM1903_eijsden_margraten/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2679.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15729471710064663 - :network_gas: 0.1348790559464436 - :ambient_heat: 0.7078262269529099 + :electricity: 0.18665424973922556 + :network_gas: 0.16005463792601182 + :ambient_heat: 0.6532911123347627 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11342.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 420.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16954592591145307 - :network_gas: 0.32181629635418596 - :ambient_heat: 0.508637777734361 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1904_stichtse_vecht/GM1904_stichtse_vecht.derived.ad b/datasets/GM1904_stichtse_vecht/GM1904_stichtse_vecht.derived.ad index e8b2e7844b..b87e0a7d64 100644 --- a/datasets/GM1904_stichtse_vecht/GM1904_stichtse_vecht.derived.ad +++ b/datasets/GM1904_stichtse_vecht/GM1904_stichtse_vecht.derived.ad @@ -1,6 +1,6 @@ - area = GM1904_stichtse_vecht -- id = 129109 -- parent_id = 129109 +- id = 129455 +- parent_id = 129455 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1904_stichtse_vecht/graph_values.yml b/datasets/GM1904_stichtse_vecht/graph_values.yml index 4269918cd4..ccc88b6f86 100644 --- a/datasets/GM1904_stichtse_vecht/graph_values.yml +++ b/datasets/GM1904_stichtse_vecht/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4426.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15726507190866582 - :network_gas: 0.13504210450233803 - :ambient_heat: 0.7076928235889961 + :electricity: 0.1866125064678627 + :network_gas: 0.16024248292406568 + :ambient_heat: 0.6531450106080716 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 28716.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 851.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16946970439655548 - :network_gas: 0.32212118241377635 - :ambient_heat: 0.5084091131896682 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1911_hollands_kroon/GM1911_hollands_kroon.derived.ad b/datasets/GM1911_hollands_kroon/GM1911_hollands_kroon.derived.ad index e2a8925bef..0ea3976c1e 100644 --- a/datasets/GM1911_hollands_kroon/GM1911_hollands_kroon.derived.ad +++ b/datasets/GM1911_hollands_kroon/GM1911_hollands_kroon.derived.ad @@ -1,6 +1,6 @@ - area = GM1911_hollands_kroon -- id = 128986 -- parent_id = 128986 +- id = 129332 +- parent_id = 129332 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1911_hollands_kroon/graph_values.yml b/datasets/GM1911_hollands_kroon/graph_values.yml index f6e93c0888..433f0ec231 100644 --- a/datasets/GM1911_hollands_kroon/graph_values.yml +++ b/datasets/GM1911_hollands_kroon/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3288.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15759704640592118 - :network_gas: 0.13321624476743354 - :ambient_heat: 0.7091867088266454 + :electricity: 0.18708012613696182 + :network_gas: 0.15813819131097295 + :ambient_heat: 0.6547816825520653 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20923.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 247.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17032553239482032 - :network_gas: 0.318697870420717 - :ambient_heat: 0.5109765971844628 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1916_leidschendam_voorburg/GM1916_leidschendam_voorburg.derived.ad b/datasets/GM1916_leidschendam_voorburg/GM1916_leidschendam_voorburg.derived.ad index 4367148874..63f2cf0985 100644 --- a/datasets/GM1916_leidschendam_voorburg/GM1916_leidschendam_voorburg.derived.ad +++ b/datasets/GM1916_leidschendam_voorburg/GM1916_leidschendam_voorburg.derived.ad @@ -1,6 +1,6 @@ - area = GM1916_leidschendam_voorburg -- id = 129010 -- parent_id = 129010 +- id = 129356 +- parent_id = 129356 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1916_leidschendam_voorburg/graph_values.yml b/datasets/GM1916_leidschendam_voorburg/graph_values.yml index 26763782e2..1dedf9bd8d 100644 --- a/datasets/GM1916_leidschendam_voorburg/graph_values.yml +++ b/datasets/GM1916_leidschendam_voorburg/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 5985.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15398684737103965 - :network_gas: 0.1530723394592819 - :ambient_heat: 0.6929408131696785 + :electricity: 0.18201450055282434 + :network_gas: 0.18093354004449524 + :ambient_heat: 0.6370519594026804 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 36938.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 3154.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16127968692942685 - :network_gas: 0.3548812522822908 - :ambient_heat: 0.48383906078828226 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1924_goeree_overflakkee/GM1924_goeree_overflakkee.derived.ad b/datasets/GM1924_goeree_overflakkee/GM1924_goeree_overflakkee.derived.ad index 5a65d60d0b..d495580ebc 100644 --- a/datasets/GM1924_goeree_overflakkee/GM1924_goeree_overflakkee.derived.ad +++ b/datasets/GM1924_goeree_overflakkee/GM1924_goeree_overflakkee.derived.ad @@ -1,6 +1,6 @@ - area = GM1924_goeree_overflakkee -- id = 128952 -- parent_id = 128952 +- id = 129298 +- parent_id = 129298 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1924_goeree_overflakkee/graph_values.yml b/datasets/GM1924_goeree_overflakkee/graph_values.yml index 8884130ac1..34b4a47d00 100644 --- a/datasets/GM1924_goeree_overflakkee/graph_values.yml +++ b/datasets/GM1924_goeree_overflakkee/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 6955.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15852636551143276 - :network_gas: 0.12810498968712 - :ambient_heat: 0.7133686448014473 + :electricity: 0.18839112824529905 + :network_gas: 0.1522386731263856 + :ambient_heat: 0.6593701986283154 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22021.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1305.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17274822849201893 - :network_gas: 0.3090070860319225 - :ambient_heat: 0.5182446854760586 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1926_pijnacker_nootdorp/GM1926_pijnacker_nootdorp.derived.ad b/datasets/GM1926_pijnacker_nootdorp/GM1926_pijnacker_nootdorp.derived.ad index d7dd6afdcd..f9ac92167d 100644 --- a/datasets/GM1926_pijnacker_nootdorp/GM1926_pijnacker_nootdorp.derived.ad +++ b/datasets/GM1926_pijnacker_nootdorp/GM1926_pijnacker_nootdorp.derived.ad @@ -1,6 +1,6 @@ - area = GM1926_pijnacker_nootdorp -- id = 129069 -- parent_id = 129069 +- id = 129415 +- parent_id = 129415 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1926_pijnacker_nootdorp/graph_values.yml b/datasets/GM1926_pijnacker_nootdorp/graph_values.yml index f1452266df..ad3b9ddb6c 100644 --- a/datasets/GM1926_pijnacker_nootdorp/graph_values.yml +++ b/datasets/GM1926_pijnacker_nootdorp/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3308.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16443550140845828 - :network_gas: 0.0956047422534795 - :ambient_heat: 0.7399597563380623 + :electricity: 0.19679544429097598 + :network_gas: 0.11441919516736399 + :ambient_heat: 0.68878536054166 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 21791.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 406.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1891436484686146 - :network_gas: 0.2434254061255397 - :ambient_heat: 0.5674309454058457 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1930_nissewaard/GM1930_nissewaard.derived.ad b/datasets/GM1930_nissewaard/GM1930_nissewaard.derived.ad index cf8eba5c32..247d6a5eb4 100644 --- a/datasets/GM1930_nissewaard/GM1930_nissewaard.derived.ad +++ b/datasets/GM1930_nissewaard/GM1930_nissewaard.derived.ad @@ -1,6 +1,6 @@ - area = GM1930_nissewaard -- id = 129040 -- parent_id = 129040 +- id = 129386 +- parent_id = 129386 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1930_nissewaard/graph_values.yml b/datasets/GM1930_nissewaard/graph_values.yml index fa47e5c012..cb7900087e 100644 --- a/datasets/GM1930_nissewaard/graph_values.yml +++ b/datasets/GM1930_nissewaard/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 6466.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16114265997112429 - :network_gas: 0.11371537015881641 - :ambient_heat: 0.7251419698700592 + :electricity: 0.19209756764141434 + :network_gas: 0.1355596712556817 + :ambient_heat: 0.6723427611029039 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 39448.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 128.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17978936028302714 - :network_gas: 0.28084255886788945 - :ambient_heat: 0.5393680808490834 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1931_krimpenerwaard/GM1931_krimpenerwaard.derived.ad b/datasets/GM1931_krimpenerwaard/GM1931_krimpenerwaard.derived.ad index 25e5b1b80c..1d06c39249 100644 --- a/datasets/GM1931_krimpenerwaard/GM1931_krimpenerwaard.derived.ad +++ b/datasets/GM1931_krimpenerwaard/GM1931_krimpenerwaard.derived.ad @@ -1,6 +1,6 @@ - area = GM1931_krimpenerwaard -- id = 129001 -- parent_id = 129001 +- id = 129347 +- parent_id = 129347 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1931_krimpenerwaard/graph_values.yml b/datasets/GM1931_krimpenerwaard/graph_values.yml index 1c58af4981..56dfb5f2ff 100644 --- a/datasets/GM1931_krimpenerwaard/graph_values.yml +++ b/datasets/GM1931_krimpenerwaard/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3631.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15813548237133712 - :network_gas: 0.13025484695764594 - :ambient_heat: 0.711609670671017 + :electricity: 0.1878393518266656 + :network_gas: 0.15472167067067114 + :ambient_heat: 0.6574389775026633 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 23909.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 830.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17172434188028718 - :network_gas: 0.31310263247884945 - :ambient_heat: 0.5151730256408633 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1940_de_fryske_marren/GM1940_de_fryske_marren.derived.ad b/datasets/GM1940_de_fryske_marren/GM1940_de_fryske_marren.derived.ad index 3e8f1b6199..2ae05b9218 100644 --- a/datasets/GM1940_de_fryske_marren/GM1940_de_fryske_marren.derived.ad +++ b/datasets/GM1940_de_fryske_marren/GM1940_de_fryske_marren.derived.ad @@ -1,6 +1,6 @@ - area = GM1940_de_fryske_marren -- id = 128914 -- parent_id = 128914 +- id = 129260 +- parent_id = 129260 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1940_de_fryske_marren/graph_values.yml b/datasets/GM1940_de_fryske_marren/graph_values.yml index d4ae692f43..ca652d6879 100644 --- a/datasets/GM1940_de_fryske_marren/graph_values.yml +++ b/datasets/GM1940_de_fryske_marren/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 5704.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15532752861264482 - :network_gas: 0.14569859263045354 - :ambient_heat: 0.6989738787569016 + :electricity: 0.18389061368524734 + :network_gas: 0.17249101850262644 + :ambient_heat: 0.6436183678121263 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 23318.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 364.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16457291492983853 - :network_gas: 0.3417083402806443 - :ambient_heat: 0.4937187447895173 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1942_gooise_meren/GM1942_gooise_meren.derived.ad b/datasets/GM1942_gooise_meren/GM1942_gooise_meren.derived.ad index 61dbb98036..0678f92f2e 100644 --- a/datasets/GM1942_gooise_meren/GM1942_gooise_meren.derived.ad +++ b/datasets/GM1942_gooise_meren/GM1942_gooise_meren.derived.ad @@ -1,6 +1,6 @@ - area = GM1942_gooise_meren -- id = 128955 -- parent_id = 128955 +- id = 129301 +- parent_id = 129301 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1942_gooise_meren/graph_values.yml b/datasets/GM1942_gooise_meren/graph_values.yml index 368f9a8fe6..70555a3652 100644 --- a/datasets/GM1942_gooise_meren/graph_values.yml +++ b/datasets/GM1942_gooise_meren/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 6396.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15298134027668722 - :network_gas: 0.15860262847822035 - :ambient_heat: 0.6884160312450924 + :electricity: 0.1806113185636995 + :network_gas: 0.18724786830413986 + :ambient_heat: 0.6321408131321606 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 26873.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 3613.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15885896588344497 - :network_gas: 0.3645641364662184 - :ambient_heat: 0.4765768976503366 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1945_berg_en_dal/GM1945_berg_en_dal.derived.ad b/datasets/GM1945_berg_en_dal/GM1945_berg_en_dal.derived.ad index 152ce73286..dc3e3e1034 100644 --- a/datasets/GM1945_berg_en_dal/GM1945_berg_en_dal.derived.ad +++ b/datasets/GM1945_berg_en_dal/GM1945_berg_en_dal.derived.ad @@ -1,6 +1,6 @@ - area = GM1945_berg_en_dal -- id = 128880 -- parent_id = 128880 +- id = 129226 +- parent_id = 129226 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1945_berg_en_dal/graph_values.yml b/datasets/GM1945_berg_en_dal/graph_values.yml index 9aba84e4ad..35cdc69747 100644 --- a/datasets/GM1945_berg_en_dal/graph_values.yml +++ b/datasets/GM1945_berg_en_dal/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3849.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1574195868586772 - :network_gas: 0.13419227227727532 - :ambient_heat: 0.7083881408640474 + :electricity: 0.1868301105691801 + :network_gas: 0.15926326302457136 + :ambient_heat: 0.6539066264062485 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15815.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 88.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16986741934407754 - :network_gas: 0.320530322623688 - :ambient_heat: 0.5096022580322344 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1948_meierijstad/GM1948_meierijstad.derived.ad b/datasets/GM1948_meierijstad/GM1948_meierijstad.derived.ad index 14a945c047..58512047fc 100644 --- a/datasets/GM1948_meierijstad/GM1948_meierijstad.derived.ad +++ b/datasets/GM1948_meierijstad/GM1948_meierijstad.derived.ad @@ -1,6 +1,6 @@ - area = GM1948_meierijstad -- id = 129179 -- parent_id = 129179 +- id = 129525 +- parent_id = 129525 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1948_meierijstad/graph_values.yml b/datasets/GM1948_meierijstad/graph_values.yml index 5521b366f4..1c10b1d3e0 100644 --- a/datasets/GM1948_meierijstad/graph_values.yml +++ b/datasets/GM1948_meierijstad/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 6741.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15956512515498433 - :network_gas: 0.12239181164758636 - :ambient_heat: 0.7180430631974295 + :electricity: 0.1898599510282476 + :network_gas: 0.14562896085907898 + :ambient_heat: 0.6645110881126733 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 34829.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 245.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17550415019606933 - :network_gas: 0.29798339921572087 - :ambient_heat: 0.52651245058821 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1949_waadhoeke/GM1949_waadhoeke.derived.ad b/datasets/GM1949_waadhoeke/GM1949_waadhoeke.derived.ad index 0ef90c6480..09b3d5f3d1 100644 --- a/datasets/GM1949_waadhoeke/GM1949_waadhoeke.derived.ad +++ b/datasets/GM1949_waadhoeke/GM1949_waadhoeke.derived.ad @@ -1,6 +1,6 @@ - area = GM1949_waadhoeke -- id = 129180 -- parent_id = 129180 +- id = 129526 +- parent_id = 129526 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1949_waadhoeke/graph_values.yml b/datasets/GM1949_waadhoeke/graph_values.yml index 413b446a8e..f207a6df32 100644 --- a/datasets/GM1949_waadhoeke/graph_values.yml +++ b/datasets/GM1949_waadhoeke/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3048.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15520310724136227 - :network_gas: 0.14638291017250743 - :ambient_heat: 0.6984139825861302 + :electricity: 0.18371625110939244 + :network_gas: 0.17327565125067892 + :ambient_heat: 0.6430080976399286 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 21213.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 841.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16426407220246467 - :network_gas: 0.3429437111901396 - :ambient_heat: 0.49279221660739575 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1950_westerwolde/GM1950_westerwolde.derived.ad b/datasets/GM1950_westerwolde/GM1950_westerwolde.derived.ad index f9c6a13f03..1c261d8d36 100644 --- a/datasets/GM1950_westerwolde/GM1950_westerwolde.derived.ad +++ b/datasets/GM1950_westerwolde/GM1950_westerwolde.derived.ad @@ -1,6 +1,6 @@ - area = GM1950_westerwolde -- id = 129181 -- parent_id = 129181 +- id = 129527 +- parent_id = 129527 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1950_westerwolde/graph_values.yml b/datasets/GM1950_westerwolde/graph_values.yml index 8e802afb58..7563d4ff74 100644 --- a/datasets/GM1950_westerwolde/graph_values.yml +++ b/datasets/GM1950_westerwolde/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2431.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15109701071163736 - :network_gas: 0.1689664410859945 - :ambient_heat: 0.679936548202368 + :electricity: 0.1779906941155271 + :network_gas: 0.19904069570590233 + :ambient_heat: 0.6229686101785707 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11770.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 9.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15443204287355533 - :network_gas: 0.3822718285057771 - :ambient_heat: 0.4632961286206676 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1952_midden_groningen/GM1952_midden_groningen.derived.ad b/datasets/GM1952_midden_groningen/GM1952_midden_groningen.derived.ad index 5de2a5fedd..f4ef5ecd6e 100644 --- a/datasets/GM1952_midden_groningen/GM1952_midden_groningen.derived.ad +++ b/datasets/GM1952_midden_groningen/GM1952_midden_groningen.derived.ad @@ -1,6 +1,6 @@ - area = GM1952_midden_groningen -- id = 129182 -- parent_id = 129182 +- id = 129528 +- parent_id = 129528 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1952_midden_groningen/graph_values.yml b/datasets/GM1952_midden_groningen/graph_values.yml index 2398d05dfc..a3af93cba4 100644 --- a/datasets/GM1952_midden_groningen/graph_values.yml +++ b/datasets/GM1952_midden_groningen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4501.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15204975251470168 - :network_gas: 0.16372636116914072 - :ambient_heat: 0.6842238863161576 + :electricity: 0.17931426058796957 + :network_gas: 0.19308463779949034 + :ambient_heat: 0.6276011016125401 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 27986.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 150.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15665279189788303 - :network_gas: 0.3733888324084661 - :ambient_heat: 0.4699583756936508 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1954_beekdaelen/GM1954_beekdaelen.derived.ad b/datasets/GM1954_beekdaelen/GM1954_beekdaelen.derived.ad index 2152b88b90..a9917cab63 100644 --- a/datasets/GM1954_beekdaelen/GM1954_beekdaelen.derived.ad +++ b/datasets/GM1954_beekdaelen/GM1954_beekdaelen.derived.ad @@ -1,6 +1,6 @@ - area = GM1954_beekdaelen -- id = 129187 -- parent_id = 129187 +- id = 129533 +- parent_id = 129533 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1954_beekdaelen/graph_values.yml b/datasets/GM1954_beekdaelen/graph_values.yml index 402b644a0d..9b0df27b35 100644 --- a/datasets/GM1954_beekdaelen/graph_values.yml +++ b/datasets/GM1954_beekdaelen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2560.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1581302398052787 - :network_gas: 0.1302836810709671 - :ambient_heat: 0.7115860791237543 + :electricity: 0.18783195482504997 + :network_gas: 0.15475495722701235 + :ambient_heat: 0.6574130879479376 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16651.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 860.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17171065769141802 - :network_gas: 0.3131573692343259 - :ambient_heat: 0.515131973074256 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1955_montferland/GM1955_montferland.derived.ad b/datasets/GM1955_montferland/GM1955_montferland.derived.ad index dc50873980..e7e5d4f582 100644 --- a/datasets/GM1955_montferland/GM1955_montferland.derived.ad +++ b/datasets/GM1955_montferland/GM1955_montferland.derived.ad @@ -1,6 +1,6 @@ - area = GM1955_montferland -- id = 129031 -- parent_id = 129031 +- id = 129377 +- parent_id = 129377 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1955_montferland/graph_values.yml b/datasets/GM1955_montferland/graph_values.yml index 214f99588d..11afc74323 100644 --- a/datasets/GM1955_montferland/graph_values.yml +++ b/datasets/GM1955_montferland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2077.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15939740367108604 - :network_gas: 0.12331427980902676 - :ambient_heat: 0.7172883165198872 + :electricity: 0.18962254441637041 + :network_gas: 0.14669729218746053 + :ambient_heat: 0.6636801633961691 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15970.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 88.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17505569052646303 - :network_gas: 0.29977723789414595 - :ambient_heat: 0.5251670715793909 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1959_altena/GM1959_altena.derived.ad b/datasets/GM1959_altena/GM1959_altena.derived.ad index 19e673977b..b5d5988e6b 100644 --- a/datasets/GM1959_altena/GM1959_altena.derived.ad +++ b/datasets/GM1959_altena/GM1959_altena.derived.ad @@ -1,6 +1,6 @@ - area = GM1959_altena -- id = 129186 -- parent_id = 129186 +- id = 129532 +- parent_id = 129532 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1959_altena/graph_values.yml b/datasets/GM1959_altena/graph_values.yml index c108daebcc..197a9d02c9 100644 --- a/datasets/GM1959_altena/graph_values.yml +++ b/datasets/GM1959_altena/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3723.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1592486200770488 - :network_gas: 0.1241325895762316 - :ambient_heat: 0.7166187903467196 + :electricity: 0.18941202331302306 + :network_gas: 0.1476446385491018 + :ambient_heat: 0.6629433381378753 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22525.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 328.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1746589965452852 - :network_gas: 0.3013640138188574 - :ambient_heat: 0.5239769896358574 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1960_west_betuwe/GM1960_west_betuwe.derived.ad b/datasets/GM1960_west_betuwe/GM1960_west_betuwe.derived.ad index 603052a228..02cfbf113c 100644 --- a/datasets/GM1960_west_betuwe/GM1960_west_betuwe.derived.ad +++ b/datasets/GM1960_west_betuwe/GM1960_west_betuwe.derived.ad @@ -1,6 +1,6 @@ - area = GM1960_west_betuwe -- id = 129184 -- parent_id = 129184 +- id = 129530 +- parent_id = 129530 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1960_west_betuwe/graph_values.yml b/datasets/GM1960_west_betuwe/graph_values.yml index 1502eece5b..a53dbf21a0 100644 --- a/datasets/GM1960_west_betuwe/graph_values.yml +++ b/datasets/GM1960_west_betuwe/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4312.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15954600084610127 - :network_gas: 0.12249699534644284 - :ambient_heat: 0.7179570038074558 + :electricity: 0.18983287614192412 + :network_gas: 0.14575079802714705 + :ambient_heat: 0.6644163258309288 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20961.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 320.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1754529466310092 - :network_gas: 0.2981882134759613 - :ambient_heat: 0.5263588398930295 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1961_vijfheerenlanden/GM1961_vijfheerenlanden.derived.ad b/datasets/GM1961_vijfheerenlanden/GM1961_vijfheerenlanden.derived.ad index 0f7c574c89..aa5081b264 100644 --- a/datasets/GM1961_vijfheerenlanden/GM1961_vijfheerenlanden.derived.ad +++ b/datasets/GM1961_vijfheerenlanden/GM1961_vijfheerenlanden.derived.ad @@ -1,6 +1,6 @@ - area = GM1961_vijfheerenlanden -- id = 129183 -- parent_id = 129183 +- id = 129529 +- parent_id = 129529 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1961_vijfheerenlanden/graph_values.yml b/datasets/GM1961_vijfheerenlanden/graph_values.yml index 90fe5fd7c1..f99108ddac 100644 --- a/datasets/GM1961_vijfheerenlanden/graph_values.yml +++ b/datasets/GM1961_vijfheerenlanden/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4871.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15988416610995432 - :network_gas: 0.12063708639525113 - :ambient_heat: 0.7194787474947945 + :electricity: 0.19031180916332865 + :network_gas: 0.1435955962536282 + :ambient_heat: 0.666092594583043 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 24175.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 823.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17636095745078118 - :network_gas: 0.2945561701968734 - :ambient_heat: 0.5290828723523454 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1963_hoeksche_waard/GM1963_hoeksche_waard.derived.ad b/datasets/GM1963_hoeksche_waard/GM1963_hoeksche_waard.derived.ad index 3f043d2fcb..7fdb5b4faa 100644 --- a/datasets/GM1963_hoeksche_waard/GM1963_hoeksche_waard.derived.ad +++ b/datasets/GM1963_hoeksche_waard/GM1963_hoeksche_waard.derived.ad @@ -1,6 +1,6 @@ - area = GM1963_hoeksche_waard -- id = 129188 -- parent_id = 129188 +- id = 129534 +- parent_id = 129534 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1963_hoeksche_waard/graph_values.yml b/datasets/GM1963_hoeksche_waard/graph_values.yml index 9d2cc87f9b..42094fc1cd 100644 --- a/datasets/GM1963_hoeksche_waard/graph_values.yml +++ b/datasets/GM1963_hoeksche_waard/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 5414.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1596823152268576 - :network_gas: 0.12174726625228319 - :ambient_heat: 0.7185704185208592 + :electricity: 0.19002588761666497 + :network_gas: 0.14488224511039255 + :ambient_heat: 0.6650918672729426 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 38171.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 523.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17581830071745436 - :network_gas: 0.2967267971301807 - :ambient_heat: 0.5274549021523649 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1966_het_hogeland/GM1966_het_hogeland.derived.ad b/datasets/GM1966_het_hogeland/GM1966_het_hogeland.derived.ad index 701b5a5948..125bd6e710 100644 --- a/datasets/GM1966_het_hogeland/GM1966_het_hogeland.derived.ad +++ b/datasets/GM1966_het_hogeland/GM1966_het_hogeland.derived.ad @@ -1,6 +1,6 @@ - area = GM1966_het_hogeland -- id = 129185 -- parent_id = 129185 +- id = 129531 +- parent_id = 129531 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1966_het_hogeland/graph_values.yml b/datasets/GM1966_het_hogeland/graph_values.yml index ed40e0b97b..3be50d3dc2 100644 --- a/datasets/GM1966_het_hogeland/graph_values.yml +++ b/datasets/GM1966_het_hogeland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3049.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1522193742162101 - :network_gas: 0.16279344181084446 - :ambient_heat: 0.6849871839729454 + :electricity: 0.17955021414171665 + :network_gas: 0.19202284524233384 + :ambient_heat: 0.6284269406159495 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22402.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 171.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15705190630983407 - :network_gas: 0.3717923747606622 - :ambient_heat: 0.4711557189295038 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1969_westerkwartier/GM1969_westerkwartier.derived.ad b/datasets/GM1969_westerkwartier/GM1969_westerkwartier.derived.ad index 5361753b66..c7a7d5b589 100644 --- a/datasets/GM1969_westerkwartier/GM1969_westerkwartier.derived.ad +++ b/datasets/GM1969_westerkwartier/GM1969_westerkwartier.derived.ad @@ -1,6 +1,6 @@ - area = GM1969_westerkwartier -- id = 129191 -- parent_id = 129191 +- id = 129537 +- parent_id = 129537 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1969_westerkwartier/graph_values.yml b/datasets/GM1969_westerkwartier/graph_values.yml index 8a93c97db0..5f42f78876 100644 --- a/datasets/GM1969_westerkwartier/graph_values.yml +++ b/datasets/GM1969_westerkwartier/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4119.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15563387179517402 - :network_gas: 0.14401370512654288 - :ambient_heat: 0.700352423078283 + :electricity: 0.18432013825885166 + :network_gas: 0.17055815507197955 + :ambient_heat: 0.6451217066691688 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 27257.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 120.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16533617440593595 - :network_gas: 0.33865530237625446 - :ambient_heat: 0.49600852321780964 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1970_noardeast_fryslan/GM1970_noardeast_fryslan.derived.ad b/datasets/GM1970_noardeast_fryslan/GM1970_noardeast_fryslan.derived.ad index 796991bddb..9114c8e24e 100644 --- a/datasets/GM1970_noardeast_fryslan/GM1970_noardeast_fryslan.derived.ad +++ b/datasets/GM1970_noardeast_fryslan/GM1970_noardeast_fryslan.derived.ad @@ -1,6 +1,6 @@ - area = GM1970_noardeast_fryslan -- id = 129190 -- parent_id = 129190 +- id = 129536 +- parent_id = 129536 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1970_noardeast_fryslan/graph_values.yml b/datasets/GM1970_noardeast_fryslan/graph_values.yml index c63825a358..9edc216344 100644 --- a/datasets/GM1970_noardeast_fryslan/graph_values.yml +++ b/datasets/GM1970_noardeast_fryslan/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 4040.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1538302142398247 - :network_gas: 0.15393382168096403 - :ambient_heat: 0.6922359640792112 + :electricity: 0.1817957002327651 + :network_gas: 0.18191814293626343 + :ambient_heat: 0.6362861568309714 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20491.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 571.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1608998615392584 - :network_gas: 0.35640055384296465 - :ambient_heat: 0.48269958461777696 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1978_molenlanden/GM1978_molenlanden.derived.ad b/datasets/GM1978_molenlanden/GM1978_molenlanden.derived.ad index 8a39c9f767..9b8ea7049a 100644 --- a/datasets/GM1978_molenlanden/GM1978_molenlanden.derived.ad +++ b/datasets/GM1978_molenlanden/GM1978_molenlanden.derived.ad @@ -1,6 +1,6 @@ - area = GM1978_molenlanden -- id = 129189 -- parent_id = 129189 +- id = 129535 +- parent_id = 129535 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1978_molenlanden/graph_values.yml b/datasets/GM1978_molenlanden/graph_values.yml index 790f06ab71..ac92e1080b 100644 --- a/datasets/GM1978_molenlanden/graph_values.yml +++ b/datasets/GM1978_molenlanden/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 2593.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15887388679342587 - :network_gas: 0.12619362263615758 - :ambient_heat: 0.7149324905704165 + :electricity: 0.1888821250769305 + :network_gas: 0.15002918412681518 + :ambient_heat: 0.6610886907962542 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 17330.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 281.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17366453848834232 - :network_gas: 0.30534184604662884 - :ambient_heat: 0.5209936154650289 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1979_eemsdelta/GM1979_eemsdelta.derived.ad b/datasets/GM1979_eemsdelta/GM1979_eemsdelta.derived.ad index 88ba2c29b3..85a3d193c3 100644 --- a/datasets/GM1979_eemsdelta/GM1979_eemsdelta.derived.ad +++ b/datasets/GM1979_eemsdelta/GM1979_eemsdelta.derived.ad @@ -1,6 +1,6 @@ - area = GM1979_eemsdelta -- id = 129192 -- parent_id = 129192 +- id = 129538 +- parent_id = 129538 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1979_eemsdelta/graph_values.yml b/datasets/GM1979_eemsdelta/graph_values.yml index cf01a7af6a..03ceed17cb 100644 --- a/datasets/GM1979_eemsdelta/graph_values.yml +++ b/datasets/GM1979_eemsdelta/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 3545.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15346628178208507 - :network_gas: 0.15593545019853208 - :ambient_heat: 0.6905982680193827 + :electricity: 0.18128763676368229 + :network_gas: 0.18420443191758337 + :ambient_heat: 0.6345079313187343 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22892.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 350.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16002126429795177 - :network_gas: 0.35991494280819114 - :ambient_heat: 0.48006379289385703 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1980_dijk_en_waard/GM1980_dijk_en_waard.derived.ad b/datasets/GM1980_dijk_en_waard/GM1980_dijk_en_waard.derived.ad index 4444ccc514..3fb1d8b237 100644 --- a/datasets/GM1980_dijk_en_waard/GM1980_dijk_en_waard.derived.ad +++ b/datasets/GM1980_dijk_en_waard/GM1980_dijk_en_waard.derived.ad @@ -1,6 +1,6 @@ - area = GM1980_dijk_en_waard -- id = 129193 -- parent_id = 129193 +- id = 129539 +- parent_id = 129539 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1980_dijk_en_waard/graph_values.yml b/datasets/GM1980_dijk_en_waard/graph_values.yml index 78d4b6b39c..b6062aa4ec 100644 --- a/datasets/GM1980_dijk_en_waard/graph_values.yml +++ b/datasets/GM1980_dijk_en_waard/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 6661.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.16240911347793463 - :network_gas: 0.10674987587135966 - :ambient_heat: 0.7308410106507058 + :electricity: 0.19390003781316914 + :network_gas: 0.1274485435253604 + :ambient_heat: 0.6786514186614704 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 36193.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 78.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1833198263726949 - :network_gas: 0.26672069450921854 - :ambient_heat: 0.5499594791180866 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1982_land_van_cuijk/GM1982_land_van_cuijk.derived.ad b/datasets/GM1982_land_van_cuijk/GM1982_land_van_cuijk.derived.ad index ce2992576f..cc1ed06b71 100644 --- a/datasets/GM1982_land_van_cuijk/GM1982_land_van_cuijk.derived.ad +++ b/datasets/GM1982_land_van_cuijk/GM1982_land_van_cuijk.derived.ad @@ -1,6 +1,6 @@ - area = GM1982_land_van_cuijk -- id = 129194 -- parent_id = 129194 +- id = 129540 +- parent_id = 129540 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1982_land_van_cuijk/graph_values.yml b/datasets/GM1982_land_van_cuijk/graph_values.yml index e455421397..d4aa7ef6b8 100644 --- a/datasets/GM1982_land_van_cuijk/graph_values.yml +++ b/datasets/GM1982_land_van_cuijk/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 8066.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1587027745307345 - :network_gas: 0.12713474008096026 - :ambient_heat: 0.7141624853883053 + :electricity: 0.18864031774017873 + :network_gas: 0.15111731874632642 + :ambient_heat: 0.660242363513495 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 39031.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 325.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17321265637002006 - :network_gas: 0.3071493745199179 - :ambient_heat: 0.5196379691100621 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1991_maashorst/GM1991_maashorst.derived.ad b/datasets/GM1991_maashorst/GM1991_maashorst.derived.ad index 6a91354b99..66696ba27c 100644 --- a/datasets/GM1991_maashorst/GM1991_maashorst.derived.ad +++ b/datasets/GM1991_maashorst/GM1991_maashorst.derived.ad @@ -1,6 +1,6 @@ - area = GM1991_maashorst -- id = 129195 -- parent_id = 129195 +- id = 129541 +- parent_id = 129541 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1991_maashorst/graph_values.yml b/datasets/GM1991_maashorst/graph_values.yml index 074f2dc675..10a656635a 100644 --- a/datasets/GM1991_maashorst/graph_values.yml +++ b/datasets/GM1991_maashorst/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 6789.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1593553240777767 - :network_gas: 0.12354571757222838 - :ambient_heat: 0.717098958349995 + :electricity: 0.18956299640707489 + :network_gas: 0.1469652586243265 + :ambient_heat: 0.6634717449685986 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 25517.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 55.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1749433884535058 - :network_gas: 0.30022644618597494 - :ambient_heat: 0.5248301653605193 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 diff --git a/datasets/GM1992_voorne_aan_zee/GM1992_voorne_aan_zee.derived.ad b/datasets/GM1992_voorne_aan_zee/GM1992_voorne_aan_zee.derived.ad index c258cf1585..9153815d15 100644 --- a/datasets/GM1992_voorne_aan_zee/GM1992_voorne_aan_zee.derived.ad +++ b/datasets/GM1992_voorne_aan_zee/GM1992_voorne_aan_zee.derived.ad @@ -1,6 +1,6 @@ - area = GM1992_voorne_aan_zee -- id = 129196 -- parent_id = 129196 +- id = 129542 +- parent_id = 129542 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1992_voorne_aan_zee/graph_values.yml b/datasets/GM1992_voorne_aan_zee/graph_values.yml index 97a5c1937a..871ad9abb4 100644 --- a/datasets/GM1992_voorne_aan_zee/graph_values.yml +++ b/datasets/GM1992_voorne_aan_zee/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 5708.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.159779527390693 - :network_gas: 0.12121259935118844 - :ambient_heat: 0.7190078732581185 + :electricity: 0.1901635713875797 + :network_gas: 0.1442626672278946 + :ambient_heat: 0.6655737613845257 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 33090.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 570.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17607939993963062 - :network_gas: 0.2956824002414757 - :ambient_heat: 0.5282381998188937 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 From f746303fb126c0a7e876cf70711d82dfc7601f48 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 27 Aug 2026 12:15:52 +0200 Subject: [PATCH 4/6] Re-export municipal datasets with heat pump update --- .../GM0014_groningen.derived.ad | 4 +- datasets/GM0014_groningen/graph_values.yml | 48 +++++++++---------- .../GM0034_almere/GM0034_almere.derived.ad | 4 +- datasets/GM0034_almere/graph_values.yml | 48 +++++++++---------- .../GM0037_stadskanaal.derived.ad | 4 +- datasets/GM0037_stadskanaal/graph_values.yml | 48 +++++++++---------- .../GM0047_veendam/GM0047_veendam.derived.ad | 4 +- datasets/GM0047_veendam/graph_values.yml | 48 +++++++++---------- .../GM0050_zeewolde.derived.ad | 4 +- datasets/GM0050_zeewolde/graph_values.yml | 48 +++++++++---------- .../GM0059_achtkarspelen.derived.ad | 4 +- .../GM0059_achtkarspelen/graph_values.yml | 48 +++++++++---------- .../GM0060_ameland/GM0060_ameland.derived.ad | 4 +- datasets/GM0060_ameland/graph_values.yml | 48 +++++++++---------- .../GM0072_harlingen.derived.ad | 4 +- datasets/GM0072_harlingen/graph_values.yml | 48 +++++++++---------- .../GM0074_heerenveen.derived.ad | 4 +- datasets/GM0074_heerenveen/graph_values.yml | 48 +++++++++---------- .../GM0080_leeuwarden.derived.ad | 4 +- datasets/GM0080_leeuwarden/graph_values.yml | 48 +++++++++---------- .../GM0085_ooststellingwerf.derived.ad | 4 +- .../GM0085_ooststellingwerf/graph_values.yml | 48 +++++++++---------- .../GM0086_opsterland.derived.ad | 4 +- datasets/GM0086_opsterland/graph_values.yml | 48 +++++++++---------- .../GM0088_schiermonnikoog.derived.ad | 4 +- .../GM0088_schiermonnikoog/graph_values.yml | 48 +++++++++---------- .../GM0090_smallingerland.derived.ad | 4 +- .../GM0090_smallingerland/graph_values.yml | 48 +++++++++---------- .../GM0093_terschelling.derived.ad | 4 +- datasets/GM0093_terschelling/graph_values.yml | 48 +++++++++---------- .../GM0096_vlieland.derived.ad | 4 +- datasets/GM0096_vlieland/graph_values.yml | 48 +++++++++---------- .../GM0098_weststellingwerf.derived.ad | 4 +- .../GM0098_weststellingwerf/graph_values.yml | 48 +++++++++---------- datasets/GM0106_assen/GM0106_assen.derived.ad | 4 +- datasets/GM0106_assen/graph_values.yml | 48 +++++++++---------- .../GM0109_coevorden.derived.ad | 4 +- datasets/GM0109_coevorden/graph_values.yml | 48 +++++++++---------- datasets/GM0114_emmen/GM0114_emmen.derived.ad | 4 +- datasets/GM0114_emmen/graph_values.yml | 48 +++++++++---------- .../GM0118_hoogeveen.derived.ad | 4 +- datasets/GM0118_hoogeveen/graph_values.yml | 48 +++++++++---------- .../GM0119_meppel/GM0119_meppel.derived.ad | 4 +- datasets/GM0119_meppel/graph_values.yml | 48 +++++++++---------- .../GM0141_almelo/GM0141_almelo.derived.ad | 4 +- datasets/GM0141_almelo/graph_values.yml | 48 +++++++++---------- datasets/GM0147_borne/GM0147_borne.derived.ad | 4 +- datasets/GM0147_borne/graph_values.yml | 48 +++++++++---------- .../GM0148_dalfsen/GM0148_dalfsen.derived.ad | 4 +- datasets/GM0148_dalfsen/graph_values.yml | 48 +++++++++---------- .../GM0150_deventer.derived.ad | 4 +- datasets/GM0150_deventer/graph_values.yml | 48 +++++++++---------- .../GM0153_enschede.derived.ad | 4 +- datasets/GM0153_enschede/graph_values.yml | 48 +++++++++---------- .../GM0158_haaksbergen.derived.ad | 4 +- datasets/GM0158_haaksbergen/graph_values.yml | 48 +++++++++---------- .../GM0160_hardenberg.derived.ad | 4 +- datasets/GM0160_hardenberg/graph_values.yml | 48 +++++++++---------- .../GM0163_hellendoorn.derived.ad | 4 +- datasets/GM0163_hellendoorn/graph_values.yml | 48 +++++++++---------- .../GM0164_hengelo/GM0164_hengelo.derived.ad | 4 +- datasets/GM0164_hengelo/graph_values.yml | 48 +++++++++---------- .../GM0166_kampen/GM0166_kampen.derived.ad | 4 +- datasets/GM0166_kampen/graph_values.yml | 48 +++++++++---------- .../GM0168_losser/GM0168_losser.derived.ad | 4 +- datasets/GM0168_losser/graph_values.yml | 48 +++++++++---------- .../GM0171_noordoostpolder.derived.ad | 4 +- .../GM0171_noordoostpolder/graph_values.yml | 48 +++++++++---------- .../GM0173_oldenzaal.derived.ad | 4 +- datasets/GM0173_oldenzaal/graph_values.yml | 48 +++++++++---------- datasets/GM0175_ommen/GM0175_ommen.derived.ad | 4 +- datasets/GM0175_ommen/graph_values.yml | 48 +++++++++---------- .../GM0177_raalte/GM0177_raalte.derived.ad | 4 +- datasets/GM0177_raalte/graph_values.yml | 48 +++++++++---------- .../GM0180_staphorst.derived.ad | 4 +- datasets/GM0180_staphorst/graph_values.yml | 48 +++++++++---------- .../GM0183_tubbergen.derived.ad | 4 +- datasets/GM0183_tubbergen/graph_values.yml | 48 +++++++++---------- datasets/GM0184_urk/GM0184_urk.derived.ad | 4 +- datasets/GM0184_urk/graph_values.yml | 48 +++++++++---------- .../GM0189_wierden/GM0189_wierden.derived.ad | 4 +- datasets/GM0189_wierden/graph_values.yml | 48 +++++++++---------- .../GM0193_zwolle/GM0193_zwolle.derived.ad | 4 +- datasets/GM0193_zwolle/graph_values.yml | 48 +++++++++---------- .../GM0197_aalten/GM0197_aalten.derived.ad | 4 +- datasets/GM0197_aalten/graph_values.yml | 48 +++++++++---------- .../GM0200_apeldoorn.derived.ad | 4 +- datasets/GM0200_apeldoorn/graph_values.yml | 48 +++++++++---------- .../GM0202_arnhem/GM0202_arnhem.derived.ad | 4 +- datasets/GM0202_arnhem/graph_values.yml | 48 +++++++++---------- .../GM0203_barneveld.derived.ad | 4 +- datasets/GM0203_barneveld/graph_values.yml | 48 +++++++++---------- .../GM0209_beuningen.derived.ad | 4 +- datasets/GM0209_beuningen/graph_values.yml | 48 +++++++++---------- .../GM0213_brummen/GM0213_brummen.derived.ad | 4 +- datasets/GM0213_brummen/graph_values.yml | 48 +++++++++---------- datasets/GM0214_buren/GM0214_buren.derived.ad | 4 +- datasets/GM0214_buren/graph_values.yml | 48 +++++++++---------- .../GM0216_culemborg.derived.ad | 4 +- datasets/GM0216_culemborg/graph_values.yml | 48 +++++++++---------- .../GM0221_doesburg.derived.ad | 4 +- datasets/GM0221_doesburg/graph_values.yml | 48 +++++++++---------- .../GM0222_doetinchem.derived.ad | 4 +- datasets/GM0222_doetinchem/graph_values.yml | 48 +++++++++---------- .../GM0225_druten/GM0225_druten.derived.ad | 4 +- datasets/GM0225_druten/graph_values.yml | 48 +++++++++---------- .../GM0226_duiven/GM0226_duiven.derived.ad | 4 +- datasets/GM0226_duiven/graph_values.yml | 48 +++++++++---------- datasets/GM0228_ede/GM0228_ede.derived.ad | 4 +- datasets/GM0228_ede/graph_values.yml | 48 +++++++++---------- .../GM0230_elburg/GM0230_elburg.derived.ad | 4 +- datasets/GM0230_elburg/graph_values.yml | 48 +++++++++---------- datasets/GM0232_epe/GM0232_epe.derived.ad | 4 +- datasets/GM0232_epe/graph_values.yml | 48 +++++++++---------- .../GM0233_ermelo/GM0233_ermelo.derived.ad | 4 +- datasets/GM0233_ermelo/graph_values.yml | 48 +++++++++---------- .../GM0243_harderwijk.derived.ad | 4 +- datasets/GM0243_harderwijk/graph_values.yml | 48 +++++++++---------- .../GM0244_hattem/GM0244_hattem.derived.ad | 4 +- datasets/GM0244_hattem/graph_values.yml | 48 +++++++++---------- .../GM0246_heerde/GM0246_heerde.derived.ad | 4 +- datasets/GM0246_heerde/graph_values.yml | 48 +++++++++---------- .../GM0252_heumen/GM0252_heumen.derived.ad | 4 +- datasets/GM0252_heumen/graph_values.yml | 48 +++++++++---------- .../GM0262_lochem/GM0262_lochem.derived.ad | 4 +- datasets/GM0262_lochem/graph_values.yml | 48 +++++++++---------- .../GM0263_maasdriel.derived.ad | 4 +- datasets/GM0263_maasdriel/graph_values.yml | 48 +++++++++---------- .../GM0267_nijkerk/GM0267_nijkerk.derived.ad | 4 +- datasets/GM0267_nijkerk/graph_values.yml | 48 +++++++++---------- .../GM0268_nijmegen.derived.ad | 4 +- datasets/GM0268_nijmegen/graph_values.yml | 48 +++++++++---------- .../GM0269_oldebroek.derived.ad | 4 +- datasets/GM0269_oldebroek/graph_values.yml | 48 +++++++++---------- .../GM0273_putten/GM0273_putten.derived.ad | 4 +- datasets/GM0273_putten/graph_values.yml | 48 +++++++++---------- .../GM0274_renkum/GM0274_renkum.derived.ad | 4 +- datasets/GM0274_renkum/graph_values.yml | 48 +++++++++---------- .../GM0275_rheden/GM0275_rheden.derived.ad | 4 +- datasets/GM0275_rheden/graph_values.yml | 48 +++++++++---------- .../GM0277_rozendaal.derived.ad | 4 +- datasets/GM0277_rozendaal/graph_values.yml | 48 +++++++++---------- .../GM0279_scherpenzeel.derived.ad | 4 +- datasets/GM0279_scherpenzeel/graph_values.yml | 48 +++++++++---------- datasets/GM0281_tiel/GM0281_tiel.derived.ad | 4 +- datasets/GM0281_tiel/graph_values.yml | 48 +++++++++---------- .../GM0285_voorst/GM0285_voorst.derived.ad | 4 +- datasets/GM0285_voorst/graph_values.yml | 48 +++++++++---------- .../GM0289_wageningen.derived.ad | 4 +- datasets/GM0289_wageningen/graph_values.yml | 48 +++++++++---------- .../GM0293_westervoort.derived.ad | 4 +- datasets/GM0293_westervoort/graph_values.yml | 48 +++++++++---------- .../GM0294_winterswijk.derived.ad | 4 +- datasets/GM0294_winterswijk/graph_values.yml | 48 +++++++++---------- .../GM0296_wijchen/GM0296_wijchen.derived.ad | 4 +- datasets/GM0296_wijchen/graph_values.yml | 48 +++++++++---------- .../GM0297_zaltbommel.derived.ad | 4 +- datasets/GM0297_zaltbommel/graph_values.yml | 48 +++++++++---------- .../GM0299_zevenaar.derived.ad | 4 +- datasets/GM0299_zevenaar/graph_values.yml | 48 +++++++++---------- .../GM0301_zutphen/GM0301_zutphen.derived.ad | 4 +- datasets/GM0301_zutphen/graph_values.yml | 48 +++++++++---------- .../GM0302_nunspeet.derived.ad | 4 +- datasets/GM0302_nunspeet/graph_values.yml | 48 +++++++++---------- .../GM0303_dronten/GM0303_dronten.derived.ad | 4 +- datasets/GM0303_dronten/graph_values.yml | 48 +++++++++---------- .../GM0307_amersfoort.derived.ad | 4 +- datasets/GM0307_amersfoort/graph_values.yml | 48 +++++++++---------- datasets/GM0308_baarn/GM0308_baarn.derived.ad | 4 +- datasets/GM0308_baarn/graph_values.yml | 48 +++++++++---------- .../GM0310_de_bilt/GM0310_de_bilt.derived.ad | 4 +- datasets/GM0310_de_bilt/graph_values.yml | 48 +++++++++---------- .../GM0312_bunnik/GM0312_bunnik.derived.ad | 4 +- datasets/GM0312_bunnik/graph_values.yml | 48 +++++++++---------- .../GM0313_bunschoten.derived.ad | 4 +- datasets/GM0313_bunschoten/graph_values.yml | 48 +++++++++---------- .../GM0317_eemnes/GM0317_eemnes.derived.ad | 4 +- datasets/GM0317_eemnes/graph_values.yml | 48 +++++++++---------- .../GM0321_houten/GM0321_houten.derived.ad | 4 +- datasets/GM0321_houten/graph_values.yml | 48 +++++++++---------- .../GM0327_leusden/GM0327_leusden.derived.ad | 4 +- datasets/GM0327_leusden/graph_values.yml | 48 +++++++++---------- datasets/GM0331_lopik/GM0331_lopik.derived.ad | 4 +- datasets/GM0331_lopik/graph_values.yml | 48 +++++++++---------- .../GM0335_montfoort.derived.ad | 4 +- datasets/GM0335_montfoort/graph_values.yml | 48 +++++++++---------- .../GM0339_renswoude.derived.ad | 4 +- datasets/GM0339_renswoude/graph_values.yml | 48 +++++++++---------- .../GM0340_rhenen/GM0340_rhenen.derived.ad | 4 +- datasets/GM0340_rhenen/graph_values.yml | 48 +++++++++---------- datasets/GM0342_soest/GM0342_soest.derived.ad | 4 +- datasets/GM0342_soest/graph_values.yml | 48 +++++++++---------- .../GM0344_utrecht/GM0344_utrecht.derived.ad | 4 +- datasets/GM0344_utrecht/graph_values.yml | 48 +++++++++---------- .../GM0345_veenendaal.derived.ad | 4 +- datasets/GM0345_veenendaal/graph_values.yml | 48 +++++++++---------- .../GM0351_woudenberg.derived.ad | 4 +- datasets/GM0351_woudenberg/graph_values.yml | 48 +++++++++---------- .../GM0352_wijk_bij_duurstede.derived.ad | 4 +- .../graph_values.yml | 48 +++++++++---------- .../GM0353_ijsselstein.derived.ad | 4 +- datasets/GM0353_ijsselstein/graph_values.yml | 48 +++++++++---------- datasets/GM0355_zeist/GM0355_zeist.derived.ad | 4 +- datasets/GM0355_zeist/graph_values.yml | 48 +++++++++---------- .../GM0356_nieuwegein.derived.ad | 4 +- datasets/GM0356_nieuwegein/graph_values.yml | 48 +++++++++---------- .../GM0358_aalsmeer.derived.ad | 4 +- datasets/GM0358_aalsmeer/graph_values.yml | 48 +++++++++---------- .../GM0361_alkmaar/GM0361_alkmaar.derived.ad | 4 +- datasets/GM0361_alkmaar/graph_values.yml | 48 +++++++++---------- .../GM0362_amstelveen.derived.ad | 4 +- datasets/GM0362_amstelveen/graph_values.yml | 48 +++++++++---------- .../GM0363_amsterdam.derived.ad | 4 +- datasets/GM0363_amsterdam/graph_values.yml | 48 +++++++++---------- .../GM0373_bergen/GM0373_bergen.derived.ad | 4 +- datasets/GM0373_bergen/graph_values.yml | 48 +++++++++---------- .../GM0375_beverwijk.derived.ad | 4 +- datasets/GM0375_beverwijk/graph_values.yml | 48 +++++++++---------- .../GM0376_blaricum.derived.ad | 4 +- datasets/GM0376_blaricum/graph_values.yml | 48 +++++++++---------- .../GM0377_bloemendaal.derived.ad | 4 +- datasets/GM0377_bloemendaal/graph_values.yml | 48 +++++++++---------- .../GM0383_castricum.derived.ad | 4 +- datasets/GM0383_castricum/graph_values.yml | 48 +++++++++---------- .../GM0384_diemen/GM0384_diemen.derived.ad | 4 +- datasets/GM0384_diemen/graph_values.yml | 48 +++++++++---------- .../GM0385_edam_volendam.derived.ad | 4 +- .../GM0385_edam_volendam/graph_values.yml | 48 +++++++++---------- .../GM0388_enkhuizen.derived.ad | 4 +- datasets/GM0388_enkhuizen/graph_values.yml | 48 +++++++++---------- .../GM0392_haarlem/GM0392_haarlem.derived.ad | 4 +- datasets/GM0392_haarlem/graph_values.yml | 48 +++++++++---------- .../GM0394_haarlemmermeer.derived.ad | 4 +- .../GM0394_haarlemmermeer/graph_values.yml | 48 +++++++++---------- .../GM0396_heemskerk.derived.ad | 4 +- datasets/GM0396_heemskerk/graph_values.yml | 48 +++++++++---------- .../GM0397_heemstede.derived.ad | 4 +- datasets/GM0397_heemstede/graph_values.yml | 48 +++++++++---------- .../GM0399_heiloo/GM0399_heiloo.derived.ad | 4 +- datasets/GM0399_heiloo/graph_values.yml | 48 +++++++++---------- .../GM0400_den_helder.derived.ad | 4 +- datasets/GM0400_den_helder/graph_values.yml | 48 +++++++++---------- .../GM0402_hilversum.derived.ad | 4 +- datasets/GM0402_hilversum/graph_values.yml | 48 +++++++++---------- datasets/GM0405_hoorn/GM0405_hoorn.derived.ad | 4 +- datasets/GM0405_hoorn/graph_values.yml | 48 +++++++++---------- .../GM0406_huizen/GM0406_huizen.derived.ad | 4 +- datasets/GM0406_huizen/graph_values.yml | 48 +++++++++---------- .../GM0415_landsmeer.derived.ad | 4 +- datasets/GM0415_landsmeer/graph_values.yml | 48 +++++++++---------- datasets/GM0417_laren/GM0417_laren.derived.ad | 4 +- datasets/GM0417_laren/graph_values.yml | 48 +++++++++---------- .../GM0420_medemblik.derived.ad | 4 +- datasets/GM0420_medemblik/graph_values.yml | 48 +++++++++---------- .../GM0431_oostzaan.derived.ad | 4 +- datasets/GM0431_oostzaan/graph_values.yml | 48 +++++++++---------- .../GM0432_opmeer/GM0432_opmeer.derived.ad | 4 +- datasets/GM0432_opmeer/graph_values.yml | 48 +++++++++---------- .../GM0437_ouder_amstel.derived.ad | 4 +- datasets/GM0437_ouder_amstel/graph_values.yml | 48 +++++++++---------- .../GM0439_purmerend.derived.ad | 4 +- datasets/GM0439_purmerend/graph_values.yml | 48 +++++++++---------- .../GM0441_schagen/GM0441_schagen.derived.ad | 4 +- datasets/GM0441_schagen/graph_values.yml | 48 +++++++++---------- datasets/GM0448_texel/GM0448_texel.derived.ad | 4 +- datasets/GM0448_texel/graph_values.yml | 48 +++++++++---------- .../GM0450_uitgeest.derived.ad | 4 +- datasets/GM0450_uitgeest/graph_values.yml | 48 +++++++++---------- .../GM0451_uithoorn.derived.ad | 4 +- datasets/GM0451_uithoorn/graph_values.yml | 48 +++++++++---------- .../GM0453_velsen/GM0453_velsen.derived.ad | 4 +- datasets/GM0453_velsen/graph_values.yml | 48 +++++++++---------- .../GM0473_zandvoort.derived.ad | 4 +- datasets/GM0473_zandvoort/graph_values.yml | 48 +++++++++---------- .../GM0479_zaanstad.derived.ad | 4 +- datasets/GM0479_zaanstad/graph_values.yml | 48 +++++++++---------- .../GM0482_alblasserdam.derived.ad | 4 +- datasets/GM0482_alblasserdam/graph_values.yml | 48 +++++++++---------- .../GM0484_alphen_aan_den_rijn.derived.ad | 4 +- .../graph_values.yml | 48 +++++++++---------- .../GM0489_barendrecht.derived.ad | 4 +- datasets/GM0489_barendrecht/graph_values.yml | 48 +++++++++---------- .../GM0498_drechterland.derived.ad | 4 +- datasets/GM0498_drechterland/graph_values.yml | 48 +++++++++---------- .../GM0502_capelle_aan_den_ijssel.derived.ad | 4 +- .../graph_values.yml | 48 +++++++++---------- datasets/GM0503_delft/GM0503_delft.derived.ad | 4 +- datasets/GM0503_delft/graph_values.yml | 48 +++++++++---------- .../GM0505_dordrecht.derived.ad | 4 +- datasets/GM0505_dordrecht/graph_values.yml | 48 +++++++++---------- .../GM0512_gorinchem.derived.ad | 4 +- datasets/GM0512_gorinchem/graph_values.yml | 48 +++++++++---------- datasets/GM0513_gouda/GM0513_gouda.derived.ad | 4 +- datasets/GM0513_gouda/graph_values.yml | 48 +++++++++---------- .../GM0518_s_gravenhage.derived.ad | 4 +- datasets/GM0518_s_gravenhage/graph_values.yml | 48 +++++++++---------- .../GM0523_hardinxveld_giessendam.derived.ad | 4 +- .../graph_values.yml | 48 +++++++++---------- .../GM0531_hendrik_ido_ambacht.derived.ad | 4 +- .../graph_values.yml | 48 +++++++++---------- .../GM0532_stede_broec.derived.ad | 4 +- datasets/GM0532_stede_broec/graph_values.yml | 48 +++++++++---------- .../GM0534_hillegom.derived.ad | 4 +- datasets/GM0534_hillegom/graph_values.yml | 48 +++++++++---------- .../GM0537_katwijk/GM0537_katwijk.derived.ad | 4 +- datasets/GM0537_katwijk/graph_values.yml | 48 +++++++++---------- .../GM0542_krimpen_aan_den_ijssel.derived.ad | 4 +- .../graph_values.yml | 48 +++++++++---------- .../GM0546_leiden/GM0546_leiden.derived.ad | 4 +- datasets/GM0546_leiden/graph_values.yml | 48 +++++++++---------- .../GM0547_leiderdorp.derived.ad | 4 +- datasets/GM0547_leiderdorp/graph_values.yml | 48 +++++++++---------- datasets/GM0553_lisse/GM0553_lisse.derived.ad | 4 +- datasets/GM0553_lisse/graph_values.yml | 48 +++++++++---------- .../GM0556_maassluis.derived.ad | 4 +- datasets/GM0556_maassluis/graph_values.yml | 48 +++++++++---------- .../GM0569_nieuwkoop.derived.ad | 4 +- datasets/GM0569_nieuwkoop/graph_values.yml | 48 +++++++++---------- .../GM0575_noordwijk.derived.ad | 4 +- datasets/GM0575_noordwijk/graph_values.yml | 48 +++++++++---------- .../GM0579_oegstgeest.derived.ad | 4 +- datasets/GM0579_oegstgeest/graph_values.yml | 48 +++++++++---------- .../GM0589_oudewater.derived.ad | 4 +- datasets/GM0589_oudewater/graph_values.yml | 48 +++++++++---------- .../GM0590_papendrecht.derived.ad | 4 +- datasets/GM0590_papendrecht/graph_values.yml | 48 +++++++++---------- .../GM0597_ridderkerk.derived.ad | 4 +- datasets/GM0597_ridderkerk/graph_values.yml | 48 +++++++++---------- .../GM0599_rotterdam.derived.ad | 4 +- datasets/GM0599_rotterdam/graph_values.yml | 48 +++++++++---------- .../GM0603_rijswijk.derived.ad | 4 +- datasets/GM0603_rijswijk/graph_values.yml | 48 +++++++++---------- .../GM0606_schiedam.derived.ad | 4 +- datasets/GM0606_schiedam/graph_values.yml | 48 +++++++++---------- .../GM0610_sliedrecht.derived.ad | 4 +- datasets/GM0610_sliedrecht/graph_values.yml | 48 +++++++++---------- .../GM0613_albrandswaard.derived.ad | 4 +- .../GM0613_albrandswaard/graph_values.yml | 48 +++++++++---------- .../GM0622_vlaardingen.derived.ad | 4 +- datasets/GM0622_vlaardingen/graph_values.yml | 48 +++++++++---------- .../GM0626_voorschoten.derived.ad | 4 +- datasets/GM0626_voorschoten/graph_values.yml | 48 +++++++++---------- .../GM0627_waddinxveen.derived.ad | 4 +- datasets/GM0627_waddinxveen/graph_values.yml | 48 +++++++++---------- .../GM0629_wassenaar.derived.ad | 4 +- datasets/GM0629_wassenaar/graph_values.yml | 48 +++++++++---------- .../GM0632_woerden/GM0632_woerden.derived.ad | 4 +- datasets/GM0632_woerden/graph_values.yml | 48 +++++++++---------- .../GM0637_zoetermeer.derived.ad | 4 +- datasets/GM0637_zoetermeer/graph_values.yml | 48 +++++++++---------- .../GM0638_zoeterwoude.derived.ad | 4 +- datasets/GM0638_zoeterwoude/graph_values.yml | 48 +++++++++---------- .../GM0642_zwijndrecht.derived.ad | 4 +- datasets/GM0642_zwijndrecht/graph_values.yml | 48 +++++++++---------- .../GM0654_borsele/GM0654_borsele.derived.ad | 4 +- datasets/GM0654_borsele/graph_values.yml | 48 +++++++++---------- datasets/GM0664_goes/GM0664_goes.derived.ad | 4 +- datasets/GM0664_goes/graph_values.yml | 48 +++++++++---------- .../GM0668_west_maas_en_waal.derived.ad | 4 +- .../GM0668_west_maas_en_waal/graph_values.yml | 48 +++++++++---------- datasets/GM0677_hulst/GM0677_hulst.derived.ad | 4 +- datasets/GM0677_hulst/graph_values.yml | 48 +++++++++---------- .../GM0678_kapelle/GM0678_kapelle.derived.ad | 4 +- datasets/GM0678_kapelle/graph_values.yml | 48 +++++++++---------- .../GM0687_middelburg.derived.ad | 4 +- datasets/GM0687_middelburg/graph_values.yml | 48 +++++++++---------- .../GM0703_reimerswaal.derived.ad | 4 +- datasets/GM0703_reimerswaal/graph_values.yml | 48 +++++++++---------- .../GM0715_terneuzen.derived.ad | 4 +- datasets/GM0715_terneuzen/graph_values.yml | 48 +++++++++---------- .../GM0716_tholen/GM0716_tholen.derived.ad | 4 +- datasets/GM0716_tholen/graph_values.yml | 48 +++++++++---------- datasets/GM0717_veere/GM0717_veere.derived.ad | 4 +- datasets/GM0717_veere/graph_values.yml | 48 +++++++++---------- .../GM0718_vlissingen.derived.ad | 4 +- datasets/GM0718_vlissingen/graph_values.yml | 48 +++++++++---------- .../GM0736_de_ronde_venen.derived.ad | 4 +- .../GM0736_de_ronde_venen/graph_values.yml | 48 +++++++++---------- .../GM0737_tytsjerksteradiel.derived.ad | 4 +- .../GM0737_tytsjerksteradiel/graph_values.yml | 48 +++++++++---------- datasets/GM0743_asten/GM0743_asten.derived.ad | 4 +- datasets/GM0743_asten/graph_values.yml | 48 +++++++++---------- .../GM0744_baarle_nassau.derived.ad | 4 +- .../GM0744_baarle_nassau/graph_values.yml | 48 +++++++++---------- .../GM0748_bergen_op_zoom.derived.ad | 4 +- .../GM0748_bergen_op_zoom/graph_values.yml | 48 +++++++++---------- datasets/GM0753_best/GM0753_best.derived.ad | 4 +- datasets/GM0753_best/graph_values.yml | 48 +++++++++---------- .../GM0755_boekel/GM0755_boekel.derived.ad | 4 +- datasets/GM0755_boekel/graph_values.yml | 48 +++++++++---------- .../GM0757_boxtel/GM0757_boxtel.derived.ad | 4 +- datasets/GM0757_boxtel/graph_values.yml | 48 +++++++++---------- datasets/GM0758_breda/GM0758_breda.derived.ad | 4 +- datasets/GM0758_breda/graph_values.yml | 48 +++++++++---------- .../GM0762_deurne/GM0762_deurne.derived.ad | 4 +- datasets/GM0762_deurne/graph_values.yml | 48 +++++++++---------- .../GM0765_pekela/GM0765_pekela.derived.ad | 4 +- datasets/GM0765_pekela/graph_values.yml | 48 +++++++++---------- .../GM0766_dongen/GM0766_dongen.derived.ad | 4 +- datasets/GM0766_dongen/graph_values.yml | 48 +++++++++---------- .../GM0770_eersel/GM0770_eersel.derived.ad | 4 +- datasets/GM0770_eersel/graph_values.yml | 48 +++++++++---------- .../GM0772_eindhoven.derived.ad | 4 +- datasets/GM0772_eindhoven/graph_values.yml | 48 +++++++++---------- .../GM0777_etten_leur.derived.ad | 4 +- datasets/GM0777_etten_leur/graph_values.yml | 48 +++++++++---------- .../GM0779_geertruidenberg.derived.ad | 4 +- .../GM0779_geertruidenberg/graph_values.yml | 48 +++++++++---------- .../GM0784_gilze_en_rijen.derived.ad | 4 +- .../GM0784_gilze_en_rijen/graph_values.yml | 48 +++++++++---------- .../GM0785_goirle/GM0785_goirle.derived.ad | 4 +- datasets/GM0785_goirle/graph_values.yml | 48 +++++++++---------- .../GM0794_helmond/GM0794_helmond.derived.ad | 4 +- datasets/GM0794_helmond/graph_values.yml | 48 +++++++++---------- .../GM0796_s_hertogenbosch.derived.ad | 4 +- .../GM0796_s_hertogenbosch/graph_values.yml | 48 +++++++++---------- .../GM0797_heusden/GM0797_heusden.derived.ad | 4 +- datasets/GM0797_heusden/graph_values.yml | 48 +++++++++---------- .../GM0798_hilvarenbeek.derived.ad | 4 +- datasets/GM0798_hilvarenbeek/graph_values.yml | 48 +++++++++---------- .../GM0809_loon_op_zand.derived.ad | 4 +- datasets/GM0809_loon_op_zand/graph_values.yml | 48 +++++++++---------- ...20_nuenen_gerwen_en_nederwetten.derived.ad | 4 +- .../graph_values.yml | 48 +++++++++---------- .../GM0823_oirschot.derived.ad | 4 +- datasets/GM0823_oirschot/graph_values.yml | 48 +++++++++---------- .../GM0824_oisterwijk.derived.ad | 4 +- datasets/GM0824_oisterwijk/graph_values.yml | 48 +++++++++---------- .../GM0826_oosterhout.derived.ad | 4 +- datasets/GM0826_oosterhout/graph_values.yml | 48 +++++++++---------- datasets/GM0828_oss/GM0828_oss.derived.ad | 4 +- datasets/GM0828_oss/graph_values.yml | 48 +++++++++---------- .../GM0840_rucphen/GM0840_rucphen.derived.ad | 4 +- datasets/GM0840_rucphen/graph_values.yml | 48 +++++++++---------- .../GM0845_sint_michielsgestel.derived.ad | 4 +- .../graph_values.yml | 48 +++++++++---------- .../GM0847_someren/GM0847_someren.derived.ad | 4 +- datasets/GM0847_someren/graph_values.yml | 48 +++++++++---------- .../GM0848_son_en_breugel.derived.ad | 4 +- .../GM0848_son_en_breugel/graph_values.yml | 48 +++++++++---------- .../GM0851_steenbergen.derived.ad | 4 +- datasets/GM0851_steenbergen/graph_values.yml | 48 +++++++++---------- .../GM0852_waterland.derived.ad | 4 +- datasets/GM0852_waterland/graph_values.yml | 48 +++++++++---------- .../GM0855_tilburg/GM0855_tilburg.derived.ad | 4 +- datasets/GM0855_tilburg/graph_values.yml | 48 +++++++++---------- .../GM0858_valkenswaard.derived.ad | 4 +- datasets/GM0858_valkenswaard/graph_values.yml | 48 +++++++++---------- .../GM0861_veldhoven.derived.ad | 4 +- datasets/GM0861_veldhoven/graph_values.yml | 48 +++++++++---------- datasets/GM0865_vught/GM0865_vught.derived.ad | 4 +- datasets/GM0865_vught/graph_values.yml | 48 +++++++++---------- .../GM0866_waalre/GM0866_waalre.derived.ad | 4 +- datasets/GM0866_waalre/graph_values.yml | 48 +++++++++---------- .../GM0867_waalwijk.derived.ad | 4 +- datasets/GM0867_waalwijk/graph_values.yml | 48 +++++++++---------- .../GM0873_woensdrecht.derived.ad | 4 +- datasets/GM0873_woensdrecht/graph_values.yml | 48 +++++++++---------- .../GM0879_zundert/GM0879_zundert.derived.ad | 4 +- datasets/GM0879_zundert/graph_values.yml | 48 +++++++++---------- .../GM0880_wormerland.derived.ad | 4 +- datasets/GM0880_wormerland/graph_values.yml | 48 +++++++++---------- .../GM0882_landgraaf.derived.ad | 4 +- datasets/GM0882_landgraaf/graph_values.yml | 48 +++++++++---------- datasets/GM0888_beek/GM0888_beek.derived.ad | 4 +- datasets/GM0888_beek/graph_values.yml | 48 +++++++++---------- .../GM0889_beesel/GM0889_beesel.derived.ad | 4 +- datasets/GM0889_beesel/graph_values.yml | 48 +++++++++---------- .../GM0893_bergen/GM0893_bergen.derived.ad | 4 +- datasets/GM0893_bergen/graph_values.yml | 48 +++++++++---------- .../GM0899_brunssum.derived.ad | 4 +- datasets/GM0899_brunssum/graph_values.yml | 48 +++++++++---------- .../GM0907_gennep/GM0907_gennep.derived.ad | 4 +- datasets/GM0907_gennep/graph_values.yml | 48 +++++++++---------- .../GM0917_heerlen/GM0917_heerlen.derived.ad | 4 +- datasets/GM0917_heerlen/graph_values.yml | 48 +++++++++---------- .../GM0928_kerkrade.derived.ad | 4 +- datasets/GM0928_kerkrade/graph_values.yml | 48 +++++++++---------- .../GM0935_maastricht.derived.ad | 4 +- datasets/GM0935_maastricht/graph_values.yml | 48 +++++++++---------- .../GM0938_meerssen.derived.ad | 4 +- datasets/GM0938_meerssen/graph_values.yml | 48 +++++++++---------- .../GM0944_mook_en_middelaar.derived.ad | 4 +- .../GM0944_mook_en_middelaar/graph_values.yml | 48 +++++++++---------- .../GM0946_nederweert.derived.ad | 4 +- datasets/GM0946_nederweert/graph_values.yml | 48 +++++++++---------- .../GM0957_roermond.derived.ad | 4 +- datasets/GM0957_roermond/graph_values.yml | 48 +++++++++---------- .../GM0965_simpelveld.derived.ad | 4 +- datasets/GM0965_simpelveld/graph_values.yml | 48 +++++++++---------- datasets/GM0971_stein/GM0971_stein.derived.ad | 4 +- datasets/GM0971_stein/graph_values.yml | 48 +++++++++---------- datasets/GM0981_vaals/GM0981_vaals.derived.ad | 4 +- datasets/GM0981_vaals/graph_values.yml | 48 +++++++++---------- datasets/GM0983_venlo/GM0983_venlo.derived.ad | 4 +- datasets/GM0983_venlo/graph_values.yml | 48 +++++++++---------- .../GM0984_venray/GM0984_venray.derived.ad | 4 +- datasets/GM0984_venray/graph_values.yml | 48 +++++++++---------- .../GM0986_voerendaal.derived.ad | 4 +- datasets/GM0986_voerendaal/graph_values.yml | 48 +++++++++---------- datasets/GM0988_weert/GM0988_weert.derived.ad | 4 +- datasets/GM0988_weert/graph_values.yml | 48 +++++++++---------- .../GM0994_valkenburg_aan_de_geul.derived.ad | 4 +- .../graph_values.yml | 48 +++++++++---------- .../GM0995_lelystad.derived.ad | 4 +- datasets/GM0995_lelystad/graph_values.yml | 48 +++++++++---------- .../GM1507_horst_aan_de_maas.derived.ad | 4 +- .../GM1507_horst_aan_de_maas/graph_values.yml | 48 +++++++++---------- .../GM1509_oude_ijsselstreek.derived.ad | 4 +- .../GM1509_oude_ijsselstreek/graph_values.yml | 48 +++++++++---------- .../GM1525_teylingen.derived.ad | 4 +- datasets/GM1525_teylingen/graph_values.yml | 48 +++++++++---------- .../GM1581_utrechtse_heuvelrug.derived.ad | 4 +- .../graph_values.yml | 48 +++++++++---------- .../GM1586_oost_gelre.derived.ad | 4 +- datasets/GM1586_oost_gelre/graph_values.yml | 48 +++++++++---------- .../GM1598_koggenland.derived.ad | 4 +- datasets/GM1598_koggenland/graph_values.yml | 48 +++++++++---------- .../GM1621_lansingerland.derived.ad | 4 +- .../GM1621_lansingerland/graph_values.yml | 48 +++++++++---------- .../GM1640_leudal/GM1640_leudal.derived.ad | 4 +- datasets/GM1640_leudal/graph_values.yml | 48 +++++++++---------- .../GM1641_maasgouw.derived.ad | 4 +- datasets/GM1641_maasgouw/graph_values.yml | 48 +++++++++---------- .../GM1652_gemert_bakel.derived.ad | 4 +- datasets/GM1652_gemert_bakel/graph_values.yml | 48 +++++++++---------- .../GM1655_halderberge.derived.ad | 4 +- datasets/GM1655_halderberge/graph_values.yml | 48 +++++++++---------- .../GM1658_heeze_leende.derived.ad | 4 +- datasets/GM1658_heeze_leende/graph_values.yml | 48 +++++++++---------- .../GM1659_laarbeek.derived.ad | 4 +- datasets/GM1659_laarbeek/graph_values.yml | 48 +++++++++---------- .../GM1667_reusel_de_mierden.derived.ad | 4 +- .../GM1667_reusel_de_mierden/graph_values.yml | 48 +++++++++---------- .../GM1669_roerdalen.derived.ad | 4 +- datasets/GM1669_roerdalen/graph_values.yml | 48 +++++++++---------- .../GM1674_roosendaal.derived.ad | 4 +- datasets/GM1674_roosendaal/graph_values.yml | 48 +++++++++---------- .../GM1676_schouwen_duiveland.derived.ad | 4 +- .../graph_values.yml | 48 +++++++++---------- .../GM1680_aa_en_hunze.derived.ad | 4 +- datasets/GM1680_aa_en_hunze/graph_values.yml | 48 +++++++++---------- .../GM1681_borger_odoorn.derived.ad | 4 +- .../GM1681_borger_odoorn/graph_values.yml | 48 +++++++++---------- .../GM1690_de_wolden.derived.ad | 4 +- datasets/GM1690_de_wolden/graph_values.yml | 48 +++++++++---------- .../GM1695_noord_beveland.derived.ad | 4 +- .../GM1695_noord_beveland/graph_values.yml | 48 +++++++++---------- .../GM1696_wijdemeren.derived.ad | 4 +- datasets/GM1696_wijdemeren/graph_values.yml | 48 +++++++++---------- .../GM1699_noordenveld.derived.ad | 4 +- datasets/GM1699_noordenveld/graph_values.yml | 48 +++++++++---------- .../GM1700_twenterand.derived.ad | 4 +- datasets/GM1700_twenterand/graph_values.yml | 48 +++++++++---------- .../GM1701_westerveld.derived.ad | 4 +- datasets/GM1701_westerveld/graph_values.yml | 48 +++++++++---------- .../GM1705_lingewaard.derived.ad | 4 +- datasets/GM1705_lingewaard/graph_values.yml | 48 +++++++++---------- .../GM1706_cranendonck.derived.ad | 4 +- datasets/GM1706_cranendonck/graph_values.yml | 48 +++++++++---------- .../GM1708_steenwijkerland.derived.ad | 4 +- .../GM1708_steenwijkerland/graph_values.yml | 48 +++++++++---------- .../GM1709_moerdijk.derived.ad | 4 +- datasets/GM1709_moerdijk/graph_values.yml | 48 +++++++++---------- .../GM1711_echt_susteren.derived.ad | 4 +- .../GM1711_echt_susteren/graph_values.yml | 48 +++++++++---------- datasets/GM1714_sluis/GM1714_sluis.derived.ad | 4 +- datasets/GM1714_sluis/graph_values.yml | 48 +++++++++---------- .../GM1719_drimmelen.derived.ad | 4 +- datasets/GM1719_drimmelen/graph_values.yml | 48 +++++++++---------- .../GM1721_bernheze.derived.ad | 4 +- datasets/GM1721_bernheze/graph_values.yml | 48 +++++++++---------- .../GM1723_alphen_chaam.derived.ad | 4 +- datasets/GM1723_alphen_chaam/graph_values.yml | 48 +++++++++---------- .../GM1724_bergeijk.derived.ad | 4 +- datasets/GM1724_bergeijk/graph_values.yml | 48 +++++++++---------- .../GM1728_bladel/GM1728_bladel.derived.ad | 4 +- datasets/GM1728_bladel/graph_values.yml | 48 +++++++++---------- .../GM1729_gulpen_wittem.derived.ad | 4 +- .../GM1729_gulpen_wittem/graph_values.yml | 48 +++++++++---------- .../GM1730_tynaarlo.derived.ad | 4 +- datasets/GM1730_tynaarlo/graph_values.yml | 48 +++++++++---------- .../GM1731_midden_drenthe.derived.ad | 4 +- .../GM1731_midden_drenthe/graph_values.yml | 48 +++++++++---------- .../GM1734_overbetuwe.derived.ad | 4 +- datasets/GM1734_overbetuwe/graph_values.yml | 48 +++++++++---------- .../GM1735_hof_van_twente.derived.ad | 4 +- .../GM1735_hof_van_twente/graph_values.yml | 48 +++++++++---------- .../GM1740_neder_betuwe.derived.ad | 4 +- datasets/GM1740_neder_betuwe/graph_values.yml | 48 +++++++++---------- .../GM1742_rijssen_holten.derived.ad | 4 +- .../GM1742_rijssen_holten/graph_values.yml | 48 +++++++++---------- .../GM1771_geldrop_mierlo.derived.ad | 4 +- .../GM1771_geldrop_mierlo/graph_values.yml | 48 +++++++++---------- .../GM1773_olst_wijhe.derived.ad | 4 +- datasets/GM1773_olst_wijhe/graph_values.yml | 48 +++++++++---------- .../GM1774_dinkelland.derived.ad | 4 +- datasets/GM1774_dinkelland/graph_values.yml | 48 +++++++++---------- .../GM1783_westland.derived.ad | 4 +- datasets/GM1783_westland/graph_values.yml | 48 +++++++++---------- .../GM1842_midden_delfland.derived.ad | 4 +- .../GM1842_midden_delfland/graph_values.yml | 48 +++++++++---------- .../GM1859_berkelland.derived.ad | 4 +- datasets/GM1859_berkelland/graph_values.yml | 48 +++++++++---------- .../GM1876_bronckhorst.derived.ad | 4 +- datasets/GM1876_bronckhorst/graph_values.yml | 48 +++++++++---------- .../GM1883_sittard_geleen.derived.ad | 4 +- .../GM1883_sittard_geleen/graph_values.yml | 48 +++++++++---------- .../GM1884_kaag_en_braassem.derived.ad | 4 +- .../GM1884_kaag_en_braassem/graph_values.yml | 48 +++++++++---------- .../GM1891_dantumadiel.derived.ad | 4 +- datasets/GM1891_dantumadiel/graph_values.yml | 48 +++++++++---------- .../GM1892_zuidplas.derived.ad | 4 +- datasets/GM1892_zuidplas/graph_values.yml | 48 +++++++++---------- .../GM1894_peel_en_maas.derived.ad | 4 +- datasets/GM1894_peel_en_maas/graph_values.yml | 48 +++++++++---------- .../GM1895_oldambt/GM1895_oldambt.derived.ad | 4 +- datasets/GM1895_oldambt/graph_values.yml | 48 +++++++++---------- .../GM1896_zwartewaterland.derived.ad | 4 +- .../GM1896_zwartewaterland/graph_values.yml | 48 +++++++++---------- .../GM1900_sudwest_fryslan.derived.ad | 4 +- .../GM1900_sudwest_fryslan/graph_values.yml | 48 +++++++++---------- .../GM1901_bodegraven_reeuwijk.derived.ad | 4 +- .../graph_values.yml | 48 +++++++++---------- .../GM1903_eijsden_margraten.derived.ad | 4 +- .../GM1903_eijsden_margraten/graph_values.yml | 48 +++++++++---------- .../GM1904_stichtse_vecht.derived.ad | 4 +- .../GM1904_stichtse_vecht/graph_values.yml | 48 +++++++++---------- .../GM1911_hollands_kroon.derived.ad | 4 +- .../GM1911_hollands_kroon/graph_values.yml | 48 +++++++++---------- .../GM1916_leidschendam_voorburg.derived.ad | 4 +- .../graph_values.yml | 48 +++++++++---------- .../GM1924_goeree_overflakkee.derived.ad | 4 +- .../graph_values.yml | 48 +++++++++---------- .../GM1926_pijnacker_nootdorp.derived.ad | 4 +- .../graph_values.yml | 48 +++++++++---------- .../GM1930_nissewaard.derived.ad | 4 +- datasets/GM1930_nissewaard/graph_values.yml | 48 +++++++++---------- .../GM1931_krimpenerwaard.derived.ad | 4 +- .../GM1931_krimpenerwaard/graph_values.yml | 48 +++++++++---------- .../GM1940_de_fryske_marren.derived.ad | 4 +- .../GM1940_de_fryske_marren/graph_values.yml | 48 +++++++++---------- .../GM1942_gooise_meren.derived.ad | 4 +- datasets/GM1942_gooise_meren/graph_values.yml | 48 +++++++++---------- .../GM1945_berg_en_dal.derived.ad | 4 +- datasets/GM1945_berg_en_dal/graph_values.yml | 48 +++++++++---------- .../GM1948_meierijstad.derived.ad | 4 +- datasets/GM1948_meierijstad/graph_values.yml | 48 +++++++++---------- .../GM1949_waadhoeke.derived.ad | 4 +- datasets/GM1949_waadhoeke/graph_values.yml | 48 +++++++++---------- .../GM1950_westerwolde.derived.ad | 4 +- datasets/GM1950_westerwolde/graph_values.yml | 48 +++++++++---------- .../GM1952_midden_groningen.derived.ad | 4 +- .../GM1952_midden_groningen/graph_values.yml | 48 +++++++++---------- .../GM1954_beekdaelen.derived.ad | 4 +- datasets/GM1954_beekdaelen/graph_values.yml | 48 +++++++++---------- .../GM1955_montferland.derived.ad | 4 +- datasets/GM1955_montferland/graph_values.yml | 48 +++++++++---------- .../GM1959_altena/GM1959_altena.derived.ad | 4 +- datasets/GM1959_altena/graph_values.yml | 48 +++++++++---------- .../GM1960_west_betuwe.derived.ad | 4 +- datasets/GM1960_west_betuwe/graph_values.yml | 48 +++++++++---------- .../GM1961_vijfheerenlanden.derived.ad | 4 +- .../GM1961_vijfheerenlanden/graph_values.yml | 48 +++++++++---------- .../GM1963_hoeksche_waard.derived.ad | 4 +- .../GM1963_hoeksche_waard/graph_values.yml | 48 +++++++++---------- .../GM1966_het_hogeland.derived.ad | 4 +- datasets/GM1966_het_hogeland/graph_values.yml | 48 +++++++++---------- .../GM1969_westerkwartier.derived.ad | 4 +- .../GM1969_westerkwartier/graph_values.yml | 48 +++++++++---------- .../GM1970_noardeast_fryslan.derived.ad | 4 +- .../GM1970_noardeast_fryslan/graph_values.yml | 48 +++++++++---------- .../GM1978_molenlanden.derived.ad | 4 +- datasets/GM1978_molenlanden/graph_values.yml | 48 +++++++++---------- .../GM1979_eemsdelta.derived.ad | 4 +- datasets/GM1979_eemsdelta/graph_values.yml | 48 +++++++++---------- .../GM1980_dijk_en_waard.derived.ad | 4 +- .../GM1980_dijk_en_waard/graph_values.yml | 48 +++++++++---------- .../GM1982_land_van_cuijk.derived.ad | 4 +- .../GM1982_land_van_cuijk/graph_values.yml | 48 +++++++++---------- .../GM1991_maashorst.derived.ad | 4 +- datasets/GM1991_maashorst/graph_values.yml | 48 +++++++++---------- .../GM1992_voorne_aan_zee.derived.ad | 4 +- .../GM1992_voorne_aan_zee/graph_values.yml | 48 +++++++++---------- 684 files changed, 8892 insertions(+), 8892 deletions(-) diff --git a/datasets/GM0014_groningen/GM0014_groningen.derived.ad b/datasets/GM0014_groningen/GM0014_groningen.derived.ad index 8cc178fbf3..019b7a5b68 100644 --- a/datasets/GM0014_groningen/GM0014_groningen.derived.ad +++ b/datasets/GM0014_groningen/GM0014_groningen.derived.ad @@ -1,6 +1,6 @@ - area = GM0014_groningen -- id = 129304 -- parent_id = 129304 +- id = 129646 +- parent_id = 129646 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0014_groningen/graph_values.yml b/datasets/GM0014_groningen/graph_values.yml index 2e174b63ef..68dabcd361 100644 --- a/datasets/GM0014_groningen/graph_values.yml +++ b/datasets/GM0014_groningen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18147055227187414 - :network_gas: 0.18338131091727508 - :ambient_heat: 0.6351481368108508 + :electricity: 0.1814705539965665 + :network_gas: 0.18338130315614792 + :ambient_heat: 0.6351481428472856 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 118786.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0034_almere/GM0034_almere.derived.ad b/datasets/GM0034_almere/GM0034_almere.derived.ad index 315042435a..5a9477b0be 100644 --- a/datasets/GM0034_almere/GM0034_almere.derived.ad +++ b/datasets/GM0034_almere/GM0034_almere.derived.ad @@ -1,6 +1,6 @@ - area = GM0034_almere -- id = 129209 -- parent_id = 129209 +- id = 129551 +- parent_id = 129551 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0034_almere/graph_values.yml b/datasets/GM0034_almere/graph_values.yml index 8b6e33b078..efdfe9963e 100644 --- a/datasets/GM0034_almere/graph_values.yml +++ b/datasets/GM0034_almere/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2082956294673982 - :network_gas: 0.06266828558227176 - :ambient_heat: 0.72903608495033 + :electricity: 0.2082956301439147 + :network_gas: 0.06266828253794311 + :ambient_heat: 0.7290360873181422 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 85128.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0037_stadskanaal/GM0037_stadskanaal.derived.ad b/datasets/GM0037_stadskanaal/GM0037_stadskanaal.derived.ad index 74418223ec..4b524b3208 100644 --- a/datasets/GM0037_stadskanaal/GM0037_stadskanaal.derived.ad +++ b/datasets/GM0037_stadskanaal/GM0037_stadskanaal.derived.ad @@ -1,6 +1,6 @@ - area = GM0037_stadskanaal -- id = 129449 -- parent_id = 129449 +- id = 129791 +- parent_id = 129791 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0037_stadskanaal/graph_values.yml b/datasets/GM0037_stadskanaal/graph_values.yml index 9c4223fbfe..c10a865c51 100644 --- a/datasets/GM0037_stadskanaal/graph_values.yml +++ b/datasets/GM0037_stadskanaal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1791110666961636 - :network_gas: 0.19399901166058714 - :ambient_heat: 0.6268899216432493 + :electricity: 0.17911106849699207 + :network_gas: 0.19399900355684707 + :ambient_heat: 0.6268899279461608 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15182.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0047_veendam/GM0047_veendam.derived.ad b/datasets/GM0047_veendam/GM0047_veendam.derived.ad index e64d64d2dc..5c54c3ded5 100644 --- a/datasets/GM0047_veendam/GM0047_veendam.derived.ad +++ b/datasets/GM0047_veendam/GM0047_veendam.derived.ad @@ -1,6 +1,6 @@ - area = GM0047_veendam -- id = 129476 -- parent_id = 129476 +- id = 129818 +- parent_id = 129818 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0047_veendam/graph_values.yml b/datasets/GM0047_veendam/graph_values.yml index c8963a72c8..8503c88a83 100644 --- a/datasets/GM0047_veendam/graph_values.yml +++ b/datasets/GM0047_veendam/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17967233680149178 - :network_gas: 0.191473292463195 - :ambient_heat: 0.6288543707353131 + :electricity: 0.1796723385844445 + :network_gas: 0.1914732844398958 + :ambient_heat: 0.6288543769756596 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12890.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0050_zeewolde/GM0050_zeewolde.derived.ad b/datasets/GM0050_zeewolde/GM0050_zeewolde.derived.ad index 7818733e22..edfb7fad57 100644 --- a/datasets/GM0050_zeewolde/GM0050_zeewolde.derived.ad +++ b/datasets/GM0050_zeewolde/GM0050_zeewolde.derived.ad @@ -1,6 +1,6 @@ - area = GM0050_zeewolde -- id = 129514 -- parent_id = 129514 +- id = 129856 +- parent_id = 129856 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0050_zeewolde/graph_values.yml b/datasets/GM0050_zeewolde/graph_values.yml index cec2a4589d..1e7a0f88ab 100644 --- a/datasets/GM0050_zeewolde/graph_values.yml +++ b/datasets/GM0050_zeewolde/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19523450566356218 - :network_gas: 0.12144342934585232 - :ambient_heat: 0.6833220649905856 + :electricity: 0.19523450689236163 + :network_gas: 0.12144342381624666 + :ambient_heat: 0.6833220692913917 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8836.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0059_achtkarspelen/GM0059_achtkarspelen.derived.ad b/datasets/GM0059_achtkarspelen/GM0059_achtkarspelen.derived.ad index bf359869ee..4370bc6810 100644 --- a/datasets/GM0059_achtkarspelen/GM0059_achtkarspelen.derived.ad +++ b/datasets/GM0059_achtkarspelen/GM0059_achtkarspelen.derived.ad @@ -1,6 +1,6 @@ - area = GM0059_achtkarspelen -- id = 129204 -- parent_id = 129204 +- id = 129546 +- parent_id = 129546 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0059_achtkarspelen/graph_values.yml b/datasets/GM0059_achtkarspelen/graph_values.yml index 55b38196ac..47ac5482fc 100644 --- a/datasets/GM0059_achtkarspelen/graph_values.yml +++ b/datasets/GM0059_achtkarspelen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18201372329290208 - :network_gas: 0.18093703771930172 - :ambient_heat: 0.6370492389877962 + :electricity: 0.18201372499969964 + :network_gas: 0.18093703003870126 + :ambient_heat: 0.6370492449615991 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12144.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0060_ameland/GM0060_ameland.derived.ad b/datasets/GM0060_ameland/GM0060_ameland.derived.ad index 0e54672266..ee27fc59be 100644 --- a/datasets/GM0060_ameland/GM0060_ameland.derived.ad +++ b/datasets/GM0060_ameland/GM0060_ameland.derived.ad @@ -1,6 +1,6 @@ - area = GM0060_ameland -- id = 129212 -- parent_id = 129212 +- id = 129554 +- parent_id = 129554 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0060_ameland/graph_values.yml b/datasets/GM0060_ameland/graph_values.yml index a554002e7d..48bcb74b81 100644 --- a/datasets/GM0060_ameland/graph_values.yml +++ b/datasets/GM0060_ameland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17987638728883018 - :network_gas: 0.19055506391651975 - :ambient_heat: 0.6295685487946502 + :electricity: 0.17987638906524778 + :network_gas: 0.19055505592262884 + :ambient_heat: 0.6295685550121235 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 1748.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0072_harlingen/GM0072_harlingen.derived.ad b/datasets/GM0072_harlingen/GM0072_harlingen.derived.ad index 7428048853..3dfd1a26b5 100644 --- a/datasets/GM0072_harlingen/GM0072_harlingen.derived.ad +++ b/datasets/GM0072_harlingen/GM0072_harlingen.derived.ad @@ -1,6 +1,6 @@ - area = GM0072_harlingen -- id = 129313 -- parent_id = 129313 +- id = 129655 +- parent_id = 129655 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0072_harlingen/graph_values.yml b/datasets/GM0072_harlingen/graph_values.yml index 089d4a64a7..bd8858f5db 100644 --- a/datasets/GM0072_harlingen/graph_values.yml +++ b/datasets/GM0072_harlingen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18448233236549777 - :network_gas: 0.16982828051609075 - :ambient_heat: 0.6456893871184113 + :electricity: 0.184482333989233 + :network_gas: 0.16982827320927166 + :ambient_heat: 0.6456893928014954 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7885.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0074_heerenveen/GM0074_heerenveen.derived.ad b/datasets/GM0074_heerenveen/GM0074_heerenveen.derived.ad index a3fb4871a0..e4bf078243 100644 --- a/datasets/GM0074_heerenveen/GM0074_heerenveen.derived.ad +++ b/datasets/GM0074_heerenveen/GM0074_heerenveen.derived.ad @@ -1,6 +1,6 @@ - area = GM0074_heerenveen -- id = 129318 -- parent_id = 129318 +- id = 129660 +- parent_id = 129660 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0074_heerenveen/graph_values.yml b/datasets/GM0074_heerenveen/graph_values.yml index dacffb3491..546ca61598 100644 --- a/datasets/GM0074_heerenveen/graph_values.yml +++ b/datasets/GM0074_heerenveen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18416230687294702 - :network_gas: 0.17126839735558966 - :ambient_heat: 0.6445692957714634 + :electricity: 0.18416230850761062 + :network_gas: 0.1712683899995926 + :ambient_heat: 0.6445693014927968 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 23643.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0080_leeuwarden/GM0080_leeuwarden.derived.ad b/datasets/GM0080_leeuwarden/GM0080_leeuwarden.derived.ad index f69ddf9017..a5cc0dde4a 100644 --- a/datasets/GM0080_leeuwarden/GM0080_leeuwarden.derived.ad +++ b/datasets/GM0080_leeuwarden/GM0080_leeuwarden.derived.ad @@ -1,6 +1,6 @@ - area = GM0080_leeuwarden -- id = 129353 -- parent_id = 129353 +- id = 129695 +- parent_id = 129695 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0080_leeuwarden/graph_values.yml b/datasets/GM0080_leeuwarden/graph_values.yml index f079aa9de5..3a7eb546f4 100644 --- a/datasets/GM0080_leeuwarden/graph_values.yml +++ b/datasets/GM0080_leeuwarden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18376600568028184 - :network_gas: 0.17305175535160913 - :ambient_heat: 0.6431822389681089 + :electricity: 0.1837660073284124 + :network_gas: 0.17305174793501102 + :ambient_heat: 0.6431822447365767 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 62935.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0085_ooststellingwerf/GM0085_ooststellingwerf.derived.ad b/datasets/GM0085_ooststellingwerf/GM0085_ooststellingwerf.derived.ad index dd18d9ac24..77968a24bb 100644 --- a/datasets/GM0085_ooststellingwerf/GM0085_ooststellingwerf.derived.ad +++ b/datasets/GM0085_ooststellingwerf/GM0085_ooststellingwerf.derived.ad @@ -1,6 +1,6 @@ - area = GM0085_ooststellingwerf -- id = 129403 -- parent_id = 129403 +- id = 129745 +- parent_id = 129745 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0085_ooststellingwerf/graph_values.yml b/datasets/GM0085_ooststellingwerf/graph_values.yml index 92acef4a32..8e19234405 100644 --- a/datasets/GM0085_ooststellingwerf/graph_values.yml +++ b/datasets/GM0085_ooststellingwerf/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.181206221309921 - :network_gas: 0.18457080199961187 - :ambient_heat: 0.6342229766904671 + :electricity: 0.181206223043272 + :network_gas: 0.1845707941995209 + :ambient_heat: 0.634222982757207 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11388.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0086_opsterland/GM0086_opsterland.derived.ad b/datasets/GM0086_opsterland/GM0086_opsterland.derived.ad index d650f6e026..324f031d48 100644 --- a/datasets/GM0086_opsterland/GM0086_opsterland.derived.ad +++ b/datasets/GM0086_opsterland/GM0086_opsterland.derived.ad @@ -1,6 +1,6 @@ - area = GM0086_opsterland -- id = 129406 -- parent_id = 129406 +- id = 129748 +- parent_id = 129748 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0086_opsterland/graph_values.yml b/datasets/GM0086_opsterland/graph_values.yml index b6f39bbe04..d273096652 100644 --- a/datasets/GM0086_opsterland/graph_values.yml +++ b/datasets/GM0086_opsterland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18381194358960307 - :network_gas: 0.172845034454916 - :ambient_heat: 0.6433430219554811 + :electricity: 0.18381194523617622 + :network_gas: 0.1728450270453256 + :ambient_heat: 0.6433430277184982 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13088.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0088_schiermonnikoog/GM0088_schiermonnikoog.derived.ad b/datasets/GM0088_schiermonnikoog/GM0088_schiermonnikoog.derived.ad index f35d60ce97..1c48da8d4d 100644 --- a/datasets/GM0088_schiermonnikoog/GM0088_schiermonnikoog.derived.ad +++ b/datasets/GM0088_schiermonnikoog/GM0088_schiermonnikoog.derived.ad @@ -1,6 +1,6 @@ - area = GM0088_schiermonnikoog -- id = 129437 -- parent_id = 129437 +- id = 129779 +- parent_id = 129779 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0088_schiermonnikoog/graph_values.yml b/datasets/GM0088_schiermonnikoog/graph_values.yml index 2baa743160..22eeefd28d 100644 --- a/datasets/GM0088_schiermonnikoog/graph_values.yml +++ b/datasets/GM0088_schiermonnikoog/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17763508478058265 - :network_gas: 0.20064094007223235 - :ambient_heat: 0.6217239751471849 + :electricity: 0.17763508662771801 + :network_gas: 0.2006409317601112 + :ambient_heat: 0.6217239816121709 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 586.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0090_smallingerland/GM0090_smallingerland.derived.ad b/datasets/GM0090_smallingerland/GM0090_smallingerland.derived.ad index 21ab569543..5f10e289e6 100644 --- a/datasets/GM0090_smallingerland/GM0090_smallingerland.derived.ad +++ b/datasets/GM0090_smallingerland/GM0090_smallingerland.derived.ad @@ -1,6 +1,6 @@ - area = GM0090_smallingerland -- id = 129445 -- parent_id = 129445 +- id = 129787 +- parent_id = 129787 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0090_smallingerland/graph_values.yml b/datasets/GM0090_smallingerland/graph_values.yml index 57509d890b..8132c65237 100644 --- a/datasets/GM0090_smallingerland/graph_values.yml +++ b/datasets/GM0090_smallingerland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1833912678898139 - :network_gas: 0.1747380778946917 - :ambient_heat: 0.6418706542154944 + :electricity: 0.18339126955061116 + :network_gas: 0.17473807042109304 + :ambient_heat: 0.6418706600282957 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 25777.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0093_terschelling/GM0093_terschelling.derived.ad b/datasets/GM0093_terschelling/GM0093_terschelling.derived.ad index f14703e8da..2aafe769ce 100644 --- a/datasets/GM0093_terschelling/GM0093_terschelling.derived.ad +++ b/datasets/GM0093_terschelling/GM0093_terschelling.derived.ad @@ -1,6 +1,6 @@ - area = GM0093_terschelling -- id = 129458 -- parent_id = 129458 +- id = 129800 +- parent_id = 129800 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0093_terschelling/graph_values.yml b/datasets/GM0093_terschelling/graph_values.yml index 0dae9cb1b6..0ce96e54dc 100644 --- a/datasets/GM0093_terschelling/graph_values.yml +++ b/datasets/GM0093_terschelling/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17852531889367973 - :network_gas: 0.19663488065756274 - :ambient_heat: 0.6248398004487575 + :electricity: 0.1785253207130068 + :network_gas: 0.19663487247057868 + :ambient_heat: 0.6248398068164145 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 2281.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0096_vlieland/GM0096_vlieland.derived.ad b/datasets/GM0096_vlieland/GM0096_vlieland.derived.ad index 78b7b70a15..8f0262b1d4 100644 --- a/datasets/GM0096_vlieland/GM0096_vlieland.derived.ad +++ b/datasets/GM0096_vlieland/GM0096_vlieland.derived.ad @@ -1,6 +1,6 @@ - area = GM0096_vlieland -- id = 129484 -- parent_id = 129484 +- id = 129826 +- parent_id = 129826 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0096_vlieland/graph_values.yml b/datasets/GM0096_vlieland/graph_values.yml index 3a463544f3..5fe097fb7a 100644 --- a/datasets/GM0096_vlieland/graph_values.yml +++ b/datasets/GM0096_vlieland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18518787906555997 - :network_gas: 0.1666533156852778 - :ambient_heat: 0.6481588052491621 + :electricity: 0.18518788066503306 + :network_gas: 0.16665330848763849 + :ambient_heat: 0.6481588108473285 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 600.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0098_weststellingwerf/GM0098_weststellingwerf.derived.ad b/datasets/GM0098_weststellingwerf/GM0098_weststellingwerf.derived.ad index b325f2914e..77e2ee3f3c 100644 --- a/datasets/GM0098_weststellingwerf/GM0098_weststellingwerf.derived.ad +++ b/datasets/GM0098_weststellingwerf/GM0098_weststellingwerf.derived.ad @@ -1,6 +1,6 @@ - area = GM0098_weststellingwerf -- id = 129501 -- parent_id = 129501 +- id = 129843 +- parent_id = 129843 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0098_weststellingwerf/graph_values.yml b/datasets/GM0098_weststellingwerf/graph_values.yml index fba5eef4df..74c6133f65 100644 --- a/datasets/GM0098_weststellingwerf/graph_values.yml +++ b/datasets/GM0098_weststellingwerf/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18450196801402685 - :network_gas: 0.16973991996744894 - :ambient_heat: 0.6457581120185242 + :electricity: 0.18450196963708995 + :network_gas: 0.1697399126636542 + :ambient_heat: 0.6457581176992558 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11666.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0106_assen/GM0106_assen.derived.ad b/datasets/GM0106_assen/GM0106_assen.derived.ad index c837a31c09..885423c73d 100644 --- a/datasets/GM0106_assen/GM0106_assen.derived.ad +++ b/datasets/GM0106_assen/GM0106_assen.derived.ad @@ -1,6 +1,6 @@ - area = GM0106_assen -- id = 129218 -- parent_id = 129218 +- id = 129560 +- parent_id = 129560 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0106_assen/graph_values.yml b/datasets/GM0106_assen/graph_values.yml index 2009212a32..118fba75cf 100644 --- a/datasets/GM0106_assen/graph_values.yml +++ b/datasets/GM0106_assen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18519107673611573 - :network_gas: 0.1666389261465639 - :ambient_heat: 0.6481699971173204 + :electricity: 0.1851910783354783 + :network_gas: 0.16663891894942173 + :ambient_heat: 0.6481700027151001 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 32515.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0109_coevorden/GM0109_coevorden.derived.ad b/datasets/GM0109_coevorden/GM0109_coevorden.derived.ad index 71240c6196..1c069eddb7 100644 --- a/datasets/GM0109_coevorden/GM0109_coevorden.derived.ad +++ b/datasets/GM0109_coevorden/GM0109_coevorden.derived.ad @@ -1,6 +1,6 @@ - area = GM0109_coevorden -- id = 129254 -- parent_id = 129254 +- id = 129596 +- parent_id = 129596 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0109_coevorden/graph_values.yml b/datasets/GM0109_coevorden/graph_values.yml index d33201d67d..1da6b38544 100644 --- a/datasets/GM0109_coevorden/graph_values.yml +++ b/datasets/GM0109_coevorden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1824857106915142 - :network_gas: 0.17881309129442527 - :ambient_heat: 0.6387011980140606 + :electricity: 0.1824857123826504 + :network_gas: 0.1788130836843012 + :ambient_heat: 0.6387012039330484 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15491.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0114_emmen/GM0114_emmen.derived.ad b/datasets/GM0114_emmen/GM0114_emmen.derived.ad index 62305af9bb..e0a29e89f4 100644 --- a/datasets/GM0114_emmen/GM0114_emmen.derived.ad +++ b/datasets/GM0114_emmen/GM0114_emmen.derived.ad @@ -1,6 +1,6 @@ - area = GM0114_emmen -- id = 129287 -- parent_id = 129287 +- id = 129629 +- parent_id = 129629 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0114_emmen/graph_values.yml b/datasets/GM0114_emmen/graph_values.yml index eee40e277f..6a52e71c65 100644 --- a/datasets/GM0114_emmen/graph_values.yml +++ b/datasets/GM0114_emmen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18289950497602372 - :network_gas: 0.17695101426905846 - :ambient_heat: 0.6401494807549178 + :electricity: 0.18289950665334395 + :network_gas: 0.17695100672110609 + :ambient_heat: 0.6401494866255498 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 49357.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0118_hoogeveen/GM0118_hoogeveen.derived.ad b/datasets/GM0118_hoogeveen/GM0118_hoogeveen.derived.ad index 1321ca6fa6..ee5cd3e9c7 100644 --- a/datasets/GM0118_hoogeveen/GM0118_hoogeveen.derived.ad +++ b/datasets/GM0118_hoogeveen/GM0118_hoogeveen.derived.ad @@ -1,6 +1,6 @@ - area = GM0118_hoogeveen -- id = 129333 -- parent_id = 129333 +- id = 129675 +- parent_id = 129675 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0118_hoogeveen/graph_values.yml b/datasets/GM0118_hoogeveen/graph_values.yml index daa7864c67..da3c395a4d 100644 --- a/datasets/GM0118_hoogeveen/graph_values.yml +++ b/datasets/GM0118_hoogeveen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18253663578648205 - :network_gas: 0.17858392802923737 - :ambient_heat: 0.6388794361842806 + :electricity: 0.18253663747592228 + :network_gas: 0.17858392042674526 + :ambient_heat: 0.6388794420973325 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 25464.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0119_meppel/GM0119_meppel.derived.ad b/datasets/GM0119_meppel/GM0119_meppel.derived.ad index c8997da857..308bce9823 100644 --- a/datasets/GM0119_meppel/GM0119_meppel.derived.ad +++ b/datasets/GM0119_meppel/GM0119_meppel.derived.ad @@ -1,6 +1,6 @@ - area = GM0119_meppel -- id = 129372 -- parent_id = 129372 +- id = 129714 +- parent_id = 129714 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0119_meppel/graph_values.yml b/datasets/GM0119_meppel/graph_values.yml index 5f6287bfd1..99bdc008d2 100644 --- a/datasets/GM0119_meppel/graph_values.yml +++ b/datasets/GM0119_meppel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1863386369106657 - :network_gas: 0.16147489774827817 - :ambient_heat: 0.6521864653410562 + :electricity: 0.1863386384700686 + :network_gas: 0.16147489073095467 + :ambient_heat: 0.6521864707989766 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16069.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0141_almelo/GM0141_almelo.derived.ad b/datasets/GM0141_almelo/GM0141_almelo.derived.ad index 712beb1c3b..e7e8e9fddf 100644 --- a/datasets/GM0141_almelo/GM0141_almelo.derived.ad +++ b/datasets/GM0141_almelo/GM0141_almelo.derived.ad @@ -1,6 +1,6 @@ - area = GM0141_almelo -- id = 129208 -- parent_id = 129208 +- id = 129550 +- parent_id = 129550 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0141_almelo/graph_values.yml b/datasets/GM0141_almelo/graph_values.yml index 85658aded8..24c0802aa1 100644 --- a/datasets/GM0141_almelo/graph_values.yml +++ b/datasets/GM0141_almelo/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18442807987096102 - :network_gas: 0.17007241710141238 - :ambient_heat: 0.6454995030276265 + :electricity: 0.18442808149655224 + :network_gas: 0.1700724097862412 + :ambient_heat: 0.6454995087172065 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 33783.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0147_borne/GM0147_borne.derived.ad b/datasets/GM0147_borne/GM0147_borne.derived.ad index 3b0c5b5d5e..f8b42169c7 100644 --- a/datasets/GM0147_borne/GM0147_borne.derived.ad +++ b/datasets/GM0147_borne/GM0147_borne.derived.ad @@ -1,6 +1,6 @@ - area = GM0147_borne -- id = 129242 -- parent_id = 129242 +- id = 129584 +- parent_id = 129584 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0147_borne/graph_values.yml b/datasets/GM0147_borne/graph_values.yml index 0837c5642a..58d83aca8d 100644 --- a/datasets/GM0147_borne/graph_values.yml +++ b/datasets/GM0147_borne/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18937570288878097 - :network_gas: 0.14780808069913728 - :ambient_heat: 0.6628162164120817 + :electricity: 0.18937570433946507 + :network_gas: 0.1478080741710493 + :ambient_heat: 0.6628162214894855 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10095.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0148_dalfsen/GM0148_dalfsen.derived.ad b/datasets/GM0148_dalfsen/GM0148_dalfsen.derived.ad index db258336ce..e6a9ac2b2b 100644 --- a/datasets/GM0148_dalfsen/GM0148_dalfsen.derived.ad +++ b/datasets/GM0148_dalfsen/GM0148_dalfsen.derived.ad @@ -1,6 +1,6 @@ - area = GM0148_dalfsen -- id = 129257 -- parent_id = 129257 +- id = 129599 +- parent_id = 129599 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0148_dalfsen/graph_values.yml b/datasets/GM0148_dalfsen/graph_values.yml index 9e2b6e0ec4..f4a852bfa2 100644 --- a/datasets/GM0148_dalfsen/graph_values.yml +++ b/datasets/GM0148_dalfsen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18735387740563614 - :network_gas: 0.15690630878589723 - :ambient_heat: 0.6557398138084667 + :electricity: 0.1873538789291749 + :network_gas: 0.1569063019299628 + :ambient_heat: 0.6557398191408624 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12044.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0150_deventer/GM0150_deventer.derived.ad b/datasets/GM0150_deventer/GM0150_deventer.derived.ad index aea50b1085..6b77652898 100644 --- a/datasets/GM0150_deventer/GM0150_deventer.derived.ad +++ b/datasets/GM0150_deventer/GM0150_deventer.derived.ad @@ -1,6 +1,6 @@ - area = GM0150_deventer -- id = 129267 -- parent_id = 129267 +- id = 129609 +- parent_id = 129609 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0150_deventer/graph_values.yml b/datasets/GM0150_deventer/graph_values.yml index 3c54ea27cd..00e536cde9 100644 --- a/datasets/GM0150_deventer/graph_values.yml +++ b/datasets/GM0150_deventer/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1870144323567505 - :network_gas: 0.15843381375773055 - :ambient_heat: 0.654551753885519 + :electricity: 0.18701443389233388 + :network_gas: 0.1584338068475951 + :ambient_heat: 0.654551759260071 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 46167.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0153_enschede/GM0153_enschede.derived.ad b/datasets/GM0153_enschede/GM0153_enschede.derived.ad index 6009b55a9c..c908459fa2 100644 --- a/datasets/GM0153_enschede/GM0153_enschede.derived.ad +++ b/datasets/GM0153_enschede/GM0153_enschede.derived.ad @@ -1,6 +1,6 @@ - area = GM0153_enschede -- id = 129289 -- parent_id = 129289 +- id = 129631 +- parent_id = 129631 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0153_enschede/graph_values.yml b/datasets/GM0153_enschede/graph_values.yml index 7e1bcb48e3..caa4618ac2 100644 --- a/datasets/GM0153_enschede/graph_values.yml +++ b/datasets/GM0153_enschede/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18937827155800435 - :network_gas: 0.14779652167059176 - :ambient_heat: 0.6628252067714039 + :electricity: 0.18937827300859467 + :network_gas: 0.14779651514292574 + :ambient_heat: 0.6628252118484795 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 75890.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0158_haaksbergen/GM0158_haaksbergen.derived.ad b/datasets/GM0158_haaksbergen/GM0158_haaksbergen.derived.ad index 689fda4500..3de09c6fc5 100644 --- a/datasets/GM0158_haaksbergen/GM0158_haaksbergen.derived.ad +++ b/datasets/GM0158_haaksbergen/GM0158_haaksbergen.derived.ad @@ -1,6 +1,6 @@ - area = GM0158_haaksbergen -- id = 129306 -- parent_id = 129306 +- id = 129648 +- parent_id = 129648 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0158_haaksbergen/graph_values.yml b/datasets/GM0158_haaksbergen/graph_values.yml index a9f6bbee5d..7ed51c47a0 100644 --- a/datasets/GM0158_haaksbergen/graph_values.yml +++ b/datasets/GM0158_haaksbergen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18788246585082677 - :network_gas: 0.15452765727593124 - :ambient_heat: 0.6575898768732419 + :electricity: 0.18788246735550237 + :network_gas: 0.15452765050488101 + :ambient_heat: 0.6575898821396166 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10563.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0160_hardenberg/GM0160_hardenberg.derived.ad b/datasets/GM0160_hardenberg/GM0160_hardenberg.derived.ad index 9153bb4d61..6b482e532d 100644 --- a/datasets/GM0160_hardenberg/GM0160_hardenberg.derived.ad +++ b/datasets/GM0160_hardenberg/GM0160_hardenberg.derived.ad @@ -1,6 +1,6 @@ - area = GM0160_hardenberg -- id = 129310 -- parent_id = 129310 +- id = 129652 +- parent_id = 129652 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0160_hardenberg/graph_values.yml b/datasets/GM0160_hardenberg/graph_values.yml index b6a4699199..353e61029c 100644 --- a/datasets/GM0160_hardenberg/graph_values.yml +++ b/datasets/GM0160_hardenberg/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18620055024802326 - :network_gas: 0.16209628864622372 - :ambient_heat: 0.6517031611057531 + :electricity: 0.18620055181226702 + :network_gas: 0.16209628160711625 + :ambient_heat: 0.6517031665806167 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 25102.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0163_hellendoorn/GM0163_hellendoorn.derived.ad b/datasets/GM0163_hellendoorn/GM0163_hellendoorn.derived.ad index 2837bdfeef..27325faf20 100644 --- a/datasets/GM0163_hellendoorn/GM0163_hellendoorn.derived.ad +++ b/datasets/GM0163_hellendoorn/GM0163_hellendoorn.derived.ad @@ -1,6 +1,6 @@ - area = GM0163_hellendoorn -- id = 129322 -- parent_id = 129322 +- id = 129664 +- parent_id = 129664 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0163_hellendoorn/graph_values.yml b/datasets/GM0163_hellendoorn/graph_values.yml index 2cebdbf6d8..4c57a5ec77 100644 --- a/datasets/GM0163_hellendoorn/graph_values.yml +++ b/datasets/GM0163_hellendoorn/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18761993756215414 - :network_gas: 0.155709036316547 - :ambient_heat: 0.6566710261212988 + :electricity: 0.1876199390762146 + :network_gas: 0.15570902950326496 + :ambient_heat: 0.6566710314205204 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14923.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0164_hengelo/GM0164_hengelo.derived.ad b/datasets/GM0164_hengelo/GM0164_hengelo.derived.ad index 736f849bf9..992490ae4b 100644 --- a/datasets/GM0164_hengelo/GM0164_hengelo.derived.ad +++ b/datasets/GM0164_hengelo/GM0164_hengelo.derived.ad @@ -1,6 +1,6 @@ - area = GM0164_hengelo -- id = 129325 -- parent_id = 129325 +- id = 129667 +- parent_id = 129667 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0164_hengelo/graph_values.yml b/datasets/GM0164_hengelo/graph_values.yml index 23a2fe7941..c465a1339b 100644 --- a/datasets/GM0164_hengelo/graph_values.yml +++ b/datasets/GM0164_hengelo/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18598095505134735 - :network_gas: 0.1630844684880399 - :ambient_heat: 0.6509345764606127 + :electricity: 0.18598095662327113 + :network_gas: 0.16308446141437244 + :ambient_heat: 0.6509345819623564 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 38880.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0166_kampen/GM0166_kampen.derived.ad b/datasets/GM0166_kampen/GM0166_kampen.derived.ad index 8d7eacc1ac..445cd5aa86 100644 --- a/datasets/GM0166_kampen/GM0166_kampen.derived.ad +++ b/datasets/GM0166_kampen/GM0166_kampen.derived.ad @@ -1,6 +1,6 @@ - area = GM0166_kampen -- id = 129341 -- parent_id = 129341 +- id = 129683 +- parent_id = 129683 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0166_kampen/graph_values.yml b/datasets/GM0166_kampen/graph_values.yml index 8ac6593a5c..b0396ea0fb 100644 --- a/datasets/GM0166_kampen/graph_values.yml +++ b/datasets/GM0166_kampen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18563130654500087 - :network_gas: 0.16465788908613582 - :ambient_heat: 0.6497108043688633 + :electricity: 0.18563130812910664 + :network_gas: 0.16465788195764935 + :ambient_heat: 0.6497108099132439 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22766.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0168_losser/GM0168_losser.derived.ad b/datasets/GM0168_losser/GM0168_losser.derived.ad index 1a31796969..76e473801e 100644 --- a/datasets/GM0168_losser/GM0168_losser.derived.ad +++ b/datasets/GM0168_losser/GM0168_losser.derived.ad @@ -1,6 +1,6 @@ - area = GM0168_losser -- id = 129365 -- parent_id = 129365 +- id = 129707 +- parent_id = 129707 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0168_losser/graph_values.yml b/datasets/GM0168_losser/graph_values.yml index 034839ca20..7814e7fbcb 100644 --- a/datasets/GM0168_losser/graph_values.yml +++ b/datasets/GM0168_losser/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18593132267743148 - :network_gas: 0.16330781449991802 - :ambient_heat: 0.6507608628226504 + :electricity: 0.185931324251088 + :network_gas: 0.16330780741845344 + :ambient_heat: 0.6507608683304587 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9852.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0171_noordoostpolder/GM0171_noordoostpolder.derived.ad b/datasets/GM0171_noordoostpolder/GM0171_noordoostpolder.derived.ad index 049997c572..f2bad8d771 100644 --- a/datasets/GM0171_noordoostpolder/GM0171_noordoostpolder.derived.ad +++ b/datasets/GM0171_noordoostpolder/GM0171_noordoostpolder.derived.ad @@ -1,6 +1,6 @@ - area = GM0171_noordoostpolder -- id = 129389 -- parent_id = 129389 +- id = 129731 +- parent_id = 129731 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0171_noordoostpolder/graph_values.yml b/datasets/GM0171_noordoostpolder/graph_values.yml index 458523b396..d091160a28 100644 --- a/datasets/GM0171_noordoostpolder/graph_values.yml +++ b/datasets/GM0171_noordoostpolder/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18881680264656614 - :network_gas: 0.15032313549679804 - :ambient_heat: 0.6608600618566358 + :electricity: 0.18881680411758034 + :network_gas: 0.15032312887722424 + :ambient_heat: 0.6608600670051953 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19904.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0173_oldenzaal/GM0173_oldenzaal.derived.ad b/datasets/GM0173_oldenzaal/GM0173_oldenzaal.derived.ad index b27e081a14..80a48bcd6c 100644 --- a/datasets/GM0173_oldenzaal/GM0173_oldenzaal.derived.ad +++ b/datasets/GM0173_oldenzaal/GM0173_oldenzaal.derived.ad @@ -1,6 +1,6 @@ - area = GM0173_oldenzaal -- id = 129398 -- parent_id = 129398 +- id = 129740 +- parent_id = 129740 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0173_oldenzaal/graph_values.yml b/datasets/GM0173_oldenzaal/graph_values.yml index c8c3726248..99372828c0 100644 --- a/datasets/GM0173_oldenzaal/graph_values.yml +++ b/datasets/GM0173_oldenzaal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18632903735346934 - :network_gas: 0.16151809581934437 - :ambient_heat: 0.6521528668271863 + :electricity: 0.18632903891320904 + :network_gas: 0.1615180888005052 + :ambient_heat: 0.6521528722862856 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14655.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0175_ommen/GM0175_ommen.derived.ad b/datasets/GM0175_ommen/GM0175_ommen.derived.ad index 92deff3831..70a123519e 100644 --- a/datasets/GM0175_ommen/GM0175_ommen.derived.ad +++ b/datasets/GM0175_ommen/GM0175_ommen.derived.ad @@ -1,6 +1,6 @@ - area = GM0175_ommen -- id = 129400 -- parent_id = 129400 +- id = 129742 +- parent_id = 129742 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0175_ommen/graph_values.yml b/datasets/GM0175_ommen/graph_values.yml index eca9c20df0..15f61a4069 100644 --- a/datasets/GM0175_ommen/graph_values.yml +++ b/datasets/GM0175_ommen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1865171556894049 - :network_gas: 0.16067156205967414 - :ambient_heat: 0.6528112822509209 + :electricity: 0.18651715724253637 + :network_gas: 0.1606715550705724 + :ambient_heat: 0.6528112876868912 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7575.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0177_raalte/GM0177_raalte.derived.ad b/datasets/GM0177_raalte/GM0177_raalte.derived.ad index 586028945d..71012eb4c4 100644 --- a/datasets/GM0177_raalte/GM0177_raalte.derived.ad +++ b/datasets/GM0177_raalte/GM0177_raalte.derived.ad @@ -1,6 +1,6 @@ - area = GM0177_raalte -- id = 129418 -- parent_id = 129418 +- id = 129760 +- parent_id = 129760 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0177_raalte/graph_values.yml b/datasets/GM0177_raalte/graph_values.yml index fcab4f7ec5..c5984dd228 100644 --- a/datasets/GM0177_raalte/graph_values.yml +++ b/datasets/GM0177_raalte/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18744442080944587 - :network_gas: 0.15649886286809656 - :ambient_heat: 0.6560567163224575 + :electricity: 0.18744442232976277 + :network_gas: 0.15649885602666055 + :ambient_heat: 0.6560567216435768 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16027.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0180_staphorst/GM0180_staphorst.derived.ad b/datasets/GM0180_staphorst/GM0180_staphorst.derived.ad index c919af692b..263f999d43 100644 --- a/datasets/GM0180_staphorst/GM0180_staphorst.derived.ad +++ b/datasets/GM0180_staphorst/GM0180_staphorst.derived.ad @@ -1,6 +1,6 @@ - area = GM0180_staphorst -- id = 129450 -- parent_id = 129450 +- id = 129792 +- parent_id = 129792 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0180_staphorst/graph_values.yml b/datasets/GM0180_staphorst/graph_values.yml index c92a08dbf7..2c351e847a 100644 --- a/datasets/GM0180_staphorst/graph_values.yml +++ b/datasets/GM0180_staphorst/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18509328024146185 - :network_gas: 0.16707901102127956 - :ambient_heat: 0.6478277087372587 + :electricity: 0.18509328184420137 + :network_gas: 0.16707900380894083 + :ambient_heat: 0.6478277143468577 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5945.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0183_tubbergen/GM0183_tubbergen.derived.ad b/datasets/GM0183_tubbergen/GM0183_tubbergen.derived.ad index 499b2b5917..4c90370952 100644 --- a/datasets/GM0183_tubbergen/GM0183_tubbergen.derived.ad +++ b/datasets/GM0183_tubbergen/GM0183_tubbergen.derived.ad @@ -1,6 +1,6 @@ - area = GM0183_tubbergen -- id = 129464 -- parent_id = 129464 +- id = 129806 +- parent_id = 129806 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0183_tubbergen/graph_values.yml b/datasets/GM0183_tubbergen/graph_values.yml index 68dbb392ce..ef723e72bb 100644 --- a/datasets/GM0183_tubbergen/graph_values.yml +++ b/datasets/GM0183_tubbergen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18732124077739004 - :network_gas: 0.15705317382951314 - :ambient_heat: 0.6556255853930968 + :electricity: 0.18732124230208919 + :network_gas: 0.15705316696835694 + :ambient_heat: 0.6556255907295538 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8606.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0184_urk/GM0184_urk.derived.ad b/datasets/GM0184_urk/GM0184_urk.derived.ad index 87621fc9e4..b76cd794ed 100644 --- a/datasets/GM0184_urk/GM0184_urk.derived.ad +++ b/datasets/GM0184_urk/GM0184_urk.derived.ad @@ -1,6 +1,6 @@ - area = GM0184_urk -- id = 129470 -- parent_id = 129470 +- id = 129812 +- parent_id = 129812 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0184_urk/graph_values.yml b/datasets/GM0184_urk/graph_values.yml index 900d3c2601..4c14facfb7 100644 --- a/datasets/GM0184_urk/graph_values.yml +++ b/datasets/GM0184_urk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19091953575106665 - :network_gas: 0.14086082257720364 - :ambient_heat: 0.6682196416717296 + :electricity: 0.19091953714483634 + :network_gas: 0.140860816305231 + :ambient_heat: 0.6682196465499327 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6753.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0189_wierden/GM0189_wierden.derived.ad b/datasets/GM0189_wierden/GM0189_wierden.derived.ad index 38dc5b4def..682fe2b3e8 100644 --- a/datasets/GM0189_wierden/GM0189_wierden.derived.ad +++ b/datasets/GM0189_wierden/GM0189_wierden.derived.ad @@ -1,6 +1,6 @@ - area = GM0189_wierden -- id = 129502 -- parent_id = 129502 +- id = 129844 +- parent_id = 129844 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0189_wierden/graph_values.yml b/datasets/GM0189_wierden/graph_values.yml index 4142ba4882..d5bc64bf2b 100644 --- a/datasets/GM0189_wierden/graph_values.yml +++ b/datasets/GM0189_wierden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18919381511073088 - :network_gas: 0.1486265769069899 - :ambient_heat: 0.6621796079822792 + :electricity: 0.18919381656804718 + :network_gas: 0.1486265703490569 + :ambient_heat: 0.6621796130828959 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9929.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0193_zwolle/GM0193_zwolle.derived.ad b/datasets/GM0193_zwolle/GM0193_zwolle.derived.ad index 2e049664fa..245e029676 100644 --- a/datasets/GM0193_zwolle/GM0193_zwolle.derived.ad +++ b/datasets/GM0193_zwolle/GM0193_zwolle.derived.ad @@ -1,6 +1,6 @@ - area = GM0193_zwolle -- id = 129524 -- parent_id = 129524 +- id = 129866 +- parent_id = 129866 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0193_zwolle/graph_values.yml b/datasets/GM0193_zwolle/graph_values.yml index 2b9597f41b..38ad10028a 100644 --- a/datasets/GM0193_zwolle/graph_values.yml +++ b/datasets/GM0193_zwolle/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18774375477453448 - :network_gas: 0.15515185803944342 - :ambient_heat: 0.657104387186022 + :electricity: 0.18774375628417272 + :network_gas: 0.15515185124606132 + :ambient_heat: 0.6571043924697659 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 59462.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0197_aalten/GM0197_aalten.derived.ad b/datasets/GM0197_aalten/GM0197_aalten.derived.ad index 89741e5eae..145653f692 100644 --- a/datasets/GM0197_aalten/GM0197_aalten.derived.ad +++ b/datasets/GM0197_aalten/GM0197_aalten.derived.ad @@ -1,6 +1,6 @@ - area = GM0197_aalten -- id = 129203 -- parent_id = 129203 +- id = 129545 +- parent_id = 129545 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0197_aalten/graph_values.yml b/datasets/GM0197_aalten/graph_values.yml index 1f2900f112..b8ac2f684f 100644 --- a/datasets/GM0197_aalten/graph_values.yml +++ b/datasets/GM0197_aalten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18694696503605324 - :network_gas: 0.15873741714844036 - :ambient_heat: 0.6543156178155065 + :electricity: 0.1869469665740242 + :network_gas: 0.1587374102275608 + :ambient_heat: 0.6543156231984151 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12023.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0200_apeldoorn/GM0200_apeldoorn.derived.ad b/datasets/GM0200_apeldoorn/GM0200_apeldoorn.derived.ad index 1f4aa9a70a..74bd3f06fa 100644 --- a/datasets/GM0200_apeldoorn/GM0200_apeldoorn.derived.ad +++ b/datasets/GM0200_apeldoorn/GM0200_apeldoorn.derived.ad @@ -1,6 +1,6 @@ - area = GM0200_apeldoorn -- id = 129216 -- parent_id = 129216 +- id = 129558 +- parent_id = 129558 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0200_apeldoorn/graph_values.yml b/datasets/GM0200_apeldoorn/graph_values.yml index ffcfd4d3ad..e385e86339 100644 --- a/datasets/GM0200_apeldoorn/graph_values.yml +++ b/datasets/GM0200_apeldoorn/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18523735969449714 - :network_gas: 0.1664306525268105 - :ambient_heat: 0.6483319877786924 + :electricity: 0.18523736129225993 + :network_gas: 0.16643064533686722 + :ambient_heat: 0.6483319933708728 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 73999.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0202_arnhem/GM0202_arnhem.derived.ad b/datasets/GM0202_arnhem/GM0202_arnhem.derived.ad index b390593573..9dcdfd8cd2 100644 --- a/datasets/GM0202_arnhem/GM0202_arnhem.derived.ad +++ b/datasets/GM0202_arnhem/GM0202_arnhem.derived.ad @@ -1,6 +1,6 @@ - area = GM0202_arnhem -- id = 129217 -- parent_id = 129217 +- id = 129559 +- parent_id = 129559 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0202_arnhem/graph_values.yml b/datasets/GM0202_arnhem/graph_values.yml index e75d638bc8..b5c9a99697 100644 --- a/datasets/GM0202_arnhem/graph_values.yml +++ b/datasets/GM0202_arnhem/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18736792977209588 - :network_gas: 0.15684307304360634 - :ambient_heat: 0.6557889971842978 + :electricity: 0.1873679312951348 + :network_gas: 0.15684306618992094 + :ambient_heat: 0.6557890025149442 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 77777.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0203_barneveld/GM0203_barneveld.derived.ad b/datasets/GM0203_barneveld/GM0203_barneveld.derived.ad index babec2a1cf..2d8e1373a2 100644 --- a/datasets/GM0203_barneveld/GM0203_barneveld.derived.ad +++ b/datasets/GM0203_barneveld/GM0203_barneveld.derived.ad @@ -1,6 +1,6 @@ - area = GM0203_barneveld -- id = 129223 -- parent_id = 129223 +- id = 129565 +- parent_id = 129565 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0203_barneveld/graph_values.yml b/datasets/GM0203_barneveld/graph_values.yml index 8247a524e6..5d487769c2 100644 --- a/datasets/GM0203_barneveld/graph_values.yml +++ b/datasets/GM0203_barneveld/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18876216102087054 - :network_gas: 0.15056902317491583 - :ambient_heat: 0.6606688158042137 + :electricity: 0.18876216249386454 + :network_gas: 0.15056901654643293 + :ambient_heat: 0.6606688209597025 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 23121.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0209_beuningen/GM0209_beuningen.derived.ad b/datasets/GM0209_beuningen/GM0209_beuningen.derived.ad index 4ee77422dc..48a8cd12f4 100644 --- a/datasets/GM0209_beuningen/GM0209_beuningen.derived.ad +++ b/datasets/GM0209_beuningen/GM0209_beuningen.derived.ad @@ -1,6 +1,6 @@ - area = GM0209_beuningen -- id = 129234 -- parent_id = 129234 +- id = 129576 +- parent_id = 129576 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0209_beuningen/graph_values.yml b/datasets/GM0209_beuningen/graph_values.yml index 46304b6bca..522a1364d8 100644 --- a/datasets/GM0209_beuningen/graph_values.yml +++ b/datasets/GM0209_beuningen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18765501089811365 - :network_gas: 0.15555120607205586 - :ambient_heat: 0.6567937830298304 + :electricity: 0.1876550124109222 + :network_gas: 0.15555119926440755 + :ambient_heat: 0.6567937883246703 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11232.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0213_brummen/GM0213_brummen.derived.ad b/datasets/GM0213_brummen/GM0213_brummen.derived.ad index 26461b056a..f192cf698d 100644 --- a/datasets/GM0213_brummen/GM0213_brummen.derived.ad +++ b/datasets/GM0213_brummen/GM0213_brummen.derived.ad @@ -1,6 +1,6 @@ - area = GM0213_brummen -- id = 129247 -- parent_id = 129247 +- id = 129589 +- parent_id = 129589 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0213_brummen/graph_values.yml b/datasets/GM0213_brummen/graph_values.yml index 547cc70af5..c39445d400 100644 --- a/datasets/GM0213_brummen/graph_values.yml +++ b/datasets/GM0213_brummen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1811910733344621 - :network_gas: 0.1846389679896672 - :ambient_heat: 0.6341699586758707 + :electricity: 0.18119107506830834 + :network_gas: 0.1846389601873478 + :ambient_heat: 0.634169964744344 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9407.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0214_buren/GM0214_buren.derived.ad b/datasets/GM0214_buren/GM0214_buren.derived.ad index cf2daa4c80..999eb8f3aa 100644 --- a/datasets/GM0214_buren/GM0214_buren.derived.ad +++ b/datasets/GM0214_buren/GM0214_buren.derived.ad @@ -1,6 +1,6 @@ - area = GM0214_buren -- id = 129251 -- parent_id = 129251 +- id = 129593 +- parent_id = 129593 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0214_buren/graph_values.yml b/datasets/GM0214_buren/graph_values.yml index 34f4612654..e3877a8dad 100644 --- a/datasets/GM0214_buren/graph_values.yml +++ b/datasets/GM0214_buren/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1893077694375055 - :network_gas: 0.14811378168054143 - :ambient_heat: 0.662578448881953 + :electricity: 0.18930777089066847 + :network_gas: 0.14811377514129845 + :ambient_heat: 0.662578453968033 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10903.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0216_culemborg/GM0216_culemborg.derived.ad b/datasets/GM0216_culemborg/GM0216_culemborg.derived.ad index 8a15bed7a4..f9067032b8 100644 --- a/datasets/GM0216_culemborg/GM0216_culemborg.derived.ad +++ b/datasets/GM0216_culemborg/GM0216_culemborg.derived.ad @@ -1,6 +1,6 @@ - area = GM0216_culemborg -- id = 129256 -- parent_id = 129256 +- id = 129598 +- parent_id = 129598 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0216_culemborg/graph_values.yml b/datasets/GM0216_culemborg/graph_values.yml index db65e6de03..672b5d2a9c 100644 --- a/datasets/GM0216_culemborg/graph_values.yml +++ b/datasets/GM0216_culemborg/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1915082862680981 - :network_gas: 0.13821144134484445 - :ambient_heat: 0.6702802723870576 + :electricity: 0.1915082876398702 + :network_gas: 0.13821143517186074 + :ambient_heat: 0.6702802771882691 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12720.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0221_doesburg/GM0221_doesburg.derived.ad b/datasets/GM0221_doesburg/GM0221_doesburg.derived.ad index de66b2325c..b2e4f9c02d 100644 --- a/datasets/GM0221_doesburg/GM0221_doesburg.derived.ad +++ b/datasets/GM0221_doesburg/GM0221_doesburg.derived.ad @@ -1,6 +1,6 @@ - area = GM0221_doesburg -- id = 129270 -- parent_id = 129270 +- id = 129612 +- parent_id = 129612 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0221_doesburg/graph_values.yml b/datasets/GM0221_doesburg/graph_values.yml index 4877ebab90..5dc9d4caf2 100644 --- a/datasets/GM0221_doesburg/graph_values.yml +++ b/datasets/GM0221_doesburg/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18699276387396918 - :network_gas: 0.15853132207399323 - :ambient_heat: 0.6544759140520375 + :electricity: 0.18699276541031962 + :network_gas: 0.15853131516040597 + :ambient_heat: 0.6544759194292744 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5307.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0222_doetinchem/GM0222_doetinchem.derived.ad b/datasets/GM0222_doetinchem/GM0222_doetinchem.derived.ad index e05a7d7b98..1efd995efa 100644 --- a/datasets/GM0222_doetinchem/GM0222_doetinchem.derived.ad +++ b/datasets/GM0222_doetinchem/GM0222_doetinchem.derived.ad @@ -1,6 +1,6 @@ - area = GM0222_doetinchem -- id = 129271 -- parent_id = 129271 +- id = 129613 +- parent_id = 129613 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0222_doetinchem/graph_values.yml b/datasets/GM0222_doetinchem/graph_values.yml index ff501782a4..445a374d45 100644 --- a/datasets/GM0222_doetinchem/graph_values.yml +++ b/datasets/GM0222_doetinchem/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1881842586815566 - :network_gas: 0.1531695875355805 - :ambient_heat: 0.6586461537828628 + :electricity: 0.18818426017540407 + :network_gas: 0.15316958081325716 + :ambient_heat: 0.6586461590113388 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 26492.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0225_druten/GM0225_druten.derived.ad b/datasets/GM0225_druten/GM0225_druten.derived.ad index 338aec441f..b1849a61c3 100644 --- a/datasets/GM0225_druten/GM0225_druten.derived.ad +++ b/datasets/GM0225_druten/GM0225_druten.derived.ad @@ -1,6 +1,6 @@ - area = GM0225_druten -- id = 129277 -- parent_id = 129277 +- id = 129619 +- parent_id = 129619 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0225_druten/graph_values.yml b/datasets/GM0225_druten/graph_values.yml index 1ca4b6211e..ec994b9144 100644 --- a/datasets/GM0225_druten/graph_values.yml +++ b/datasets/GM0225_druten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1898258049287775 - :network_gas: 0.14578261853321667 - :ambient_heat: 0.6643915765380058 + :electricity: 0.18982580636298307 + :network_gas: 0.14578261207928206 + :ambient_heat: 0.6643915815577349 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8189.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0226_duiven/GM0226_duiven.derived.ad b/datasets/GM0226_duiven/GM0226_duiven.derived.ad index 02efbc82ca..c54150d7a5 100644 --- a/datasets/GM0226_duiven/GM0226_duiven.derived.ad +++ b/datasets/GM0226_duiven/GM0226_duiven.derived.ad @@ -1,6 +1,6 @@ - area = GM0226_duiven -- id = 129278 -- parent_id = 129278 +- id = 129620 +- parent_id = 129620 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0226_duiven/graph_values.yml b/datasets/GM0226_duiven/graph_values.yml index c79df12689..d7273e6c10 100644 --- a/datasets/GM0226_duiven/graph_values.yml +++ b/datasets/GM0226_duiven/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20618230262562615 - :network_gas: 0.07217827038986606 - :ambient_heat: 0.7216394269845079 + :electricity: 0.20618230339689939 + :network_gas: 0.07217826691913135 + :ambient_heat: 0.7216394296839693 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10750.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0228_ede/GM0228_ede.derived.ad b/datasets/GM0228_ede/GM0228_ede.derived.ad index bab11597bf..b86f8ba15c 100644 --- a/datasets/GM0228_ede/GM0228_ede.derived.ad +++ b/datasets/GM0228_ede/GM0228_ede.derived.ad @@ -1,6 +1,6 @@ - area = GM0228_ede -- id = 129281 -- parent_id = 129281 +- id = 129623 +- parent_id = 129623 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0228_ede/graph_values.yml b/datasets/GM0228_ede/graph_values.yml index 8ba9552f2a..11a0638023 100644 --- a/datasets/GM0228_ede/graph_values.yml +++ b/datasets/GM0228_ede/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19023114689560597 - :network_gas: 0.14395857699348646 - :ambient_heat: 0.6658102761109076 + :electricity: 0.19023114831489085 + :network_gas: 0.143958570606695 + :ambient_heat: 0.665810281078414 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 49897.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0230_elburg/GM0230_elburg.derived.ad b/datasets/GM0230_elburg/GM0230_elburg.derived.ad index 9e4d0d7685..b795941108 100644 --- a/datasets/GM0230_elburg/GM0230_elburg.derived.ad +++ b/datasets/GM0230_elburg/GM0230_elburg.derived.ad @@ -1,6 +1,6 @@ - area = GM0230_elburg -- id = 129286 -- parent_id = 129286 +- id = 129628 +- parent_id = 129628 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0230_elburg/graph_values.yml b/datasets/GM0230_elburg/graph_values.yml index 6424987a0d..b6e8abadf8 100644 --- a/datasets/GM0230_elburg/graph_values.yml +++ b/datasets/GM0230_elburg/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18794290911813447 - :network_gas: 0.15425566217207137 - :ambient_heat: 0.6578014287097941 + :electricity: 0.1879429106206448 + :network_gas: 0.15425565541076486 + :ambient_heat: 0.6578014339685901 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9583.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0232_epe/GM0232_epe.derived.ad b/datasets/GM0232_epe/GM0232_epe.derived.ad index 1e2496bf16..e700b27d74 100644 --- a/datasets/GM0232_epe/GM0232_epe.derived.ad +++ b/datasets/GM0232_epe/GM0232_epe.derived.ad @@ -1,6 +1,6 @@ - area = GM0232_epe -- id = 129290 -- parent_id = 129290 +- id = 129632 +- parent_id = 129632 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0232_epe/graph_values.yml b/datasets/GM0232_epe/graph_values.yml index 7a9443ca9a..35f709ad91 100644 --- a/datasets/GM0232_epe/graph_values.yml +++ b/datasets/GM0232_epe/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18465349370897624 - :network_gas: 0.1690580533349688 - :ambient_heat: 0.6462884529560549 + :electricity: 0.18465349532684694 + :network_gas: 0.16905804605454003 + :ambient_heat: 0.6462884586186131 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14683.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0233_ermelo/GM0233_ermelo.derived.ad b/datasets/GM0233_ermelo/GM0233_ermelo.derived.ad index 8a1eb46108..a7f9fd4892 100644 --- a/datasets/GM0233_ermelo/GM0233_ermelo.derived.ad +++ b/datasets/GM0233_ermelo/GM0233_ermelo.derived.ad @@ -1,6 +1,6 @@ - area = GM0233_ermelo -- id = 129291 -- parent_id = 129291 +- id = 129633 +- parent_id = 129633 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0233_ermelo/graph_values.yml b/datasets/GM0233_ermelo/graph_values.yml index 82400f798b..51065f6be3 100644 --- a/datasets/GM0233_ermelo/graph_values.yml +++ b/datasets/GM0233_ermelo/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1845908466329083 - :network_gas: 0.16933996559286965 - :ambient_heat: 0.6460691877742221 + :electricity: 0.18459084825292704 + :network_gas: 0.16933995830277457 + :ambient_heat: 0.6460691934442984 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11332.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0243_harderwijk/GM0243_harderwijk.derived.ad b/datasets/GM0243_harderwijk/GM0243_harderwijk.derived.ad index 8da936db7b..08905a0cc4 100644 --- a/datasets/GM0243_harderwijk/GM0243_harderwijk.derived.ad +++ b/datasets/GM0243_harderwijk/GM0243_harderwijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0243_harderwijk -- id = 129311 -- parent_id = 129311 +- id = 129653 +- parent_id = 129653 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0243_harderwijk/graph_values.yml b/datasets/GM0243_harderwijk/graph_values.yml index 566612c102..fa3f790642 100644 --- a/datasets/GM0243_harderwijk/graph_values.yml +++ b/datasets/GM0243_harderwijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18728642203995133 - :network_gas: 0.15720985837897164 - :ambient_heat: 0.655503719581077 + :electricity: 0.1872864235658879 + :network_gas: 0.15720985151224695 + :ambient_heat: 0.6555037249218651 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20668.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0244_hattem/GM0244_hattem.derived.ad b/datasets/GM0244_hattem/GM0244_hattem.derived.ad index 754baa9bb6..335f84021d 100644 --- a/datasets/GM0244_hattem/GM0244_hattem.derived.ad +++ b/datasets/GM0244_hattem/GM0244_hattem.derived.ad @@ -1,6 +1,6 @@ - area = GM0244_hattem -- id = 129314 -- parent_id = 129314 +- id = 129656 +- parent_id = 129656 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0244_hattem/graph_values.yml b/datasets/GM0244_hattem/graph_values.yml index e01f0dc5d2..be3a3f48cf 100644 --- a/datasets/GM0244_hattem/graph_values.yml +++ b/datasets/GM0244_hattem/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18624203418274765 - :network_gas: 0.1619096106647631 - :ambient_heat: 0.6518483551524892 + :electricity: 0.1862420357455381 + :network_gas: 0.16190960363219575 + :ambient_heat: 0.6518483606222661 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5259.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0246_heerde/GM0246_heerde.derived.ad b/datasets/GM0246_heerde/GM0246_heerde.derived.ad index 0fa9ac2d83..ea08f32ffc 100644 --- a/datasets/GM0246_heerde/GM0246_heerde.derived.ad +++ b/datasets/GM0246_heerde/GM0246_heerde.derived.ad @@ -1,6 +1,6 @@ - area = GM0246_heerde -- id = 129317 -- parent_id = 129317 +- id = 129659 +- parent_id = 129659 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0246_heerde/graph_values.yml b/datasets/GM0246_heerde/graph_values.yml index 66a1783b62..098b40a7e9 100644 --- a/datasets/GM0246_heerde/graph_values.yml +++ b/datasets/GM0246_heerde/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1868731520875415 - :network_gas: 0.1590695759064117 - :ambient_heat: 0.6540572720060469 + :electricity: 0.18687315362812212 + :network_gas: 0.1590695689737884 + :ambient_heat: 0.6540572773980894 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8005.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0252_heumen/GM0252_heumen.derived.ad b/datasets/GM0252_heumen/GM0252_heumen.derived.ad index 4e04878aa5..1e3b77a344 100644 --- a/datasets/GM0252_heumen/GM0252_heumen.derived.ad +++ b/datasets/GM0252_heumen/GM0252_heumen.derived.ad @@ -1,6 +1,6 @@ - area = GM0252_heumen -- id = 129326 -- parent_id = 129326 +- id = 129668 +- parent_id = 129668 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0252_heumen/graph_values.yml b/datasets/GM0252_heumen/graph_values.yml index 347a5c6531..881251857e 100644 --- a/datasets/GM0252_heumen/graph_values.yml +++ b/datasets/GM0252_heumen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1884648048189953 - :network_gas: 0.1519071280559885 - :ambient_heat: 0.6596280671250162 + :electricity: 0.18846480630273882 + :network_gas: 0.15190712137913304 + :ambient_heat: 0.6596280723181283 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7265.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0262_lochem/GM0262_lochem.derived.ad b/datasets/GM0262_lochem/GM0262_lochem.derived.ad index 3f90d1ec1c..3e4b939c7c 100644 --- a/datasets/GM0262_lochem/GM0262_lochem.derived.ad +++ b/datasets/GM0262_lochem/GM0262_lochem.derived.ad @@ -1,6 +1,6 @@ - area = GM0262_lochem -- id = 129362 -- parent_id = 129362 +- id = 129704 +- parent_id = 129704 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0262_lochem/graph_values.yml b/datasets/GM0262_lochem/graph_values.yml index 2719047a32..0718b3e878 100644 --- a/datasets/GM0262_lochem/graph_values.yml +++ b/datasets/GM0262_lochem/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18202238903859155 - :network_gas: 0.18089804180621127 - :ambient_heat: 0.6370795691551971 + :electricity: 0.18202239074510254 + :network_gas: 0.18089803412690053 + :ambient_heat: 0.637079575127997 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15122.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0263_maasdriel/GM0263_maasdriel.derived.ad b/datasets/GM0263_maasdriel/GM0263_maasdriel.derived.ad index cf0021c240..920f0cb121 100644 --- a/datasets/GM0263_maasdriel/GM0263_maasdriel.derived.ad +++ b/datasets/GM0263_maasdriel/GM0263_maasdriel.derived.ad @@ -1,6 +1,6 @@ - area = GM0263_maasdriel -- id = 129366 -- parent_id = 129366 +- id = 129708 +- parent_id = 129708 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0263_maasdriel/graph_values.yml b/datasets/GM0263_maasdriel/graph_values.yml index 5b041709a9..e473fc1e01 100644 --- a/datasets/GM0263_maasdriel/graph_values.yml +++ b/datasets/GM0263_maasdriel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18974326321329116 - :network_gas: 0.14615405680047938 - :ambient_heat: 0.6641026799862294 + :electricity: 0.18974326465052574 + :network_gas: 0.14615405033291437 + :ambient_heat: 0.6641026850165599 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10195.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0267_nijkerk/GM0267_nijkerk.derived.ad b/datasets/GM0267_nijkerk/GM0267_nijkerk.derived.ad index caf3aadfc3..5e7b5a243c 100644 --- a/datasets/GM0267_nijkerk/GM0267_nijkerk.derived.ad +++ b/datasets/GM0267_nijkerk/GM0267_nijkerk.derived.ad @@ -1,6 +1,6 @@ - area = GM0267_nijkerk -- id = 129384 -- parent_id = 129384 +- id = 129726 +- parent_id = 129726 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0267_nijkerk/graph_values.yml b/datasets/GM0267_nijkerk/graph_values.yml index 3475a8de7c..ad74e346a5 100644 --- a/datasets/GM0267_nijkerk/graph_values.yml +++ b/datasets/GM0267_nijkerk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1890729107743081 - :network_gas: 0.14917064722296086 - :ambient_heat: 0.661756442002731 + :electricity: 0.18907291223602443 + :network_gas: 0.14917064064522775 + :ambient_heat: 0.6617564471187478 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 17338.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0268_nijmegen/GM0268_nijmegen.derived.ad b/datasets/GM0268_nijmegen/GM0268_nijmegen.derived.ad index 7bb1de4c86..504c3da23f 100644 --- a/datasets/GM0268_nijmegen/GM0268_nijmegen.derived.ad +++ b/datasets/GM0268_nijmegen/GM0268_nijmegen.derived.ad @@ -1,6 +1,6 @@ - area = GM0268_nijmegen -- id = 129385 -- parent_id = 129385 +- id = 129727 +- parent_id = 129727 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0268_nijmegen/graph_values.yml b/datasets/GM0268_nijmegen/graph_values.yml index 784247871d..ecfb41e446 100644 --- a/datasets/GM0268_nijmegen/graph_values.yml +++ b/datasets/GM0268_nijmegen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18634315885252264 - :network_gas: 0.1614545489799238 - :ambient_heat: 0.6522022921675535 + :electricity: 0.18634316041176688 + :network_gas: 0.16145454196331438 + :ambient_heat: 0.6522022976249188 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 82196.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0269_oldebroek/GM0269_oldebroek.derived.ad b/datasets/GM0269_oldebroek/GM0269_oldebroek.derived.ad index b7e9ea7e7d..f12c7a6d57 100644 --- a/datasets/GM0269_oldebroek/GM0269_oldebroek.derived.ad +++ b/datasets/GM0269_oldebroek/GM0269_oldebroek.derived.ad @@ -1,6 +1,6 @@ - area = GM0269_oldebroek -- id = 129397 -- parent_id = 129397 +- id = 129739 +- parent_id = 129739 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0269_oldebroek/graph_values.yml b/datasets/GM0269_oldebroek/graph_values.yml index 8ef58bc3c9..4e5de83093 100644 --- a/datasets/GM0269_oldebroek/graph_values.yml +++ b/datasets/GM0269_oldebroek/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18687080627663363 - :network_gas: 0.15908013207105892 - :ambient_heat: 0.6540490616523075 + :electricity: 0.1868708078172972 + :network_gas: 0.1590801251380627 + :ambient_heat: 0.6540490670446402 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9451.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0273_putten/GM0273_putten.derived.ad b/datasets/GM0273_putten/GM0273_putten.derived.ad index dcd679cb10..01f7bd4d0a 100644 --- a/datasets/GM0273_putten/GM0273_putten.derived.ad +++ b/datasets/GM0273_putten/GM0273_putten.derived.ad @@ -1,6 +1,6 @@ - area = GM0273_putten -- id = 129417 -- parent_id = 129417 +- id = 129759 +- parent_id = 129759 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0273_putten/graph_values.yml b/datasets/GM0273_putten/graph_values.yml index c8be9ce517..d71cfc78a8 100644 --- a/datasets/GM0273_putten/graph_values.yml +++ b/datasets/GM0273_putten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18849188960710542 - :network_gas: 0.15178524632981513 - :ambient_heat: 0.6597228640630796 + :electricity: 0.18849189108987147 + :network_gas: 0.15178523965735802 + :ambient_heat: 0.6597228692527706 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9898.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0274_renkum/GM0274_renkum.derived.ad b/datasets/GM0274_renkum/GM0274_renkum.derived.ad index f67b387401..8c25d825f5 100644 --- a/datasets/GM0274_renkum/GM0274_renkum.derived.ad +++ b/datasets/GM0274_renkum/GM0274_renkum.derived.ad @@ -1,6 +1,6 @@ - area = GM0274_renkum -- id = 129420 -- parent_id = 129420 +- id = 129762 +- parent_id = 129762 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0274_renkum/graph_values.yml b/datasets/GM0274_renkum/graph_values.yml index 960af97574..9f1cc5569b 100644 --- a/datasets/GM0274_renkum/graph_values.yml +++ b/datasets/GM0274_renkum/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18171168634038537 - :network_gas: 0.1822962060093127 - :ambient_heat: 0.6359921076503018 + :electricity: 0.1817116880571506 + :network_gas: 0.18229619828385796 + :ambient_heat: 0.6359921136589914 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14987.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0275_rheden/GM0275_rheden.derived.ad b/datasets/GM0275_rheden/GM0275_rheden.derived.ad index 94f27465d4..a44818e18a 100644 --- a/datasets/GM0275_rheden/GM0275_rheden.derived.ad +++ b/datasets/GM0275_rheden/GM0275_rheden.derived.ad @@ -1,6 +1,6 @@ - area = GM0275_rheden -- id = 129423 -- parent_id = 129423 +- id = 129765 +- parent_id = 129765 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0275_rheden/graph_values.yml b/datasets/GM0275_rheden/graph_values.yml index abb3ef935b..7cf1ce0a10 100644 --- a/datasets/GM0275_rheden/graph_values.yml +++ b/datasets/GM0275_rheden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1808888202172389 - :network_gas: 0.18599910902229158 - :ambient_heat: 0.6331120707604695 + :electricity: 0.18088882196094383 + :network_gas: 0.18599910117560775 + :ambient_heat: 0.6331120768634484 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 21217.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0277_rozendaal/GM0277_rozendaal.derived.ad b/datasets/GM0277_rozendaal/GM0277_rozendaal.derived.ad index 935f2e32c7..a9459dc03c 100644 --- a/datasets/GM0277_rozendaal/GM0277_rozendaal.derived.ad +++ b/datasets/GM0277_rozendaal/GM0277_rozendaal.derived.ad @@ -1,6 +1,6 @@ - area = GM0277_rozendaal -- id = 129432 -- parent_id = 129432 +- id = 129774 +- parent_id = 129774 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0277_rozendaal/graph_values.yml b/datasets/GM0277_rozendaal/graph_values.yml index c838fa3f7d..ccaae646fe 100644 --- a/datasets/GM0277_rozendaal/graph_values.yml +++ b/datasets/GM0277_rozendaal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18718254447257499 - :network_gas: 0.1576773081212795 - :ambient_heat: 0.6551401474061455 + :electricity: 0.18718254600219997 + :network_gas: 0.15767730123795717 + :ambient_heat: 0.6551401527598429 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 694.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0279_scherpenzeel/GM0279_scherpenzeel.derived.ad b/datasets/GM0279_scherpenzeel/GM0279_scherpenzeel.derived.ad index 47c7b34c18..08dec8637b 100644 --- a/datasets/GM0279_scherpenzeel/GM0279_scherpenzeel.derived.ad +++ b/datasets/GM0279_scherpenzeel/GM0279_scherpenzeel.derived.ad @@ -1,6 +1,6 @@ - area = GM0279_scherpenzeel -- id = 129435 -- parent_id = 129435 +- id = 129777 +- parent_id = 129777 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0279_scherpenzeel/graph_values.yml b/datasets/GM0279_scherpenzeel/graph_values.yml index 5cac6e68c3..cde8c28cef 100644 --- a/datasets/GM0279_scherpenzeel/graph_values.yml +++ b/datasets/GM0279_scherpenzeel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18770441474917743 - :network_gas: 0.15532888841452844 - :ambient_heat: 0.6569666968362943 + :electricity: 0.18770441626022147 + :network_gas: 0.15532888161482006 + :ambient_heat: 0.6569667021249584 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4112.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0281_tiel/GM0281_tiel.derived.ad b/datasets/GM0281_tiel/GM0281_tiel.derived.ad index b51e456659..569b173a21 100644 --- a/datasets/GM0281_tiel/GM0281_tiel.derived.ad +++ b/datasets/GM0281_tiel/GM0281_tiel.derived.ad @@ -1,6 +1,6 @@ - area = GM0281_tiel -- id = 129462 -- parent_id = 129462 +- id = 129804 +- parent_id = 129804 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0281_tiel/graph_values.yml b/datasets/GM0281_tiel/graph_values.yml index 79979c2dbd..6f4d346f73 100644 --- a/datasets/GM0281_tiel/graph_values.yml +++ b/datasets/GM0281_tiel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18813972409947843 - :network_gas: 0.15336999345037072 - :ambient_heat: 0.6584902824501507 + :electricity: 0.18813972559492642 + :network_gas: 0.15336998672084487 + :ambient_heat: 0.6584902876842287 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18255.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0285_voorst/GM0285_voorst.derived.ad b/datasets/GM0285_voorst/GM0285_voorst.derived.ad index 08e2c69b20..691df08179 100644 --- a/datasets/GM0285_voorst/GM0285_voorst.derived.ad +++ b/datasets/GM0285_voorst/GM0285_voorst.derived.ad @@ -1,6 +1,6 @@ - area = GM0285_voorst -- id = 129488 -- parent_id = 129488 +- id = 129830 +- parent_id = 129830 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0285_voorst/graph_values.yml b/datasets/GM0285_voorst/graph_values.yml index 277b1651bc..16445a33b9 100644 --- a/datasets/GM0285_voorst/graph_values.yml +++ b/datasets/GM0285_voorst/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18511601748573672 - :network_gas: 0.16697669327120565 - :ambient_heat: 0.6479072892430576 + :electricity: 0.18511601908769154 + :network_gas: 0.1669766860623983 + :ambient_heat: 0.64790729484991 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10715.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0289_wageningen/GM0289_wageningen.derived.ad b/datasets/GM0289_wageningen/GM0289_wageningen.derived.ad index a8d60aad07..76df2e8026 100644 --- a/datasets/GM0289_wageningen/GM0289_wageningen.derived.ad +++ b/datasets/GM0289_wageningen/GM0289_wageningen.derived.ad @@ -1,6 +1,6 @@ - area = GM0289_wageningen -- id = 129493 -- parent_id = 129493 +- id = 129835 +- parent_id = 129835 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0289_wageningen/graph_values.yml b/datasets/GM0289_wageningen/graph_values.yml index aa11501d40..b492d83e7b 100644 --- a/datasets/GM0289_wageningen/graph_values.yml +++ b/datasets/GM0289_wageningen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18836994502975082 - :network_gas: 0.1523339977368801 - :ambient_heat: 0.659296057233369 + :electricity: 0.18836994651691483 + :network_gas: 0.1523339910446323 + :ambient_heat: 0.659296062438453 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18053.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0293_westervoort/GM0293_westervoort.derived.ad b/datasets/GM0293_westervoort/GM0293_westervoort.derived.ad index d8873d78a1..80dacf8b61 100644 --- a/datasets/GM0293_westervoort/GM0293_westervoort.derived.ad +++ b/datasets/GM0293_westervoort/GM0293_westervoort.derived.ad @@ -1,6 +1,6 @@ - area = GM0293_westervoort -- id = 129499 -- parent_id = 129499 +- id = 129841 +- parent_id = 129841 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0293_westervoort/graph_values.yml b/datasets/GM0293_westervoort/graph_values.yml index 710240e301..e05c3f1bd5 100644 --- a/datasets/GM0293_westervoort/graph_values.yml +++ b/datasets/GM0293_westervoort/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20001989906732007 - :network_gas: 0.09990912728307323 - :ambient_heat: 0.7000709736496067 + :electricity: 0.20001990010300763 + :network_gas: 0.09990912262247212 + :ambient_heat: 0.7000709772745202 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6739.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0294_winterswijk/GM0294_winterswijk.derived.ad b/datasets/GM0294_winterswijk/GM0294_winterswijk.derived.ad index 7b75963e53..4dec80cdee 100644 --- a/datasets/GM0294_winterswijk/GM0294_winterswijk.derived.ad +++ b/datasets/GM0294_winterswijk/GM0294_winterswijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0294_winterswijk -- id = 129506 -- parent_id = 129506 +- id = 129848 +- parent_id = 129848 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0294_winterswijk/graph_values.yml b/datasets/GM0294_winterswijk/graph_values.yml index 0f5fb038e3..18ddeb8354 100644 --- a/datasets/GM0294_winterswijk/graph_values.yml +++ b/datasets/GM0294_winterswijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18552201997898876 - :network_gas: 0.16514967935818758 - :ambient_heat: 0.6493283006628237 + :electricity: 0.18552202156689043 + :network_gas: 0.16514967221261947 + :ambient_heat: 0.6493283062204901 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13072.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0296_wijchen/GM0296_wijchen.derived.ad b/datasets/GM0296_wijchen/GM0296_wijchen.derived.ad index 1d9a5e9f1e..0696530f27 100644 --- a/datasets/GM0296_wijchen/GM0296_wijchen.derived.ad +++ b/datasets/GM0296_wijchen/GM0296_wijchen.derived.ad @@ -1,6 +1,6 @@ - area = GM0296_wijchen -- id = 129503 -- parent_id = 129503 +- id = 129845 +- parent_id = 129845 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0296_wijchen/graph_values.yml b/datasets/GM0296_wijchen/graph_values.yml index fc3664bd41..70eec9aedb 100644 --- a/datasets/GM0296_wijchen/graph_values.yml +++ b/datasets/GM0296_wijchen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18938869958439045 - :network_gas: 0.1477495954826759 - :ambient_heat: 0.6628617049329336 + :electricity: 0.18938870103460004 + :network_gas: 0.14774958895672313 + :ambient_heat: 0.6628617100086769 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18166.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0297_zaltbommel/GM0297_zaltbommel.derived.ad b/datasets/GM0297_zaltbommel/GM0297_zaltbommel.derived.ad index d9ce0d22c0..843d987119 100644 --- a/datasets/GM0297_zaltbommel/GM0297_zaltbommel.derived.ad +++ b/datasets/GM0297_zaltbommel/GM0297_zaltbommel.derived.ad @@ -1,6 +1,6 @@ - area = GM0297_zaltbommel -- id = 129512 -- parent_id = 129512 +- id = 129854 +- parent_id = 129854 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0297_zaltbommel/graph_values.yml b/datasets/GM0297_zaltbommel/graph_values.yml index e364638793..657edaa976 100644 --- a/datasets/GM0297_zaltbommel/graph_values.yml +++ b/datasets/GM0297_zaltbommel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1893102161201953 - :network_gas: 0.14810277159220628 - :ambient_heat: 0.6625870122875984 + :electricity: 0.18931021757326902 + :network_gas: 0.1481027650533649 + :ambient_heat: 0.662587017373366 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11803.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0299_zevenaar/GM0299_zevenaar.derived.ad b/datasets/GM0299_zevenaar/GM0299_zevenaar.derived.ad index ac67c5cfa3..ba6d353818 100644 --- a/datasets/GM0299_zevenaar/GM0299_zevenaar.derived.ad +++ b/datasets/GM0299_zevenaar/GM0299_zevenaar.derived.ad @@ -1,6 +1,6 @@ - area = GM0299_zevenaar -- id = 129516 -- parent_id = 129516 +- id = 129858 +- parent_id = 129858 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0299_zevenaar/graph_values.yml b/datasets/GM0299_zevenaar/graph_values.yml index 0ebbe67b4a..254a13f915 100644 --- a/datasets/GM0299_zevenaar/graph_values.yml +++ b/datasets/GM0299_zevenaar/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1897144085750715 - :network_gas: 0.1462839028638872 - :ambient_heat: 0.6640016885610414 + :electricity: 0.18971441001336414 + :network_gas: 0.14628389639156067 + :ambient_heat: 0.6640016935950752 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20189.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0301_zutphen/GM0301_zutphen.derived.ad b/datasets/GM0301_zutphen/GM0301_zutphen.derived.ad index f880ba5666..cfc4cc8f36 100644 --- a/datasets/GM0301_zutphen/GM0301_zutphen.derived.ad +++ b/datasets/GM0301_zutphen/GM0301_zutphen.derived.ad @@ -1,6 +1,6 @@ - area = GM0301_zutphen -- id = 129521 -- parent_id = 129521 +- id = 129863 +- parent_id = 129863 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0301_zutphen/graph_values.yml b/datasets/GM0301_zutphen/graph_values.yml index 6331e94d10..6de973e79e 100644 --- a/datasets/GM0301_zutphen/graph_values.yml +++ b/datasets/GM0301_zutphen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18489415267123172 - :network_gas: 0.16797508640830924 - :ambient_heat: 0.647130760920459 + :electricity: 0.18489415428083356 + :network_gas: 0.1679750791650903 + :ambient_heat: 0.6471307665540761 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22588.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0302_nunspeet/GM0302_nunspeet.derived.ad b/datasets/GM0302_nunspeet/GM0302_nunspeet.derived.ad index 1f95d669d6..ae46f1efab 100644 --- a/datasets/GM0302_nunspeet/GM0302_nunspeet.derived.ad +++ b/datasets/GM0302_nunspeet/GM0302_nunspeet.derived.ad @@ -1,6 +1,6 @@ - area = GM0302_nunspeet -- id = 129392 -- parent_id = 129392 +- id = 129734 +- parent_id = 129734 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0302_nunspeet/graph_values.yml b/datasets/GM0302_nunspeet/graph_values.yml index 6eb23b6298..fbada44a3d 100644 --- a/datasets/GM0302_nunspeet/graph_values.yml +++ b/datasets/GM0302_nunspeet/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1867270705089751 - :network_gas: 0.15972694397905243 - :ambient_heat: 0.6535459855119725 + :electricity: 0.18672707205471306 + :network_gas: 0.15972693702322127 + :ambient_heat: 0.6535459909220657 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11197.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0303_dronten/GM0303_dronten.derived.ad b/datasets/GM0303_dronten/GM0303_dronten.derived.ad index ccee532af5..a6ac0d8f6e 100644 --- a/datasets/GM0303_dronten/GM0303_dronten.derived.ad +++ b/datasets/GM0303_dronten/GM0303_dronten.derived.ad @@ -1,6 +1,6 @@ - area = GM0303_dronten -- id = 129276 -- parent_id = 129276 +- id = 129618 +- parent_id = 129618 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0303_dronten/graph_values.yml b/datasets/GM0303_dronten/graph_values.yml index 454b3513e0..1dac87dc0b 100644 --- a/datasets/GM0303_dronten/graph_values.yml +++ b/datasets/GM0303_dronten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18859932050306388 - :network_gas: 0.1513018065853151 - :ambient_heat: 0.6600988729116211 + :electricity: 0.18859932198194973 + :network_gas: 0.1513017999303191 + :ambient_heat: 0.6600988780877313 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 17696.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0307_amersfoort/GM0307_amersfoort.derived.ad b/datasets/GM0307_amersfoort/GM0307_amersfoort.derived.ad index 6c0a152ffd..954f3f67d1 100644 --- a/datasets/GM0307_amersfoort/GM0307_amersfoort.derived.ad +++ b/datasets/GM0307_amersfoort/GM0307_amersfoort.derived.ad @@ -1,6 +1,6 @@ - area = GM0307_amersfoort -- id = 129213 -- parent_id = 129213 +- id = 129555 +- parent_id = 129555 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0307_amersfoort/graph_values.yml b/datasets/GM0307_amersfoort/graph_values.yml index 53a019cb7c..8f0839c8f6 100644 --- a/datasets/GM0307_amersfoort/graph_values.yml +++ b/datasets/GM0307_amersfoort/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18957456701500008 - :network_gas: 0.14691319081190468 - :ambient_heat: 0.6635122421730952 + :electricity: 0.18957456845841525 + :network_gas: 0.14691318431652672 + :ambient_heat: 0.663512247225058 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 68785.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0308_baarn/GM0308_baarn.derived.ad b/datasets/GM0308_baarn/GM0308_baarn.derived.ad index abdc60e75b..91234a3283 100644 --- a/datasets/GM0308_baarn/GM0308_baarn.derived.ad +++ b/datasets/GM0308_baarn/GM0308_baarn.derived.ad @@ -1,6 +1,6 @@ - area = GM0308_baarn -- id = 129221 -- parent_id = 129221 +- id = 129563 +- parent_id = 129563 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0308_baarn/graph_values.yml b/datasets/GM0308_baarn/graph_values.yml index 2e0cdf1cc5..1675529f34 100644 --- a/datasets/GM0308_baarn/graph_values.yml +++ b/datasets/GM0308_baarn/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18115079077214039 - :network_gas: 0.18482023978734602 - :ambient_heat: 0.6340289694405137 + :electricity: 0.18115079250730293 + :network_gas: 0.18482023197910288 + :ambient_heat: 0.6340289755135942 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11684.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0310_de_bilt/GM0310_de_bilt.derived.ad b/datasets/GM0310_de_bilt/GM0310_de_bilt.derived.ad index 822b49de8b..3aff092c6c 100644 --- a/datasets/GM0310_de_bilt/GM0310_de_bilt.derived.ad +++ b/datasets/GM0310_de_bilt/GM0310_de_bilt.derived.ad @@ -1,6 +1,6 @@ - area = GM0310_de_bilt -- id = 129259 -- parent_id = 129259 +- id = 129601 +- parent_id = 129601 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0310_de_bilt/graph_values.yml b/datasets/GM0310_de_bilt/graph_values.yml index c11a9c2a0a..78fc5b30a3 100644 --- a/datasets/GM0310_de_bilt/graph_values.yml +++ b/datasets/GM0310_de_bilt/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1825323731217937 - :network_gas: 0.17860311004861312 - :ambient_heat: 0.6388645168295931 + :electricity: 0.1825323748113759 + :network_gas: 0.17860310244548197 + :ambient_heat: 0.6388645227431421 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19696.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0312_bunnik/GM0312_bunnik.derived.ad b/datasets/GM0312_bunnik/GM0312_bunnik.derived.ad index 60f2d88f17..80e12218bf 100644 --- a/datasets/GM0312_bunnik/GM0312_bunnik.derived.ad +++ b/datasets/GM0312_bunnik/GM0312_bunnik.derived.ad @@ -1,6 +1,6 @@ - area = GM0312_bunnik -- id = 129249 -- parent_id = 129249 +- id = 129591 +- parent_id = 129591 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0312_bunnik/graph_values.yml b/datasets/GM0312_bunnik/graph_values.yml index 24789c3ddf..a201c7d903 100644 --- a/datasets/GM0312_bunnik/graph_values.yml +++ b/datasets/GM0312_bunnik/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18204731792831497 - :network_gas: 0.18078586163707996 - :ambient_heat: 0.6371668204346052 + :electricity: 0.18204731963400125 + :network_gas: 0.18078585396148034 + :ambient_heat: 0.6371668264045185 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6470.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0313_bunschoten/GM0313_bunschoten.derived.ad b/datasets/GM0313_bunschoten/GM0313_bunschoten.derived.ad index 5368a6fecc..aa814cca1e 100644 --- a/datasets/GM0313_bunschoten/GM0313_bunschoten.derived.ad +++ b/datasets/GM0313_bunschoten/GM0313_bunschoten.derived.ad @@ -1,6 +1,6 @@ - area = GM0313_bunschoten -- id = 129250 -- parent_id = 129250 +- id = 129592 +- parent_id = 129592 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0313_bunschoten/graph_values.yml b/datasets/GM0313_bunschoten/graph_values.yml index 36da6f706a..10e14ff007 100644 --- a/datasets/GM0313_bunschoten/graph_values.yml +++ b/datasets/GM0313_bunschoten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1901131730165859 - :network_gas: 0.1444894602317049 - :ambient_heat: 0.6653973667517092 + :electricity: 0.19011317444022133 + :network_gas: 0.14448945382533596 + :ambient_heat: 0.6653973717344427 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8541.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0317_eemnes/GM0317_eemnes.derived.ad b/datasets/GM0317_eemnes/GM0317_eemnes.derived.ad index 2ebde83a24..83e4f4d0ba 100644 --- a/datasets/GM0317_eemnes/GM0317_eemnes.derived.ad +++ b/datasets/GM0317_eemnes/GM0317_eemnes.derived.ad @@ -1,6 +1,6 @@ - area = GM0317_eemnes -- id = 129282 -- parent_id = 129282 +- id = 129624 +- parent_id = 129624 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0317_eemnes/graph_values.yml b/datasets/GM0317_eemnes/graph_values.yml index b60fffa3e3..97e08a9325 100644 --- a/datasets/GM0317_eemnes/graph_values.yml +++ b/datasets/GM0317_eemnes/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18465610633856058 - :network_gas: 0.16904629648450728 - :ambient_heat: 0.646297597176932 + :electricity: 0.18465610795634166 + :network_gas: 0.16904628920448184 + :ambient_heat: 0.6462976028391766 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4079.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0321_houten/GM0321_houten.derived.ad b/datasets/GM0321_houten/GM0321_houten.derived.ad index 8abb3f49f2..fbf2af6b6d 100644 --- a/datasets/GM0321_houten/GM0321_houten.derived.ad +++ b/datasets/GM0321_houten/GM0321_houten.derived.ad @@ -1,6 +1,6 @@ - area = GM0321_houten -- id = 129336 -- parent_id = 129336 +- id = 129678 +- parent_id = 129678 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0321_houten/graph_values.yml b/datasets/GM0321_houten/graph_values.yml index 983704e1ec..18cd17d26f 100644 --- a/datasets/GM0321_houten/graph_values.yml +++ b/datasets/GM0321_houten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19605424465149396 - :network_gas: 0.11775459846208469 - :ambient_heat: 0.6861911568864213 + :electricity: 0.19605424584797146 + :network_gas: 0.11775459307792802 + :ambient_heat: 0.6861911610741005 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20672.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0327_leusden/GM0327_leusden.derived.ad b/datasets/GM0327_leusden/GM0327_leusden.derived.ad index 9da981dbb7..9f651f60cc 100644 --- a/datasets/GM0327_leusden/GM0327_leusden.derived.ad +++ b/datasets/GM0327_leusden/GM0327_leusden.derived.ad @@ -1,6 +1,6 @@ - area = GM0327_leusden -- id = 129359 -- parent_id = 129359 +- id = 129701 +- parent_id = 129701 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0327_leusden/graph_values.yml b/datasets/GM0327_leusden/graph_values.yml index 7bc0908e7d..7a006797cd 100644 --- a/datasets/GM0327_leusden/graph_values.yml +++ b/datasets/GM0327_leusden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18979014228444266 - :network_gas: 0.14594310066930627 - :ambient_heat: 0.664266757046251 + :electricity: 0.18979014371995734 + :network_gas: 0.14594309420948082 + :ambient_heat: 0.664266762070562 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13220.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0331_lopik/GM0331_lopik.derived.ad b/datasets/GM0331_lopik/GM0331_lopik.derived.ad index 6073319300..7a7590deec 100644 --- a/datasets/GM0331_lopik/GM0331_lopik.derived.ad +++ b/datasets/GM0331_lopik/GM0331_lopik.derived.ad @@ -1,6 +1,6 @@ - area = GM0331_lopik -- id = 129364 -- parent_id = 129364 +- id = 129706 +- parent_id = 129706 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0331_lopik/graph_values.yml b/datasets/GM0331_lopik/graph_values.yml index af9b08ce16..53e8ad3b92 100644 --- a/datasets/GM0331_lopik/graph_values.yml +++ b/datasets/GM0331_lopik/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1888544482453988 - :network_gas: 0.15015373005231356 - :ambient_heat: 0.6609918217022877 + :electricity: 0.18885444971504825 + :network_gas: 0.15015372343888134 + :ambient_heat: 0.6609918268460705 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5822.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0335_montfoort/GM0335_montfoort.derived.ad b/datasets/GM0335_montfoort/GM0335_montfoort.derived.ad index dcda81d2e1..ed7ae423a9 100644 --- a/datasets/GM0335_montfoort/GM0335_montfoort.derived.ad +++ b/datasets/GM0335_montfoort/GM0335_montfoort.derived.ad @@ -1,6 +1,6 @@ - area = GM0335_montfoort -- id = 129378 -- parent_id = 129378 +- id = 129720 +- parent_id = 129720 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0335_montfoort/graph_values.yml b/datasets/GM0335_montfoort/graph_values.yml index 755b7344f4..47da30c6ae 100644 --- a/datasets/GM0335_montfoort/graph_values.yml +++ b/datasets/GM0335_montfoort/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1885622998701334 - :network_gas: 0.15146839967909392 - :ambient_heat: 0.6599693004507727 + :electricity: 0.18856230135035693 + :network_gas: 0.15146839301807805 + :ambient_heat: 0.659969305631565 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5746.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0339_renswoude/GM0339_renswoude.derived.ad b/datasets/GM0339_renswoude/GM0339_renswoude.derived.ad index 5cc91d1e63..05af575afb 100644 --- a/datasets/GM0339_renswoude/GM0339_renswoude.derived.ad +++ b/datasets/GM0339_renswoude/GM0339_renswoude.derived.ad @@ -1,6 +1,6 @@ - area = GM0339_renswoude -- id = 129421 -- parent_id = 129421 +- id = 129763 +- parent_id = 129763 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0339_renswoude/graph_values.yml b/datasets/GM0339_renswoude/graph_values.yml index dbfeb2d09d..8367f95570 100644 --- a/datasets/GM0339_renswoude/graph_values.yml +++ b/datasets/GM0339_renswoude/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1886658771760401 - :network_gas: 0.15100230111539112 - :ambient_heat: 0.6603318217085689 + :electricity: 0.1886658786525193 + :network_gas: 0.1510022944712249 + :ambient_heat: 0.6603318268762557 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 2149.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0340_rhenen/GM0340_rhenen.derived.ad b/datasets/GM0340_rhenen/GM0340_rhenen.derived.ad index 7adf4449b6..03036aa1f9 100644 --- a/datasets/GM0340_rhenen/GM0340_rhenen.derived.ad +++ b/datasets/GM0340_rhenen/GM0340_rhenen.derived.ad @@ -1,6 +1,6 @@ - area = GM0340_rhenen -- id = 129424 -- parent_id = 129424 +- id = 129766 +- parent_id = 129766 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0340_rhenen/graph_values.yml b/datasets/GM0340_rhenen/graph_values.yml index 05fa37a742..d0630c83dc 100644 --- a/datasets/GM0340_rhenen/graph_values.yml +++ b/datasets/GM0340_rhenen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18743165740397333 - :network_gas: 0.1565562982773943 - :ambient_heat: 0.6560120443186324 + :electricity: 0.18743165892474464 + :network_gas: 0.15655629143391353 + :ambient_heat: 0.656012049641342 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8269.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0342_soest/GM0342_soest.derived.ad b/datasets/GM0342_soest/GM0342_soest.derived.ad index 9af315c6b8..d157d4e3a3 100644 --- a/datasets/GM0342_soest/GM0342_soest.derived.ad +++ b/datasets/GM0342_soest/GM0342_soest.derived.ad @@ -1,6 +1,6 @@ - area = GM0342_soest -- id = 129446 -- parent_id = 129446 +- id = 129788 +- parent_id = 129788 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0342_soest/graph_values.yml b/datasets/GM0342_soest/graph_values.yml index 0cf3a2c88b..9c2dd24ac8 100644 --- a/datasets/GM0342_soest/graph_values.yml +++ b/datasets/GM0342_soest/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18585554594038076 - :network_gas: 0.16364881031934247 - :ambient_heat: 0.6504956437402768 + :electricity: 0.1858555475166804 + :network_gas: 0.16364880322598344 + :ambient_heat: 0.650495649257336 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20935.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0344_utrecht/GM0344_utrecht.derived.ad b/datasets/GM0344_utrecht/GM0344_utrecht.derived.ad index de27647a4a..b354d362eb 100644 --- a/datasets/GM0344_utrecht/GM0344_utrecht.derived.ad +++ b/datasets/GM0344_utrecht/GM0344_utrecht.derived.ad @@ -1,6 +1,6 @@ - area = GM0344_utrecht -- id = 129471 -- parent_id = 129471 +- id = 129813 +- parent_id = 129813 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0344_utrecht/graph_values.yml b/datasets/GM0344_utrecht/graph_values.yml index 5932aa10b1..97b935a294 100644 --- a/datasets/GM0344_utrecht/graph_values.yml +++ b/datasets/GM0344_utrecht/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1950276425368375 - :network_gas: 0.12237431478842468 - :ambient_heat: 0.6825980426747378 + :electricity: 0.19502764377374396 + :network_gas: 0.12237430922233747 + :ambient_heat: 0.6825980470039186 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 159409.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0345_veenendaal/GM0345_veenendaal.derived.ad b/datasets/GM0345_veenendaal/GM0345_veenendaal.derived.ad index 4102a5e5ad..86eb4e8c9e 100644 --- a/datasets/GM0345_veenendaal/GM0345_veenendaal.derived.ad +++ b/datasets/GM0345_veenendaal/GM0345_veenendaal.derived.ad @@ -1,6 +1,6 @@ - area = GM0345_veenendaal -- id = 129477 -- parent_id = 129477 +- id = 129819 +- parent_id = 129819 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0345_veenendaal/graph_values.yml b/datasets/GM0345_veenendaal/graph_values.yml index aaefa0e65a..2d4dc472a0 100644 --- a/datasets/GM0345_veenendaal/graph_values.yml +++ b/datasets/GM0345_veenendaal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1915649974665845 - :network_gas: 0.13795624057543865 - :ambient_heat: 0.670478761957977 + :electricity: 0.19156499883622918 + :network_gas: 0.13795623441202842 + :ambient_heat: 0.6704787667517423 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 28601.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0351_woudenberg/GM0351_woudenberg.derived.ad b/datasets/GM0351_woudenberg/GM0351_woudenberg.derived.ad index 1724f5bcf8..88cf42bc63 100644 --- a/datasets/GM0351_woudenberg/GM0351_woudenberg.derived.ad +++ b/datasets/GM0351_woudenberg/GM0351_woudenberg.derived.ad @@ -1,6 +1,6 @@ - area = GM0351_woudenberg -- id = 129510 -- parent_id = 129510 +- id = 129852 +- parent_id = 129852 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0351_woudenberg/graph_values.yml b/datasets/GM0351_woudenberg/graph_values.yml index 0ddd8c5b8a..fc8d939f31 100644 --- a/datasets/GM0351_woudenberg/graph_values.yml +++ b/datasets/GM0351_woudenberg/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19065725933901254 - :network_gas: 0.14204106817136528 - :ambient_heat: 0.6673016724896221 + :electricity: 0.19065726074252956 + :network_gas: 0.14204106185552934 + :ambient_heat: 0.667301677401941 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5279.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0352_wijk_bij_duurstede/GM0352_wijk_bij_duurstede.derived.ad b/datasets/GM0352_wijk_bij_duurstede/GM0352_wijk_bij_duurstede.derived.ad index 2b5cf7f608..1823bee49f 100644 --- a/datasets/GM0352_wijk_bij_duurstede/GM0352_wijk_bij_duurstede.derived.ad +++ b/datasets/GM0352_wijk_bij_duurstede/GM0352_wijk_bij_duurstede.derived.ad @@ -1,6 +1,6 @@ - area = GM0352_wijk_bij_duurstede -- id = 129505 -- parent_id = 129505 +- id = 129847 +- parent_id = 129847 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0352_wijk_bij_duurstede/graph_values.yml b/datasets/GM0352_wijk_bij_duurstede/graph_values.yml index fba5d4c97a..e726d899ed 100644 --- a/datasets/GM0352_wijk_bij_duurstede/graph_values.yml +++ b/datasets/GM0352_wijk_bij_duurstede/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18650281622428044 - :network_gas: 0.16073608974786105 - :ambient_heat: 0.6527610940278585 + :electricity: 0.1865028177779162 + :network_gas: 0.1607360827564899 + :ambient_heat: 0.6527610994655939 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10238.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0353_ijsselstein/GM0353_ijsselstein.derived.ad b/datasets/GM0353_ijsselstein/GM0353_ijsselstein.derived.ad index 95142b32a8..42768572b4 100644 --- a/datasets/GM0353_ijsselstein/GM0353_ijsselstein.derived.ad +++ b/datasets/GM0353_ijsselstein/GM0353_ijsselstein.derived.ad @@ -1,6 +1,6 @@ - area = GM0353_ijsselstein -- id = 129339 -- parent_id = 129339 +- id = 129681 +- parent_id = 129681 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0353_ijsselstein/graph_values.yml b/datasets/GM0353_ijsselstein/graph_values.yml index baef60d84a..a8144c510c 100644 --- a/datasets/GM0353_ijsselstein/graph_values.yml +++ b/datasets/GM0353_ijsselstein/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19026888900413239 - :network_gas: 0.1437887372547398 - :ambient_heat: 0.6659423737411277 + :electricity: 0.1902688904220241 + :network_gas: 0.14378873087421773 + :ambient_heat: 0.6659423787037582 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14438.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0355_zeist/GM0355_zeist.derived.ad b/datasets/GM0355_zeist/GM0355_zeist.derived.ad index 829d26942b..51e2e86d57 100644 --- a/datasets/GM0355_zeist/GM0355_zeist.derived.ad +++ b/datasets/GM0355_zeist/GM0355_zeist.derived.ad @@ -1,6 +1,6 @@ - area = GM0355_zeist -- id = 129515 -- parent_id = 129515 +- id = 129857 +- parent_id = 129857 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0355_zeist/graph_values.yml b/datasets/GM0355_zeist/graph_values.yml index fe879bca41..fef2195d94 100644 --- a/datasets/GM0355_zeist/graph_values.yml +++ b/datasets/GM0355_zeist/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18382930975350603 - :network_gas: 0.17276688660214687 - :ambient_heat: 0.6434038036443471 + :electricity: 0.1838293113994903 + :network_gas: 0.17276687919520684 + :ambient_heat: 0.643403809405303 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 29560.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0356_nieuwegein/GM0356_nieuwegein.derived.ad b/datasets/GM0356_nieuwegein/GM0356_nieuwegein.derived.ad index 36dc906262..4bfb2551a7 100644 --- a/datasets/GM0356_nieuwegein/GM0356_nieuwegein.derived.ad +++ b/datasets/GM0356_nieuwegein/GM0356_nieuwegein.derived.ad @@ -1,6 +1,6 @@ - area = GM0356_nieuwegein -- id = 129382 -- parent_id = 129382 +- id = 129724 +- parent_id = 129724 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0356_nieuwegein/graph_values.yml b/datasets/GM0356_nieuwegein/graph_values.yml index aa90a32264..fb660fe4d5 100644 --- a/datasets/GM0356_nieuwegein/graph_values.yml +++ b/datasets/GM0356_nieuwegein/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20408762575441264 - :network_gas: 0.08160433020622415 - :ambient_heat: 0.714308044039363 + :electricity: 0.20408762661755075 + :network_gas: 0.081604326322097 + :ambient_heat: 0.7143080470603521 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 29444.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0358_aalsmeer/GM0358_aalsmeer.derived.ad b/datasets/GM0358_aalsmeer/GM0358_aalsmeer.derived.ad index 0549fe544c..ab74f65b94 100644 --- a/datasets/GM0358_aalsmeer/GM0358_aalsmeer.derived.ad +++ b/datasets/GM0358_aalsmeer/GM0358_aalsmeer.derived.ad @@ -1,6 +1,6 @@ - area = GM0358_aalsmeer -- id = 129202 -- parent_id = 129202 +- id = 129544 +- parent_id = 129544 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0358_aalsmeer/graph_values.yml b/datasets/GM0358_aalsmeer/graph_values.yml index 04d5790456..bc706e5c17 100644 --- a/datasets/GM0358_aalsmeer/graph_values.yml +++ b/datasets/GM0358_aalsmeer/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18718894985708004 - :network_gas: 0.15764848384851415 - :ambient_heat: 0.6551625662944057 + :electricity: 0.1871889513864777 + :network_gas: 0.15764847696621462 + :ambient_heat: 0.6551625716473077 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13276.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0361_alkmaar/GM0361_alkmaar.derived.ad b/datasets/GM0361_alkmaar/GM0361_alkmaar.derived.ad index 3660de89fd..858d14946f 100644 --- a/datasets/GM0361_alkmaar/GM0361_alkmaar.derived.ad +++ b/datasets/GM0361_alkmaar/GM0361_alkmaar.derived.ad @@ -1,6 +1,6 @@ - area = GM0361_alkmaar -- id = 129207 -- parent_id = 129207 +- id = 129549 +- parent_id = 129549 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0361_alkmaar/graph_values.yml b/datasets/GM0361_alkmaar/graph_values.yml index 33283fa5cd..6b7ed75fc9 100644 --- a/datasets/GM0361_alkmaar/graph_values.yml +++ b/datasets/GM0361_alkmaar/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18596631719961296 - :network_gas: 0.1631503389179511 - :ambient_heat: 0.6508833438824361 + :electricity: 0.18596631877204783 + :network_gas: 0.16315033184198346 + :ambient_heat: 0.6508833493859686 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 51588.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0362_amstelveen/GM0362_amstelveen.derived.ad b/datasets/GM0362_amstelveen/GM0362_amstelveen.derived.ad index 6bcbdc3abb..c18c6198b1 100644 --- a/datasets/GM0362_amstelveen/GM0362_amstelveen.derived.ad +++ b/datasets/GM0362_amstelveen/GM0362_amstelveen.derived.ad @@ -1,6 +1,6 @@ - area = GM0362_amstelveen -- id = 129214 -- parent_id = 129214 +- id = 129556 +- parent_id = 129556 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0362_amstelveen/graph_values.yml b/datasets/GM0362_amstelveen/graph_values.yml index fb2ae289db..1a59f8cf68 100644 --- a/datasets/GM0362_amstelveen/graph_values.yml +++ b/datasets/GM0362_amstelveen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18639056121239672 - :network_gas: 0.16124123804602733 - :ambient_heat: 0.6523682007415759 + :electricity: 0.18639056276997704 + :network_gas: 0.16124123103690557 + :ambient_heat: 0.6523682061931173 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 42242.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0363_amsterdam/GM0363_amsterdam.derived.ad b/datasets/GM0363_amsterdam/GM0363_amsterdam.derived.ad index 6c32bb5a5e..9457b978aa 100644 --- a/datasets/GM0363_amsterdam/GM0363_amsterdam.derived.ad +++ b/datasets/GM0363_amsterdam/GM0363_amsterdam.derived.ad @@ -1,6 +1,6 @@ - area = GM0363_amsterdam -- id = 129215 -- parent_id = 129215 +- id = 129557 +- parent_id = 129557 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0363_amsterdam/graph_values.yml b/datasets/GM0363_amsterdam/graph_values.yml index 3c1393ea10..6e574c08e4 100644 --- a/datasets/GM0363_amsterdam/graph_values.yml +++ b/datasets/GM0363_amsterdam/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18581562148516684 - :network_gas: 0.1638284706326602 - :ambient_heat: 0.650355907882173 + :electricity: 0.18581562306285807 + :network_gas: 0.16382846353303926 + :ambient_heat: 0.6503559134041027 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 457831.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0373_bergen/GM0373_bergen.derived.ad b/datasets/GM0373_bergen/GM0373_bergen.derived.ad index fb624c8c18..7e91c20fb6 100644 --- a/datasets/GM0373_bergen/GM0373_bergen.derived.ad +++ b/datasets/GM0373_bergen/GM0373_bergen.derived.ad @@ -1,6 +1,6 @@ - area = GM0373_bergen -- id = 129229 -- parent_id = 129229 +- id = 129571 +- parent_id = 129571 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0373_bergen/graph_values.yml b/datasets/GM0373_bergen/graph_values.yml index 910a931f0f..d1616926a4 100644 --- a/datasets/GM0373_bergen/graph_values.yml +++ b/datasets/GM0373_bergen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1810652646785893 - :network_gas: 0.1852051077756982 - :ambient_heat: 0.6337296275457125 + :electricity: 0.18106526641654425 + :network_gas: 0.1852050999548894 + :ambient_heat: 0.6337296336285664 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15239.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0375_beverwijk/GM0375_beverwijk.derived.ad b/datasets/GM0375_beverwijk/GM0375_beverwijk.derived.ad index 372d797c48..28ff91a471 100644 --- a/datasets/GM0375_beverwijk/GM0375_beverwijk.derived.ad +++ b/datasets/GM0375_beverwijk/GM0375_beverwijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0375_beverwijk -- id = 129235 -- parent_id = 129235 +- id = 129577 +- parent_id = 129577 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0375_beverwijk/graph_values.yml b/datasets/GM0375_beverwijk/graph_values.yml index 1410fdaf17..c21961633c 100644 --- a/datasets/GM0375_beverwijk/graph_values.yml +++ b/datasets/GM0375_beverwijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1850106793719058 - :network_gas: 0.16745071548224832 - :ambient_heat: 0.6475386051458458 + :electricity: 0.18501068097749418 + :network_gas: 0.16745070825709 + :ambient_heat: 0.6475386107654157 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19501.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0376_blaricum/GM0376_blaricum.derived.ad b/datasets/GM0376_blaricum/GM0376_blaricum.derived.ad index e964bfc62a..d9e8cd514d 100644 --- a/datasets/GM0376_blaricum/GM0376_blaricum.derived.ad +++ b/datasets/GM0376_blaricum/GM0376_blaricum.derived.ad @@ -1,6 +1,6 @@ - area = GM0376_blaricum -- id = 129237 -- parent_id = 129237 +- id = 129579 +- parent_id = 129579 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0376_blaricum/graph_values.yml b/datasets/GM0376_blaricum/graph_values.yml index 39bf8aad61..521a32c1bc 100644 --- a/datasets/GM0376_blaricum/graph_values.yml +++ b/datasets/GM0376_blaricum/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18888119032060055 - :network_gas: 0.15003339053650122 - :ambient_heat: 0.6610854191428983 + :electricity: 0.18888119178928006 + :network_gas: 0.15003338392743354 + :ambient_heat: 0.6610854242832864 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5136.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0377_bloemendaal/GM0377_bloemendaal.derived.ad b/datasets/GM0377_bloemendaal/GM0377_bloemendaal.derived.ad index e60ee2a511..d349d7bce2 100644 --- a/datasets/GM0377_bloemendaal/GM0377_bloemendaal.derived.ad +++ b/datasets/GM0377_bloemendaal/GM0377_bloemendaal.derived.ad @@ -1,6 +1,6 @@ - area = GM0377_bloemendaal -- id = 129238 -- parent_id = 129238 +- id = 129580 +- parent_id = 129580 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0377_bloemendaal/graph_values.yml b/datasets/GM0377_bloemendaal/graph_values.yml index 33b0d8e4ff..f07af9b064 100644 --- a/datasets/GM0377_bloemendaal/graph_values.yml +++ b/datasets/GM0377_bloemendaal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17803244420101969 - :network_gas: 0.1988528200442192 - :ambient_heat: 0.6231147357547612 + :electricity: 0.17803244603578838 + :network_gas: 0.19885281178774794 + :ambient_heat: 0.6231147421764637 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10145.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0383_castricum/GM0383_castricum.derived.ad b/datasets/GM0383_castricum/GM0383_castricum.derived.ad index b29303e784..4da030a9f3 100644 --- a/datasets/GM0383_castricum/GM0383_castricum.derived.ad +++ b/datasets/GM0383_castricum/GM0383_castricum.derived.ad @@ -1,6 +1,6 @@ - area = GM0383_castricum -- id = 129253 -- parent_id = 129253 +- id = 129595 +- parent_id = 129595 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0383_castricum/graph_values.yml b/datasets/GM0383_castricum/graph_values.yml index e831ad813b..8baff1f635 100644 --- a/datasets/GM0383_castricum/graph_values.yml +++ b/datasets/GM0383_castricum/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18488719533285022 - :network_gas: 0.1680063944771804 - :ambient_heat: 0.6471064101899693 + :electricity: 0.18488719694269148 + :network_gas: 0.16800638723288405 + :ambient_heat: 0.6471064158244245 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16223.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0384_diemen/GM0384_diemen.derived.ad b/datasets/GM0384_diemen/GM0384_diemen.derived.ad index ad71df910e..065b9b08ae 100644 --- a/datasets/GM0384_diemen/GM0384_diemen.derived.ad +++ b/datasets/GM0384_diemen/GM0384_diemen.derived.ad @@ -1,6 +1,6 @@ - area = GM0384_diemen -- id = 129268 -- parent_id = 129268 +- id = 129610 +- parent_id = 129610 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0384_diemen/graph_values.yml b/datasets/GM0384_diemen/graph_values.yml index c07265ebd6..38e3069d92 100644 --- a/datasets/GM0384_diemen/graph_values.yml +++ b/datasets/GM0384_diemen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1932190746944467 - :network_gas: 0.13051288207705924 - :ambient_heat: 0.6762680432284939 + :electricity: 0.19321907600138113 + :network_gas: 0.13051287619584578 + :ambient_heat: 0.676268047802773 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15467.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0385_edam_volendam/GM0385_edam_volendam.derived.ad b/datasets/GM0385_edam_volendam/GM0385_edam_volendam.derived.ad index 0864c8015a..775feb8b55 100644 --- a/datasets/GM0385_edam_volendam/GM0385_edam_volendam.derived.ad +++ b/datasets/GM0385_edam_volendam/GM0385_edam_volendam.derived.ad @@ -1,6 +1,6 @@ - area = GM0385_edam_volendam -- id = 129280 -- parent_id = 129280 +- id = 129622 +- parent_id = 129622 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0385_edam_volendam/graph_values.yml b/datasets/GM0385_edam_volendam/graph_values.yml index 814c57629b..4dd0a6ba3b 100644 --- a/datasets/GM0385_edam_volendam/graph_values.yml +++ b/datasets/GM0385_edam_volendam/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18535795793387702 - :network_gas: 0.16588795964956307 - :ambient_heat: 0.6487540824165599 + :electricity: 0.18535795952746673 + :network_gas: 0.1658879524783989 + :ambient_heat: 0.6487540879941344 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15416.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0388_enkhuizen/GM0388_enkhuizen.derived.ad b/datasets/GM0388_enkhuizen/GM0388_enkhuizen.derived.ad index 6386d67a11..fdc27ffa78 100644 --- a/datasets/GM0388_enkhuizen/GM0388_enkhuizen.derived.ad +++ b/datasets/GM0388_enkhuizen/GM0388_enkhuizen.derived.ad @@ -1,6 +1,6 @@ - area = GM0388_enkhuizen -- id = 129288 -- parent_id = 129288 +- id = 129630 +- parent_id = 129630 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0388_enkhuizen/graph_values.yml b/datasets/GM0388_enkhuizen/graph_values.yml index 63bb120d29..3b08968048 100644 --- a/datasets/GM0388_enkhuizen/graph_values.yml +++ b/datasets/GM0388_enkhuizen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1841630951926599 - :network_gas: 0.17126484991165195 - :ambient_heat: 0.6445720548956881 + :electricity: 0.18416309682729665 + :network_gas: 0.1712648425557758 + :ambient_heat: 0.6445720606169276 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8878.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0392_haarlem/GM0392_haarlem.derived.ad b/datasets/GM0392_haarlem/GM0392_haarlem.derived.ad index 6ad608a931..cf687a9f81 100644 --- a/datasets/GM0392_haarlem/GM0392_haarlem.derived.ad +++ b/datasets/GM0392_haarlem/GM0392_haarlem.derived.ad @@ -1,6 +1,6 @@ - area = GM0392_haarlem -- id = 129307 -- parent_id = 129307 +- id = 129649 +- parent_id = 129649 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0392_haarlem/graph_values.yml b/datasets/GM0392_haarlem/graph_values.yml index 01c3dd0f87..ad9531289a 100644 --- a/datasets/GM0392_haarlem/graph_values.yml +++ b/datasets/GM0392_haarlem/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1808077900924109 - :network_gas: 0.18636374512156414 - :ambient_heat: 0.632828464786025 + :electricity: 0.18080779183875162 + :network_gas: 0.18636373726301936 + :ambient_heat: 0.632828470898229 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 77093.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0394_haarlemmermeer/GM0394_haarlemmermeer.derived.ad b/datasets/GM0394_haarlemmermeer/GM0394_haarlemmermeer.derived.ad index 4b59a98e5c..3ad7e2898a 100644 --- a/datasets/GM0394_haarlemmermeer/GM0394_haarlemmermeer.derived.ad +++ b/datasets/GM0394_haarlemmermeer/GM0394_haarlemmermeer.derived.ad @@ -1,6 +1,6 @@ - area = GM0394_haarlemmermeer -- id = 129308 -- parent_id = 129308 +- id = 129650 +- parent_id = 129650 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0394_haarlemmermeer/graph_values.yml b/datasets/GM0394_haarlemmermeer/graph_values.yml index d420bb64d2..f6084599b2 100644 --- a/datasets/GM0394_haarlemmermeer/graph_values.yml +++ b/datasets/GM0394_haarlemmermeer/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18891987685315542 - :network_gas: 0.14985930088336125 - :ambient_heat: 0.6612208222634833 + :electricity: 0.18891987832043125 + :network_gas: 0.14985929428061023 + :ambient_heat: 0.6612208273989585 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 65149.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0396_heemskerk/GM0396_heemskerk.derived.ad b/datasets/GM0396_heemskerk/GM0396_heemskerk.derived.ad index 1edd9d7458..d0177e7947 100644 --- a/datasets/GM0396_heemskerk/GM0396_heemskerk.derived.ad +++ b/datasets/GM0396_heemskerk/GM0396_heemskerk.derived.ad @@ -1,6 +1,6 @@ - area = GM0396_heemskerk -- id = 129315 -- parent_id = 129315 +- id = 129657 +- parent_id = 129657 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0396_heemskerk/graph_values.yml b/datasets/GM0396_heemskerk/graph_values.yml index 5ac743e6f3..35a7a1fe06 100644 --- a/datasets/GM0396_heemskerk/graph_values.yml +++ b/datasets/GM0396_heemskerk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1865994893751799 - :network_gas: 0.16030105992749263 - :ambient_heat: 0.6530994506973276 + :electricity: 0.18659949092541386 + :network_gas: 0.16030105295142938 + :ambient_heat: 0.6530994561231568 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 17591.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0397_heemstede/GM0397_heemstede.derived.ad b/datasets/GM0397_heemstede/GM0397_heemstede.derived.ad index 699afeaac5..ef91609da0 100644 --- a/datasets/GM0397_heemstede/GM0397_heemstede.derived.ad +++ b/datasets/GM0397_heemstede/GM0397_heemstede.derived.ad @@ -1,6 +1,6 @@ - area = GM0397_heemstede -- id = 129316 -- parent_id = 129316 +- id = 129658 +- parent_id = 129658 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0397_heemstede/graph_values.yml b/datasets/GM0397_heemstede/graph_values.yml index 67d05e3f74..268f4c0f58 100644 --- a/datasets/GM0397_heemstede/graph_values.yml +++ b/datasets/GM0397_heemstede/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17924700975263844 - :network_gas: 0.19338726700461634 - :ambient_heat: 0.6273657232427452 + :electricity: 0.17924701154915082 + :network_gas: 0.19338725892029887 + :ambient_heat: 0.6273657295305504 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12813.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0399_heiloo/GM0399_heiloo.derived.ad b/datasets/GM0399_heiloo/GM0399_heiloo.derived.ad index 92fe4a822b..3319cdad65 100644 --- a/datasets/GM0399_heiloo/GM0399_heiloo.derived.ad +++ b/datasets/GM0399_heiloo/GM0399_heiloo.derived.ad @@ -1,6 +1,6 @@ - area = GM0399_heiloo -- id = 129321 -- parent_id = 129321 +- id = 129663 +- parent_id = 129663 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0399_heiloo/graph_values.yml b/datasets/GM0399_heiloo/graph_values.yml index 67250b0dcf..1d38b24a35 100644 --- a/datasets/GM0399_heiloo/graph_values.yml +++ b/datasets/GM0399_heiloo/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18469003327105454 - :network_gas: 0.16889362506321634 - :ambient_heat: 0.646416341665729 + :electricity: 0.1846900348876715 + :network_gas: 0.16889361778842937 + :ambient_heat: 0.6464163473238992 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10934.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0400_den_helder/GM0400_den_helder.derived.ad b/datasets/GM0400_den_helder/GM0400_den_helder.derived.ad index 4f46f01ba2..8e99fb83fc 100644 --- a/datasets/GM0400_den_helder/GM0400_den_helder.derived.ad +++ b/datasets/GM0400_den_helder/GM0400_den_helder.derived.ad @@ -1,6 +1,6 @@ - area = GM0400_den_helder -- id = 129265 -- parent_id = 129265 +- id = 129607 +- parent_id = 129607 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0400_den_helder/graph_values.yml b/datasets/GM0400_den_helder/graph_values.yml index baafbd1216..5a400b5aee 100644 --- a/datasets/GM0400_den_helder/graph_values.yml +++ b/datasets/GM0400_den_helder/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18042253666224353 - :network_gas: 0.18809738811305388 - :ambient_heat: 0.6314800752247025 + :electricity: 0.18042253842107392 + :network_gas: 0.18809738019830546 + :ambient_heat: 0.6314800813806206 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 28369.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0402_hilversum/GM0402_hilversum.derived.ad b/datasets/GM0402_hilversum/GM0402_hilversum.derived.ad index f83b2d596d..afb365aa25 100644 --- a/datasets/GM0402_hilversum/GM0402_hilversum.derived.ad +++ b/datasets/GM0402_hilversum/GM0402_hilversum.derived.ad @@ -1,6 +1,6 @@ - area = GM0402_hilversum -- id = 129330 -- parent_id = 129330 +- id = 129672 +- parent_id = 129672 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0402_hilversum/graph_values.yml b/datasets/GM0402_hilversum/graph_values.yml index 6ef8aa2fc9..761d6eef56 100644 --- a/datasets/GM0402_hilversum/graph_values.yml +++ b/datasets/GM0402_hilversum/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18043479413392283 - :network_gas: 0.18804222940918194 - :ambient_heat: 0.6315229764568951 + :electricity: 0.1804347958923569 + :network_gas: 0.18804222149621697 + :ambient_heat: 0.631522982611426 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 42918.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0405_hoorn/GM0405_hoorn.derived.ad b/datasets/GM0405_hoorn/GM0405_hoorn.derived.ad index d6ef9fb124..5f10f19615 100644 --- a/datasets/GM0405_hoorn/GM0405_hoorn.derived.ad +++ b/datasets/GM0405_hoorn/GM0405_hoorn.derived.ad @@ -1,6 +1,6 @@ - area = GM0405_hoorn -- id = 129334 -- parent_id = 129334 +- id = 129676 +- parent_id = 129676 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0405_hoorn/graph_values.yml b/datasets/GM0405_hoorn/graph_values.yml index 1c7ba8727a..d0769797a1 100644 --- a/datasets/GM0405_hoorn/graph_values.yml +++ b/datasets/GM0405_hoorn/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18709101747798548 - :network_gas: 0.1580891802041143 - :ambient_heat: 0.6548198023179004 + :electricity: 0.18709101901085606 + :network_gas: 0.15808917330618638 + :ambient_heat: 0.6548198076829576 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 33643.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0406_huizen/GM0406_huizen.derived.ad b/datasets/GM0406_huizen/GM0406_huizen.derived.ad index 139af52cb3..ad398d8fc2 100644 --- a/datasets/GM0406_huizen/GM0406_huizen.derived.ad +++ b/datasets/GM0406_huizen/GM0406_huizen.derived.ad @@ -1,6 +1,6 @@ - area = GM0406_huizen -- id = 129337 -- parent_id = 129337 +- id = 129679 +- parent_id = 129679 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0406_huizen/graph_values.yml b/datasets/GM0406_huizen/graph_values.yml index 8b8f956dee..4ba9f4b973 100644 --- a/datasets/GM0406_huizen/graph_values.yml +++ b/datasets/GM0406_huizen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18437734230106761 - :network_gas: 0.17030073650252125 - :ambient_heat: 0.6453219211964111 + :electricity: 0.1843773439283933 + :network_gas: 0.1703007291795447 + :ambient_heat: 0.6453219268920619 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19010.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0415_landsmeer/GM0415_landsmeer.derived.ad b/datasets/GM0415_landsmeer/GM0415_landsmeer.derived.ad index 7dd39a0252..fbc09513fd 100644 --- a/datasets/GM0415_landsmeer/GM0415_landsmeer.derived.ad +++ b/datasets/GM0415_landsmeer/GM0415_landsmeer.derived.ad @@ -1,6 +1,6 @@ - area = GM0415_landsmeer -- id = 129350 -- parent_id = 129350 +- id = 129692 +- parent_id = 129692 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0415_landsmeer/graph_values.yml b/datasets/GM0415_landsmeer/graph_values.yml index d298ab4fbb..e3519a55b3 100644 --- a/datasets/GM0415_landsmeer/graph_values.yml +++ b/datasets/GM0415_landsmeer/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18756297909142297 - :network_gas: 0.15596534981269478 - :ambient_heat: 0.6564716710958822 + :electricity: 0.1875629806075153 + :network_gas: 0.15596534299026915 + :ambient_heat: 0.6564716764022155 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4888.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0417_laren/GM0417_laren.derived.ad b/datasets/GM0417_laren/GM0417_laren.derived.ad index d64138d8bd..3ce9fe3f97 100644 --- a/datasets/GM0417_laren/GM0417_laren.derived.ad +++ b/datasets/GM0417_laren/GM0417_laren.derived.ad @@ -1,6 +1,6 @@ - area = GM0417_laren -- id = 129352 -- parent_id = 129352 +- id = 129694 +- parent_id = 129694 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0417_laren/graph_values.yml b/datasets/GM0417_laren/graph_values.yml index 7abf522b82..9ba0dad73e 100644 --- a/datasets/GM0417_laren/graph_values.yml +++ b/datasets/GM0417_laren/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17733669221932696 - :network_gas: 0.2019837085773924 - :ambient_heat: 0.6206795992032806 + :electricity: 0.17733669407570046 + :network_gas: 0.20198370022369938 + :ambient_heat: 0.6206796057006001 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5427.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0420_medemblik/GM0420_medemblik.derived.ad b/datasets/GM0420_medemblik/GM0420_medemblik.derived.ad index ecab87ec3c..77b745a82c 100644 --- a/datasets/GM0420_medemblik/GM0420_medemblik.derived.ad +++ b/datasets/GM0420_medemblik/GM0420_medemblik.derived.ad @@ -1,6 +1,6 @@ - area = GM0420_medemblik -- id = 129370 -- parent_id = 129370 +- id = 129712 +- parent_id = 129712 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0420_medemblik/graph_values.yml b/datasets/GM0420_medemblik/graph_values.yml index abef42d8eb..d2d7dc7af8 100644 --- a/datasets/GM0420_medemblik/graph_values.yml +++ b/datasets/GM0420_medemblik/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18634347243404115 - :network_gas: 0.16145313786101026 - :ambient_heat: 0.6522033897049486 + :electricity: 0.18634347399327436 + :network_gas: 0.16145313084445034 + :ambient_heat: 0.6522033951622753 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19174.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0431_oostzaan/GM0431_oostzaan.derived.ad b/datasets/GM0431_oostzaan/GM0431_oostzaan.derived.ad index 366bbd0965..9f8b7fa18f 100644 --- a/datasets/GM0431_oostzaan/GM0431_oostzaan.derived.ad +++ b/datasets/GM0431_oostzaan/GM0431_oostzaan.derived.ad @@ -1,6 +1,6 @@ - area = GM0431_oostzaan -- id = 129404 -- parent_id = 129404 +- id = 129746 +- parent_id = 129746 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0431_oostzaan/graph_values.yml b/datasets/GM0431_oostzaan/graph_values.yml index 481032500d..d59a6997a6 100644 --- a/datasets/GM0431_oostzaan/graph_values.yml +++ b/datasets/GM0431_oostzaan/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18755043801373383 - :network_gas: 0.15602178474549233 - :ambient_heat: 0.6564277772407738 + :electricity: 0.18755043953027334 + :network_gas: 0.15602177792105437 + :ambient_heat: 0.6564277825486723 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4100.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0432_opmeer/GM0432_opmeer.derived.ad b/datasets/GM0432_opmeer/GM0432_opmeer.derived.ad index fbda741511..56b5cc26e3 100644 --- a/datasets/GM0432_opmeer/GM0432_opmeer.derived.ad +++ b/datasets/GM0432_opmeer/GM0432_opmeer.derived.ad @@ -1,6 +1,6 @@ - area = GM0432_opmeer -- id = 129405 -- parent_id = 129405 +- id = 129747 +- parent_id = 129747 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0432_opmeer/graph_values.yml b/datasets/GM0432_opmeer/graph_values.yml index d76fb4abe5..174995223e 100644 --- a/datasets/GM0432_opmeer/graph_values.yml +++ b/datasets/GM0432_opmeer/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18710403551672475 - :network_gas: 0.15803059894342708 - :ambient_heat: 0.6548653655398482 + :electricity: 0.18710403704913392 + :network_gas: 0.15803059204757552 + :ambient_heat: 0.6548653709032904 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4957.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0437_ouder_amstel/GM0437_ouder_amstel.derived.ad b/datasets/GM0437_ouder_amstel/GM0437_ouder_amstel.derived.ad index 41d1d4ef83..501f2599c5 100644 --- a/datasets/GM0437_ouder_amstel/GM0437_ouder_amstel.derived.ad +++ b/datasets/GM0437_ouder_amstel/GM0437_ouder_amstel.derived.ad @@ -1,6 +1,6 @@ - area = GM0437_ouder_amstel -- id = 129409 -- parent_id = 129409 +- id = 129751 +- parent_id = 129751 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0437_ouder_amstel/graph_values.yml b/datasets/GM0437_ouder_amstel/graph_values.yml index d3a805ec72..8838c777a0 100644 --- a/datasets/GM0437_ouder_amstel/graph_values.yml +++ b/datasets/GM0437_ouder_amstel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1873128143154464 - :network_gas: 0.15709109296415982 - :ambient_heat: 0.6555960927203937 + :electricity: 0.18731281584044507 + :network_gas: 0.15709108610165579 + :ambient_heat: 0.6555960980578992 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6296.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0439_purmerend/GM0439_purmerend.derived.ad b/datasets/GM0439_purmerend/GM0439_purmerend.derived.ad index fdbf3c2163..f4a4354ee7 100644 --- a/datasets/GM0439_purmerend/GM0439_purmerend.derived.ad +++ b/datasets/GM0439_purmerend/GM0439_purmerend.derived.ad @@ -1,6 +1,6 @@ - area = GM0439_purmerend -- id = 129416 -- parent_id = 129416 +- id = 129758 +- parent_id = 129758 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0439_purmerend/graph_values.yml b/datasets/GM0439_purmerend/graph_values.yml index a6faa5a6ff..20284ee111 100644 --- a/datasets/GM0439_purmerend/graph_values.yml +++ b/datasets/GM0439_purmerend/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20691030235776242 - :network_gas: 0.06890226676576812 - :ambient_heat: 0.7241874308764695 + :electricity: 0.20691030309662897 + :network_gas: 0.06890226344086353 + :ambient_heat: 0.7241874334625074 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 41148.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0441_schagen/GM0441_schagen.derived.ad b/datasets/GM0441_schagen/GM0441_schagen.derived.ad index 697cd0c13b..bca249fcf3 100644 --- a/datasets/GM0441_schagen/GM0441_schagen.derived.ad +++ b/datasets/GM0441_schagen/GM0441_schagen.derived.ad @@ -1,6 +1,6 @@ - area = GM0441_schagen -- id = 129434 -- parent_id = 129434 +- id = 129776 +- parent_id = 129776 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0441_schagen/graph_values.yml b/datasets/GM0441_schagen/graph_values.yml index 2405296710..7f052e17cd 100644 --- a/datasets/GM0441_schagen/graph_values.yml +++ b/datasets/GM0441_schagen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18577469951212863 - :network_gas: 0.16401261978280476 - :ambient_heat: 0.6502126807050665 + :electricity: 0.18577470109124541 + :network_gas: 0.16401261267676887 + :ambient_heat: 0.6502126862319857 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20529.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0448_texel/GM0448_texel.derived.ad b/datasets/GM0448_texel/GM0448_texel.derived.ad index c6a8c5276a..dda6efd23d 100644 --- a/datasets/GM0448_texel/GM0448_texel.derived.ad +++ b/datasets/GM0448_texel/GM0448_texel.derived.ad @@ -1,6 +1,6 @@ - area = GM0448_texel -- id = 129459 -- parent_id = 129459 +- id = 129801 +- parent_id = 129801 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0448_texel/graph_values.yml b/datasets/GM0448_texel/graph_values.yml index 005ed6a0b4..b8d3424393 100644 --- a/datasets/GM0448_texel/graph_values.yml +++ b/datasets/GM0448_texel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18366345997931652 - :network_gas: 0.17351321168623207 - :ambient_heat: 0.6428233283344513 + :electricity: 0.18366346163091976 + :network_gas: 0.17351320425400668 + :ambient_heat: 0.6428233341150736 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6770.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0450_uitgeest/GM0450_uitgeest.derived.ad b/datasets/GM0450_uitgeest/GM0450_uitgeest.derived.ad index 658d5313d7..2bc2fc8ebc 100644 --- a/datasets/GM0450_uitgeest/GM0450_uitgeest.derived.ad +++ b/datasets/GM0450_uitgeest/GM0450_uitgeest.derived.ad @@ -1,6 +1,6 @@ - area = GM0450_uitgeest -- id = 129468 -- parent_id = 129468 +- id = 129810 +- parent_id = 129810 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0450_uitgeest/graph_values.yml b/datasets/GM0450_uitgeest/graph_values.yml index 1a9387ed04..854bb8e364 100644 --- a/datasets/GM0450_uitgeest/graph_values.yml +++ b/datasets/GM0450_uitgeest/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.187445532983521 - :network_gas: 0.15649385807738042 - :ambient_heat: 0.6560606089390986 + :electricity: 0.1874455345037983 + :network_gas: 0.15649385123612258 + :ambient_heat: 0.6560606142600791 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5720.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0451_uithoorn/GM0451_uithoorn.derived.ad b/datasets/GM0451_uithoorn/GM0451_uithoorn.derived.ad index 65359256f9..069f80936a 100644 --- a/datasets/GM0451_uithoorn/GM0451_uithoorn.derived.ad +++ b/datasets/GM0451_uithoorn/GM0451_uithoorn.derived.ad @@ -1,6 +1,6 @@ - area = GM0451_uithoorn -- id = 129469 -- parent_id = 129469 +- id = 129811 +- parent_id = 129811 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0451_uithoorn/graph_values.yml b/datasets/GM0451_uithoorn/graph_values.yml index e63415c90c..c4b889607e 100644 --- a/datasets/GM0451_uithoorn/graph_values.yml +++ b/datasets/GM0451_uithoorn/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18850083760031625 - :network_gas: 0.15174498030100628 - :ambient_heat: 0.6597541820986775 + :electricity: 0.1885008390827593 + :network_gas: 0.15174497363000253 + :ambient_heat: 0.6597541872872381 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13250.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0453_velsen/GM0453_velsen.derived.ad b/datasets/GM0453_velsen/GM0453_velsen.derived.ad index e69bb885e1..3c447d84c3 100644 --- a/datasets/GM0453_velsen/GM0453_velsen.derived.ad +++ b/datasets/GM0453_velsen/GM0453_velsen.derived.ad @@ -1,6 +1,6 @@ - area = GM0453_velsen -- id = 129480 -- parent_id = 129480 +- id = 129822 +- parent_id = 129822 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0453_velsen/graph_values.yml b/datasets/GM0453_velsen/graph_values.yml index 99393791bb..3e112c0f3f 100644 --- a/datasets/GM0453_velsen/graph_values.yml +++ b/datasets/GM0453_velsen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18293219388272108 - :network_gas: 0.17680391397206496 - :ambient_heat: 0.6402638921452138 + :electricity: 0.18293219555894652 + :network_gas: 0.17680390642903934 + :ambient_heat: 0.640263898012014 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 31435.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0473_zandvoort/GM0473_zandvoort.derived.ad b/datasets/GM0473_zandvoort/GM0473_zandvoort.derived.ad index 74e67ecfe7..de6d0bcf25 100644 --- a/datasets/GM0473_zandvoort/GM0473_zandvoort.derived.ad +++ b/datasets/GM0473_zandvoort/GM0473_zandvoort.derived.ad @@ -1,6 +1,6 @@ - area = GM0473_zandvoort -- id = 129513 -- parent_id = 129513 +- id = 129855 +- parent_id = 129855 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0473_zandvoort/graph_values.yml b/datasets/GM0473_zandvoort/graph_values.yml index 754b0b8080..7ed9f2db9a 100644 --- a/datasets/GM0473_zandvoort/graph_values.yml +++ b/datasets/GM0473_zandvoort/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1814203387559564 - :network_gas: 0.18360727207201688 - :ambient_heat: 0.6349723891720268 + :electricity: 0.18142034048229608 + :network_gas: 0.18360726430347665 + :ambient_heat: 0.6349723952142272 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9695.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0479_zaanstad/GM0479_zaanstad.derived.ad b/datasets/GM0479_zaanstad/GM0479_zaanstad.derived.ad index 2a7d396987..eca950f9f5 100644 --- a/datasets/GM0479_zaanstad/GM0479_zaanstad.derived.ad +++ b/datasets/GM0479_zaanstad/GM0479_zaanstad.derived.ad @@ -1,6 +1,6 @@ - area = GM0479_zaanstad -- id = 129511 -- parent_id = 129511 +- id = 129853 +- parent_id = 129853 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0479_zaanstad/graph_values.yml b/datasets/GM0479_zaanstad/graph_values.yml index 50a1cf81d8..bca06ff842 100644 --- a/datasets/GM0479_zaanstad/graph_values.yml +++ b/datasets/GM0479_zaanstad/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18585525938814249 - :network_gas: 0.1636500998063157 - :ambient_heat: 0.650494640805542 + :electricity: 0.18585526096445212 + :network_gas: 0.16365009271291167 + :ambient_heat: 0.6504946463226361 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 69079.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0482_alblasserdam/GM0482_alblasserdam.derived.ad b/datasets/GM0482_alblasserdam/GM0482_alblasserdam.derived.ad index 5bbb8c880f..987f7fb506 100644 --- a/datasets/GM0482_alblasserdam/GM0482_alblasserdam.derived.ad +++ b/datasets/GM0482_alblasserdam/GM0482_alblasserdam.derived.ad @@ -1,6 +1,6 @@ - area = GM0482_alblasserdam -- id = 129205 -- parent_id = 129205 +- id = 129547 +- parent_id = 129547 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0482_alblasserdam/graph_values.yml b/datasets/GM0482_alblasserdam/graph_values.yml index ab7f9fb724..23fdf2953f 100644 --- a/datasets/GM0482_alblasserdam/graph_values.yml +++ b/datasets/GM0482_alblasserdam/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18918939506622126 - :network_gas: 0.14864646713660545 - :ambient_heat: 0.6621641377971733 + :electricity: 0.18918939652369854 + :network_gas: 0.14864646057794806 + :ambient_heat: 0.6621641428983535 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8406.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0484_alphen_aan_den_rijn/GM0484_alphen_aan_den_rijn.derived.ad b/datasets/GM0484_alphen_aan_den_rijn/GM0484_alphen_aan_den_rijn.derived.ad index f3871b7907..fe8f31636f 100644 --- a/datasets/GM0484_alphen_aan_den_rijn/GM0484_alphen_aan_den_rijn.derived.ad +++ b/datasets/GM0484_alphen_aan_den_rijn/GM0484_alphen_aan_den_rijn.derived.ad @@ -1,6 +1,6 @@ - area = GM0484_alphen_aan_den_rijn -- id = 129210 -- parent_id = 129210 +- id = 129552 +- parent_id = 129552 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0484_alphen_aan_den_rijn/graph_values.yml b/datasets/GM0484_alphen_aan_den_rijn/graph_values.yml index 66ca2ab4f1..82aa2e1185 100644 --- a/datasets/GM0484_alphen_aan_den_rijn/graph_values.yml +++ b/datasets/GM0484_alphen_aan_den_rijn/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18911879329744855 - :network_gas: 0.14896417556444833 - :ambient_heat: 0.6619170311381031 + :electricity: 0.18911879475749588 + :network_gas: 0.14896416899422565 + :ambient_heat: 0.6619170362482785 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 48847.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0489_barendrecht/GM0489_barendrecht.derived.ad b/datasets/GM0489_barendrecht/GM0489_barendrecht.derived.ad index d0c7860f15..b2339bea1a 100644 --- a/datasets/GM0489_barendrecht/GM0489_barendrecht.derived.ad +++ b/datasets/GM0489_barendrecht/GM0489_barendrecht.derived.ad @@ -1,6 +1,6 @@ - area = GM0489_barendrecht -- id = 129222 -- parent_id = 129222 +- id = 129564 +- parent_id = 129564 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0489_barendrecht/graph_values.yml b/datasets/GM0489_barendrecht/graph_values.yml index 127dfd260b..18c6c7764d 100644 --- a/datasets/GM0489_barendrecht/graph_values.yml +++ b/datasets/GM0489_barendrecht/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1926914434285919 - :network_gas: 0.13288722627366428 - :ambient_heat: 0.6744213302977439 + :electricity: 0.19269144475566877 + :network_gas: 0.1328872203018096 + :ambient_heat: 0.6744213349425217 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19420.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0498_drechterland/GM0498_drechterland.derived.ad b/datasets/GM0498_drechterland/GM0498_drechterland.derived.ad index 432e34fb26..96a19cb649 100644 --- a/datasets/GM0498_drechterland/GM0498_drechterland.derived.ad +++ b/datasets/GM0498_drechterland/GM0498_drechterland.derived.ad @@ -1,6 +1,6 @@ - area = GM0498_drechterland -- id = 129274 -- parent_id = 129274 +- id = 129616 +- parent_id = 129616 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0498_drechterland/graph_values.yml b/datasets/GM0498_drechterland/graph_values.yml index 854cd5f1a8..374e4643ca 100644 --- a/datasets/GM0498_drechterland/graph_values.yml +++ b/datasets/GM0498_drechterland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18883222739242772 - :network_gas: 0.1502537240380946 - :ambient_heat: 0.6609140485694778 + :electricity: 0.1888322288628828 + :network_gas: 0.1502537174210368 + :ambient_heat: 0.6609140537160804 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8399.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0502_capelle_aan_den_ijssel/GM0502_capelle_aan_den_ijssel.derived.ad b/datasets/GM0502_capelle_aan_den_ijssel/GM0502_capelle_aan_den_ijssel.derived.ad index 48a5d292b4..7559d11021 100644 --- a/datasets/GM0502_capelle_aan_den_ijssel/GM0502_capelle_aan_den_ijssel.derived.ad +++ b/datasets/GM0502_capelle_aan_den_ijssel/GM0502_capelle_aan_den_ijssel.derived.ad @@ -1,6 +1,6 @@ - area = GM0502_capelle_aan_den_ijssel -- id = 129252 -- parent_id = 129252 +- id = 129594 +- parent_id = 129594 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0502_capelle_aan_den_ijssel/graph_values.yml b/datasets/GM0502_capelle_aan_den_ijssel/graph_values.yml index f4903a28af..d23bd96763 100644 --- a/datasets/GM0502_capelle_aan_den_ijssel/graph_values.yml +++ b/datasets/GM0502_capelle_aan_den_ijssel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19586026793999736 - :network_gas: 0.1186274949506434 - :ambient_heat: 0.6855122371093592 + :electricity: 0.19586026914415158 + :network_gas: 0.11862748953194141 + :ambient_heat: 0.685512241323907 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 31546.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0503_delft/GM0503_delft.derived.ad b/datasets/GM0503_delft/GM0503_delft.derived.ad index cc6d824e74..4b5568ccf9 100644 --- a/datasets/GM0503_delft/GM0503_delft.derived.ad +++ b/datasets/GM0503_delft/GM0503_delft.derived.ad @@ -1,6 +1,6 @@ - area = GM0503_delft -- id = 129263 -- parent_id = 129263 +- id = 129605 +- parent_id = 129605 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0503_delft/graph_values.yml b/datasets/GM0503_delft/graph_values.yml index 0d0d399eff..fbda3c770e 100644 --- a/datasets/GM0503_delft/graph_values.yml +++ b/datasets/GM0503_delft/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1888553739709205 - :network_gas: 0.15014956428132473 - :ambient_heat: 0.6609950617477548 + :electricity: 0.18885537544053638 + :network_gas: 0.15014955766804358 + :ambient_heat: 0.6609950668914201 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 51465.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0505_dordrecht/GM0505_dordrecht.derived.ad b/datasets/GM0505_dordrecht/GM0505_dordrecht.derived.ad index 285bd7fbc1..cf3407d940 100644 --- a/datasets/GM0505_dordrecht/GM0505_dordrecht.derived.ad +++ b/datasets/GM0505_dordrecht/GM0505_dordrecht.derived.ad @@ -1,6 +1,6 @@ - area = GM0505_dordrecht -- id = 129273 -- parent_id = 129273 +- id = 129615 +- parent_id = 129615 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0505_dordrecht/graph_values.yml b/datasets/GM0505_dordrecht/graph_values.yml index f34ff8721a..35a6cce311 100644 --- a/datasets/GM0505_dordrecht/graph_values.yml +++ b/datasets/GM0505_dordrecht/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18674712537819257 - :network_gas: 0.15963669693453142 - :ambient_heat: 0.6536161776872759 + :electricity: 0.18674712692322315 + :network_gas: 0.15963668998188377 + :ambient_heat: 0.6536161830948931 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 55783.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0512_gorinchem/GM0512_gorinchem.derived.ad b/datasets/GM0512_gorinchem/GM0512_gorinchem.derived.ad index 0fcede9bdb..489e39ec0c 100644 --- a/datasets/GM0512_gorinchem/GM0512_gorinchem.derived.ad +++ b/datasets/GM0512_gorinchem/GM0512_gorinchem.derived.ad @@ -1,6 +1,6 @@ - area = GM0512_gorinchem -- id = 129302 -- parent_id = 129302 +- id = 129644 +- parent_id = 129644 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0512_gorinchem/graph_values.yml b/datasets/GM0512_gorinchem/graph_values.yml index 23dcd53fdc..6ba675aa71 100644 --- a/datasets/GM0512_gorinchem/graph_values.yml +++ b/datasets/GM0512_gorinchem/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18994713200233837 - :network_gas: 0.14523664589731985 - :ambient_heat: 0.6648162221003419 + :electricity: 0.18994713343208597 + :network_gas: 0.14523663946344642 + :ambient_heat: 0.6648162271044677 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 17273.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0513_gouda/GM0513_gouda.derived.ad b/datasets/GM0513_gouda/GM0513_gouda.derived.ad index b879e82f20..08c1905b9a 100644 --- a/datasets/GM0513_gouda/GM0513_gouda.derived.ad +++ b/datasets/GM0513_gouda/GM0513_gouda.derived.ad @@ -1,6 +1,6 @@ - area = GM0513_gouda -- id = 129303 -- parent_id = 129303 +- id = 129645 +- parent_id = 129645 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0513_gouda/graph_values.yml b/datasets/GM0513_gouda/graph_values.yml index d4f4c9167d..038be8d301 100644 --- a/datasets/GM0513_gouda/graph_values.yml +++ b/datasets/GM0513_gouda/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18646838203819746 - :network_gas: 0.1608910438136677 - :ambient_heat: 0.6526405741481348 + :electricity: 0.1864683835930438 + :network_gas: 0.16089103681684877 + :ambient_heat: 0.6526405795901074 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 33708.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0518_s_gravenhage/GM0518_s_gravenhage.derived.ad b/datasets/GM0518_s_gravenhage/GM0518_s_gravenhage.derived.ad index bf8ba4d91e..6819423118 100644 --- a/datasets/GM0518_s_gravenhage/GM0518_s_gravenhage.derived.ad +++ b/datasets/GM0518_s_gravenhage/GM0518_s_gravenhage.derived.ad @@ -1,6 +1,6 @@ - area = GM0518_s_gravenhage -- id = 129264 -- parent_id = 129264 +- id = 129606 +- parent_id = 129606 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0518_s_gravenhage/graph_values.yml b/datasets/GM0518_s_gravenhage/graph_values.yml index eb8ad129da..d211b0bb9e 100644 --- a/datasets/GM0518_s_gravenhage/graph_values.yml +++ b/datasets/GM0518_s_gravenhage/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.184016374819548 - :network_gas: 0.17192509256398536 - :ambient_heat: 0.6440585326164667 + :electricity: 0.1840163764591791 + :network_gas: 0.17192508518563449 + :ambient_heat: 0.6440585383551864 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 265826.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0523_hardinxveld_giessendam/GM0523_hardinxveld_giessendam.derived.ad b/datasets/GM0523_hardinxveld_giessendam/GM0523_hardinxveld_giessendam.derived.ad index 8bf256f197..749ef3eb36 100644 --- a/datasets/GM0523_hardinxveld_giessendam/GM0523_hardinxveld_giessendam.derived.ad +++ b/datasets/GM0523_hardinxveld_giessendam/GM0523_hardinxveld_giessendam.derived.ad @@ -1,6 +1,6 @@ - area = GM0523_hardinxveld_giessendam -- id = 129312 -- parent_id = 129312 +- id = 129654 +- parent_id = 129654 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0523_hardinxveld_giessendam/graph_values.yml b/datasets/GM0523_hardinxveld_giessendam/graph_values.yml index 2ba3f86d73..ac0867af46 100644 --- a/datasets/GM0523_hardinxveld_giessendam/graph_values.yml +++ b/datasets/GM0523_hardinxveld_giessendam/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18843419985613477 - :network_gas: 0.1520448505918917 - :ambient_heat: 0.6595209495519736 + :electricity: 0.18843420134098227 + :network_gas: 0.15204484391006812 + :ambient_heat: 0.6595209547489497 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7508.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0531_hendrik_ido_ambacht/GM0531_hendrik_ido_ambacht.derived.ad b/datasets/GM0531_hendrik_ido_ambacht/GM0531_hendrik_ido_ambacht.derived.ad index 07dd4dc588..e2c2e12c43 100644 --- a/datasets/GM0531_hendrik_ido_ambacht/GM0531_hendrik_ido_ambacht.derived.ad +++ b/datasets/GM0531_hendrik_ido_ambacht/GM0531_hendrik_ido_ambacht.derived.ad @@ -1,6 +1,6 @@ - area = GM0531_hendrik_ido_ambacht -- id = 129324 -- parent_id = 129324 +- id = 129666 +- parent_id = 129666 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0531_hendrik_ido_ambacht/graph_values.yml b/datasets/GM0531_hendrik_ido_ambacht/graph_values.yml index ec4873107a..9be56c18f1 100644 --- a/datasets/GM0531_hendrik_ido_ambacht/graph_values.yml +++ b/datasets/GM0531_hendrik_ido_ambacht/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1921927325027001 - :network_gas: 0.13513142874858072 - :ambient_heat: 0.6726758387487192 + :electricity: 0.192192733848696 + :network_gas: 0.1351314226915902 + :ambient_heat: 0.6726758434597138 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12330.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0532_stede_broec/GM0532_stede_broec.derived.ad b/datasets/GM0532_stede_broec/GM0532_stede_broec.derived.ad index 0c3226b779..3c8dc54081 100644 --- a/datasets/GM0532_stede_broec/GM0532_stede_broec.derived.ad +++ b/datasets/GM0532_stede_broec/GM0532_stede_broec.derived.ad @@ -1,6 +1,6 @@ - area = GM0532_stede_broec -- id = 129451 -- parent_id = 129451 +- id = 129793 +- parent_id = 129793 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0532_stede_broec/graph_values.yml b/datasets/GM0532_stede_broec/graph_values.yml index 7ab0f2a687..0bc70f88dd 100644 --- a/datasets/GM0532_stede_broec/graph_values.yml +++ b/datasets/GM0532_stede_broec/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18737179823180064 - :network_gas: 0.1568256649492719 - :ambient_heat: 0.6558025368189275 + :electricity: 0.187371799754702 + :network_gas: 0.1568256580962057 + :ambient_heat: 0.6558025421490924 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9251.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0534_hillegom/GM0534_hillegom.derived.ad b/datasets/GM0534_hillegom/GM0534_hillegom.derived.ad index 4537774779..ca09148f2f 100644 --- a/datasets/GM0534_hillegom/GM0534_hillegom.derived.ad +++ b/datasets/GM0534_hillegom/GM0534_hillegom.derived.ad @@ -1,6 +1,6 @@ - area = GM0534_hillegom -- id = 129328 -- parent_id = 129328 +- id = 129670 +- parent_id = 129670 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0534_hillegom/graph_values.yml b/datasets/GM0534_hillegom/graph_values.yml index fdba52499e..95056cad8d 100644 --- a/datasets/GM0534_hillegom/graph_values.yml +++ b/datasets/GM0534_hillegom/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18754278937116825 - :network_gas: 0.15605620368777784 - :ambient_heat: 0.656401006941054 + :electricity: 0.18754279088798045 + :network_gas: 0.15605619686211278 + :ambient_heat: 0.6564010122499069 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9858.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0537_katwijk/GM0537_katwijk.derived.ad b/datasets/GM0537_katwijk/GM0537_katwijk.derived.ad index beb39a0eca..365c338fb5 100644 --- a/datasets/GM0537_katwijk/GM0537_katwijk.derived.ad +++ b/datasets/GM0537_katwijk/GM0537_katwijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0537_katwijk -- id = 129343 -- parent_id = 129343 +- id = 129685 +- parent_id = 129685 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0537_katwijk/graph_values.yml b/datasets/GM0537_katwijk/graph_values.yml index 8d21660b47..959dbd2f42 100644 --- a/datasets/GM0537_katwijk/graph_values.yml +++ b/datasets/GM0537_katwijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18891301111016295 - :network_gas: 0.14989019677237392 - :ambient_heat: 0.6611967921174631 + :electricity: 0.188913012577688 + :network_gas: 0.14989019016850172 + :ambient_heat: 0.6611967972538103 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 27160.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0542_krimpen_aan_den_ijssel/GM0542_krimpen_aan_den_ijssel.derived.ad b/datasets/GM0542_krimpen_aan_den_ijssel/GM0542_krimpen_aan_den_ijssel.derived.ad index 5f8af053f3..73c90d2b4a 100644 --- a/datasets/GM0542_krimpen_aan_den_ijssel/GM0542_krimpen_aan_den_ijssel.derived.ad +++ b/datasets/GM0542_krimpen_aan_den_ijssel/GM0542_krimpen_aan_den_ijssel.derived.ad @@ -1,6 +1,6 @@ - area = GM0542_krimpen_aan_den_ijssel -- id = 129346 -- parent_id = 129346 +- id = 129688 +- parent_id = 129688 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0542_krimpen_aan_den_ijssel/graph_values.yml b/datasets/GM0542_krimpen_aan_den_ijssel/graph_values.yml index 8cb96dba1d..612450c8c5 100644 --- a/datasets/GM0542_krimpen_aan_den_ijssel/graph_values.yml +++ b/datasets/GM0542_krimpen_aan_den_ijssel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18872972380454003 - :network_gas: 0.1507149908635887 - :ambient_heat: 0.6605552853318712 + :electricity: 0.18872972527870868 + :network_gas: 0.15071498422982005 + :ambient_heat: 0.6605552904914713 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12643.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0546_leiden/GM0546_leiden.derived.ad b/datasets/GM0546_leiden/GM0546_leiden.derived.ad index f30d1d810c..e685c9be08 100644 --- a/datasets/GM0546_leiden/GM0546_leiden.derived.ad +++ b/datasets/GM0546_leiden/GM0546_leiden.derived.ad @@ -1,6 +1,6 @@ - area = GM0546_leiden -- id = 129354 -- parent_id = 129354 +- id = 129696 +- parent_id = 129696 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0546_leiden/graph_values.yml b/datasets/GM0546_leiden/graph_values.yml index 7c5329add5..0318ccee95 100644 --- a/datasets/GM0546_leiden/graph_values.yml +++ b/datasets/GM0546_leiden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18920281228419186 - :network_gas: 0.148586089566729 - :ambient_heat: 0.6622110981490791 + :electricity: 0.18920281374118048 + :network_gas: 0.14858608301027074 + :ambient_heat: 0.6622111032485488 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 60499.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0547_leiderdorp/GM0547_leiderdorp.derived.ad b/datasets/GM0547_leiderdorp/GM0547_leiderdorp.derived.ad index a720a81af0..691114ec3a 100644 --- a/datasets/GM0547_leiderdorp/GM0547_leiderdorp.derived.ad +++ b/datasets/GM0547_leiderdorp/GM0547_leiderdorp.derived.ad @@ -1,6 +1,6 @@ - area = GM0547_leiderdorp -- id = 129355 -- parent_id = 129355 +- id = 129697 +- parent_id = 129697 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0547_leiderdorp/graph_values.yml b/datasets/GM0547_leiderdorp/graph_values.yml index 861b760b15..3142acd967 100644 --- a/datasets/GM0547_leiderdorp/graph_values.yml +++ b/datasets/GM0547_leiderdorp/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18925419271408916 - :network_gas: 0.14835487729133798 - :ambient_heat: 0.6623909299945727 + :electricity: 0.18925419416920566 + :network_gas: 0.1483548707433044 + :ambient_heat: 0.66239093508749 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12376.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0553_lisse/GM0553_lisse.derived.ad b/datasets/GM0553_lisse/GM0553_lisse.derived.ad index d78a5177c0..792f6c83b5 100644 --- a/datasets/GM0553_lisse/GM0553_lisse.derived.ad +++ b/datasets/GM0553_lisse/GM0553_lisse.derived.ad @@ -1,6 +1,6 @@ - area = GM0553_lisse -- id = 129361 -- parent_id = 129361 +- id = 129703 +- parent_id = 129703 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0553_lisse/graph_values.yml b/datasets/GM0553_lisse/graph_values.yml index ff36aefcbc..4b74d0bed7 100644 --- a/datasets/GM0553_lisse/graph_values.yml +++ b/datasets/GM0553_lisse/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18874528689737402 - :network_gas: 0.15064495684259174 - :ambient_heat: 0.6606097562600343 + :electricity: 0.18874528837097912 + :network_gas: 0.1506449502113589 + :ambient_heat: 0.660609761417662 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10408.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0556_maassluis/GM0556_maassluis.derived.ad b/datasets/GM0556_maassluis/GM0556_maassluis.derived.ad index 274ba015aa..19246149e2 100644 --- a/datasets/GM0556_maassluis/GM0556_maassluis.derived.ad +++ b/datasets/GM0556_maassluis/GM0556_maassluis.derived.ad @@ -1,6 +1,6 @@ - area = GM0556_maassluis -- id = 129368 -- parent_id = 129368 +- id = 129710 +- parent_id = 129710 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0556_maassluis/graph_values.yml b/datasets/GM0556_maassluis/graph_values.yml index 54107a507e..f196516652 100644 --- a/datasets/GM0556_maassluis/graph_values.yml +++ b/datasets/GM0556_maassluis/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18990332438001817 - :network_gas: 0.14543378048837674 - :ambient_heat: 0.6646628951316051 + :electricity: 0.18990332581137614 + :network_gas: 0.14543377404725624 + :ambient_heat: 0.6646629001413676 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15387.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0569_nieuwkoop/GM0569_nieuwkoop.derived.ad b/datasets/GM0569_nieuwkoop/GM0569_nieuwkoop.derived.ad index c5602a7f4e..8634b534b0 100644 --- a/datasets/GM0569_nieuwkoop/GM0569_nieuwkoop.derived.ad +++ b/datasets/GM0569_nieuwkoop/GM0569_nieuwkoop.derived.ad @@ -1,6 +1,6 @@ - area = GM0569_nieuwkoop -- id = 129383 -- parent_id = 129383 +- id = 129725 +- parent_id = 129725 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0569_nieuwkoop/graph_values.yml b/datasets/GM0569_nieuwkoop/graph_values.yml index c1fd8776fb..ad39082c0e 100644 --- a/datasets/GM0569_nieuwkoop/graph_values.yml +++ b/datasets/GM0569_nieuwkoop/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19006044700909522 - :network_gas: 0.1447267276151925 - :ambient_heat: 0.6652128253757122 + :electricity: 0.19006044843467293 + :network_gas: 0.14472672120008334 + :ambient_heat: 0.6652128303652437 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11633.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0575_noordwijk/GM0575_noordwijk.derived.ad b/datasets/GM0575_noordwijk/GM0575_noordwijk.derived.ad index 47dadc5a54..d71cab8318 100644 --- a/datasets/GM0575_noordwijk/GM0575_noordwijk.derived.ad +++ b/datasets/GM0575_noordwijk/GM0575_noordwijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0575_noordwijk -- id = 129390 -- parent_id = 129390 +- id = 129732 +- parent_id = 129732 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0575_noordwijk/graph_values.yml b/datasets/GM0575_noordwijk/graph_values.yml index 0e6f23e945..977f89bd0d 100644 --- a/datasets/GM0575_noordwijk/graph_values.yml +++ b/datasets/GM0575_noordwijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1866604562170364 - :network_gas: 0.16002670873468966 - :ambient_heat: 0.6533128350482739 + :electricity: 0.18666045776512286 + :network_gas: 0.16002670176829042 + :ambient_heat: 0.6533128404665868 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20093.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0579_oegstgeest/GM0579_oegstgeest.derived.ad b/datasets/GM0579_oegstgeest/GM0579_oegstgeest.derived.ad index 8fde179088..2a60762686 100644 --- a/datasets/GM0579_oegstgeest/GM0579_oegstgeest.derived.ad +++ b/datasets/GM0579_oegstgeest/GM0579_oegstgeest.derived.ad @@ -1,6 +1,6 @@ - area = GM0579_oegstgeest -- id = 129393 -- parent_id = 129393 +- id = 129735 +- parent_id = 129735 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0579_oegstgeest/graph_values.yml b/datasets/GM0579_oegstgeest/graph_values.yml index 660aa2b877..7329726321 100644 --- a/datasets/GM0579_oegstgeest/graph_values.yml +++ b/datasets/GM0579_oegstgeest/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1879140046795567 - :network_gas: 0.1543857323374207 - :ambient_heat: 0.6577002629830225 + :electricity: 0.18791400618310272 + :network_gas: 0.15438572557145372 + :ambient_heat: 0.6577002682454435 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11008.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0589_oudewater/GM0589_oudewater.derived.ad b/datasets/GM0589_oudewater/GM0589_oudewater.derived.ad index 7d1f6a750c..7de60403a2 100644 --- a/datasets/GM0589_oudewater/GM0589_oudewater.derived.ad +++ b/datasets/GM0589_oudewater/GM0589_oudewater.derived.ad @@ -1,6 +1,6 @@ - area = GM0589_oudewater -- id = 129410 -- parent_id = 129410 +- id = 129752 +- parent_id = 129752 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0589_oudewater/graph_values.yml b/datasets/GM0589_oudewater/graph_values.yml index c4c9588fdb..b9dbcab629 100644 --- a/datasets/GM0589_oudewater/graph_values.yml +++ b/datasets/GM0589_oudewater/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18706670604700104 - :network_gas: 0.15819858180482424 - :ambient_heat: 0.6547347121481748 + :electricity: 0.18706670758073307 + :network_gas: 0.15819857490301978 + :ambient_heat: 0.6547347175162472 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4315.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0590_papendrecht/GM0590_papendrecht.derived.ad b/datasets/GM0590_papendrecht/GM0590_papendrecht.derived.ad index 7b5c0606e1..73adddd4da 100644 --- a/datasets/GM0590_papendrecht/GM0590_papendrecht.derived.ad +++ b/datasets/GM0590_papendrecht/GM0590_papendrecht.derived.ad @@ -1,6 +1,6 @@ - area = GM0590_papendrecht -- id = 129412 -- parent_id = 129412 +- id = 129754 +- parent_id = 129754 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0590_papendrecht/graph_values.yml b/datasets/GM0590_papendrecht/graph_values.yml index 13295b9977..d8f8acab65 100644 --- a/datasets/GM0590_papendrecht/graph_values.yml +++ b/datasets/GM0590_papendrecht/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19064703414286496 - :network_gas: 0.14208708162186232 - :ambient_heat: 0.6672658842352726 + :electricity: 0.19064703554676138 + :network_gas: 0.14208707530431927 + :ambient_heat: 0.6672658891489194 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14474.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0597_ridderkerk/GM0597_ridderkerk.derived.ad b/datasets/GM0597_ridderkerk/GM0597_ridderkerk.derived.ad index 2fdfb30c86..77f47bf879 100644 --- a/datasets/GM0597_ridderkerk/GM0597_ridderkerk.derived.ad +++ b/datasets/GM0597_ridderkerk/GM0597_ridderkerk.derived.ad @@ -1,6 +1,6 @@ - area = GM0597_ridderkerk -- id = 129425 -- parent_id = 129425 +- id = 129767 +- parent_id = 129767 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0597_ridderkerk/graph_values.yml b/datasets/GM0597_ridderkerk/graph_values.yml index 9a6390edf1..7015ab2940 100644 --- a/datasets/GM0597_ridderkerk/graph_values.yml +++ b/datasets/GM0597_ridderkerk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19015859450077194 - :network_gas: 0.14428506325154564 - :ambient_heat: 0.6655563422476825 + :electricity: 0.19015859592273313 + :network_gas: 0.14428505685271087 + :ambient_heat: 0.6655563472245559 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 21285.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0599_rotterdam/GM0599_rotterdam.derived.ad b/datasets/GM0599_rotterdam/GM0599_rotterdam.derived.ad index 3e22b0e921..6b9858a5bf 100644 --- a/datasets/GM0599_rotterdam/GM0599_rotterdam.derived.ad +++ b/datasets/GM0599_rotterdam/GM0599_rotterdam.derived.ad @@ -1,6 +1,6 @@ - area = GM0599_rotterdam -- id = 129431 -- parent_id = 129431 +- id = 129773 +- parent_id = 129773 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0599_rotterdam/graph_values.yml b/datasets/GM0599_rotterdam/graph_values.yml index d06f648003..28461e54f5 100644 --- a/datasets/GM0599_rotterdam/graph_values.yml +++ b/datasets/GM0599_rotterdam/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1892353482741809 - :network_gas: 0.14843967739593755 - :ambient_heat: 0.6623249743298816 + :electricity: 0.18923534972998415 + :network_gas: 0.14843967084481344 + :ambient_heat: 0.6623249794252025 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 317566.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0603_rijswijk/GM0603_rijswijk.derived.ad b/datasets/GM0603_rijswijk/GM0603_rijswijk.derived.ad index b3fc86dec0..c0ed168001 100644 --- a/datasets/GM0603_rijswijk/GM0603_rijswijk.derived.ad +++ b/datasets/GM0603_rijswijk/GM0603_rijswijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0603_rijswijk -- id = 129427 -- parent_id = 129427 +- id = 129769 +- parent_id = 129769 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0603_rijswijk/graph_values.yml b/datasets/GM0603_rijswijk/graph_values.yml index 7e0de3da15..898f9aa58c 100644 --- a/datasets/GM0603_rijswijk/graph_values.yml +++ b/datasets/GM0603_rijswijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18664006026566843 - :network_gas: 0.1601184906511504 - :ambient_heat: 0.653241449083181 + :electricity: 0.18664006181447354 + :network_gas: 0.16011848368151732 + :ambient_heat: 0.6532414545040092 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 27201.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0606_schiedam/GM0606_schiedam.derived.ad b/datasets/GM0606_schiedam/GM0606_schiedam.derived.ad index 7c05272487..e394c26eaf 100644 --- a/datasets/GM0606_schiedam/GM0606_schiedam.derived.ad +++ b/datasets/GM0606_schiedam/GM0606_schiedam.derived.ad @@ -1,6 +1,6 @@ - area = GM0606_schiedam -- id = 129436 -- parent_id = 129436 +- id = 129778 +- parent_id = 129778 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0606_schiedam/graph_values.yml b/datasets/GM0606_schiedam/graph_values.yml index 250d133c9f..d57a049e2a 100644 --- a/datasets/GM0606_schiedam/graph_values.yml +++ b/datasets/GM0606_schiedam/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18594728110216752 - :network_gas: 0.16323600148273917 - :ambient_heat: 0.6508167174150933 + :electricity: 0.185947282675267 + :network_gas: 0.16323599440378098 + :ambient_heat: 0.6508167229209519 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 37452.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0610_sliedrecht/GM0610_sliedrecht.derived.ad b/datasets/GM0610_sliedrecht/GM0610_sliedrecht.derived.ad index 96d9bc6ce5..b90f45bd6e 100644 --- a/datasets/GM0610_sliedrecht/GM0610_sliedrecht.derived.ad +++ b/datasets/GM0610_sliedrecht/GM0610_sliedrecht.derived.ad @@ -1,6 +1,6 @@ - area = GM0610_sliedrecht -- id = 129443 -- parent_id = 129443 +- id = 129785 +- parent_id = 129785 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0610_sliedrecht/graph_values.yml b/datasets/GM0610_sliedrecht/graph_values.yml index 45340fc0a7..4b1c575802 100644 --- a/datasets/GM0610_sliedrecht/graph_values.yml +++ b/datasets/GM0610_sliedrecht/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18943273084577597 - :network_gas: 0.14755145451434157 - :ambient_heat: 0.6630158146398825 + :electricity: 0.18943273229437746 + :network_gas: 0.14755144799562528 + :ambient_heat: 0.6630158197099972 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11078.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0613_albrandswaard/GM0613_albrandswaard.derived.ad b/datasets/GM0613_albrandswaard/GM0613_albrandswaard.derived.ad index 1e26daf650..e686159f3e 100644 --- a/datasets/GM0613_albrandswaard/GM0613_albrandswaard.derived.ad +++ b/datasets/GM0613_albrandswaard/GM0613_albrandswaard.derived.ad @@ -1,6 +1,6 @@ - area = GM0613_albrandswaard -- id = 129206 -- parent_id = 129206 +- id = 129548 +- parent_id = 129548 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0613_albrandswaard/graph_values.yml b/datasets/GM0613_albrandswaard/graph_values.yml index 2e08d704e0..f5134b4419 100644 --- a/datasets/GM0613_albrandswaard/graph_values.yml +++ b/datasets/GM0613_albrandswaard/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19025797365521765 - :network_gas: 0.14383785639726748 - :ambient_heat: 0.6659041699475148 + :electricity: 0.19025797507351236 + :network_gas: 0.14383785001493193 + :ambient_heat: 0.6659041749115556 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10558.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0622_vlaardingen/GM0622_vlaardingen.derived.ad b/datasets/GM0622_vlaardingen/GM0622_vlaardingen.derived.ad index bb1b8e6a04..7f77b3a967 100644 --- a/datasets/GM0622_vlaardingen/GM0622_vlaardingen.derived.ad +++ b/datasets/GM0622_vlaardingen/GM0622_vlaardingen.derived.ad @@ -1,6 +1,6 @@ - area = GM0622_vlaardingen -- id = 129483 -- parent_id = 129483 +- id = 129825 +- parent_id = 129825 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0622_vlaardingen/graph_values.yml b/datasets/GM0622_vlaardingen/graph_values.yml index 08150c0c3d..16426c42ea 100644 --- a/datasets/GM0622_vlaardingen/graph_values.yml +++ b/datasets/GM0622_vlaardingen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18557765441342303 - :network_gas: 0.16489932403415944 - :ambient_heat: 0.6495230215524175 + :electricity: 0.18557765599939302 + :network_gas: 0.16489931689728393 + :ambient_heat: 0.6495230271033229 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 35541.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0626_voorschoten/GM0626_voorschoten.derived.ad b/datasets/GM0626_voorschoten/GM0626_voorschoten.derived.ad index 217777096a..a66038765a 100644 --- a/datasets/GM0626_voorschoten/GM0626_voorschoten.derived.ad +++ b/datasets/GM0626_voorschoten/GM0626_voorschoten.derived.ad @@ -1,6 +1,6 @@ - area = GM0626_voorschoten -- id = 129487 -- parent_id = 129487 +- id = 129829 +- parent_id = 129829 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0626_voorschoten/graph_values.yml b/datasets/GM0626_voorschoten/graph_values.yml index dc21731ef9..51f18a48c2 100644 --- a/datasets/GM0626_voorschoten/graph_values.yml +++ b/datasets/GM0626_voorschoten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18529358959507097 - :network_gas: 0.16617761760120406 - :ambient_heat: 0.648528792803725 + :electricity: 0.18529359119088887 + :network_gas: 0.1661776104200129 + :ambient_heat: 0.6485287983890982 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11502.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0627_waddinxveen/GM0627_waddinxveen.derived.ad b/datasets/GM0627_waddinxveen/GM0627_waddinxveen.derived.ad index 664194bd05..7775dfa989 100644 --- a/datasets/GM0627_waddinxveen/GM0627_waddinxveen.derived.ad +++ b/datasets/GM0627_waddinxveen/GM0627_waddinxveen.derived.ad @@ -1,6 +1,6 @@ - area = GM0627_waddinxveen -- id = 129492 -- parent_id = 129492 +- id = 129834 +- parent_id = 129834 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0627_waddinxveen/graph_values.yml b/datasets/GM0627_waddinxveen/graph_values.yml index eee560dd89..cfe2cf7b2d 100644 --- a/datasets/GM0627_waddinxveen/graph_values.yml +++ b/datasets/GM0627_waddinxveen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1940972653687841 - :network_gas: 0.12656101821670332 - :ambient_heat: 0.6793417164145126 + :electricity: 0.19409726664190538 + :network_gas: 0.12656101248764898 + :ambient_heat: 0.6793417208704456 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12786.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0629_wassenaar/GM0629_wassenaar.derived.ad b/datasets/GM0629_wassenaar/GM0629_wassenaar.derived.ad index e64caaaf30..8ee8219264 100644 --- a/datasets/GM0629_wassenaar/GM0629_wassenaar.derived.ad +++ b/datasets/GM0629_wassenaar/GM0629_wassenaar.derived.ad @@ -1,6 +1,6 @@ - area = GM0629_wassenaar -- id = 129494 -- parent_id = 129494 +- id = 129836 +- parent_id = 129836 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0629_wassenaar/graph_values.yml b/datasets/GM0629_wassenaar/graph_values.yml index e7117fefc6..ac0ef6b2e0 100644 --- a/datasets/GM0629_wassenaar/graph_values.yml +++ b/datasets/GM0629_wassenaar/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.177762807701468 - :network_gas: 0.200066186080946 - :ambient_heat: 0.6221710062175859 + :electricity: 0.17776280954463636 + :network_gas: 0.2000661777866762 + :ambient_heat: 0.6221710126686875 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12255.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0632_woerden/GM0632_woerden.derived.ad b/datasets/GM0632_woerden/GM0632_woerden.derived.ad index 1ada58332f..f9ba90b31c 100644 --- a/datasets/GM0632_woerden/GM0632_woerden.derived.ad +++ b/datasets/GM0632_woerden/GM0632_woerden.derived.ad @@ -1,6 +1,6 @@ - area = GM0632_woerden -- id = 129508 -- parent_id = 129508 +- id = 129850 +- parent_id = 129850 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0632_woerden/graph_values.yml b/datasets/GM0632_woerden/graph_values.yml index c42c49bb3d..9053dfec52 100644 --- a/datasets/GM0632_woerden/graph_values.yml +++ b/datasets/GM0632_woerden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1883574980358847 - :network_gas: 0.15239000929184982 - :ambient_heat: 0.6592524926722655 + :electricity: 0.18835749952349717 + :network_gas: 0.1523900025975837 + :ambient_heat: 0.659252497878919 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22411.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0637_zoetermeer/GM0637_zoetermeer.derived.ad b/datasets/GM0637_zoetermeer/GM0637_zoetermeer.derived.ad index 4c1a9ca56b..608f17f1fe 100644 --- a/datasets/GM0637_zoetermeer/GM0637_zoetermeer.derived.ad +++ b/datasets/GM0637_zoetermeer/GM0637_zoetermeer.derived.ad @@ -1,6 +1,6 @@ - area = GM0637_zoetermeer -- id = 129517 -- parent_id = 129517 +- id = 129859 +- parent_id = 129859 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0637_zoetermeer/graph_values.yml b/datasets/GM0637_zoetermeer/graph_values.yml index eb7b98ea96..9c7348c03e 100644 --- a/datasets/GM0637_zoetermeer/graph_values.yml +++ b/datasets/GM0637_zoetermeer/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19268737881286171 - :network_gas: 0.13290551707141454 - :ambient_heat: 0.6744071041157239 + :electricity: 0.19268738014009318 + :network_gas: 0.1329055110988639 + :ambient_heat: 0.6744071087610428 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 56357.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0638_zoeterwoude/GM0638_zoeterwoude.derived.ad b/datasets/GM0638_zoeterwoude/GM0638_zoeterwoude.derived.ad index 67f3ae503d..42552897ee 100644 --- a/datasets/GM0638_zoeterwoude/GM0638_zoeterwoude.derived.ad +++ b/datasets/GM0638_zoeterwoude/GM0638_zoeterwoude.derived.ad @@ -1,6 +1,6 @@ - area = GM0638_zoeterwoude -- id = 129518 -- parent_id = 129518 +- id = 129860 +- parent_id = 129860 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0638_zoeterwoude/graph_values.yml b/datasets/GM0638_zoeterwoude/graph_values.yml index ead87f226f..d05c738e8b 100644 --- a/datasets/GM0638_zoeterwoude/graph_values.yml +++ b/datasets/GM0638_zoeterwoude/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19177074809065908 - :network_gas: 0.13703036140217173 - :ambient_heat: 0.6711988905071691 + :electricity: 0.1917707494525728 + :network_gas: 0.13703035527355126 + :ambient_heat: 0.671198895273876 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 3732.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0642_zwijndrecht/GM0642_zwijndrecht.derived.ad b/datasets/GM0642_zwijndrecht/GM0642_zwijndrecht.derived.ad index fed48b5253..67ea2d1d6f 100644 --- a/datasets/GM0642_zwijndrecht/GM0642_zwijndrecht.derived.ad +++ b/datasets/GM0642_zwijndrecht/GM0642_zwijndrecht.derived.ad @@ -1,6 +1,6 @@ - area = GM0642_zwijndrecht -- id = 129523 -- parent_id = 129523 +- id = 129865 +- parent_id = 129865 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0642_zwijndrecht/graph_values.yml b/datasets/GM0642_zwijndrecht/graph_values.yml index 859f804242..17fe8a7718 100644 --- a/datasets/GM0642_zwijndrecht/graph_values.yml +++ b/datasets/GM0642_zwijndrecht/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1864004015245683 - :network_gas: 0.16119695657597563 - :ambient_heat: 0.6524026418994561 + :electricity: 0.18640040308180308 + :network_gas: 0.16119694956840888 + :ambient_heat: 0.6524026473497881 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20717.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0654_borsele/GM0654_borsele.derived.ad b/datasets/GM0654_borsele/GM0654_borsele.derived.ad index 8b3aa30985..f7a57ce64d 100644 --- a/datasets/GM0654_borsele/GM0654_borsele.derived.ad +++ b/datasets/GM0654_borsele/GM0654_borsele.derived.ad @@ -1,6 +1,6 @@ - area = GM0654_borsele -- id = 129243 -- parent_id = 129243 +- id = 129585 +- parent_id = 129585 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0654_borsele/graph_values.yml b/datasets/GM0654_borsele/graph_values.yml index 3938d018dd..f4738f8d45 100644 --- a/datasets/GM0654_borsele/graph_values.yml +++ b/datasets/GM0654_borsele/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18498092206261202 - :network_gas: 0.1675846235714776 - :ambient_heat: 0.6474344543659104 + :electricity: 0.18498092366922594 + :network_gas: 0.16758461634170446 + :ambient_heat: 0.6474344599890696 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9820.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0664_goes/GM0664_goes.derived.ad b/datasets/GM0664_goes/GM0664_goes.derived.ad index 67ddc7816f..3f5e3d5936 100644 --- a/datasets/GM0664_goes/GM0664_goes.derived.ad +++ b/datasets/GM0664_goes/GM0664_goes.derived.ad @@ -1,6 +1,6 @@ - area = GM0664_goes -- id = 129299 -- parent_id = 129299 +- id = 129641 +- parent_id = 129641 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0664_goes/graph_values.yml b/datasets/GM0664_goes/graph_values.yml index 34825ff27e..10c0318651 100644 --- a/datasets/GM0664_goes/graph_values.yml +++ b/datasets/GM0664_goes/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18993916349954154 - :network_gas: 0.14527250421276797 - :ambient_heat: 0.6647883322876905 + :electricity: 0.1899391649295821 + :network_gas: 0.145272497777576 + :ambient_heat: 0.6647883372928419 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18622.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0668_west_maas_en_waal/GM0668_west_maas_en_waal.derived.ad b/datasets/GM0668_west_maas_en_waal/GM0668_west_maas_en_waal.derived.ad index 3d0d79252d..25d2114330 100644 --- a/datasets/GM0668_west_maas_en_waal/GM0668_west_maas_en_waal.derived.ad +++ b/datasets/GM0668_west_maas_en_waal/GM0668_west_maas_en_waal.derived.ad @@ -1,6 +1,6 @@ - area = GM0668_west_maas_en_waal -- id = 129497 -- parent_id = 129497 +- id = 129839 +- parent_id = 129839 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0668_west_maas_en_waal/graph_values.yml b/datasets/GM0668_west_maas_en_waal/graph_values.yml index 4a58fe3308..1e5bc69e54 100644 --- a/datasets/GM0668_west_maas_en_waal/graph_values.yml +++ b/datasets/GM0668_west_maas_en_waal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1900064304932152 - :network_gas: 0.14496980229499334 - :ambient_heat: 0.6650237672117915 + :electricity: 0.19000643192078137 + :network_gas: 0.14496979587093597 + :ambient_heat: 0.6650237722082826 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8346.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0677_hulst/GM0677_hulst.derived.ad b/datasets/GM0677_hulst/GM0677_hulst.derived.ad index db1c183006..240928f911 100644 --- a/datasets/GM0677_hulst/GM0677_hulst.derived.ad +++ b/datasets/GM0677_hulst/GM0677_hulst.derived.ad @@ -1,6 +1,6 @@ - area = GM0677_hulst -- id = 129338 -- parent_id = 129338 +- id = 129680 +- parent_id = 129680 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0677_hulst/graph_values.yml b/datasets/GM0677_hulst/graph_values.yml index 9ad21fb600..314072aa66 100644 --- a/datasets/GM0677_hulst/graph_values.yml +++ b/datasets/GM0677_hulst/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1860422140422789 - :network_gas: 0.1628088026224613 - :ambient_heat: 0.6511489833352597 + :electricity: 0.18604221561206252 + :network_gas: 0.16280879555842465 + :ambient_heat: 0.6511489888295128 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13607.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0678_kapelle/GM0678_kapelle.derived.ad b/datasets/GM0678_kapelle/GM0678_kapelle.derived.ad index f9e4fa0f4a..d38affcdb4 100644 --- a/datasets/GM0678_kapelle/GM0678_kapelle.derived.ad +++ b/datasets/GM0678_kapelle/GM0678_kapelle.derived.ad @@ -1,6 +1,6 @@ - area = GM0678_kapelle -- id = 129342 -- parent_id = 129342 +- id = 129684 +- parent_id = 129684 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0678_kapelle/graph_values.yml b/datasets/GM0678_kapelle/graph_values.yml index 1985c88f74..c90019e52a 100644 --- a/datasets/GM0678_kapelle/graph_values.yml +++ b/datasets/GM0678_kapelle/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18997396668860758 - :network_gas: 0.14511588963108954 - :ambient_heat: 0.6649101436803029 + :electricity: 0.18997396811736816 + :network_gas: 0.1451158832016573 + :ambient_heat: 0.6649101486809744 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5456.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0687_middelburg/GM0687_middelburg.derived.ad b/datasets/GM0687_middelburg/GM0687_middelburg.derived.ad index 306409a6be..e7f8151875 100644 --- a/datasets/GM0687_middelburg/GM0687_middelburg.derived.ad +++ b/datasets/GM0687_middelburg/GM0687_middelburg.derived.ad @@ -1,6 +1,6 @@ - area = GM0687_middelburg -- id = 129373 -- parent_id = 129373 +- id = 129715 +- parent_id = 129715 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0687_middelburg/graph_values.yml b/datasets/GM0687_middelburg/graph_values.yml index fa6a5241e8..889b4ed8ba 100644 --- a/datasets/GM0687_middelburg/graph_values.yml +++ b/datasets/GM0687_middelburg/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1835280833066845 - :network_gas: 0.17412240761115289 - :ambient_heat: 0.6423495090821626 + :electricity: 0.18352808496286477 + :network_gas: 0.17412240015833072 + :ambient_heat: 0.6423495148788045 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 23882.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0703_reimerswaal/GM0703_reimerswaal.derived.ad b/datasets/GM0703_reimerswaal/GM0703_reimerswaal.derived.ad index 52b4622685..6b5ce07611 100644 --- a/datasets/GM0703_reimerswaal/GM0703_reimerswaal.derived.ad +++ b/datasets/GM0703_reimerswaal/GM0703_reimerswaal.derived.ad @@ -1,6 +1,6 @@ - area = GM0703_reimerswaal -- id = 129419 -- parent_id = 129419 +- id = 129761 +- parent_id = 129761 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0703_reimerswaal/graph_values.yml b/datasets/GM0703_reimerswaal/graph_values.yml index 8adecd87d7..43cb74bf90 100644 --- a/datasets/GM0703_reimerswaal/graph_values.yml +++ b/datasets/GM0703_reimerswaal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1854122057701358 - :network_gas: 0.16564384402652335 - :ambient_heat: 0.6489439502033408 + :electricity: 0.18541220736184613 + :network_gas: 0.16564383686381634 + :ambient_heat: 0.6489439557743375 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9322.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0715_terneuzen/GM0715_terneuzen.derived.ad b/datasets/GM0715_terneuzen/GM0715_terneuzen.derived.ad index 6046babffd..64af8122c1 100644 --- a/datasets/GM0715_terneuzen/GM0715_terneuzen.derived.ad +++ b/datasets/GM0715_terneuzen/GM0715_terneuzen.derived.ad @@ -1,6 +1,6 @@ - area = GM0715_terneuzen -- id = 129457 -- parent_id = 129457 +- id = 129799 +- parent_id = 129799 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0715_terneuzen/graph_values.yml b/datasets/GM0715_terneuzen/graph_values.yml index 93a46cb191..b3e07685a2 100644 --- a/datasets/GM0715_terneuzen/graph_values.yml +++ b/datasets/GM0715_terneuzen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18163710083956855 - :network_gas: 0.18263184125778203 - :ambient_heat: 0.6357310579026494 + :electricity: 0.1816371025587886 + :network_gas: 0.18263183352128035 + :ambient_heat: 0.6357310639199311 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 27046.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0716_tholen/GM0716_tholen.derived.ad b/datasets/GM0716_tholen/GM0716_tholen.derived.ad index 046d30035c..2ca779d323 100644 --- a/datasets/GM0716_tholen/GM0716_tholen.derived.ad +++ b/datasets/GM0716_tholen/GM0716_tholen.derived.ad @@ -1,6 +1,6 @@ - area = GM0716_tholen -- id = 129461 -- parent_id = 129461 +- id = 129803 +- parent_id = 129803 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0716_tholen/graph_values.yml b/datasets/GM0716_tholen/graph_values.yml index dd96fbfd5b..ad8cf20e15 100644 --- a/datasets/GM0716_tholen/graph_values.yml +++ b/datasets/GM0716_tholen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18922439395380508 - :network_gas: 0.14848897191029883 - :ambient_heat: 0.6622866341358962 + :electricity: 0.1892243954100074 + :network_gas: 0.14848896535737852 + :ambient_heat: 0.662286639232614 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11102.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0717_veere/GM0717_veere.derived.ad b/datasets/GM0717_veere/GM0717_veere.derived.ad index 33d11bc53a..f8e7dacb26 100644 --- a/datasets/GM0717_veere/GM0717_veere.derived.ad +++ b/datasets/GM0717_veere/GM0717_veere.derived.ad @@ -1,6 +1,6 @@ - area = GM0717_veere -- id = 129478 -- parent_id = 129478 +- id = 129820 +- parent_id = 129820 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0717_veere/graph_values.yml b/datasets/GM0717_veere/graph_values.yml index 51fe6f1ffb..14088f16e6 100644 --- a/datasets/GM0717_veere/graph_values.yml +++ b/datasets/GM0717_veere/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18529818534883186 - :network_gas: 0.1661569366787923 - :ambient_heat: 0.6485448779723758 + :electricity: 0.18529818694449074 + :network_gas: 0.16615692949831676 + :ambient_heat: 0.6485448835571924 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10972.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0718_vlissingen/GM0718_vlissingen.derived.ad b/datasets/GM0718_vlissingen/GM0718_vlissingen.derived.ad index 4348fa119e..162f12c0f9 100644 --- a/datasets/GM0718_vlissingen/GM0718_vlissingen.derived.ad +++ b/datasets/GM0718_vlissingen/GM0718_vlissingen.derived.ad @@ -1,6 +1,6 @@ - area = GM0718_vlissingen -- id = 129485 -- parent_id = 129485 +- id = 129827 +- parent_id = 129827 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0718_vlissingen/graph_values.yml b/datasets/GM0718_vlissingen/graph_values.yml index 5d58dfbd63..24ed34e819 100644 --- a/datasets/GM0718_vlissingen/graph_values.yml +++ b/datasets/GM0718_vlissingen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1855500919964024 - :network_gas: 0.16502335509359878 - :ambient_heat: 0.6494265529099987 + :electricity: 0.1855500935833296 + :network_gas: 0.165023347952416 + :ambient_heat: 0.6494265584642545 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22881.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0736_de_ronde_venen/GM0736_de_ronde_venen.derived.ad b/datasets/GM0736_de_ronde_venen/GM0736_de_ronde_venen.derived.ad index c91376be71..9ef2217795 100644 --- a/datasets/GM0736_de_ronde_venen/GM0736_de_ronde_venen.derived.ad +++ b/datasets/GM0736_de_ronde_venen/GM0736_de_ronde_venen.derived.ad @@ -1,6 +1,6 @@ - area = GM0736_de_ronde_venen -- id = 129261 -- parent_id = 129261 +- id = 129603 +- parent_id = 129603 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0736_de_ronde_venen/graph_values.yml b/datasets/GM0736_de_ronde_venen/graph_values.yml index 65340be439..62684e5df8 100644 --- a/datasets/GM0736_de_ronde_venen/graph_values.yml +++ b/datasets/GM0736_de_ronde_venen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1882926898288056 - :network_gas: 0.15268164665363762 - :ambient_heat: 0.6590256635175568 + :electricity: 0.1882926913187522 + :network_gas: 0.15268163994886802 + :ambient_heat: 0.6590256687323798 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18550.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0737_tytsjerksteradiel/GM0737_tytsjerksteradiel.derived.ad b/datasets/GM0737_tytsjerksteradiel/GM0737_tytsjerksteradiel.derived.ad index 4ea6e051af..617b0d1811 100644 --- a/datasets/GM0737_tytsjerksteradiel/GM0737_tytsjerksteradiel.derived.ad +++ b/datasets/GM0737_tytsjerksteradiel/GM0737_tytsjerksteradiel.derived.ad @@ -1,6 +1,6 @@ - area = GM0737_tytsjerksteradiel -- id = 129467 -- parent_id = 129467 +- id = 129809 +- parent_id = 129809 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0737_tytsjerksteradiel/graph_values.yml b/datasets/GM0737_tytsjerksteradiel/graph_values.yml index d34100fc14..af63cf4dd3 100644 --- a/datasets/GM0737_tytsjerksteradiel/graph_values.yml +++ b/datasets/GM0737_tytsjerksteradiel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18392006654389098 - :network_gas: 0.17235848044334226 - :ambient_heat: 0.6437214530127667 + :electricity: 0.18392006818679496 + :network_gas: 0.17235847305026342 + :ambient_heat: 0.6437214587629416 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14018.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0743_asten/GM0743_asten.derived.ad b/datasets/GM0743_asten/GM0743_asten.derived.ad index 77352f4201..2f85c8b6b0 100644 --- a/datasets/GM0743_asten/GM0743_asten.derived.ad +++ b/datasets/GM0743_asten/GM0743_asten.derived.ad @@ -1,6 +1,6 @@ - area = GM0743_asten -- id = 129219 -- parent_id = 129219 +- id = 129561 +- parent_id = 129561 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0743_asten/graph_values.yml b/datasets/GM0743_asten/graph_values.yml index 33b096ecd0..d998d48651 100644 --- a/datasets/GM0743_asten/graph_values.yml +++ b/datasets/GM0743_asten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18978264799720335 - :network_gas: 0.1459768250115997 - :ambient_heat: 0.6642405269911971 + :electricity: 0.189782649432993 + :network_gas: 0.1459768185505366 + :ambient_heat: 0.6642405320164704 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7040.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0744_baarle_nassau/GM0744_baarle_nassau.derived.ad b/datasets/GM0744_baarle_nassau/GM0744_baarle_nassau.derived.ad index f937df9484..1605bc8e10 100644 --- a/datasets/GM0744_baarle_nassau/GM0744_baarle_nassau.derived.ad +++ b/datasets/GM0744_baarle_nassau/GM0744_baarle_nassau.derived.ad @@ -1,6 +1,6 @@ - area = GM0744_baarle_nassau -- id = 129220 -- parent_id = 129220 +- id = 129562 +- parent_id = 129562 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0744_baarle_nassau/graph_values.yml b/datasets/GM0744_baarle_nassau/graph_values.yml index af025e868f..23e26a3867 100644 --- a/datasets/GM0744_baarle_nassau/graph_values.yml +++ b/datasets/GM0744_baarle_nassau/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18575818906333766 - :network_gas: 0.16408691691189323 - :ambient_heat: 0.6501548940247692 + :electricity: 0.18575819064302934 + :network_gas: 0.16408690980327012 + :ambient_heat: 0.6501548995537006 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 2911.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0748_bergen_op_zoom/GM0748_bergen_op_zoom.derived.ad b/datasets/GM0748_bergen_op_zoom/GM0748_bergen_op_zoom.derived.ad index e834c1da87..ca18bd8210 100644 --- a/datasets/GM0748_bergen_op_zoom/GM0748_bergen_op_zoom.derived.ad +++ b/datasets/GM0748_bergen_op_zoom/GM0748_bergen_op_zoom.derived.ad @@ -1,6 +1,6 @@ - area = GM0748_bergen_op_zoom -- id = 129230 -- parent_id = 129230 +- id = 129572 +- parent_id = 129572 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0748_bergen_op_zoom/graph_values.yml b/datasets/GM0748_bergen_op_zoom/graph_values.yml index b3e763dd2a..024f1fed6a 100644 --- a/datasets/GM0748_bergen_op_zoom/graph_values.yml +++ b/datasets/GM0748_bergen_op_zoom/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18880240148039268 - :network_gas: 0.15038794084011473 - :ambient_heat: 0.6608096576794927 + :electricity: 0.18880240295192882 + :network_gas: 0.15038793421819227 + :ambient_heat: 0.660809662829879 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 30883.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0753_best/GM0753_best.derived.ad b/datasets/GM0753_best/GM0753_best.derived.ad index c268712072..839c38b2dc 100644 --- a/datasets/GM0753_best/GM0753_best.derived.ad +++ b/datasets/GM0753_best/GM0753_best.derived.ad @@ -1,6 +1,6 @@ - area = GM0753_best -- id = 129233 -- parent_id = 129233 +- id = 129575 +- parent_id = 129575 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0753_best/graph_values.yml b/datasets/GM0753_best/graph_values.yml index 1057cbe093..6f19fa13d2 100644 --- a/datasets/GM0753_best/graph_values.yml +++ b/datasets/GM0753_best/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1906889869281303 - :network_gas: 0.14189829380985752 - :ambient_heat: 0.6674127192620122 + :electricity: 0.1906889883304699 + :network_gas: 0.1418982874993201 + :ambient_heat: 0.6674127241702101 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12967.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0755_boekel/GM0755_boekel.derived.ad b/datasets/GM0755_boekel/GM0755_boekel.derived.ad index 5bdf7fe716..d53db0d508 100644 --- a/datasets/GM0755_boekel/GM0755_boekel.derived.ad +++ b/datasets/GM0755_boekel/GM0755_boekel.derived.ad @@ -1,6 +1,6 @@ - area = GM0755_boekel -- id = 129240 -- parent_id = 129240 +- id = 129582 +- parent_id = 129582 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0755_boekel/graph_values.yml b/datasets/GM0755_boekel/graph_values.yml index 8d7591a4f0..431b4ec664 100644 --- a/datasets/GM0755_boekel/graph_values.yml +++ b/datasets/GM0755_boekel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1913554618756593 - :network_gas: 0.1388991521246423 - :ambient_heat: 0.6697453859996985 + :electricity: 0.19135546325315694 + :network_gas: 0.13889914592589372 + :ambient_heat: 0.6697453908209494 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4373.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0757_boxtel/GM0757_boxtel.derived.ad b/datasets/GM0757_boxtel/GM0757_boxtel.derived.ad index 44eb07ac35..328e2d56d9 100644 --- a/datasets/GM0757_boxtel/GM0757_boxtel.derived.ad +++ b/datasets/GM0757_boxtel/GM0757_boxtel.derived.ad @@ -1,6 +1,6 @@ - area = GM0757_boxtel -- id = 129244 -- parent_id = 129244 +- id = 129586 +- parent_id = 129586 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0757_boxtel/graph_values.yml b/datasets/GM0757_boxtel/graph_values.yml index a2909e90fd..2a2a334427 100644 --- a/datasets/GM0757_boxtel/graph_values.yml +++ b/datasets/GM0757_boxtel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18889402115282355 - :network_gas: 0.1499756517063789 - :ambient_heat: 0.6611303271407974 + :electricity: 0.18889402262103763 + :network_gas: 0.1499756450994059 + :ambient_heat: 0.6611303322795564 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14342.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0758_breda/GM0758_breda.derived.ad b/datasets/GM0758_breda/GM0758_breda.derived.ad index 69b11edfa7..3341ff13f0 100644 --- a/datasets/GM0758_breda/GM0758_breda.derived.ad +++ b/datasets/GM0758_breda/GM0758_breda.derived.ad @@ -1,6 +1,6 @@ - area = GM0758_breda -- id = 129245 -- parent_id = 129245 +- id = 129587 +- parent_id = 129587 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0758_breda/graph_values.yml b/datasets/GM0758_breda/graph_values.yml index 85eedf05cb..d2ead3d5bb 100644 --- a/datasets/GM0758_breda/graph_values.yml +++ b/datasets/GM0758_breda/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19159076227801455 - :network_gas: 0.137840298753082 - :ambient_heat: 0.6705689389689035 + :electricity: 0.1915907636466922 + :network_gas: 0.1378402925940234 + :ambient_heat: 0.6705689437592844 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 85127.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0762_deurne/GM0762_deurne.derived.ad b/datasets/GM0762_deurne/GM0762_deurne.derived.ad index 3c3b29dbca..a0fbaa6f72 100644 --- a/datasets/GM0762_deurne/GM0762_deurne.derived.ad +++ b/datasets/GM0762_deurne/GM0762_deurne.derived.ad @@ -1,6 +1,6 @@ - area = GM0762_deurne -- id = 129266 -- parent_id = 129266 +- id = 129608 +- parent_id = 129608 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0762_deurne/graph_values.yml b/datasets/GM0762_deurne/graph_values.yml index 12b3043ecf..92d8ee258f 100644 --- a/datasets/GM0762_deurne/graph_values.yml +++ b/datasets/GM0762_deurne/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.188393727502391 - :network_gas: 0.15222697645222846 - :ambient_heat: 0.6593792960453806 + :electricity: 0.18839372898869783 + :network_gas: 0.15222696976383793 + :ambient_heat: 0.6593793012474642 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13959.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0765_pekela/GM0765_pekela.derived.ad b/datasets/GM0765_pekela/GM0765_pekela.derived.ad index 01a3be458a..abcfb52519 100644 --- a/datasets/GM0765_pekela/GM0765_pekela.derived.ad +++ b/datasets/GM0765_pekela/GM0765_pekela.derived.ad @@ -1,6 +1,6 @@ - area = GM0765_pekela -- id = 129414 -- parent_id = 129414 +- id = 129756 +- parent_id = 129756 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0765_pekela/graph_values.yml b/datasets/GM0765_pekela/graph_values.yml index 45c544b00d..7650751237 100644 --- a/datasets/GM0765_pekela/graph_values.yml +++ b/datasets/GM0765_pekela/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1761275741117888 - :network_gas: 0.2074247480824946 - :ambient_heat: 0.6164476778057165 + :electricity: 0.17612757600517118 + :network_gas: 0.2074247395622612 + :ambient_heat: 0.6164476844325675 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5751.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0766_dongen/GM0766_dongen.derived.ad b/datasets/GM0766_dongen/GM0766_dongen.derived.ad index 223f6619a7..7a62b025d0 100644 --- a/datasets/GM0766_dongen/GM0766_dongen.derived.ad +++ b/datasets/GM0766_dongen/GM0766_dongen.derived.ad @@ -1,6 +1,6 @@ - area = GM0766_dongen -- id = 129272 -- parent_id = 129272 +- id = 129614 +- parent_id = 129614 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0766_dongen/graph_values.yml b/datasets/GM0766_dongen/graph_values.yml index 33e1326e00..936750d41a 100644 --- a/datasets/GM0766_dongen/graph_values.yml +++ b/datasets/GM0766_dongen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18747505866169187 - :network_gas: 0.156360992329741 - :ambient_heat: 0.6561639490085672 + :electricity: 0.18747506018091764 + :network_gas: 0.1563609854932148 + :ambient_heat: 0.6561639543258675 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11447.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0770_eersel/GM0770_eersel.derived.ad b/datasets/GM0770_eersel/GM0770_eersel.derived.ad index 1da5ec62be..a48dc6d9b2 100644 --- a/datasets/GM0770_eersel/GM0770_eersel.derived.ad +++ b/datasets/GM0770_eersel/GM0770_eersel.derived.ad @@ -1,6 +1,6 @@ - area = GM0770_eersel -- id = 129283 -- parent_id = 129283 +- id = 129625 +- parent_id = 129625 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0770_eersel/graph_values.yml b/datasets/GM0770_eersel/graph_values.yml index 4687b1305c..db35e0c6a0 100644 --- a/datasets/GM0770_eersel/graph_values.yml +++ b/datasets/GM0770_eersel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18941076315203456 - :network_gas: 0.14765030928190953 - :ambient_heat: 0.6629389275660558 + :electricity: 0.1894107646014385 + :network_gas: 0.1476503027595824 + :ambient_heat: 0.6629389326389792 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8482.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0772_eindhoven/GM0772_eindhoven.derived.ad b/datasets/GM0772_eindhoven/GM0772_eindhoven.derived.ad index dcbdb63629..02f809a9c1 100644 --- a/datasets/GM0772_eindhoven/GM0772_eindhoven.derived.ad +++ b/datasets/GM0772_eindhoven/GM0772_eindhoven.derived.ad @@ -1,6 +1,6 @@ - area = GM0772_eindhoven -- id = 129285 -- parent_id = 129285 +- id = 129627 +- parent_id = 129627 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0772_eindhoven/graph_values.yml b/datasets/GM0772_eindhoven/graph_values.yml index 8a75a36ab5..76e198d77a 100644 --- a/datasets/GM0772_eindhoven/graph_values.yml +++ b/datasets/GM0772_eindhoven/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18716963210244647 - :network_gas: 0.15773541387251735 - :ambient_heat: 0.6550949540250361 + :electricity: 0.18716963363252953 + :network_gas: 0.15773540698713343 + :ambient_heat: 0.6550949593803369 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 114315.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0777_etten_leur/GM0777_etten_leur.derived.ad b/datasets/GM0777_etten_leur/GM0777_etten_leur.derived.ad index 556ec28a34..238428730c 100644 --- a/datasets/GM0777_etten_leur/GM0777_etten_leur.derived.ad +++ b/datasets/GM0777_etten_leur/GM0777_etten_leur.derived.ad @@ -1,6 +1,6 @@ - area = GM0777_etten_leur -- id = 129292 -- parent_id = 129292 +- id = 129634 +- parent_id = 129634 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0777_etten_leur/graph_values.yml b/datasets/GM0777_etten_leur/graph_values.yml index f0321ac8d4..649cf9b8ff 100644 --- a/datasets/GM0777_etten_leur/graph_values.yml +++ b/datasets/GM0777_etten_leur/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19177054196813018 - :network_gas: 0.13703128895491942 - :ambient_heat: 0.6711981690769505 + :electricity: 0.19177054333005156 + :network_gas: 0.137031282826264 + :ambient_heat: 0.6711981738436844 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19146.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0779_geertruidenberg/GM0779_geertruidenberg.derived.ad b/datasets/GM0779_geertruidenberg/GM0779_geertruidenberg.derived.ad index 8dea5e62e9..ebde6f88fe 100644 --- a/datasets/GM0779_geertruidenberg/GM0779_geertruidenberg.derived.ad +++ b/datasets/GM0779_geertruidenberg/GM0779_geertruidenberg.derived.ad @@ -1,6 +1,6 @@ - area = GM0779_geertruidenberg -- id = 129293 -- parent_id = 129293 +- id = 129635 +- parent_id = 129635 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0779_geertruidenberg/graph_values.yml b/datasets/GM0779_geertruidenberg/graph_values.yml index 1926c89369..d34d943b26 100644 --- a/datasets/GM0779_geertruidenberg/graph_values.yml +++ b/datasets/GM0779_geertruidenberg/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19027133676351096 - :network_gas: 0.14377772232129804 - :ambient_heat: 0.665950940915191 + :electricity: 0.1902713381813123 + :network_gas: 0.14377771594118266 + :ambient_heat: 0.6659509458775051 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9636.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0784_gilze_en_rijen/GM0784_gilze_en_rijen.derived.ad b/datasets/GM0784_gilze_en_rijen/GM0784_gilze_en_rijen.derived.ad index 5be6758808..94a5bf261d 100644 --- a/datasets/GM0784_gilze_en_rijen/GM0784_gilze_en_rijen.derived.ad +++ b/datasets/GM0784_gilze_en_rijen/GM0784_gilze_en_rijen.derived.ad @@ -1,6 +1,6 @@ - area = GM0784_gilze_en_rijen -- id = 129297 -- parent_id = 129297 +- id = 129639 +- parent_id = 129639 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0784_gilze_en_rijen/graph_values.yml b/datasets/GM0784_gilze_en_rijen/graph_values.yml index 13d3a7a9e3..276a6932e9 100644 --- a/datasets/GM0784_gilze_en_rijen/graph_values.yml +++ b/datasets/GM0784_gilze_en_rijen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18979789800804414 - :network_gas: 0.14590819986164894 - :ambient_heat: 0.664293902130307 + :electricity: 0.18979789944327413 + :network_gas: 0.14590819340310432 + :ambient_heat: 0.6642939071536216 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11376.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0785_goirle/GM0785_goirle.derived.ad b/datasets/GM0785_goirle/GM0785_goirle.derived.ad index 0b1cf153c1..27a4b5f091 100644 --- a/datasets/GM0785_goirle/GM0785_goirle.derived.ad +++ b/datasets/GM0785_goirle/GM0785_goirle.derived.ad @@ -1,6 +1,6 @@ - area = GM0785_goirle -- id = 129300 -- parent_id = 129300 +- id = 129642 +- parent_id = 129642 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0785_goirle/graph_values.yml b/datasets/GM0785_goirle/graph_values.yml index 3c6986ff7b..d0cf9eec31 100644 --- a/datasets/GM0785_goirle/graph_values.yml +++ b/datasets/GM0785_goirle/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19082743292445786 - :network_gas: 0.14127528590794522 - :ambient_heat: 0.667897281167597 + :electricity: 0.1908274343216541 + :network_gas: 0.1412752796205528 + :ambient_heat: 0.6678972860577931 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10411.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0794_helmond/GM0794_helmond.derived.ad b/datasets/GM0794_helmond/GM0794_helmond.derived.ad index 2dd5bd9565..a0cfb39aa1 100644 --- a/datasets/GM0794_helmond/GM0794_helmond.derived.ad +++ b/datasets/GM0794_helmond/GM0794_helmond.derived.ad @@ -1,6 +1,6 @@ - area = GM0794_helmond -- id = 129323 -- parent_id = 129323 +- id = 129665 +- parent_id = 129665 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0794_helmond/graph_values.yml b/datasets/GM0794_helmond/graph_values.yml index 895f3cee1c..a5699e1e73 100644 --- a/datasets/GM0794_helmond/graph_values.yml +++ b/datasets/GM0794_helmond/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19284282171027697 - :network_gas: 0.13220602300185144 - :ambient_heat: 0.6749511552878715 + :electricity: 0.19284282303158823 + :network_gas: 0.1322060170559421 + :ambient_heat: 0.6749511599124697 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 41212.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0796_s_hertogenbosch/GM0796_s_hertogenbosch.derived.ad b/datasets/GM0796_s_hertogenbosch/GM0796_s_hertogenbosch.derived.ad index 3ca204f82e..679d0401b5 100644 --- a/datasets/GM0796_s_hertogenbosch/GM0796_s_hertogenbosch.derived.ad +++ b/datasets/GM0796_s_hertogenbosch/GM0796_s_hertogenbosch.derived.ad @@ -1,6 +1,6 @@ - area = GM0796_s_hertogenbosch -- id = 129439 -- parent_id = 129439 +- id = 129781 +- parent_id = 129781 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0796_s_hertogenbosch/graph_values.yml b/datasets/GM0796_s_hertogenbosch/graph_values.yml index ad0a40a0a7..3c65b9132a 100644 --- a/datasets/GM0796_s_hertogenbosch/graph_values.yml +++ b/datasets/GM0796_s_hertogenbosch/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18914526069179877 - :network_gas: 0.1488450721142902 - :ambient_heat: 0.6620096671939111 + :electricity: 0.1891452621508829 + :network_gas: 0.14884506554840193 + :ambient_heat: 0.6620096723007152 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 73387.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0797_heusden/GM0797_heusden.derived.ad b/datasets/GM0797_heusden/GM0797_heusden.derived.ad index 22696c6aff..37d0ce2944 100644 --- a/datasets/GM0797_heusden/GM0797_heusden.derived.ad +++ b/datasets/GM0797_heusden/GM0797_heusden.derived.ad @@ -1,6 +1,6 @@ - area = GM0797_heusden -- id = 129327 -- parent_id = 129327 +- id = 129669 +- parent_id = 129669 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0797_heusden/graph_values.yml b/datasets/GM0797_heusden/graph_values.yml index 11e0aba936..6f73454195 100644 --- a/datasets/GM0797_heusden/graph_values.yml +++ b/datasets/GM0797_heusden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18952796991183804 - :network_gas: 0.14712287808525468 - :ambient_heat: 0.6633491520029071 + :electricity: 0.18952797135695817 + :network_gas: 0.14712287158220483 + :ambient_heat: 0.6633491570608371 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19327.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0798_hilvarenbeek/GM0798_hilvarenbeek.derived.ad b/datasets/GM0798_hilvarenbeek/GM0798_hilvarenbeek.derived.ad index 149b7937c6..9094e738ba 100644 --- a/datasets/GM0798_hilvarenbeek/GM0798_hilvarenbeek.derived.ad +++ b/datasets/GM0798_hilvarenbeek/GM0798_hilvarenbeek.derived.ad @@ -1,6 +1,6 @@ - area = GM0798_hilvarenbeek -- id = 129329 -- parent_id = 129329 +- id = 129671 +- parent_id = 129671 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0798_hilvarenbeek/graph_values.yml b/datasets/GM0798_hilvarenbeek/graph_values.yml index 5de908ee95..a5a1210dd0 100644 --- a/datasets/GM0798_hilvarenbeek/graph_values.yml +++ b/datasets/GM0798_hilvarenbeek/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18488650656599318 - :network_gas: 0.16800949393260634 - :ambient_heat: 0.6471039995014004 + :electricity: 0.18488650817585817 + :network_gas: 0.1680094866882033 + :ambient_heat: 0.6471040051359386 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6840.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0809_loon_op_zand/GM0809_loon_op_zand.derived.ad b/datasets/GM0809_loon_op_zand/GM0809_loon_op_zand.derived.ad index c013aaa5de..536de2ac5f 100644 --- a/datasets/GM0809_loon_op_zand/GM0809_loon_op_zand.derived.ad +++ b/datasets/GM0809_loon_op_zand/GM0809_loon_op_zand.derived.ad @@ -1,6 +1,6 @@ - area = GM0809_loon_op_zand -- id = 129363 -- parent_id = 129363 +- id = 129705 +- parent_id = 129705 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0809_loon_op_zand/graph_values.yml b/datasets/GM0809_loon_op_zand/graph_values.yml index 25eaa71e59..713c18eb00 100644 --- a/datasets/GM0809_loon_op_zand/graph_values.yml +++ b/datasets/GM0809_loon_op_zand/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1867825875194615 - :network_gas: 0.15947711706356876 - :ambient_heat: 0.6537402954169698 + :electricity: 0.18678258906324063 + :network_gas: 0.15947711011655227 + :ambient_heat: 0.653740300820207 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10472.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0820_nuenen_gerwen_en_nederwetten/GM0820_nuenen_gerwen_en_nederwetten.derived.ad b/datasets/GM0820_nuenen_gerwen_en_nederwetten/GM0820_nuenen_gerwen_en_nederwetten.derived.ad index e639a50bdc..623b76f52c 100644 --- a/datasets/GM0820_nuenen_gerwen_en_nederwetten/GM0820_nuenen_gerwen_en_nederwetten.derived.ad +++ b/datasets/GM0820_nuenen_gerwen_en_nederwetten/GM0820_nuenen_gerwen_en_nederwetten.derived.ad @@ -1,6 +1,6 @@ - area = GM0820_nuenen_gerwen_en_nederwetten -- id = 129391 -- parent_id = 129391 +- id = 129733 +- parent_id = 129733 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0820_nuenen_gerwen_en_nederwetten/graph_values.yml b/datasets/GM0820_nuenen_gerwen_en_nederwetten/graph_values.yml index f3ae3e1aa0..b855b3642a 100644 --- a/datasets/GM0820_nuenen_gerwen_en_nederwetten/graph_values.yml +++ b/datasets/GM0820_nuenen_gerwen_en_nederwetten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18723697411400242 - :network_gas: 0.15743237437377477 - :ambient_heat: 0.6553306515122227 + :electricity: 0.18723697564169536 + :network_gas: 0.15743236749914644 + :ambient_heat: 0.6553306568591581 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10435.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0823_oirschot/GM0823_oirschot.derived.ad b/datasets/GM0823_oirschot/GM0823_oirschot.derived.ad index 3533871e20..bced3ddcbd 100644 --- a/datasets/GM0823_oirschot/GM0823_oirschot.derived.ad +++ b/datasets/GM0823_oirschot/GM0823_oirschot.derived.ad @@ -1,6 +1,6 @@ - area = GM0823_oirschot -- id = 129394 -- parent_id = 129394 +- id = 129736 +- parent_id = 129736 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0823_oirschot/graph_values.yml b/datasets/GM0823_oirschot/graph_values.yml index 9840fe7a42..c34d16afed 100644 --- a/datasets/GM0823_oirschot/graph_values.yml +++ b/datasets/GM0823_oirschot/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1904260171043947 - :network_gas: 0.14308165976118573 - :ambient_heat: 0.6664923231344195 + :electricity: 0.19042601851647914 + :network_gas: 0.1430816534067965 + :ambient_heat: 0.6664923280767244 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8010.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0824_oisterwijk/GM0824_oisterwijk.derived.ad b/datasets/GM0824_oisterwijk/GM0824_oisterwijk.derived.ad index 570069bb6e..cb886e95d3 100644 --- a/datasets/GM0824_oisterwijk/GM0824_oisterwijk.derived.ad +++ b/datasets/GM0824_oisterwijk/GM0824_oisterwijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0824_oisterwijk -- id = 129395 -- parent_id = 129395 +- id = 129737 +- parent_id = 129737 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0824_oisterwijk/graph_values.yml b/datasets/GM0824_oisterwijk/graph_values.yml index d19908646b..3279491539 100644 --- a/datasets/GM0824_oisterwijk/graph_values.yml +++ b/datasets/GM0824_oisterwijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18774576995513761 - :network_gas: 0.15514278971336068 - :ambient_heat: 0.6571114403315017 + :electricity: 0.18774577146470384 + :network_gas: 0.1551427829203027 + :ambient_heat: 0.6571114456149935 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14096.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0826_oosterhout/GM0826_oosterhout.derived.ad b/datasets/GM0826_oosterhout/GM0826_oosterhout.derived.ad index b9570889c3..8f1b691b0e 100644 --- a/datasets/GM0826_oosterhout/GM0826_oosterhout.derived.ad +++ b/datasets/GM0826_oosterhout/GM0826_oosterhout.derived.ad @@ -1,6 +1,6 @@ - area = GM0826_oosterhout -- id = 129402 -- parent_id = 129402 +- id = 129744 +- parent_id = 129744 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0826_oosterhout/graph_values.yml b/datasets/GM0826_oosterhout/graph_values.yml index 5008402e57..5426857657 100644 --- a/datasets/GM0826_oosterhout/graph_values.yml +++ b/datasets/GM0826_oosterhout/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18976756120288907 - :network_gas: 0.14604471568609823 - :ambient_heat: 0.6641877231110127 + :electricity: 0.1897675626392323 + :network_gas: 0.14604470922254414 + :ambient_heat: 0.6641877281382236 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 25176.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0828_oss/GM0828_oss.derived.ad b/datasets/GM0828_oss/GM0828_oss.derived.ad index 76bc0cd009..6e624d3557 100644 --- a/datasets/GM0828_oss/GM0828_oss.derived.ad +++ b/datasets/GM0828_oss/GM0828_oss.derived.ad @@ -1,6 +1,6 @@ - area = GM0828_oss -- id = 129407 -- parent_id = 129407 +- id = 129749 +- parent_id = 129749 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0828_oss/graph_values.yml b/datasets/GM0828_oss/graph_values.yml index 045fb1d828..dd17b31112 100644 --- a/datasets/GM0828_oss/graph_values.yml +++ b/datasets/GM0828_oss/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18860684284884513 - :network_gas: 0.151267955979397 - :ambient_heat: 0.660125201171758 + :electricity: 0.18860684432745903 + :network_gas: 0.15126794932562446 + :ambient_heat: 0.6601252063469164 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 40708.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0840_rucphen/GM0840_rucphen.derived.ad b/datasets/GM0840_rucphen/GM0840_rucphen.derived.ad index d685564b7a..c292a73743 100644 --- a/datasets/GM0840_rucphen/GM0840_rucphen.derived.ad +++ b/datasets/GM0840_rucphen/GM0840_rucphen.derived.ad @@ -1,6 +1,6 @@ - area = GM0840_rucphen -- id = 129433 -- parent_id = 129433 +- id = 129775 +- parent_id = 129775 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0840_rucphen/graph_values.yml b/datasets/GM0840_rucphen/graph_values.yml index 312182563c..e83a69a177 100644 --- a/datasets/GM0840_rucphen/graph_values.yml +++ b/datasets/GM0840_rucphen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1891411344585748 - :network_gas: 0.14886364019117104 - :ambient_heat: 0.6619952253502541 + :electricity: 0.18914113591780912 + :network_gas: 0.14886363362460692 + :ambient_heat: 0.6619952304575839 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9868.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0845_sint_michielsgestel/GM0845_sint_michielsgestel.derived.ad b/datasets/GM0845_sint_michielsgestel/GM0845_sint_michielsgestel.derived.ad index 058822343e..32b16d9721 100644 --- a/datasets/GM0845_sint_michielsgestel/GM0845_sint_michielsgestel.derived.ad +++ b/datasets/GM0845_sint_michielsgestel/GM0845_sint_michielsgestel.derived.ad @@ -1,6 +1,6 @@ - area = GM0845_sint_michielsgestel -- id = 129441 -- parent_id = 129441 +- id = 129783 +- parent_id = 129783 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0845_sint_michielsgestel/graph_values.yml b/datasets/GM0845_sint_michielsgestel/graph_values.yml index 52fe02e360..81d1e7c73a 100644 --- a/datasets/GM0845_sint_michielsgestel/graph_values.yml +++ b/datasets/GM0845_sint_michielsgestel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18894237372128603 - :network_gas: 0.14975806482753123 - :ambient_heat: 0.6612995614511827 + :electricity: 0.1889423751877453 + :network_gas: 0.14975805822845495 + :ambient_heat: 0.6612995665837998 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12248.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0847_someren/GM0847_someren.derived.ad b/datasets/GM0847_someren/GM0847_someren.derived.ad index 043fcb0814..f5c9785c58 100644 --- a/datasets/GM0847_someren/GM0847_someren.derived.ad +++ b/datasets/GM0847_someren/GM0847_someren.derived.ad @@ -1,6 +1,6 @@ - area = GM0847_someren -- id = 129447 -- parent_id = 129447 +- id = 129789 +- parent_id = 129789 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0847_someren/graph_values.yml b/datasets/GM0847_someren/graph_values.yml index b32b07723a..be610d8765 100644 --- a/datasets/GM0847_someren/graph_values.yml +++ b/datasets/GM0847_someren/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18886148651856394 - :network_gas: 0.15012205777637908 - :ambient_heat: 0.661016455705057 + :electricity: 0.18886148798795815 + :network_gas: 0.15012205116409544 + :ambient_heat: 0.6610164608479464 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8163.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0848_son_en_breugel/GM0848_son_en_breugel.derived.ad b/datasets/GM0848_son_en_breugel/GM0848_son_en_breugel.derived.ad index d540fb542f..86cd4f53c4 100644 --- a/datasets/GM0848_son_en_breugel/GM0848_son_en_breugel.derived.ad +++ b/datasets/GM0848_son_en_breugel/GM0848_son_en_breugel.derived.ad @@ -1,6 +1,6 @@ - area = GM0848_son_en_breugel -- id = 129448 -- parent_id = 129448 +- id = 129790 +- parent_id = 129790 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0848_son_en_breugel/graph_values.yml b/datasets/GM0848_son_en_breugel/graph_values.yml index 822b4eb8ca..04c7db6f8c 100644 --- a/datasets/GM0848_son_en_breugel/graph_values.yml +++ b/datasets/GM0848_son_en_breugel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18787297849952841 - :network_gas: 0.15457035041971212 - :ambient_heat: 0.6575566710807595 + :electricity: 0.18787298000454375 + :network_gas: 0.15457034364713318 + :ambient_heat: 0.6575566763483232 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7308.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0851_steenbergen/GM0851_steenbergen.derived.ad b/datasets/GM0851_steenbergen/GM0851_steenbergen.derived.ad index ac52d48866..7cc0eb0fc1 100644 --- a/datasets/GM0851_steenbergen/GM0851_steenbergen.derived.ad +++ b/datasets/GM0851_steenbergen/GM0851_steenbergen.derived.ad @@ -1,6 +1,6 @@ - area = GM0851_steenbergen -- id = 129452 -- parent_id = 129452 +- id = 129794 +- parent_id = 129794 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0851_steenbergen/graph_values.yml b/datasets/GM0851_steenbergen/graph_values.yml index 8663029dec..5beb6e22a9 100644 --- a/datasets/GM0851_steenbergen/graph_values.yml +++ b/datasets/GM0851_steenbergen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18966299681903656 - :network_gas: 0.14651525610710525 - :ambient_heat: 0.6638217470738582 + :electricity: 0.1896629982592135 + :network_gas: 0.14651524962629925 + :ambient_heat: 0.6638217521144871 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10458.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0852_waterland/GM0852_waterland.derived.ad b/datasets/GM0852_waterland/GM0852_waterland.derived.ad index f216c6f601..a43dff48af 100644 --- a/datasets/GM0852_waterland/GM0852_waterland.derived.ad +++ b/datasets/GM0852_waterland/GM0852_waterland.derived.ad @@ -1,6 +1,6 @@ - area = GM0852_waterland -- id = 129495 -- parent_id = 129495 +- id = 129837 +- parent_id = 129837 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0852_waterland/graph_values.yml b/datasets/GM0852_waterland/graph_values.yml index a22d401d9e..9533362463 100644 --- a/datasets/GM0852_waterland/graph_values.yml +++ b/datasets/GM0852_waterland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18407964203955207 - :network_gas: 0.17164038965425796 - :ambient_heat: 0.6442799683061899 + :electricity: 0.18407964367703075 + :network_gas: 0.1716403822855929 + :ambient_heat: 0.6442799740373764 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7391.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0855_tilburg/GM0855_tilburg.derived.ad b/datasets/GM0855_tilburg/GM0855_tilburg.derived.ad index 8791685469..d4cda105f7 100644 --- a/datasets/GM0855_tilburg/GM0855_tilburg.derived.ad +++ b/datasets/GM0855_tilburg/GM0855_tilburg.derived.ad @@ -1,6 +1,6 @@ - area = GM0855_tilburg -- id = 129463 -- parent_id = 129463 +- id = 129805 +- parent_id = 129805 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0855_tilburg/graph_values.yml b/datasets/GM0855_tilburg/graph_values.yml index b8d8d7cebe..b3a671e4e6 100644 --- a/datasets/GM0855_tilburg/graph_values.yml +++ b/datasets/GM0855_tilburg/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1951778568436938 - :network_gas: 0.12169834941106322 - :ambient_heat: 0.683123793745243 + :electricity: 0.1951778580747153 + :network_gas: 0.12169834387145825 + :ambient_heat: 0.6831237980538264 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 102395.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0858_valkenswaard/GM0858_valkenswaard.derived.ad b/datasets/GM0858_valkenswaard/GM0858_valkenswaard.derived.ad index 91ec4c35ec..f44b83f205 100644 --- a/datasets/GM0858_valkenswaard/GM0858_valkenswaard.derived.ad +++ b/datasets/GM0858_valkenswaard/GM0858_valkenswaard.derived.ad @@ -1,6 +1,6 @@ - area = GM0858_valkenswaard -- id = 129475 -- parent_id = 129475 +- id = 129817 +- parent_id = 129817 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0858_valkenswaard/graph_values.yml b/datasets/GM0858_valkenswaard/graph_values.yml index d91eaf44fb..9cef8914bb 100644 --- a/datasets/GM0858_valkenswaard/graph_values.yml +++ b/datasets/GM0858_valkenswaard/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18815212544560306 - :network_gas: 0.1533141873105406 - :ambient_heat: 0.6585336872438564 + :electricity: 0.18815212694060543 + :network_gas: 0.15331418058302 + :ambient_heat: 0.6585336924763746 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14873.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0861_veldhoven/GM0861_veldhoven.derived.ad b/datasets/GM0861_veldhoven/GM0861_veldhoven.derived.ad index 5d67e624eb..28121841fb 100644 --- a/datasets/GM0861_veldhoven/GM0861_veldhoven.derived.ad +++ b/datasets/GM0861_veldhoven/GM0861_veldhoven.derived.ad @@ -1,6 +1,6 @@ - area = GM0861_veldhoven -- id = 129479 -- parent_id = 129479 +- id = 129821 +- parent_id = 129821 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0861_veldhoven/graph_values.yml b/datasets/GM0861_veldhoven/graph_values.yml index f3485a247d..383da5f37b 100644 --- a/datasets/GM0861_veldhoven/graph_values.yml +++ b/datasets/GM0861_veldhoven/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18901644079848212 - :network_gas: 0.14942476248879463 - :ambient_heat: 0.6615587967127233 + :electricity: 0.18901644226225117 + :network_gas: 0.1494247559018241 + :ambient_heat: 0.6615588018359246 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20078.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0865_vught/GM0865_vught.derived.ad b/datasets/GM0865_vught/GM0865_vught.derived.ad index cb358b0cdb..5fe963699b 100644 --- a/datasets/GM0865_vught/GM0865_vught.derived.ad +++ b/datasets/GM0865_vught/GM0865_vught.derived.ad @@ -1,6 +1,6 @@ - area = GM0865_vught -- id = 129489 -- parent_id = 129489 +- id = 129831 +- parent_id = 129831 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0865_vught/graph_values.yml b/datasets/GM0865_vught/graph_values.yml index 0d2d401abc..97c3aefb79 100644 --- a/datasets/GM0865_vught/graph_values.yml +++ b/datasets/GM0865_vught/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18629899008536058 - :network_gas: 0.16165330872516465 - :ambient_heat: 0.6520477011894747 + :electricity: 0.1862989916461543 + :network_gas: 0.16165330170158254 + :ambient_heat: 0.6520477066522631 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13714.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0866_waalre/GM0866_waalre.derived.ad b/datasets/GM0866_waalre/GM0866_waalre.derived.ad index 8cc85f362b..12696ee545 100644 --- a/datasets/GM0866_waalre/GM0866_waalre.derived.ad +++ b/datasets/GM0866_waalre/GM0866_waalre.derived.ad @@ -1,6 +1,6 @@ - area = GM0866_waalre -- id = 129490 -- parent_id = 129490 +- id = 129832 +- parent_id = 129832 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0866_waalre/graph_values.yml b/datasets/GM0866_waalre/graph_values.yml index e1b8f4d427..0335877404 100644 --- a/datasets/GM0866_waalre/graph_values.yml +++ b/datasets/GM0866_waalre/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1863315475509772 - :network_gas: 0.1615067999139067 - :ambient_heat: 0.6521616525351162 + :electricity: 0.18633154911062882 + :network_gas: 0.16150679289546385 + :ambient_heat: 0.6521616579939072 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7789.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0867_waalwijk/GM0867_waalwijk.derived.ad b/datasets/GM0867_waalwijk/GM0867_waalwijk.derived.ad index 73e513021a..aa10f765ec 100644 --- a/datasets/GM0867_waalwijk/GM0867_waalwijk.derived.ad +++ b/datasets/GM0867_waalwijk/GM0867_waalwijk.derived.ad @@ -1,6 +1,6 @@ - area = GM0867_waalwijk -- id = 129491 -- parent_id = 129491 +- id = 129833 +- parent_id = 129833 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0867_waalwijk/graph_values.yml b/datasets/GM0867_waalwijk/graph_values.yml index 53f8f8a0f3..1015a1b958 100644 --- a/datasets/GM0867_waalwijk/graph_values.yml +++ b/datasets/GM0867_waalwijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1879883214775672 - :network_gas: 0.1540513062533627 - :ambient_heat: 0.6579603722690701 + :electricity: 0.18798832297844958 + :network_gas: 0.15405129949938196 + :ambient_heat: 0.6579603775221684 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 21972.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0873_woensdrecht/GM0873_woensdrecht.derived.ad b/datasets/GM0873_woensdrecht/GM0873_woensdrecht.derived.ad index 7def67b406..c6a518d55c 100644 --- a/datasets/GM0873_woensdrecht/GM0873_woensdrecht.derived.ad +++ b/datasets/GM0873_woensdrecht/GM0873_woensdrecht.derived.ad @@ -1,6 +1,6 @@ - area = GM0873_woensdrecht -- id = 129507 -- parent_id = 129507 +- id = 129849 +- parent_id = 129849 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0873_woensdrecht/graph_values.yml b/datasets/GM0873_woensdrecht/graph_values.yml index 2f5bae1ef5..40d8af292e 100644 --- a/datasets/GM0873_woensdrecht/graph_values.yml +++ b/datasets/GM0873_woensdrecht/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18842962182857867 - :network_gas: 0.15206545174626437 - :ambient_heat: 0.659504926425157 + :electricity: 0.18842962331359125 + :network_gas: 0.15206544506369776 + :ambient_heat: 0.659504931622711 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9912.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0879_zundert/GM0879_zundert.derived.ad b/datasets/GM0879_zundert/GM0879_zundert.derived.ad index 6a2e878de6..0966e097bf 100644 --- a/datasets/GM0879_zundert/GM0879_zundert.derived.ad +++ b/datasets/GM0879_zundert/GM0879_zundert.derived.ad @@ -1,6 +1,6 @@ - area = GM0879_zundert -- id = 129520 -- parent_id = 129520 +- id = 129862 +- parent_id = 129862 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0879_zundert/graph_values.yml b/datasets/GM0879_zundert/graph_values.yml index 888e8bf010..2b81374f8c 100644 --- a/datasets/GM0879_zundert/graph_values.yml +++ b/datasets/GM0879_zundert/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18710336015430282 - :network_gas: 0.15803363807880605 - :ambient_heat: 0.6548630017668912 + :electricity: 0.18710336168673597 + :network_gas: 0.15803363118284675 + :ambient_heat: 0.6548630071304173 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9626.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0880_wormerland/GM0880_wormerland.derived.ad b/datasets/GM0880_wormerland/GM0880_wormerland.derived.ad index 5cd8a6bd2f..f2fdb0bc4a 100644 --- a/datasets/GM0880_wormerland/GM0880_wormerland.derived.ad +++ b/datasets/GM0880_wormerland/GM0880_wormerland.derived.ad @@ -1,6 +1,6 @@ - area = GM0880_wormerland -- id = 129509 -- parent_id = 129509 +- id = 129851 +- parent_id = 129851 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0880_wormerland/graph_values.yml b/datasets/GM0880_wormerland/graph_values.yml index f16fee0c86..13cd0be11f 100644 --- a/datasets/GM0880_wormerland/graph_values.yml +++ b/datasets/GM0880_wormerland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1868975030837415 - :network_gas: 0.1589599962619692 - :ambient_heat: 0.6541425006542892 + :electricity: 0.18689750462346152 + :network_gas: 0.15895998933321892 + :ambient_heat: 0.6541425060433196 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6911.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0882_landgraaf/GM0882_landgraaf.derived.ad b/datasets/GM0882_landgraaf/GM0882_landgraaf.derived.ad index d4f439e04c..235cad2798 100644 --- a/datasets/GM0882_landgraaf/GM0882_landgraaf.derived.ad +++ b/datasets/GM0882_landgraaf/GM0882_landgraaf.derived.ad @@ -1,6 +1,6 @@ - area = GM0882_landgraaf -- id = 129349 -- parent_id = 129349 +- id = 129691 +- parent_id = 129691 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0882_landgraaf/graph_values.yml b/datasets/GM0882_landgraaf/graph_values.yml index e31561f776..e86cb0c790 100644 --- a/datasets/GM0882_landgraaf/graph_values.yml +++ b/datasets/GM0882_landgraaf/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1868297113852374 - :network_gas: 0.15926505935496174 - :ambient_heat: 0.6539052292598009 + :electricity: 0.18682971292735276 + :network_gas: 0.15926505241543243 + :ambient_heat: 0.6539052346572148 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18136.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0888_beek/GM0888_beek.derived.ad b/datasets/GM0888_beek/GM0888_beek.derived.ad index f21867f4e5..74bceacdeb 100644 --- a/datasets/GM0888_beek/GM0888_beek.derived.ad +++ b/datasets/GM0888_beek/GM0888_beek.derived.ad @@ -1,6 +1,6 @@ - area = GM0888_beek -- id = 129224 -- parent_id = 129224 +- id = 129566 +- parent_id = 129566 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0888_beek/graph_values.yml b/datasets/GM0888_beek/graph_values.yml index ab2df3eea8..ff28e274ad 100644 --- a/datasets/GM0888_beek/graph_values.yml +++ b/datasets/GM0888_beek/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18734826124593634 - :network_gas: 0.15693158154180348 - :ambient_heat: 0.6557201572122602 + :electricity: 0.18734826276967478 + :network_gas: 0.1569315746849703 + :ambient_heat: 0.6557201625453549 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7484.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0889_beesel/GM0889_beesel.derived.ad b/datasets/GM0889_beesel/GM0889_beesel.derived.ad index 8814a42f0b..dd3b2d0b07 100644 --- a/datasets/GM0889_beesel/GM0889_beesel.derived.ad +++ b/datasets/GM0889_beesel/GM0889_beesel.derived.ad @@ -1,6 +1,6 @@ - area = GM0889_beesel -- id = 129225 -- parent_id = 129225 +- id = 129567 +- parent_id = 129567 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0889_beesel/graph_values.yml b/datasets/GM0889_beesel/graph_values.yml index 6c47e44e88..41e76a8528 100644 --- a/datasets/GM0889_beesel/graph_values.yml +++ b/datasets/GM0889_beesel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18913222888862463 - :network_gas: 0.14890371531502544 - :ambient_heat: 0.6619640557963498 + :electricity: 0.18913223034818305 + :network_gas: 0.14890370874700284 + :ambient_heat: 0.6619640609048141 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6031.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0893_bergen/GM0893_bergen.derived.ad b/datasets/GM0893_bergen/GM0893_bergen.derived.ad index ae9b4422d9..17bd5a4005 100644 --- a/datasets/GM0893_bergen/GM0893_bergen.derived.ad +++ b/datasets/GM0893_bergen/GM0893_bergen.derived.ad @@ -1,6 +1,6 @@ - area = GM0893_bergen -- id = 129228 -- parent_id = 129228 +- id = 129570 +- parent_id = 129570 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0893_bergen/graph_values.yml b/datasets/GM0893_bergen/graph_values.yml index edcf7ec9bb..c19b923539 100644 --- a/datasets/GM0893_bergen/graph_values.yml +++ b/datasets/GM0893_bergen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.189163141084866 - :network_gas: 0.14876461022687076 - :ambient_heat: 0.6620722486882633 + :electricity: 0.18916314254329925 + :network_gas: 0.14876460366391148 + :ambient_heat: 0.6620722537927893 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5772.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0899_brunssum/GM0899_brunssum.derived.ad b/datasets/GM0899_brunssum/GM0899_brunssum.derived.ad index 7b102fdc56..de482fc449 100644 --- a/datasets/GM0899_brunssum/GM0899_brunssum.derived.ad +++ b/datasets/GM0899_brunssum/GM0899_brunssum.derived.ad @@ -1,6 +1,6 @@ - area = GM0899_brunssum -- id = 129248 -- parent_id = 129248 +- id = 129590 +- parent_id = 129590 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0899_brunssum/graph_values.yml b/datasets/GM0899_brunssum/graph_values.yml index 0ca37a403f..3465ed61da 100644 --- a/datasets/GM0899_brunssum/graph_values.yml +++ b/datasets/GM0899_brunssum/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18810767385112878 - :network_gas: 0.15351421978056268 - :ambient_heat: 0.6583781063683085 + :electricity: 0.18810767534772804 + :network_gas: 0.15351421304585602 + :ambient_heat: 0.6583781116064159 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14436.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0907_gennep/GM0907_gennep.derived.ad b/datasets/GM0907_gennep/GM0907_gennep.derived.ad index 38bed9e8ac..2b09156f42 100644 --- a/datasets/GM0907_gennep/GM0907_gennep.derived.ad +++ b/datasets/GM0907_gennep/GM0907_gennep.derived.ad @@ -1,6 +1,6 @@ - area = GM0907_gennep -- id = 129296 -- parent_id = 129296 +- id = 129638 +- parent_id = 129638 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0907_gennep/graph_values.yml b/datasets/GM0907_gennep/graph_values.yml index cc3be8bc1f..182946c63d 100644 --- a/datasets/GM0907_gennep/graph_values.yml +++ b/datasets/GM0907_gennep/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1876909652376238 - :network_gas: 0.15538941130574252 - :ambient_heat: 0.6569196234566337 + :electricity: 0.1876909667491483 + :network_gas: 0.15538940450387212 + :ambient_heat: 0.6569196287469796 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7484.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0917_heerlen/GM0917_heerlen.derived.ad b/datasets/GM0917_heerlen/GM0917_heerlen.derived.ad index a8f05681be..60e2575b30 100644 --- a/datasets/GM0917_heerlen/GM0917_heerlen.derived.ad +++ b/datasets/GM0917_heerlen/GM0917_heerlen.derived.ad @@ -1,6 +1,6 @@ - area = GM0917_heerlen -- id = 129319 -- parent_id = 129319 +- id = 129661 +- parent_id = 129661 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0917_heerlen/graph_values.yml b/datasets/GM0917_heerlen/graph_values.yml index 078e7a4cb2..b429badc8d 100644 --- a/datasets/GM0917_heerlen/graph_values.yml +++ b/datasets/GM0917_heerlen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1860902718458124 - :network_gas: 0.16259254218774938 - :ambient_heat: 0.6513171859664382 + :electricity: 0.18609027341391585 + :network_gas: 0.16259253513127359 + :ambient_heat: 0.6513171914548106 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 45956.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0928_kerkrade/GM0928_kerkrade.derived.ad b/datasets/GM0928_kerkrade/GM0928_kerkrade.derived.ad index b3f8b77f74..a416e345e2 100644 --- a/datasets/GM0928_kerkrade/GM0928_kerkrade.derived.ad +++ b/datasets/GM0928_kerkrade/GM0928_kerkrade.derived.ad @@ -1,6 +1,6 @@ - area = GM0928_kerkrade -- id = 129344 -- parent_id = 129344 +- id = 129686 +- parent_id = 129686 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0928_kerkrade/graph_values.yml b/datasets/GM0928_kerkrade/graph_values.yml index a184afae09..9015715bf9 100644 --- a/datasets/GM0928_kerkrade/graph_values.yml +++ b/datasets/GM0928_kerkrade/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18493368466478105 - :network_gas: 0.16779719217508574 - :ambient_heat: 0.6472691231601332 + :electricity: 0.184933686273022 + :network_gas: 0.16779718493799067 + :ambient_heat: 0.6472691287889872 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 23908.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0935_maastricht/GM0935_maastricht.derived.ad b/datasets/GM0935_maastricht/GM0935_maastricht.derived.ad index 1fa468c6f2..c3cfd23792 100644 --- a/datasets/GM0935_maastricht/GM0935_maastricht.derived.ad +++ b/datasets/GM0935_maastricht/GM0935_maastricht.derived.ad @@ -1,6 +1,6 @@ - area = GM0935_maastricht -- id = 129369 -- parent_id = 129369 +- id = 129711 +- parent_id = 129711 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0935_maastricht/graph_values.yml b/datasets/GM0935_maastricht/graph_values.yml index 630a6d1b37..2ee81e9d89 100644 --- a/datasets/GM0935_maastricht/graph_values.yml +++ b/datasets/GM0935_maastricht/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18372264217288928 - :network_gas: 0.17324689142254548 - :ambient_heat: 0.6430304664045653 + :electricity: 0.18372264382248887 + :network_gas: 0.17324688399933633 + :ambient_heat: 0.6430304721781748 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 62599.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0938_meerssen/GM0938_meerssen.derived.ad b/datasets/GM0938_meerssen/GM0938_meerssen.derived.ad index d31a9b747f..aab3899846 100644 --- a/datasets/GM0938_meerssen/GM0938_meerssen.derived.ad +++ b/datasets/GM0938_meerssen/GM0938_meerssen.derived.ad @@ -1,6 +1,6 @@ - area = GM0938_meerssen -- id = 129371 -- parent_id = 129371 +- id = 129713 +- parent_id = 129713 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0938_meerssen/graph_values.yml b/datasets/GM0938_meerssen/graph_values.yml index d1f113559d..25e93a3fbd 100644 --- a/datasets/GM0938_meerssen/graph_values.yml +++ b/datasets/GM0938_meerssen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18694104853998011 - :network_gas: 0.1587640414200188 - :ambient_heat: 0.6542949100400011 + :electricity: 0.18694105007816036 + :network_gas: 0.15876403449819748 + :ambient_heat: 0.6542949154236422 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8632.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0944_mook_en_middelaar/GM0944_mook_en_middelaar.derived.ad b/datasets/GM0944_mook_en_middelaar/GM0944_mook_en_middelaar.derived.ad index fd2a3b520b..45cb028a99 100644 --- a/datasets/GM0944_mook_en_middelaar/GM0944_mook_en_middelaar.derived.ad +++ b/datasets/GM0944_mook_en_middelaar/GM0944_mook_en_middelaar.derived.ad @@ -1,6 +1,6 @@ - area = GM0944_mook_en_middelaar -- id = 129379 -- parent_id = 129379 +- id = 129721 +- parent_id = 129721 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0944_mook_en_middelaar/graph_values.yml b/datasets/GM0944_mook_en_middelaar/graph_values.yml index 455659baeb..08e91dff97 100644 --- a/datasets/GM0944_mook_en_middelaar/graph_values.yml +++ b/datasets/GM0944_mook_en_middelaar/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18695794689020812 - :network_gas: 0.1586879987318908 - :ambient_heat: 0.6543540543779011 + :electricity: 0.1869579484277906 + :network_gas: 0.15868799181275942 + :ambient_heat: 0.65435405975945 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 3661.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0946_nederweert/GM0946_nederweert.derived.ad b/datasets/GM0946_nederweert/GM0946_nederweert.derived.ad index b34498470e..302f55f064 100644 --- a/datasets/GM0946_nederweert/GM0946_nederweert.derived.ad +++ b/datasets/GM0946_nederweert/GM0946_nederweert.derived.ad @@ -1,6 +1,6 @@ - area = GM0946_nederweert -- id = 129381 -- parent_id = 129381 +- id = 129723 +- parent_id = 129723 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0946_nederweert/graph_values.yml b/datasets/GM0946_nederweert/graph_values.yml index 7b0c4b717e..3730a8871c 100644 --- a/datasets/GM0946_nederweert/graph_values.yml +++ b/datasets/GM0946_nederweert/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19074043489973774 - :network_gas: 0.1416667775963228 - :ambient_heat: 0.6675927875039395 + :electricity: 0.19074043630016707 + :network_gas: 0.14166677129438157 + :ambient_heat: 0.6675927924054513 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7513.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0957_roermond/GM0957_roermond.derived.ad b/datasets/GM0957_roermond/GM0957_roermond.derived.ad index a9b0e6f65a..1d0802b8e6 100644 --- a/datasets/GM0957_roermond/GM0957_roermond.derived.ad +++ b/datasets/GM0957_roermond/GM0957_roermond.derived.ad @@ -1,6 +1,6 @@ - area = GM0957_roermond -- id = 129429 -- parent_id = 129429 +- id = 129771 +- parent_id = 129771 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0957_roermond/graph_values.yml b/datasets/GM0957_roermond/graph_values.yml index 002f16a437..8b1727cb9a 100644 --- a/datasets/GM0957_roermond/graph_values.yml +++ b/datasets/GM0957_roermond/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18768884238127995 - :network_gas: 0.15539896417337265 - :ambient_heat: 0.6569121934453475 + :electricity: 0.18768884389288032 + :network_gas: 0.15539895737116105 + :ambient_heat: 0.6569121987359587 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 27685.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0965_simpelveld/GM0965_simpelveld.derived.ad b/datasets/GM0965_simpelveld/GM0965_simpelveld.derived.ad index 3cbbcf3be9..e4087ddb2e 100644 --- a/datasets/GM0965_simpelveld/GM0965_simpelveld.derived.ad +++ b/datasets/GM0965_simpelveld/GM0965_simpelveld.derived.ad @@ -1,6 +1,6 @@ - area = GM0965_simpelveld -- id = 129440 -- parent_id = 129440 +- id = 129782 +- parent_id = 129782 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0965_simpelveld/graph_values.yml b/datasets/GM0965_simpelveld/graph_values.yml index 90ea31ad4f..992607f095 100644 --- a/datasets/GM0965_simpelveld/graph_values.yml +++ b/datasets/GM0965_simpelveld/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.184120707029933 - :network_gas: 0.17145559692512236 - :ambient_heat: 0.6444236960449446 + :electricity: 0.18412070866601363 + :network_gas: 0.17145558956274853 + :ambient_heat: 0.6444237017712379 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5176.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0971_stein/GM0971_stein.derived.ad b/datasets/GM0971_stein/GM0971_stein.derived.ad index dee2eaf22a..58751b9df6 100644 --- a/datasets/GM0971_stein/GM0971_stein.derived.ad +++ b/datasets/GM0971_stein/GM0971_stein.derived.ad @@ -1,6 +1,6 @@ - area = GM0971_stein -- id = 129454 -- parent_id = 129454 +- id = 129796 +- parent_id = 129796 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0971_stein/graph_values.yml b/datasets/GM0971_stein/graph_values.yml index 276da8a99e..43bad6667b 100644 --- a/datasets/GM0971_stein/graph_values.yml +++ b/datasets/GM0971_stein/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18995326270193288 - :network_gas: 0.14520905770847403 - :ambient_heat: 0.6648376795895931 + :electricity: 0.189953264131455 + :network_gas: 0.1452090512756151 + :ambient_heat: 0.6648376845929299 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11803.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0981_vaals/GM0981_vaals.derived.ad b/datasets/GM0981_vaals/GM0981_vaals.derived.ad index 898d84e143..355f9e8a9c 100644 --- a/datasets/GM0981_vaals/GM0981_vaals.derived.ad +++ b/datasets/GM0981_vaals/GM0981_vaals.derived.ad @@ -1,6 +1,6 @@ - area = GM0981_vaals -- id = 129473 -- parent_id = 129473 +- id = 129815 +- parent_id = 129815 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0981_vaals/graph_values.yml b/datasets/GM0981_vaals/graph_values.yml index b11c2a881b..2e67345df8 100644 --- a/datasets/GM0981_vaals/graph_values.yml +++ b/datasets/GM0981_vaals/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17933050471885326 - :network_gas: 0.19301153910275162 - :ambient_heat: 0.6276579561783951 + :electricity: 0.1793305065127104 + :network_gas: 0.19301153103038254 + :ambient_heat: 0.627657962456907 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5816.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0983_venlo/GM0983_venlo.derived.ad b/datasets/GM0983_venlo/GM0983_venlo.derived.ad index 9f2086befa..e9207d1819 100644 --- a/datasets/GM0983_venlo/GM0983_venlo.derived.ad +++ b/datasets/GM0983_venlo/GM0983_venlo.derived.ad @@ -1,6 +1,6 @@ - area = GM0983_venlo -- id = 129481 -- parent_id = 129481 +- id = 129823 +- parent_id = 129823 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0983_venlo/graph_values.yml b/datasets/GM0983_venlo/graph_values.yml index 8cbc056c45..954cbc57c3 100644 --- a/datasets/GM0983_venlo/graph_values.yml +++ b/datasets/GM0983_venlo/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1872779725511167 - :network_gas: 0.15724788113478058 - :ambient_heat: 0.6554741463141026 + :electricity: 0.1872779740773535 + :network_gas: 0.15724787426670503 + :ambient_heat: 0.6554741516559416 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 47741.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0984_venray/GM0984_venray.derived.ad b/datasets/GM0984_venray/GM0984_venray.derived.ad index 27158e05ce..ab1addcbe2 100644 --- a/datasets/GM0984_venray/GM0984_venray.derived.ad +++ b/datasets/GM0984_venray/GM0984_venray.derived.ad @@ -1,6 +1,6 @@ - area = GM0984_venray -- id = 129482 -- parent_id = 129482 +- id = 129824 +- parent_id = 129824 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0984_venray/graph_values.yml b/datasets/GM0984_venray/graph_values.yml index cdec114b3e..921c35dc1a 100644 --- a/datasets/GM0984_venray/graph_values.yml +++ b/datasets/GM0984_venray/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18899013697286135 - :network_gas: 0.1495431298785852 - :ambient_heat: 0.6614667331485534 + :electricity: 0.1889901384375861 + :network_gas: 0.1495431232873142 + :ambient_heat: 0.6614667382750997 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19163.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0986_voerendaal/GM0986_voerendaal.derived.ad b/datasets/GM0986_voerendaal/GM0986_voerendaal.derived.ad index 3681377669..634d84d099 100644 --- a/datasets/GM0986_voerendaal/GM0986_voerendaal.derived.ad +++ b/datasets/GM0986_voerendaal/GM0986_voerendaal.derived.ad @@ -1,6 +1,6 @@ - area = GM0986_voerendaal -- id = 129486 -- parent_id = 129486 +- id = 129828 +- parent_id = 129828 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0986_voerendaal/graph_values.yml b/datasets/GM0986_voerendaal/graph_values.yml index cc599a24b8..7e9e5c7926 100644 --- a/datasets/GM0986_voerendaal/graph_values.yml +++ b/datasets/GM0986_voerendaal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1865118006893575 - :network_gas: 0.16069565959541207 - :ambient_heat: 0.6527925397152303 + :electricity: 0.18651180224267727 + :network_gas: 0.1606956526054628 + :ambient_heat: 0.6527925451518599 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5803.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0988_weert/GM0988_weert.derived.ad b/datasets/GM0988_weert/GM0988_weert.derived.ad index 6204da53ac..045a482814 100644 --- a/datasets/GM0988_weert/GM0988_weert.derived.ad +++ b/datasets/GM0988_weert/GM0988_weert.derived.ad @@ -1,6 +1,6 @@ - area = GM0988_weert -- id = 129496 -- parent_id = 129496 +- id = 129838 +- parent_id = 129838 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0988_weert/graph_values.yml b/datasets/GM0988_weert/graph_values.yml index f336783bda..cc4e8841a6 100644 --- a/datasets/GM0988_weert/graph_values.yml +++ b/datasets/GM0988_weert/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18802860880511604 - :network_gas: 0.15387001301213027 - :ambient_heat: 0.6581013781827536 + :electricity: 0.18802861030455342 + :network_gas: 0.1538700062646521 + :ambient_heat: 0.6581013834307944 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6030.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0994_valkenburg_aan_de_geul/GM0994_valkenburg_aan_de_geul.derived.ad b/datasets/GM0994_valkenburg_aan_de_geul/GM0994_valkenburg_aan_de_geul.derived.ad index 70d196400a..8af0e3b353 100644 --- a/datasets/GM0994_valkenburg_aan_de_geul/GM0994_valkenburg_aan_de_geul.derived.ad +++ b/datasets/GM0994_valkenburg_aan_de_geul/GM0994_valkenburg_aan_de_geul.derived.ad @@ -1,6 +1,6 @@ - area = GM0994_valkenburg_aan_de_geul -- id = 129474 -- parent_id = 129474 +- id = 129816 +- parent_id = 129816 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0994_valkenburg_aan_de_geul/graph_values.yml b/datasets/GM0994_valkenburg_aan_de_geul/graph_values.yml index 28a4f699ba..df6ab8e972 100644 --- a/datasets/GM0994_valkenburg_aan_de_geul/graph_values.yml +++ b/datasets/GM0994_valkenburg_aan_de_geul/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18337091713807246 - :network_gas: 0.17482965641253326 - :ambient_heat: 0.6417994264493944 + :electricity: 0.18337091879955572 + :network_gas: 0.17482964893584754 + :ambient_heat: 0.6417994322645967 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8304.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM0995_lelystad/GM0995_lelystad.derived.ad b/datasets/GM0995_lelystad/GM0995_lelystad.derived.ad index c3a5a9665f..be78c850c3 100644 --- a/datasets/GM0995_lelystad/GM0995_lelystad.derived.ad +++ b/datasets/GM0995_lelystad/GM0995_lelystad.derived.ad @@ -1,6 +1,6 @@ - area = GM0995_lelystad -- id = 129357 -- parent_id = 129357 +- id = 129699 +- parent_id = 129699 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM0995_lelystad/graph_values.yml b/datasets/GM0995_lelystad/graph_values.yml index c5efe3f737..ed928b7fed 100644 --- a/datasets/GM0995_lelystad/graph_values.yml +++ b/datasets/GM0995_lelystad/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19200543184559873 - :network_gas: 0.13597428294807257 - :ambient_heat: 0.6720202852063287 + :electricity: 0.1920054331986701 + :network_gas: 0.1359742768592425 + :ambient_heat: 0.6720202899420875 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 33718.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1507_horst_aan_de_maas/GM1507_horst_aan_de_maas.derived.ad b/datasets/GM1507_horst_aan_de_maas/GM1507_horst_aan_de_maas.derived.ad index 3ff6fcf45f..3da9884983 100644 --- a/datasets/GM1507_horst_aan_de_maas/GM1507_horst_aan_de_maas.derived.ad +++ b/datasets/GM1507_horst_aan_de_maas/GM1507_horst_aan_de_maas.derived.ad @@ -1,6 +1,6 @@ - area = GM1507_horst_aan_de_maas -- id = 129335 -- parent_id = 129335 +- id = 129677 +- parent_id = 129677 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1507_horst_aan_de_maas/graph_values.yml b/datasets/GM1507_horst_aan_de_maas/graph_values.yml index 0343880ddc..758428a6e9 100644 --- a/datasets/GM1507_horst_aan_de_maas/graph_values.yml +++ b/datasets/GM1507_horst_aan_de_maas/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18849083007669698 - :network_gas: 0.15179001422368188 - :ambient_heat: 0.6597191556996211 + :electricity: 0.1884908315595013 + :network_gas: 0.15179000755105265 + :ambient_heat: 0.6597191608894462 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 17884.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1509_oude_ijsselstreek/GM1509_oude_ijsselstreek.derived.ad b/datasets/GM1509_oude_ijsselstreek/GM1509_oude_ijsselstreek.derived.ad index 5a9d7c8550..a47d19a212 100644 --- a/datasets/GM1509_oude_ijsselstreek/GM1509_oude_ijsselstreek.derived.ad +++ b/datasets/GM1509_oude_ijsselstreek/GM1509_oude_ijsselstreek.derived.ad @@ -1,6 +1,6 @@ - area = GM1509_oude_ijsselstreek -- id = 129408 -- parent_id = 129408 +- id = 129750 +- parent_id = 129750 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1509_oude_ijsselstreek/graph_values.yml b/datasets/GM1509_oude_ijsselstreek/graph_values.yml index a4711b8a98..ec53b768e9 100644 --- a/datasets/GM1509_oude_ijsselstreek/graph_values.yml +++ b/datasets/GM1509_oude_ijsselstreek/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1884102084262539 - :network_gas: 0.1521528121855125 - :ambient_heat: 0.6594369793882335 + :electricity: 0.18841020991196655 + :network_gas: 0.15215280549979568 + :ambient_heat: 0.6594369845882377 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 17403.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1525_teylingen/GM1525_teylingen.derived.ad b/datasets/GM1525_teylingen/GM1525_teylingen.derived.ad index 0d62a71c86..b7a9688c84 100644 --- a/datasets/GM1525_teylingen/GM1525_teylingen.derived.ad +++ b/datasets/GM1525_teylingen/GM1525_teylingen.derived.ad @@ -1,6 +1,6 @@ - area = GM1525_teylingen -- id = 129460 -- parent_id = 129460 +- id = 129802 +- parent_id = 129802 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1525_teylingen/graph_values.yml b/datasets/GM1525_teylingen/graph_values.yml index 220d7907c3..72b83740fd 100644 --- a/datasets/GM1525_teylingen/graph_values.yml +++ b/datasets/GM1525_teylingen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18943106532827858 - :network_gas: 0.1475589493541288 - :ambient_heat: 0.6630099853175927 + :electricity: 0.18943106677694088 + :network_gas: 0.14755894283513873 + :ambient_heat: 0.6630099903879203 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16273.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1581_utrechtse_heuvelrug/GM1581_utrechtse_heuvelrug.derived.ad b/datasets/GM1581_utrechtse_heuvelrug/GM1581_utrechtse_heuvelrug.derived.ad index a187385de7..d8951ffc51 100644 --- a/datasets/GM1581_utrechtse_heuvelrug/GM1581_utrechtse_heuvelrug.derived.ad +++ b/datasets/GM1581_utrechtse_heuvelrug/GM1581_utrechtse_heuvelrug.derived.ad @@ -1,6 +1,6 @@ - area = GM1581_utrechtse_heuvelrug -- id = 129472 -- parent_id = 129472 +- id = 129814 +- parent_id = 129814 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1581_utrechtse_heuvelrug/graph_values.yml b/datasets/GM1581_utrechtse_heuvelrug/graph_values.yml index d71a37935d..8eafbe832c 100644 --- a/datasets/GM1581_utrechtse_heuvelrug/graph_values.yml +++ b/datasets/GM1581_utrechtse_heuvelrug/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1842125797837161 - :network_gas: 0.17104216892362265 - :ambient_heat: 0.6447452512926612 + :electricity: 0.18421258141666616 + :network_gas: 0.1710421615753368 + :ambient_heat: 0.6447452570079971 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 21833.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1586_oost_gelre/GM1586_oost_gelre.derived.ad b/datasets/GM1586_oost_gelre/GM1586_oost_gelre.derived.ad index 9ec309f82f..271b11083e 100644 --- a/datasets/GM1586_oost_gelre/GM1586_oost_gelre.derived.ad +++ b/datasets/GM1586_oost_gelre/GM1586_oost_gelre.derived.ad @@ -1,6 +1,6 @@ - area = GM1586_oost_gelre -- id = 129401 -- parent_id = 129401 +- id = 129743 +- parent_id = 129743 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1586_oost_gelre/graph_values.yml b/datasets/GM1586_oost_gelre/graph_values.yml index 1400a74828..41ef8c3858 100644 --- a/datasets/GM1586_oost_gelre/graph_values.yml +++ b/datasets/GM1586_oost_gelre/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18830391159875534 - :network_gas: 0.15263114861441957 - :ambient_heat: 0.659064939786825 + :electricity: 0.18830391308829791 + :network_gas: 0.1526311419114681 + :ambient_heat: 0.659064945000234 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12912.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1598_koggenland/GM1598_koggenland.derived.ad b/datasets/GM1598_koggenland/GM1598_koggenland.derived.ad index 93e8415f5b..c222867ba7 100644 --- a/datasets/GM1598_koggenland/GM1598_koggenland.derived.ad +++ b/datasets/GM1598_koggenland/GM1598_koggenland.derived.ad @@ -1,6 +1,6 @@ - area = GM1598_koggenland -- id = 129345 -- parent_id = 129345 +- id = 129687 +- parent_id = 129687 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1598_koggenland/graph_values.yml b/datasets/GM1598_koggenland/graph_values.yml index d865d8ad3c..52d5cc3198 100644 --- a/datasets/GM1598_koggenland/graph_values.yml +++ b/datasets/GM1598_koggenland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1891550170507623 - :network_gas: 0.14880116843423138 - :ambient_heat: 0.6620438145150063 + :electricity: 0.1891550185094913 + :network_gas: 0.1488011618699412 + :ambient_heat: 0.6620438196205675 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9603.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1621_lansingerland/GM1621_lansingerland.derived.ad b/datasets/GM1621_lansingerland/GM1621_lansingerland.derived.ad index cd4d0a2eb9..66a5429fb7 100644 --- a/datasets/GM1621_lansingerland/GM1621_lansingerland.derived.ad +++ b/datasets/GM1621_lansingerland/GM1621_lansingerland.derived.ad @@ -1,6 +1,6 @@ - area = GM1621_lansingerland -- id = 129351 -- parent_id = 129351 +- id = 129693 +- parent_id = 129693 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1621_lansingerland/graph_values.yml b/datasets/GM1621_lansingerland/graph_values.yml index 69b10ec754..831365ef5c 100644 --- a/datasets/GM1621_lansingerland/graph_values.yml +++ b/datasets/GM1621_lansingerland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19340911858278137 - :network_gas: 0.1296576833188196 - :ambient_heat: 0.6769331980983992 + :electricity: 0.19340911988242893 + :network_gas: 0.1296576774703967 + :ambient_heat: 0.6769332026471744 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 24648.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1640_leudal/GM1640_leudal.derived.ad b/datasets/GM1640_leudal/GM1640_leudal.derived.ad index 0efd62f17d..486c955e04 100644 --- a/datasets/GM1640_leudal/GM1640_leudal.derived.ad +++ b/datasets/GM1640_leudal/GM1640_leudal.derived.ad @@ -1,6 +1,6 @@ - area = GM1640_leudal -- id = 129358 -- parent_id = 129358 +- id = 129700 +- parent_id = 129700 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1640_leudal/graph_values.yml b/datasets/GM1640_leudal/graph_values.yml index a964c1d834..cd33898a91 100644 --- a/datasets/GM1640_leudal/graph_values.yml +++ b/datasets/GM1640_leudal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18945606198529982 - :network_gas: 0.14744646423170757 - :ambient_heat: 0.6630974737829926 + :electricity: 0.18945606343304885 + :network_gas: 0.14744645771682746 + :ambient_heat: 0.6630974788501238 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16118.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1641_maasgouw/GM1641_maasgouw.derived.ad b/datasets/GM1641_maasgouw/GM1641_maasgouw.derived.ad index 3e11b75bdb..88703bc647 100644 --- a/datasets/GM1641_maasgouw/GM1641_maasgouw.derived.ad +++ b/datasets/GM1641_maasgouw/GM1641_maasgouw.derived.ad @@ -1,6 +1,6 @@ - area = GM1641_maasgouw -- id = 129367 -- parent_id = 129367 +- id = 129709 +- parent_id = 129709 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1641_maasgouw/graph_values.yml b/datasets/GM1641_maasgouw/graph_values.yml index 2d7187f947..2eb5ebae62 100644 --- a/datasets/GM1641_maasgouw/graph_values.yml +++ b/datasets/GM1641_maasgouw/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18913545952728683 - :network_gas: 0.1488891774196139 - :ambient_heat: 0.6619753630530993 + :electricity: 0.18913546098672768 + :network_gas: 0.1488891708521204 + :ambient_heat: 0.6619753681611519 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10946.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1652_gemert_bakel/GM1652_gemert_bakel.derived.ad b/datasets/GM1652_gemert_bakel/GM1652_gemert_bakel.derived.ad index c7637fdef1..7c7a3feb2f 100644 --- a/datasets/GM1652_gemert_bakel/GM1652_gemert_bakel.derived.ad +++ b/datasets/GM1652_gemert_bakel/GM1652_gemert_bakel.derived.ad @@ -1,6 +1,6 @@ - area = GM1652_gemert_bakel -- id = 129295 -- parent_id = 129295 +- id = 129637 +- parent_id = 129637 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1652_gemert_bakel/graph_values.yml b/datasets/GM1652_gemert_bakel/graph_values.yml index 32b95e74ec..0380e095a5 100644 --- a/datasets/GM1652_gemert_bakel/graph_values.yml +++ b/datasets/GM1652_gemert_bakel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1897886006254974 - :network_gas: 0.14595003814478696 - :ambient_heat: 0.6642613612297156 + :electricity: 0.18978860206106868 + :network_gas: 0.14595003168470697 + :ambient_heat: 0.6642613662542244 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12601.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1655_halderberge/GM1655_halderberge.derived.ad b/datasets/GM1655_halderberge/GM1655_halderberge.derived.ad index b1c5af9072..d8e0bdf7d9 100644 --- a/datasets/GM1655_halderberge/GM1655_halderberge.derived.ad +++ b/datasets/GM1655_halderberge/GM1655_halderberge.derived.ad @@ -1,6 +1,6 @@ - area = GM1655_halderberge -- id = 129309 -- parent_id = 129309 +- id = 129651 +- parent_id = 129651 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1655_halderberge/graph_values.yml b/datasets/GM1655_halderberge/graph_values.yml index 73861ada05..c90e590c36 100644 --- a/datasets/GM1655_halderberge/graph_values.yml +++ b/datasets/GM1655_halderberge/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18786261003715057 - :network_gas: 0.15461700856919594 - :ambient_heat: 0.6575203813936535 + :electricity: 0.1878626115425371 + :network_gas: 0.15461700179494647 + :ambient_heat: 0.6575203866625164 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13469.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1658_heeze_leende/GM1658_heeze_leende.derived.ad b/datasets/GM1658_heeze_leende/GM1658_heeze_leende.derived.ad index 152cf21c26..d4dd51bac2 100644 --- a/datasets/GM1658_heeze_leende/GM1658_heeze_leende.derived.ad +++ b/datasets/GM1658_heeze_leende/GM1658_heeze_leende.derived.ad @@ -1,6 +1,6 @@ - area = GM1658_heeze_leende -- id = 129320 -- parent_id = 129320 +- id = 129662 +- parent_id = 129662 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1658_heeze_leende/graph_values.yml b/datasets/GM1658_heeze_leende/graph_values.yml index 01afbb0c11..a5f3e7070c 100644 --- a/datasets/GM1658_heeze_leende/graph_values.yml +++ b/datasets/GM1658_heeze_leende/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1884429571756573 - :network_gas: 0.15200544259594498 - :ambient_heat: 0.6595516002283978 + :electricity: 0.18844295866018893 + :network_gas: 0.15200543591554272 + :ambient_heat: 0.6595516054242684 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6905.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1659_laarbeek/GM1659_laarbeek.derived.ad b/datasets/GM1659_laarbeek/GM1659_laarbeek.derived.ad index 8aa586e876..d4f69829ee 100644 --- a/datasets/GM1659_laarbeek/GM1659_laarbeek.derived.ad +++ b/datasets/GM1659_laarbeek/GM1659_laarbeek.derived.ad @@ -1,6 +1,6 @@ - area = GM1659_laarbeek -- id = 129348 -- parent_id = 129348 +- id = 129690 +- parent_id = 129690 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1659_laarbeek/graph_values.yml b/datasets/GM1659_laarbeek/graph_values.yml index ce42f59f17..6942b0847f 100644 --- a/datasets/GM1659_laarbeek/graph_values.yml +++ b/datasets/GM1659_laarbeek/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18862335362094831 - :network_gas: 0.1511936573954017 - :ambient_heat: 0.66018298898365 + :electricity: 0.18862335509896536 + :network_gas: 0.15119365074431512 + :ambient_heat: 0.6601829941567195 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9783.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1667_reusel_de_mierden/GM1667_reusel_de_mierden.derived.ad b/datasets/GM1667_reusel_de_mierden/GM1667_reusel_de_mierden.derived.ad index 502fdd4a9c..27002cc729 100644 --- a/datasets/GM1667_reusel_de_mierden/GM1667_reusel_de_mierden.derived.ad +++ b/datasets/GM1667_reusel_de_mierden/GM1667_reusel_de_mierden.derived.ad @@ -1,6 +1,6 @@ - area = GM1667_reusel_de_mierden -- id = 129422 -- parent_id = 129422 +- id = 129764 +- parent_id = 129764 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1667_reusel_de_mierden/graph_values.yml b/datasets/GM1667_reusel_de_mierden/graph_values.yml index fbef69d9bd..8f7c455b71 100644 --- a/datasets/GM1667_reusel_de_mierden/graph_values.yml +++ b/datasets/GM1667_reusel_de_mierden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19137836597396973 - :network_gas: 0.13879608353030162 - :ambient_heat: 0.6698255504957287 + :electricity: 0.19137836735060998 + :network_gas: 0.13879607733541136 + :ambient_heat: 0.6698255553139787 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 5509.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1669_roerdalen/GM1669_roerdalen.derived.ad b/datasets/GM1669_roerdalen/GM1669_roerdalen.derived.ad index 820d6cdbfa..e9d8403be5 100644 --- a/datasets/GM1669_roerdalen/GM1669_roerdalen.derived.ad +++ b/datasets/GM1669_roerdalen/GM1669_roerdalen.derived.ad @@ -1,6 +1,6 @@ - area = GM1669_roerdalen -- id = 129428 -- parent_id = 129428 +- id = 129770 +- parent_id = 129770 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1669_roerdalen/graph_values.yml b/datasets/GM1669_roerdalen/graph_values.yml index 60384d4abb..060fe397fb 100644 --- a/datasets/GM1669_roerdalen/graph_values.yml +++ b/datasets/GM1669_roerdalen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18883963713249854 - :network_gas: 0.15022038015862013 - :ambient_heat: 0.6609399827088812 + :electricity: 0.18883963860268504 + :network_gas: 0.15022037354277123 + :ambient_heat: 0.6609399878545437 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9538.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1674_roosendaal/GM1674_roosendaal.derived.ad b/datasets/GM1674_roosendaal/GM1674_roosendaal.derived.ad index 46f1bd0602..c272b1ee96 100644 --- a/datasets/GM1674_roosendaal/GM1674_roosendaal.derived.ad +++ b/datasets/GM1674_roosendaal/GM1674_roosendaal.derived.ad @@ -1,6 +1,6 @@ - area = GM1674_roosendaal -- id = 129430 -- parent_id = 129430 +- id = 129772 +- parent_id = 129772 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1674_roosendaal/graph_values.yml b/datasets/GM1674_roosendaal/graph_values.yml index 1f9a7a2531..848039705a 100644 --- a/datasets/GM1674_roosendaal/graph_values.yml +++ b/datasets/GM1674_roosendaal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18535566966516837 - :network_gas: 0.16589825687393242 - :ambient_heat: 0.6487460734608993 + :electricity: 0.18535567125883728 + :network_gas: 0.1658982497024116 + :ambient_heat: 0.6487460790387511 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 35586.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1676_schouwen_duiveland/GM1676_schouwen_duiveland.derived.ad b/datasets/GM1676_schouwen_duiveland/GM1676_schouwen_duiveland.derived.ad index 0002812050..ff80c91253 100644 --- a/datasets/GM1676_schouwen_duiveland/GM1676_schouwen_duiveland.derived.ad +++ b/datasets/GM1676_schouwen_duiveland/GM1676_schouwen_duiveland.derived.ad @@ -1,6 +1,6 @@ - area = GM1676_schouwen_duiveland -- id = 129438 -- parent_id = 129438 +- id = 129780 +- parent_id = 129780 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1676_schouwen_duiveland/graph_values.yml b/datasets/GM1676_schouwen_duiveland/graph_values.yml index f3bd4dafe1..e62531b5da 100644 --- a/datasets/GM1676_schouwen_duiveland/graph_values.yml +++ b/datasets/GM1676_schouwen_duiveland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18647971795877655 - :network_gas: 0.16084003209586045 - :ambient_heat: 0.652680249945363 + :electricity: 0.18647971951322442 + :network_gas: 0.16084002510083464 + :ambient_heat: 0.652680255385941 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16968.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1680_aa_en_hunze/GM1680_aa_en_hunze.derived.ad b/datasets/GM1680_aa_en_hunze/GM1680_aa_en_hunze.derived.ad index 263d376874..6a6ee28419 100644 --- a/datasets/GM1680_aa_en_hunze/GM1680_aa_en_hunze.derived.ad +++ b/datasets/GM1680_aa_en_hunze/GM1680_aa_en_hunze.derived.ad @@ -1,6 +1,6 @@ - area = GM1680_aa_en_hunze -- id = 129201 -- parent_id = 129201 +- id = 129543 +- parent_id = 129543 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1680_aa_en_hunze/graph_values.yml b/datasets/GM1680_aa_en_hunze/graph_values.yml index ff8996c145..2665e8a13b 100644 --- a/datasets/GM1680_aa_en_hunze/graph_values.yml +++ b/datasets/GM1680_aa_en_hunze/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1845847340381508 - :network_gas: 0.16936747230982896 - :ambient_heat: 0.6460477936520204 + :electricity: 0.18458473565837902 + :network_gas: 0.16936746501879113 + :ambient_heat: 0.6460477993228299 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11030.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1681_borger_odoorn/GM1681_borger_odoorn.derived.ad b/datasets/GM1681_borger_odoorn/GM1681_borger_odoorn.derived.ad index e45b5d73fa..dc0b59b3f3 100644 --- a/datasets/GM1681_borger_odoorn/GM1681_borger_odoorn.derived.ad +++ b/datasets/GM1681_borger_odoorn/GM1681_borger_odoorn.derived.ad @@ -1,6 +1,6 @@ - area = GM1681_borger_odoorn -- id = 129241 -- parent_id = 129241 +- id = 129583 +- parent_id = 129583 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1681_borger_odoorn/graph_values.yml b/datasets/GM1681_borger_odoorn/graph_values.yml index 930c8de303..205ad9a0c2 100644 --- a/datasets/GM1681_borger_odoorn/graph_values.yml +++ b/datasets/GM1681_borger_odoorn/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17987377765586163 - :network_gas: 0.19056680728219022 - :ambient_heat: 0.6295594150619481 + :electricity: 0.1798737794323629 + :network_gas: 0.19056679928792267 + :ambient_heat: 0.6295594212797144 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11192.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1690_de_wolden/GM1690_de_wolden.derived.ad b/datasets/GM1690_de_wolden/GM1690_de_wolden.derived.ad index 68c3d69cae..94c59a6dc8 100644 --- a/datasets/GM1690_de_wolden/GM1690_de_wolden.derived.ad +++ b/datasets/GM1690_de_wolden/GM1690_de_wolden.derived.ad @@ -1,6 +1,6 @@ - area = GM1690_de_wolden -- id = 129262 -- parent_id = 129262 +- id = 129604 +- parent_id = 129604 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1690_de_wolden/graph_values.yml b/datasets/GM1690_de_wolden/graph_values.yml index a82a48eca0..03c3474465 100644 --- a/datasets/GM1690_de_wolden/graph_values.yml +++ b/datasets/GM1690_de_wolden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1840109403926962 - :network_gas: 0.17194954752086988 - :ambient_heat: 0.644039512086434 + :electricity: 0.1840109420325121 + :network_gas: 0.1719495401416875 + :ambient_heat: 0.6440395178258004 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10429.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1695_noord_beveland/GM1695_noord_beveland.derived.ad b/datasets/GM1695_noord_beveland/GM1695_noord_beveland.derived.ad index b534a2483a..1b47d85f41 100644 --- a/datasets/GM1695_noord_beveland/GM1695_noord_beveland.derived.ad +++ b/datasets/GM1695_noord_beveland/GM1695_noord_beveland.derived.ad @@ -1,6 +1,6 @@ - area = GM1695_noord_beveland -- id = 129387 -- parent_id = 129387 +- id = 129729 +- parent_id = 129729 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1695_noord_beveland/graph_values.yml b/datasets/GM1695_noord_beveland/graph_values.yml index 239d840087..bca36a1463 100644 --- a/datasets/GM1695_noord_beveland/graph_values.yml +++ b/datasets/GM1695_noord_beveland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18851017077527304 - :network_gas: 0.1517029809517852 - :ambient_heat: 0.6597868482729418 + :electricity: 0.18851017225737918 + :network_gas: 0.15170297428229768 + :ambient_heat: 0.6597868534603232 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4552.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1696_wijdemeren/GM1696_wijdemeren.derived.ad b/datasets/GM1696_wijdemeren/GM1696_wijdemeren.derived.ad index 2e33d50311..dea4748efa 100644 --- a/datasets/GM1696_wijdemeren/GM1696_wijdemeren.derived.ad +++ b/datasets/GM1696_wijdemeren/GM1696_wijdemeren.derived.ad @@ -1,6 +1,6 @@ - area = GM1696_wijdemeren -- id = 129504 -- parent_id = 129504 +- id = 129846 +- parent_id = 129846 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1696_wijdemeren/graph_values.yml b/datasets/GM1696_wijdemeren/graph_values.yml index 0d337738f3..4e7ed31ccb 100644 --- a/datasets/GM1696_wijdemeren/graph_values.yml +++ b/datasets/GM1696_wijdemeren/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18374587549867719 - :network_gas: 0.173142341302372 - :ambient_heat: 0.6431117831989507 + :electricity: 0.1837458771474898 + :network_gas: 0.17314233388270436 + :ambient_heat: 0.6431117889698058 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 10783.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1699_noordenveld/GM1699_noordenveld.derived.ad b/datasets/GM1699_noordenveld/GM1699_noordenveld.derived.ad index f853eeded4..3de81340a4 100644 --- a/datasets/GM1699_noordenveld/GM1699_noordenveld.derived.ad +++ b/datasets/GM1699_noordenveld/GM1699_noordenveld.derived.ad @@ -1,6 +1,6 @@ - area = GM1699_noordenveld -- id = 129388 -- parent_id = 129388 +- id = 129730 +- parent_id = 129730 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1699_noordenveld/graph_values.yml b/datasets/GM1699_noordenveld/graph_values.yml index a3348a8387..ccda5e3dda 100644 --- a/datasets/GM1699_noordenveld/graph_values.yml +++ b/datasets/GM1699_noordenveld/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1816209667715617 - :network_gas: 0.18270444467084473 - :ambient_heat: 0.6356745885575935 + :electricity: 0.18162096849131246 + :network_gas: 0.18270443693195504 + :ambient_heat: 0.6356745945767326 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14831.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1700_twenterand/GM1700_twenterand.derived.ad b/datasets/GM1700_twenterand/GM1700_twenterand.derived.ad index 635684a219..e3d41a442f 100644 --- a/datasets/GM1700_twenterand/GM1700_twenterand.derived.ad +++ b/datasets/GM1700_twenterand/GM1700_twenterand.derived.ad @@ -1,6 +1,6 @@ - area = GM1700_twenterand -- id = 129465 -- parent_id = 129465 +- id = 129807 +- parent_id = 129807 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1700_twenterand/graph_values.yml b/datasets/GM1700_twenterand/graph_values.yml index 828b9db9e9..f5de66efe3 100644 --- a/datasets/GM1700_twenterand/graph_values.yml +++ b/datasets/GM1700_twenterand/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18544723757839363 - :network_gas: 0.1654862006569653 - :ambient_heat: 0.6490665617646411 + :electricity: 0.18544723916888955 + :network_gas: 0.16548619349972304 + :ambient_heat: 0.6490665673313873 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 13808.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1701_westerveld/GM1701_westerveld.derived.ad b/datasets/GM1701_westerveld/GM1701_westerveld.derived.ad index a0f8e811e9..2535364286 100644 --- a/datasets/GM1701_westerveld/GM1701_westerveld.derived.ad +++ b/datasets/GM1701_westerveld/GM1701_westerveld.derived.ad @@ -1,6 +1,6 @@ - area = GM1701_westerveld -- id = 129498 -- parent_id = 129498 +- id = 129840 +- parent_id = 129840 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1701_westerveld/graph_values.yml b/datasets/GM1701_westerveld/graph_values.yml index bedd558c67..b4fdf60ce4 100644 --- a/datasets/GM1701_westerveld/graph_values.yml +++ b/datasets/GM1701_westerveld/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18484321499966241 - :network_gas: 0.1682043062682873 - :ambient_heat: 0.6469524787320504 + :electricity: 0.18484321661101666 + :network_gas: 0.16820429901718237 + :ambient_heat: 0.646952484371801 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8415.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1705_lingewaard/GM1705_lingewaard.derived.ad b/datasets/GM1705_lingewaard/GM1705_lingewaard.derived.ad index a8cfaf474f..1279ae22b8 100644 --- a/datasets/GM1705_lingewaard/GM1705_lingewaard.derived.ad +++ b/datasets/GM1705_lingewaard/GM1705_lingewaard.derived.ad @@ -1,6 +1,6 @@ - area = GM1705_lingewaard -- id = 129360 -- parent_id = 129360 +- id = 129702 +- parent_id = 129702 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1705_lingewaard/graph_values.yml b/datasets/GM1705_lingewaard/graph_values.yml index 1e6425a718..4aff550355 100644 --- a/datasets/GM1705_lingewaard/graph_values.yml +++ b/datasets/GM1705_lingewaard/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18956743491996006 - :network_gas: 0.14694528528689846 - :ambient_heat: 0.6634872797931415 + :electricity: 0.18956743636363627 + :network_gas: 0.14694527879034588 + :ambient_heat: 0.6634872848460177 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20045.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1706_cranendonck/GM1706_cranendonck.derived.ad b/datasets/GM1706_cranendonck/GM1706_cranendonck.derived.ad index a343fefb4a..c4209b3f02 100644 --- a/datasets/GM1706_cranendonck/GM1706_cranendonck.derived.ad +++ b/datasets/GM1706_cranendonck/GM1706_cranendonck.derived.ad @@ -1,6 +1,6 @@ - area = GM1706_cranendonck -- id = 129255 -- parent_id = 129255 +- id = 129597 +- parent_id = 129597 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1706_cranendonck/graph_values.yml b/datasets/GM1706_cranendonck/graph_values.yml index 3cd724579a..5a4829d3ea 100644 --- a/datasets/GM1706_cranendonck/graph_values.yml +++ b/datasets/GM1706_cranendonck/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1859506146892078 - :network_gas: 0.16322100031894327 - :ambient_heat: 0.6508283849918489 + :electricity: 0.1859506162621909 + :network_gas: 0.16322099324050876 + :ambient_heat: 0.6508283904973003 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 9032.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1708_steenwijkerland/GM1708_steenwijkerland.derived.ad b/datasets/GM1708_steenwijkerland/GM1708_steenwijkerland.derived.ad index a4b79ef597..a68ba48fd5 100644 --- a/datasets/GM1708_steenwijkerland/GM1708_steenwijkerland.derived.ad +++ b/datasets/GM1708_steenwijkerland/GM1708_steenwijkerland.derived.ad @@ -1,6 +1,6 @@ - area = GM1708_steenwijkerland -- id = 129453 -- parent_id = 129453 +- id = 129795 +- parent_id = 129795 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1708_steenwijkerland/graph_values.yml b/datasets/GM1708_steenwijkerland/graph_values.yml index bba51508cd..03f9544c20 100644 --- a/datasets/GM1708_steenwijkerland/graph_values.yml +++ b/datasets/GM1708_steenwijkerland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18202721402300912 - :network_gas: 0.18087632934432377 - :ambient_heat: 0.6370964566326672 + :electricity: 0.18202721572936048 + :network_gas: 0.1808763216657312 + :ambient_heat: 0.6370964626049083 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20197.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1709_moerdijk/GM1709_moerdijk.derived.ad b/datasets/GM1709_moerdijk/GM1709_moerdijk.derived.ad index a0be274100..b755517002 100644 --- a/datasets/GM1709_moerdijk/GM1709_moerdijk.derived.ad +++ b/datasets/GM1709_moerdijk/GM1709_moerdijk.derived.ad @@ -1,6 +1,6 @@ - area = GM1709_moerdijk -- id = 129376 -- parent_id = 129376 +- id = 129718 +- parent_id = 129718 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1709_moerdijk/graph_values.yml b/datasets/GM1709_moerdijk/graph_values.yml index d8b3fda10f..9143d6e2ea 100644 --- a/datasets/GM1709_moerdijk/graph_values.yml +++ b/datasets/GM1709_moerdijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18776692883738338 - :network_gas: 0.15504757460288865 - :ambient_heat: 0.6571854965597279 + :electricity: 0.18776693034619316 + :network_gas: 0.15504756781323464 + :ambient_heat: 0.6571855018405721 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16616.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1711_echt_susteren/GM1711_echt_susteren.derived.ad b/datasets/GM1711_echt_susteren/GM1711_echt_susteren.derived.ad index 0d0f9e9625..1a0cd06a12 100644 --- a/datasets/GM1711_echt_susteren/GM1711_echt_susteren.derived.ad +++ b/datasets/GM1711_echt_susteren/GM1711_echt_susteren.derived.ad @@ -1,6 +1,6 @@ - area = GM1711_echt_susteren -- id = 129279 -- parent_id = 129279 +- id = 129621 +- parent_id = 129621 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1711_echt_susteren/graph_values.yml b/datasets/GM1711_echt_susteren/graph_values.yml index e2aaac3729..d90af984fd 100644 --- a/datasets/GM1711_echt_susteren/graph_values.yml +++ b/datasets/GM1711_echt_susteren/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18844783326896716 - :network_gas: 0.15198350014370282 - :ambient_heat: 0.6595686665873299 + :electricity: 0.18844783475332297 + :network_gas: 0.15198349346409212 + :ambient_heat: 0.6595686717825849 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14672.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1714_sluis/GM1714_sluis.derived.ad b/datasets/GM1714_sluis/GM1714_sluis.derived.ad index 1b1488b9c1..a5828ec5d1 100644 --- a/datasets/GM1714_sluis/GM1714_sluis.derived.ad +++ b/datasets/GM1714_sluis/GM1714_sluis.derived.ad @@ -1,6 +1,6 @@ - area = GM1714_sluis -- id = 129444 -- parent_id = 129444 +- id = 129786 +- parent_id = 129786 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1714_sluis/graph_values.yml b/datasets/GM1714_sluis/graph_values.yml index adfbcec5a4..8809464d3d 100644 --- a/datasets/GM1714_sluis/graph_values.yml +++ b/datasets/GM1714_sluis/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1817042001653975 - :network_gas: 0.18232989384642073 - :ambient_heat: 0.6359659059881817 + :electricity: 0.1817042018824092 + :network_gas: 0.18232988611985668 + :ambient_heat: 0.635965911997734 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14123.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1719_drimmelen/GM1719_drimmelen.derived.ad b/datasets/GM1719_drimmelen/GM1719_drimmelen.derived.ad index 7c24f4773c..b9cd9487b4 100644 --- a/datasets/GM1719_drimmelen/GM1719_drimmelen.derived.ad +++ b/datasets/GM1719_drimmelen/GM1719_drimmelen.derived.ad @@ -1,6 +1,6 @@ - area = GM1719_drimmelen -- id = 129275 -- parent_id = 129275 +- id = 129617 +- parent_id = 129617 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1719_drimmelen/graph_values.yml b/datasets/GM1719_drimmelen/graph_values.yml index 7c2ae85164..05efb6a576 100644 --- a/datasets/GM1719_drimmelen/graph_values.yml +++ b/datasets/GM1719_drimmelen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18853154961463284 - :network_gas: 0.15160677603284065 - :ambient_heat: 0.6598616743525264 + :electricity: 0.1885315510959671 + :network_gas: 0.15160676936682682 + :ambient_heat: 0.6598616795372061 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11831.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1721_bernheze/GM1721_bernheze.derived.ad b/datasets/GM1721_bernheze/GM1721_bernheze.derived.ad index 2e0391d5ac..02236c6df3 100644 --- a/datasets/GM1721_bernheze/GM1721_bernheze.derived.ad +++ b/datasets/GM1721_bernheze/GM1721_bernheze.derived.ad @@ -1,6 +1,6 @@ - area = GM1721_bernheze -- id = 129232 -- parent_id = 129232 +- id = 129574 +- parent_id = 129574 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1721_bernheze/graph_values.yml b/datasets/GM1721_bernheze/graph_values.yml index 97cc7b0a88..20cf04a64f 100644 --- a/datasets/GM1721_bernheze/graph_values.yml +++ b/datasets/GM1721_bernheze/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19007287477703444 - :network_gas: 0.14467080257702133 - :ambient_heat: 0.6652563226459443 + :electricity: 0.19007287620215446 + :network_gas: 0.1446707961639718 + :ambient_heat: 0.6652563276338737 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 12775.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1723_alphen_chaam/GM1723_alphen_chaam.derived.ad b/datasets/GM1723_alphen_chaam/GM1723_alphen_chaam.derived.ad index e361326c06..a5c4cd4917 100644 --- a/datasets/GM1723_alphen_chaam/GM1723_alphen_chaam.derived.ad +++ b/datasets/GM1723_alphen_chaam/GM1723_alphen_chaam.derived.ad @@ -1,6 +1,6 @@ - area = GM1723_alphen_chaam -- id = 129211 -- parent_id = 129211 +- id = 129553 +- parent_id = 129553 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1723_alphen_chaam/graph_values.yml b/datasets/GM1723_alphen_chaam/graph_values.yml index 2dda3f5d60..fbc92d1323 100644 --- a/datasets/GM1723_alphen_chaam/graph_values.yml +++ b/datasets/GM1723_alphen_chaam/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18843992306352625 - :network_gas: 0.1520190961206626 - :ambient_heat: 0.659540980815811 + :electricity: 0.18843992454816735 + :network_gas: 0.15201908943976788 + :ambient_heat: 0.6595409860120648 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 4407.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1724_bergeijk/GM1724_bergeijk.derived.ad b/datasets/GM1724_bergeijk/GM1724_bergeijk.derived.ad index 6b29dd3605..91d0cba04e 100644 --- a/datasets/GM1724_bergeijk/GM1724_bergeijk.derived.ad +++ b/datasets/GM1724_bergeijk/GM1724_bergeijk.derived.ad @@ -1,6 +1,6 @@ - area = GM1724_bergeijk -- id = 129227 -- parent_id = 129227 +- id = 129569 +- parent_id = 129569 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1724_bergeijk/graph_values.yml b/datasets/GM1724_bergeijk/graph_values.yml index 93c1f9b4a5..c49ef1227a 100644 --- a/datasets/GM1724_bergeijk/graph_values.yml +++ b/datasets/GM1724_bergeijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18944148200198369 - :network_gas: 0.14751207425335244 - :ambient_heat: 0.6630464437446638 + :electricity: 0.18944148345026546 + :network_gas: 0.1475120677360749 + :ambient_heat: 0.6630464488136596 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7994.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1728_bladel/GM1728_bladel.derived.ad b/datasets/GM1728_bladel/GM1728_bladel.derived.ad index 341b009ad3..b5972f3d2d 100644 --- a/datasets/GM1728_bladel/GM1728_bladel.derived.ad +++ b/datasets/GM1728_bladel/GM1728_bladel.derived.ad @@ -1,6 +1,6 @@ - area = GM1728_bladel -- id = 129236 -- parent_id = 129236 +- id = 129578 +- parent_id = 129578 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1728_bladel/graph_values.yml b/datasets/GM1728_bladel/graph_values.yml index b2431d4466..2e57ca545f 100644 --- a/datasets/GM1728_bladel/graph_values.yml +++ b/datasets/GM1728_bladel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1896649565849317 - :network_gas: 0.1465064371475761 - :ambient_heat: 0.6638286062674922 + :electricity: 0.18966495802503688 + :network_gas: 0.1465064306670933 + :ambient_heat: 0.6638286113078699 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8820.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1729_gulpen_wittem/GM1729_gulpen_wittem.derived.ad b/datasets/GM1729_gulpen_wittem/GM1729_gulpen_wittem.derived.ad index 1e9744958e..f37ebc94d1 100644 --- a/datasets/GM1729_gulpen_wittem/GM1729_gulpen_wittem.derived.ad +++ b/datasets/GM1729_gulpen_wittem/GM1729_gulpen_wittem.derived.ad @@ -1,6 +1,6 @@ - area = GM1729_gulpen_wittem -- id = 129305 -- parent_id = 129305 +- id = 129647 +- parent_id = 129647 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1729_gulpen_wittem/graph_values.yml b/datasets/GM1729_gulpen_wittem/graph_values.yml index 7fc64e41df..15075dd081 100644 --- a/datasets/GM1729_gulpen_wittem/graph_values.yml +++ b/datasets/GM1729_gulpen_wittem/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18518769604319682 - :network_gas: 0.16665413928712622 - :ambient_heat: 0.6481581646696771 + :electricity: 0.18518769764267617 + :network_gas: 0.1666541320894584 + :ambient_heat: 0.6481581702678654 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 6866.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1730_tynaarlo/GM1730_tynaarlo.derived.ad b/datasets/GM1730_tynaarlo/GM1730_tynaarlo.derived.ad index 41d95fa6f6..2a853b0110 100644 --- a/datasets/GM1730_tynaarlo/GM1730_tynaarlo.derived.ad +++ b/datasets/GM1730_tynaarlo/GM1730_tynaarlo.derived.ad @@ -1,6 +1,6 @@ - area = GM1730_tynaarlo -- id = 129466 -- parent_id = 129466 +- id = 129808 +- parent_id = 129808 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1730_tynaarlo/graph_values.yml b/datasets/GM1730_tynaarlo/graph_values.yml index 74d32b3b7b..822f49c976 100644 --- a/datasets/GM1730_tynaarlo/graph_values.yml +++ b/datasets/GM1730_tynaarlo/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1823988398527457 - :network_gas: 0.17920401064517688 - :ambient_heat: 0.6383971495020774 + :electricity: 0.18239884154677222 + :network_gas: 0.17920400302204625 + :ambient_heat: 0.6383971554311815 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14575.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1731_midden_drenthe/GM1731_midden_drenthe.derived.ad b/datasets/GM1731_midden_drenthe/GM1731_midden_drenthe.derived.ad index a873ac78aa..cdb5e796f8 100644 --- a/datasets/GM1731_midden_drenthe/GM1731_midden_drenthe.derived.ad +++ b/datasets/GM1731_midden_drenthe/GM1731_midden_drenthe.derived.ad @@ -1,6 +1,6 @@ - area = GM1731_midden_drenthe -- id = 129375 -- parent_id = 129375 +- id = 129717 +- parent_id = 129717 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1731_midden_drenthe/graph_values.yml b/datasets/GM1731_midden_drenthe/graph_values.yml index 7a3e1bda3e..49b7d3584b 100644 --- a/datasets/GM1731_midden_drenthe/graph_values.yml +++ b/datasets/GM1731_midden_drenthe/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18448390385009766 - :network_gas: 0.16982120882496626 - :ambient_heat: 0.6456948873249361 + :electricity: 0.18448390547377908 + :network_gas: 0.16982120151838914 + :ambient_heat: 0.6456948930078318 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14395.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1734_overbetuwe/GM1734_overbetuwe.derived.ad b/datasets/GM1734_overbetuwe/GM1734_overbetuwe.derived.ad index 1c2a706dc2..11833e3b4e 100644 --- a/datasets/GM1734_overbetuwe/GM1734_overbetuwe.derived.ad +++ b/datasets/GM1734_overbetuwe/GM1734_overbetuwe.derived.ad @@ -1,6 +1,6 @@ - area = GM1734_overbetuwe -- id = 129411 -- parent_id = 129411 +- id = 129753 +- parent_id = 129753 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1734_overbetuwe/graph_values.yml b/datasets/GM1734_overbetuwe/graph_values.yml index 387fb2e54e..9d8ef32445 100644 --- a/datasets/GM1734_overbetuwe/graph_values.yml +++ b/datasets/GM1734_overbetuwe/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1858297336387081 - :network_gas: 0.16376496584810585 - :ambient_heat: 0.6504053005131861 + :electricity: 0.18582973521590757 + :network_gas: 0.1637649587506979 + :ambient_heat: 0.6504053060333946 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20053.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1735_hof_van_twente/GM1735_hof_van_twente.derived.ad b/datasets/GM1735_hof_van_twente/GM1735_hof_van_twente.derived.ad index 393b92e24c..1a4d83b695 100644 --- a/datasets/GM1735_hof_van_twente/GM1735_hof_van_twente.derived.ad +++ b/datasets/GM1735_hof_van_twente/GM1735_hof_van_twente.derived.ad @@ -1,6 +1,6 @@ - area = GM1735_hof_van_twente -- id = 129331 -- parent_id = 129331 +- id = 129673 +- parent_id = 129673 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1735_hof_van_twente/graph_values.yml b/datasets/GM1735_hof_van_twente/graph_values.yml index 3cb3408d29..fd26dbb213 100644 --- a/datasets/GM1735_hof_van_twente/graph_values.yml +++ b/datasets/GM1735_hof_van_twente/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18406025830396994 - :network_gas: 0.17172761659296765 - :ambient_heat: 0.6442121251030626 + :electricity: 0.18406025994210826 + :network_gas: 0.1717276092213341 + :ambient_heat: 0.6442121308365576 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15251.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1740_neder_betuwe/GM1740_neder_betuwe.derived.ad b/datasets/GM1740_neder_betuwe/GM1740_neder_betuwe.derived.ad index e1332be1f1..e0221fa0ef 100644 --- a/datasets/GM1740_neder_betuwe/GM1740_neder_betuwe.derived.ad +++ b/datasets/GM1740_neder_betuwe/GM1740_neder_betuwe.derived.ad @@ -1,6 +1,6 @@ - area = GM1740_neder_betuwe -- id = 129380 -- parent_id = 129380 +- id = 129722 +- parent_id = 129722 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1740_neder_betuwe/graph_values.yml b/datasets/GM1740_neder_betuwe/graph_values.yml index 4402466f37..3b142d7f68 100644 --- a/datasets/GM1740_neder_betuwe/graph_values.yml +++ b/datasets/GM1740_neder_betuwe/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18797036342594875 - :network_gas: 0.15413211760477788 - :ambient_heat: 0.6578975189692734 + :electricity: 0.18797036492747501 + :network_gas: 0.15413211084789966 + :ambient_heat: 0.6578975242246253 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8886.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1742_rijssen_holten/GM1742_rijssen_holten.derived.ad b/datasets/GM1742_rijssen_holten/GM1742_rijssen_holten.derived.ad index 86f38a717f..f0ef4d4c56 100644 --- a/datasets/GM1742_rijssen_holten/GM1742_rijssen_holten.derived.ad +++ b/datasets/GM1742_rijssen_holten/GM1742_rijssen_holten.derived.ad @@ -1,6 +1,6 @@ - area = GM1742_rijssen_holten -- id = 129426 -- parent_id = 129426 +- id = 129768 +- parent_id = 129768 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1742_rijssen_holten/graph_values.yml b/datasets/GM1742_rijssen_holten/graph_values.yml index 2bbacd9c61..c2cc2a0097 100644 --- a/datasets/GM1742_rijssen_holten/graph_values.yml +++ b/datasets/GM1742_rijssen_holten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18518713149134491 - :network_gas: 0.16665667977420473 - :ambient_heat: 0.6481561887344502 + :electricity: 0.18518713309084384 + :network_gas: 0.16665667257644923 + :ambient_heat: 0.648156194332707 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14849.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1771_geldrop_mierlo/GM1771_geldrop_mierlo.derived.ad b/datasets/GM1771_geldrop_mierlo/GM1771_geldrop_mierlo.derived.ad index ff83464f10..94a0d67e1e 100644 --- a/datasets/GM1771_geldrop_mierlo/GM1771_geldrop_mierlo.derived.ad +++ b/datasets/GM1771_geldrop_mierlo/GM1771_geldrop_mierlo.derived.ad @@ -1,6 +1,6 @@ - area = GM1771_geldrop_mierlo -- id = 129294 -- parent_id = 129294 +- id = 129636 +- parent_id = 129636 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1771_geldrop_mierlo/graph_values.yml b/datasets/GM1771_geldrop_mierlo/graph_values.yml index ec568cac9c..a82d40c627 100644 --- a/datasets/GM1771_geldrop_mierlo/graph_values.yml +++ b/datasets/GM1771_geldrop_mierlo/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18727147089150617 - :network_gas: 0.15727713864615941 - :ambient_heat: 0.6554513904623344 + :electricity: 0.18727147241797393 + :network_gas: 0.15727713177704444 + :ambient_heat: 0.6554513958049817 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18051.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1773_olst_wijhe/GM1773_olst_wijhe.derived.ad b/datasets/GM1773_olst_wijhe/GM1773_olst_wijhe.derived.ad index edb0bfc1f9..80c7facfee 100644 --- a/datasets/GM1773_olst_wijhe/GM1773_olst_wijhe.derived.ad +++ b/datasets/GM1773_olst_wijhe/GM1773_olst_wijhe.derived.ad @@ -1,6 +1,6 @@ - area = GM1773_olst_wijhe -- id = 129399 -- parent_id = 129399 +- id = 129741 +- parent_id = 129741 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1773_olst_wijhe/graph_values.yml b/datasets/GM1773_olst_wijhe/graph_values.yml index 0348a93d95..fd02105821 100644 --- a/datasets/GM1773_olst_wijhe/graph_values.yml +++ b/datasets/GM1773_olst_wijhe/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18646502154782274 - :network_gas: 0.16090616604264715 - :ambient_heat: 0.6526288124095301 + :electricity: 0.1864650231027872 + :network_gas: 0.16090615904529668 + :ambient_heat: 0.6526288178519161 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7821.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1774_dinkelland/GM1774_dinkelland.derived.ad b/datasets/GM1774_dinkelland/GM1774_dinkelland.derived.ad index 035af0547d..e666524806 100644 --- a/datasets/GM1774_dinkelland/GM1774_dinkelland.derived.ad +++ b/datasets/GM1774_dinkelland/GM1774_dinkelland.derived.ad @@ -1,6 +1,6 @@ - area = GM1774_dinkelland -- id = 129269 -- parent_id = 129269 +- id = 129611 +- parent_id = 129611 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1774_dinkelland/graph_values.yml b/datasets/GM1774_dinkelland/graph_values.yml index 5a301cce33..f18bb57202 100644 --- a/datasets/GM1774_dinkelland/graph_values.yml +++ b/datasets/GM1774_dinkelland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18614114724757433 - :network_gas: 0.16236360254231794 - :ambient_heat: 0.6514952502101077 + :electricity: 0.1861411488138979 + :network_gas: 0.16236359549385165 + :ambient_heat: 0.6514952556922505 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11038.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1783_westland/GM1783_westland.derived.ad b/datasets/GM1783_westland/GM1783_westland.derived.ad index be1ded7601..24c3aef15c 100644 --- a/datasets/GM1783_westland/GM1783_westland.derived.ad +++ b/datasets/GM1783_westland/GM1783_westland.derived.ad @@ -1,6 +1,6 @@ - area = GM1783_westland -- id = 129500 -- parent_id = 129500 +- id = 129842 +- parent_id = 129842 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1783_westland/graph_values.yml b/datasets/GM1783_westland/graph_values.yml index ec09180064..f74e741886 100644 --- a/datasets/GM1783_westland/graph_values.yml +++ b/datasets/GM1783_westland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1904494264718103 - :network_gas: 0.1429763174525199 - :ambient_heat: 0.6665742560756698 + :electricity: 0.19044942788302854 + :network_gas: 0.1429763111020284 + :ambient_heat: 0.666574261014943 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 45912.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1842_midden_delfland/GM1842_midden_delfland.derived.ad b/datasets/GM1842_midden_delfland/GM1842_midden_delfland.derived.ad index bfeb262bd5..8cb89e1230 100644 --- a/datasets/GM1842_midden_delfland/GM1842_midden_delfland.derived.ad +++ b/datasets/GM1842_midden_delfland/GM1842_midden_delfland.derived.ad @@ -1,6 +1,6 @@ - area = GM1842_midden_delfland -- id = 129374 -- parent_id = 129374 +- id = 129716 +- parent_id = 129716 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1842_midden_delfland/graph_values.yml b/datasets/GM1842_midden_delfland/graph_values.yml index 7a0067cd2c..540117e050 100644 --- a/datasets/GM1842_midden_delfland/graph_values.yml +++ b/datasets/GM1842_midden_delfland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19072812461425437 - :network_gas: 0.1417221739626631 - :ambient_heat: 0.6675497014230825 + :electricity: 0.19072812601514091 + :network_gas: 0.14172216765866458 + :ambient_heat: 0.6675497063261945 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 7978.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1859_berkelland/GM1859_berkelland.derived.ad b/datasets/GM1859_berkelland/GM1859_berkelland.derived.ad index c347a8f96f..f549e5f6b1 100644 --- a/datasets/GM1859_berkelland/GM1859_berkelland.derived.ad +++ b/datasets/GM1859_berkelland/GM1859_berkelland.derived.ad @@ -1,6 +1,6 @@ - area = GM1859_berkelland -- id = 129231 -- parent_id = 129231 +- id = 129573 +- parent_id = 129573 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1859_berkelland/graph_values.yml b/datasets/GM1859_berkelland/graph_values.yml index 9c70e1842f..654d72b6ab 100644 --- a/datasets/GM1859_berkelland/graph_values.yml +++ b/datasets/GM1859_berkelland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18330215523382337 - :network_gas: 0.17513908543781453 - :ambient_heat: 0.6415587593283621 + :electricity: 0.1833021568976231 + :network_gas: 0.1751390779507045 + :ambient_heat: 0.6415587651516723 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 19547.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1876_bronckhorst/GM1876_bronckhorst.derived.ad b/datasets/GM1876_bronckhorst/GM1876_bronckhorst.derived.ad index 710aa04590..d8f2dc798a 100644 --- a/datasets/GM1876_bronckhorst/GM1876_bronckhorst.derived.ad +++ b/datasets/GM1876_bronckhorst/GM1876_bronckhorst.derived.ad @@ -1,6 +1,6 @@ - area = GM1876_bronckhorst -- id = 129246 -- parent_id = 129246 +- id = 129588 +- parent_id = 129588 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1876_bronckhorst/graph_values.yml b/datasets/GM1876_bronckhorst/graph_values.yml index 7bcc671263..385150a4cb 100644 --- a/datasets/GM1876_bronckhorst/graph_values.yml +++ b/datasets/GM1876_bronckhorst/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18581402625130175 - :network_gas: 0.1638356491956358 - :ambient_heat: 0.6503503245530625 + :electricity: 0.18581402782904852 + :network_gas: 0.16383564209576473 + :ambient_heat: 0.6503503300751867 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16139.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1883_sittard_geleen/GM1883_sittard_geleen.derived.ad b/datasets/GM1883_sittard_geleen/GM1883_sittard_geleen.derived.ad index b4535aaed2..b5de22bd07 100644 --- a/datasets/GM1883_sittard_geleen/GM1883_sittard_geleen.derived.ad +++ b/datasets/GM1883_sittard_geleen/GM1883_sittard_geleen.derived.ad @@ -1,6 +1,6 @@ - area = GM1883_sittard_geleen -- id = 129442 -- parent_id = 129442 +- id = 129784 +- parent_id = 129784 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1883_sittard_geleen/graph_values.yml b/datasets/GM1883_sittard_geleen/graph_values.yml index e472664aea..954d9cd966 100644 --- a/datasets/GM1883_sittard_geleen/graph_values.yml +++ b/datasets/GM1883_sittard_geleen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1882714396339715 - :network_gas: 0.15277727267136282 - :ambient_heat: 0.6589512876946656 + :electricity: 0.18827144112468305 + :network_gas: 0.1527772659631511 + :ambient_heat: 0.6589512929121658 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 46679.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1884_kaag_en_braassem/GM1884_kaag_en_braassem.derived.ad b/datasets/GM1884_kaag_en_braassem/GM1884_kaag_en_braassem.derived.ad index b43782830a..09554ce645 100644 --- a/datasets/GM1884_kaag_en_braassem/GM1884_kaag_en_braassem.derived.ad +++ b/datasets/GM1884_kaag_en_braassem/GM1884_kaag_en_braassem.derived.ad @@ -1,6 +1,6 @@ - area = GM1884_kaag_en_braassem -- id = 129340 -- parent_id = 129340 +- id = 129682 +- parent_id = 129682 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1884_kaag_en_braassem/graph_values.yml b/datasets/GM1884_kaag_en_braassem/graph_values.yml index 912a5d9f0b..cf1e4022d9 100644 --- a/datasets/GM1884_kaag_en_braassem/graph_values.yml +++ b/datasets/GM1884_kaag_en_braassem/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19089636563675996 - :network_gas: 0.14096508824529239 - :ambient_heat: 0.6681385461179478 + :electricity: 0.190896367031392 + :network_gas: 0.14096508196943897 + :ambient_heat: 0.6681385509991691 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11874.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1891_dantumadiel/GM1891_dantumadiel.derived.ad b/datasets/GM1891_dantumadiel/GM1891_dantumadiel.derived.ad index d939bcda14..289b679d42 100644 --- a/datasets/GM1891_dantumadiel/GM1891_dantumadiel.derived.ad +++ b/datasets/GM1891_dantumadiel/GM1891_dantumadiel.derived.ad @@ -1,6 +1,6 @@ - area = GM1891_dantumadiel -- id = 129258 -- parent_id = 129258 +- id = 129600 +- parent_id = 129600 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1891_dantumadiel/graph_values.yml b/datasets/GM1891_dantumadiel/graph_values.yml index 5f3302dd8c..bc9067ad05 100644 --- a/datasets/GM1891_dantumadiel/graph_values.yml +++ b/datasets/GM1891_dantumadiel/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18398391304912845 - :network_gas: 0.1720711707462217 - :ambient_heat: 0.6439449162046499 + :electricity: 0.1839839146898632 + :network_gas: 0.17207116336290446 + :ambient_heat: 0.6439449219472324 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8148.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1892_zuidplas/GM1892_zuidplas.derived.ad b/datasets/GM1892_zuidplas/GM1892_zuidplas.derived.ad index 926664f218..2cb639a25e 100644 --- a/datasets/GM1892_zuidplas/GM1892_zuidplas.derived.ad +++ b/datasets/GM1892_zuidplas/GM1892_zuidplas.derived.ad @@ -1,6 +1,6 @@ - area = GM1892_zuidplas -- id = 129519 -- parent_id = 129519 +- id = 129861 +- parent_id = 129861 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1892_zuidplas/graph_values.yml b/datasets/GM1892_zuidplas/graph_values.yml index cca105aa00..68770836ee 100644 --- a/datasets/GM1892_zuidplas/graph_values.yml +++ b/datasets/GM1892_zuidplas/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19171392048348618 - :network_gas: 0.13728608601143905 - :ambient_heat: 0.6709999935050747 + :electricity: 0.1917139218475371 + :network_gas: 0.13728607987320088 + :ambient_heat: 0.670999998279262 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18549.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1894_peel_en_maas/GM1894_peel_en_maas.derived.ad b/datasets/GM1894_peel_en_maas/GM1894_peel_en_maas.derived.ad index c52445a175..16eff5f012 100644 --- a/datasets/GM1894_peel_en_maas/GM1894_peel_en_maas.derived.ad +++ b/datasets/GM1894_peel_en_maas/GM1894_peel_en_maas.derived.ad @@ -1,6 +1,6 @@ - area = GM1894_peel_en_maas -- id = 129413 -- parent_id = 129413 +- id = 129755 +- parent_id = 129755 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1894_peel_en_maas/graph_values.yml b/datasets/GM1894_peel_en_maas/graph_values.yml index e57d460a62..4815066176 100644 --- a/datasets/GM1894_peel_en_maas/graph_values.yml +++ b/datasets/GM1894_peel_en_maas/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1906518326308554 - :network_gas: 0.1420654883940727 - :ambient_heat: 0.6672826789750719 + :electricity: 0.19065183403457373 + :network_gas: 0.14206548207733075 + :ambient_heat: 0.6672826838880953 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18491.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1895_oldambt/GM1895_oldambt.derived.ad b/datasets/GM1895_oldambt/GM1895_oldambt.derived.ad index d263364447..ba0593e43f 100644 --- a/datasets/GM1895_oldambt/GM1895_oldambt.derived.ad +++ b/datasets/GM1895_oldambt/GM1895_oldambt.derived.ad @@ -1,6 +1,6 @@ - area = GM1895_oldambt -- id = 129396 -- parent_id = 129396 +- id = 129738 +- parent_id = 129738 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1895_oldambt/graph_values.yml b/datasets/GM1895_oldambt/graph_values.yml index bb21b37850..7d8063d029 100644 --- a/datasets/GM1895_oldambt/graph_values.yml +++ b/datasets/GM1895_oldambt/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18232049979082224 - :network_gas: 0.17955654144353328 - :ambient_heat: 0.6381229587656444 + :electricity: 0.18232050148745227 + :network_gas: 0.17955653380868702 + :ambient_heat: 0.6381229647038608 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 18399.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1896_zwartewaterland/GM1896_zwartewaterland.derived.ad b/datasets/GM1896_zwartewaterland/GM1896_zwartewaterland.derived.ad index e9edaa1976..d79aa12f93 100644 --- a/datasets/GM1896_zwartewaterland/GM1896_zwartewaterland.derived.ad +++ b/datasets/GM1896_zwartewaterland/GM1896_zwartewaterland.derived.ad @@ -1,6 +1,6 @@ - area = GM1896_zwartewaterland -- id = 129522 -- parent_id = 129522 +- id = 129864 +- parent_id = 129864 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1896_zwartewaterland/graph_values.yml b/datasets/GM1896_zwartewaterland/graph_values.yml index 26ae1d0d94..c3d96487bd 100644 --- a/datasets/GM1896_zwartewaterland/graph_values.yml +++ b/datasets/GM1896_zwartewaterland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18701665060418443 - :network_gas: 0.15842383162956214 - :ambient_heat: 0.6545595177662534 + :electricity: 0.1870166521396893 + :network_gas: 0.15842382471978003 + :ambient_heat: 0.6545595231405307 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 8961.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1900_sudwest_fryslan/GM1900_sudwest_fryslan.derived.ad b/datasets/GM1900_sudwest_fryslan/GM1900_sudwest_fryslan.derived.ad index 30e47ec455..6498d8a1c6 100644 --- a/datasets/GM1900_sudwest_fryslan/GM1900_sudwest_fryslan.derived.ad +++ b/datasets/GM1900_sudwest_fryslan/GM1900_sudwest_fryslan.derived.ad @@ -1,6 +1,6 @@ - area = GM1900_sudwest_fryslan -- id = 129456 -- parent_id = 129456 +- id = 129798 +- parent_id = 129798 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1900_sudwest_fryslan/graph_values.yml b/datasets/GM1900_sudwest_fryslan/graph_values.yml index b0a6079b36..c3df566788 100644 --- a/datasets/GM1900_sudwest_fryslan/graph_values.yml +++ b/datasets/GM1900_sudwest_fryslan/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18375127453062326 - :network_gas: 0.17311804562279798 - :ambient_heat: 0.6431306798465787 + :electricity: 0.18375127617925294 + :network_gas: 0.17311803820395352 + :ambient_heat: 0.6431306856167935 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 42025.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1901_bodegraven_reeuwijk/GM1901_bodegraven_reeuwijk.derived.ad b/datasets/GM1901_bodegraven_reeuwijk/GM1901_bodegraven_reeuwijk.derived.ad index ae856dc43e..e257802cf6 100644 --- a/datasets/GM1901_bodegraven_reeuwijk/GM1901_bodegraven_reeuwijk.derived.ad +++ b/datasets/GM1901_bodegraven_reeuwijk/GM1901_bodegraven_reeuwijk.derived.ad @@ -1,6 +1,6 @@ - area = GM1901_bodegraven_reeuwijk -- id = 129239 -- parent_id = 129239 +- id = 129581 +- parent_id = 129581 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1901_bodegraven_reeuwijk/graph_values.yml b/datasets/GM1901_bodegraven_reeuwijk/graph_values.yml index 69c807667c..5b6fa02ba4 100644 --- a/datasets/GM1901_bodegraven_reeuwijk/graph_values.yml +++ b/datasets/GM1901_bodegraven_reeuwijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19009769954148775 - :network_gas: 0.1445590909722962 - :ambient_heat: 0.6653432094862161 + :electricity: 0.1900977009656933 + :network_gas: 0.14455908456336167 + :ambient_heat: 0.665343214470945 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 14665.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1903_eijsden_margraten/GM1903_eijsden_margraten.derived.ad b/datasets/GM1903_eijsden_margraten/GM1903_eijsden_margraten.derived.ad index 16c66a1453..9f42639c3d 100644 --- a/datasets/GM1903_eijsden_margraten/GM1903_eijsden_margraten.derived.ad +++ b/datasets/GM1903_eijsden_margraten/GM1903_eijsden_margraten.derived.ad @@ -1,6 +1,6 @@ - area = GM1903_eijsden_margraten -- id = 129284 -- parent_id = 129284 +- id = 129626 +- parent_id = 129626 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1903_eijsden_margraten/graph_values.yml b/datasets/GM1903_eijsden_margraten/graph_values.yml index 616997aed4..6ae7fc3c26 100644 --- a/datasets/GM1903_eijsden_margraten/graph_values.yml +++ b/datasets/GM1903_eijsden_margraten/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18665424973922556 - :network_gas: 0.16005463792601182 - :ambient_heat: 0.6532911123347627 + :electricity: 0.18665425128753071 + :network_gas: 0.1600546309586284 + :ambient_heat: 0.653291117753841 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11342.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1904_stichtse_vecht/GM1904_stichtse_vecht.derived.ad b/datasets/GM1904_stichtse_vecht/GM1904_stichtse_vecht.derived.ad index b87e0a7d64..7435fb558a 100644 --- a/datasets/GM1904_stichtse_vecht/GM1904_stichtse_vecht.derived.ad +++ b/datasets/GM1904_stichtse_vecht/GM1904_stichtse_vecht.derived.ad @@ -1,6 +1,6 @@ - area = GM1904_stichtse_vecht -- id = 129455 -- parent_id = 129455 +- id = 129797 +- parent_id = 129797 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1904_stichtse_vecht/graph_values.yml b/datasets/GM1904_stichtse_vecht/graph_values.yml index ccc88b6f86..783c1a5997 100644 --- a/datasets/GM1904_stichtse_vecht/graph_values.yml +++ b/datasets/GM1904_stichtse_vecht/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1866125064678627 - :network_gas: 0.16024248292406568 - :ambient_heat: 0.6531450106080716 + :electricity: 0.18661250801763832 + :network_gas: 0.16024247595006516 + :ambient_heat: 0.6531450160322966 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 28716.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1911_hollands_kroon/GM1911_hollands_kroon.derived.ad b/datasets/GM1911_hollands_kroon/GM1911_hollands_kroon.derived.ad index 0ea3976c1e..40d3156e2f 100644 --- a/datasets/GM1911_hollands_kroon/GM1911_hollands_kroon.derived.ad +++ b/datasets/GM1911_hollands_kroon/GM1911_hollands_kroon.derived.ad @@ -1,6 +1,6 @@ - area = GM1911_hollands_kroon -- id = 129332 -- parent_id = 129332 +- id = 129674 +- parent_id = 129674 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1911_hollands_kroon/graph_values.yml b/datasets/GM1911_hollands_kroon/graph_values.yml index 433f0ec231..434b549e36 100644 --- a/datasets/GM1911_hollands_kroon/graph_values.yml +++ b/datasets/GM1911_hollands_kroon/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18708012613696182 - :network_gas: 0.15813819131097295 - :ambient_heat: 0.6547816825520653 + :electricity: 0.1870801276702184 + :network_gas: 0.15813818441130828 + :ambient_heat: 0.6547816879184734 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20923.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1916_leidschendam_voorburg/GM1916_leidschendam_voorburg.derived.ad b/datasets/GM1916_leidschendam_voorburg/GM1916_leidschendam_voorburg.derived.ad index 63f2cf0985..286e9a0ebb 100644 --- a/datasets/GM1916_leidschendam_voorburg/GM1916_leidschendam_voorburg.derived.ad +++ b/datasets/GM1916_leidschendam_voorburg/GM1916_leidschendam_voorburg.derived.ad @@ -1,6 +1,6 @@ - area = GM1916_leidschendam_voorburg -- id = 129356 -- parent_id = 129356 +- id = 129698 +- parent_id = 129698 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1916_leidschendam_voorburg/graph_values.yml b/datasets/GM1916_leidschendam_voorburg/graph_values.yml index 1dedf9bd8d..366787a7ae 100644 --- a/datasets/GM1916_leidschendam_voorburg/graph_values.yml +++ b/datasets/GM1916_leidschendam_voorburg/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18201450055282434 - :network_gas: 0.18093354004449524 - :ambient_heat: 0.6370519594026804 + :electricity: 0.18201450225959626 + :network_gas: 0.1809335323640105 + :ambient_heat: 0.6370519653763934 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 36938.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1924_goeree_overflakkee/GM1924_goeree_overflakkee.derived.ad b/datasets/GM1924_goeree_overflakkee/GM1924_goeree_overflakkee.derived.ad index d495580ebc..40bed5adbc 100644 --- a/datasets/GM1924_goeree_overflakkee/GM1924_goeree_overflakkee.derived.ad +++ b/datasets/GM1924_goeree_overflakkee/GM1924_goeree_overflakkee.derived.ad @@ -1,6 +1,6 @@ - area = GM1924_goeree_overflakkee -- id = 129298 -- parent_id = 129298 +- id = 129640 +- parent_id = 129640 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1924_goeree_overflakkee/graph_values.yml b/datasets/GM1924_goeree_overflakkee/graph_values.yml index 34b4a47d00..c0a64d7b29 100644 --- a/datasets/GM1924_goeree_overflakkee/graph_values.yml +++ b/datasets/GM1924_goeree_overflakkee/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18839112824529905 - :network_gas: 0.1522386731263856 - :ambient_heat: 0.6593701986283154 + :electricity: 0.18839112973169952 + :network_gas: 0.15223866643757336 + :ambient_heat: 0.659370203830727 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22021.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1926_pijnacker_nootdorp/GM1926_pijnacker_nootdorp.derived.ad b/datasets/GM1926_pijnacker_nootdorp/GM1926_pijnacker_nootdorp.derived.ad index f9ac92167d..f6185cb675 100644 --- a/datasets/GM1926_pijnacker_nootdorp/GM1926_pijnacker_nootdorp.derived.ad +++ b/datasets/GM1926_pijnacker_nootdorp/GM1926_pijnacker_nootdorp.derived.ad @@ -1,6 +1,6 @@ - area = GM1926_pijnacker_nootdorp -- id = 129415 -- parent_id = 129415 +- id = 129757 +- parent_id = 129757 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1926_pijnacker_nootdorp/graph_values.yml b/datasets/GM1926_pijnacker_nootdorp/graph_values.yml index ad3b9ddb6c..b959971380 100644 --- a/datasets/GM1926_pijnacker_nootdorp/graph_values.yml +++ b/datasets/GM1926_pijnacker_nootdorp/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19679544429097598 - :network_gas: 0.11441919516736399 - :ambient_heat: 0.68878536054166 + :electricity: 0.19679544545795846 + :network_gas: 0.11441918991593505 + :ambient_heat: 0.6887853646261064 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 21791.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1930_nissewaard/GM1930_nissewaard.derived.ad b/datasets/GM1930_nissewaard/GM1930_nissewaard.derived.ad index 247d6a5eb4..2dad2c6068 100644 --- a/datasets/GM1930_nissewaard/GM1930_nissewaard.derived.ad +++ b/datasets/GM1930_nissewaard/GM1930_nissewaard.derived.ad @@ -1,6 +1,6 @@ - area = GM1930_nissewaard -- id = 129386 -- parent_id = 129386 +- id = 129728 +- parent_id = 129728 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1930_nissewaard/graph_values.yml b/datasets/GM1930_nissewaard/graph_values.yml index cb7900087e..4e884db2b3 100644 --- a/datasets/GM1930_nissewaard/graph_values.yml +++ b/datasets/GM1930_nissewaard/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19209756764141434 - :network_gas: 0.1355596712556817 - :ambient_heat: 0.6723427611029039 + :electricity: 0.19209756899100724 + :network_gas: 0.1355596651825047 + :ambient_heat: 0.672342765826488 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 39448.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1931_krimpenerwaard/GM1931_krimpenerwaard.derived.ad b/datasets/GM1931_krimpenerwaard/GM1931_krimpenerwaard.derived.ad index 1d06c39249..f44198516a 100644 --- a/datasets/GM1931_krimpenerwaard/GM1931_krimpenerwaard.derived.ad +++ b/datasets/GM1931_krimpenerwaard/GM1931_krimpenerwaard.derived.ad @@ -1,6 +1,6 @@ - area = GM1931_krimpenerwaard -- id = 129347 -- parent_id = 129347 +- id = 129689 +- parent_id = 129689 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1931_krimpenerwaard/graph_values.yml b/datasets/GM1931_krimpenerwaard/graph_values.yml index 56dfb5f2ff..0b62672ea1 100644 --- a/datasets/GM1931_krimpenerwaard/graph_values.yml +++ b/datasets/GM1931_krimpenerwaard/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1878393518266656 - :network_gas: 0.15472167067067114 - :ambient_heat: 0.6574389775026633 + :electricity: 0.18783935333288465 + :network_gas: 0.1547216638926754 + :ambient_heat: 0.65743898277444 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 23909.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1940_de_fryske_marren/GM1940_de_fryske_marren.derived.ad b/datasets/GM1940_de_fryske_marren/GM1940_de_fryske_marren.derived.ad index 2ae05b9218..c5e1dea29c 100644 --- a/datasets/GM1940_de_fryske_marren/GM1940_de_fryske_marren.derived.ad +++ b/datasets/GM1940_de_fryske_marren/GM1940_de_fryske_marren.derived.ad @@ -1,6 +1,6 @@ - area = GM1940_de_fryske_marren -- id = 129260 -- parent_id = 129260 +- id = 129602 +- parent_id = 129602 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1940_de_fryske_marren/graph_values.yml b/datasets/GM1940_de_fryske_marren/graph_values.yml index ca652d6879..3f9b670764 100644 --- a/datasets/GM1940_de_fryske_marren/graph_values.yml +++ b/datasets/GM1940_de_fryske_marren/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18389061368524734 - :network_gas: 0.17249101850262644 - :ambient_heat: 0.6436183678121263 + :electricity: 0.18389061532915132 + :network_gas: 0.17249101110504744 + :ambient_heat: 0.6436183735658013 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 23318.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1942_gooise_meren/GM1942_gooise_meren.derived.ad b/datasets/GM1942_gooise_meren/GM1942_gooise_meren.derived.ad index 0678f92f2e..8d507c98b3 100644 --- a/datasets/GM1942_gooise_meren/GM1942_gooise_meren.derived.ad +++ b/datasets/GM1942_gooise_meren/GM1942_gooise_meren.derived.ad @@ -1,6 +1,6 @@ - area = GM1942_gooise_meren -- id = 129301 -- parent_id = 129301 +- id = 129643 +- parent_id = 129643 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1942_gooise_meren/graph_values.yml b/datasets/GM1942_gooise_meren/graph_values.yml index 70555a3652..77298f785d 100644 --- a/datasets/GM1942_gooise_meren/graph_values.yml +++ b/datasets/GM1942_gooise_meren/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1806113185636995 - :network_gas: 0.18724786830413986 - :ambient_heat: 0.6321408131321606 + :electricity: 0.18061132031641833 + :network_gas: 0.18724786041689342 + :ambient_heat: 0.6321408192666882 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 26873.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1945_berg_en_dal/GM1945_berg_en_dal.derived.ad b/datasets/GM1945_berg_en_dal/GM1945_berg_en_dal.derived.ad index dc3e3e1034..7b19fa6bba 100644 --- a/datasets/GM1945_berg_en_dal/GM1945_berg_en_dal.derived.ad +++ b/datasets/GM1945_berg_en_dal/GM1945_berg_en_dal.derived.ad @@ -1,6 +1,6 @@ - area = GM1945_berg_en_dal -- id = 129226 -- parent_id = 129226 +- id = 129568 +- parent_id = 129568 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1945_berg_en_dal/graph_values.yml b/datasets/GM1945_berg_en_dal/graph_values.yml index 35cdc69747..95e308af74 100644 --- a/datasets/GM1945_berg_en_dal/graph_values.yml +++ b/datasets/GM1945_berg_en_dal/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1868301105691801 - :network_gas: 0.15926326302457136 - :ambient_heat: 0.6539066264062485 + :electricity: 0.18683011211128137 + :network_gas: 0.1592632560851055 + :ambient_heat: 0.6539066318036132 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15815.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1948_meierijstad/GM1948_meierijstad.derived.ad b/datasets/GM1948_meierijstad/GM1948_meierijstad.derived.ad index 58512047fc..cb7157e12b 100644 --- a/datasets/GM1948_meierijstad/GM1948_meierijstad.derived.ad +++ b/datasets/GM1948_meierijstad/GM1948_meierijstad.derived.ad @@ -1,6 +1,6 @@ - area = GM1948_meierijstad -- id = 129525 -- parent_id = 129525 +- id = 129867 +- parent_id = 129867 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1948_meierijstad/graph_values.yml b/datasets/GM1948_meierijstad/graph_values.yml index 1c10b1d3e0..42efceb31e 100644 --- a/datasets/GM1948_meierijstad/graph_values.yml +++ b/datasets/GM1948_meierijstad/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1898599510282476 - :network_gas: 0.14562896085907898 - :ambient_heat: 0.6645110881126733 + :electricity: 0.18985995246119922 + :network_gas: 0.14562895441078724 + :ambient_heat: 0.6645110931280135 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 34829.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1949_waadhoeke/GM1949_waadhoeke.derived.ad b/datasets/GM1949_waadhoeke/GM1949_waadhoeke.derived.ad index 09b3d5f3d1..8ade1cc8b1 100644 --- a/datasets/GM1949_waadhoeke/GM1949_waadhoeke.derived.ad +++ b/datasets/GM1949_waadhoeke/GM1949_waadhoeke.derived.ad @@ -1,6 +1,6 @@ - area = GM1949_waadhoeke -- id = 129526 -- parent_id = 129526 +- id = 129868 +- parent_id = 129868 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1949_waadhoeke/graph_values.yml b/datasets/GM1949_waadhoeke/graph_values.yml index f207a6df32..3b3315d9a7 100644 --- a/datasets/GM1949_waadhoeke/graph_values.yml +++ b/datasets/GM1949_waadhoeke/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18371625110939244 - :network_gas: 0.17327565125067892 - :ambient_heat: 0.6430080976399286 + :electricity: 0.1837162527592085 + :network_gas: 0.1732756438264958 + :ambient_heat: 0.6430081034142958 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 21213.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1950_westerwolde/GM1950_westerwolde.derived.ad b/datasets/GM1950_westerwolde/GM1950_westerwolde.derived.ad index 1c261d8d36..ac10a327fb 100644 --- a/datasets/GM1950_westerwolde/GM1950_westerwolde.derived.ad +++ b/datasets/GM1950_westerwolde/GM1950_westerwolde.derived.ad @@ -1,6 +1,6 @@ - area = GM1950_westerwolde -- id = 129527 -- parent_id = 129527 +- id = 129869 +- parent_id = 129869 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1950_westerwolde/graph_values.yml b/datasets/GM1950_westerwolde/graph_values.yml index 7563d4ff74..263d11faaf 100644 --- a/datasets/GM1950_westerwolde/graph_values.yml +++ b/datasets/GM1950_westerwolde/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1779906941155271 - :network_gas: 0.19904069570590233 - :ambient_heat: 0.6229686101785707 + :electricity: 0.17799069595159855 + :network_gas: 0.1990406874435684 + :ambient_heat: 0.622968616604833 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 11770.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1952_midden_groningen/GM1952_midden_groningen.derived.ad b/datasets/GM1952_midden_groningen/GM1952_midden_groningen.derived.ad index f4ef5ecd6e..e79b7a5026 100644 --- a/datasets/GM1952_midden_groningen/GM1952_midden_groningen.derived.ad +++ b/datasets/GM1952_midden_groningen/GM1952_midden_groningen.derived.ad @@ -1,6 +1,6 @@ - area = GM1952_midden_groningen -- id = 129528 -- parent_id = 129528 +- id = 129870 +- parent_id = 129870 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1952_midden_groningen/graph_values.yml b/datasets/GM1952_midden_groningen/graph_values.yml index a3af93cba4..741650e69e 100644 --- a/datasets/GM1952_midden_groningen/graph_values.yml +++ b/datasets/GM1952_midden_groningen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17931426058796957 - :network_gas: 0.19308463779949034 - :ambient_heat: 0.6276011016125401 + :electricity: 0.17931426238234355 + :network_gas: 0.19308462972479554 + :ambient_heat: 0.6276011078928609 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 27986.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1954_beekdaelen/GM1954_beekdaelen.derived.ad b/datasets/GM1954_beekdaelen/GM1954_beekdaelen.derived.ad index a9917cab63..7cbd0c9c36 100644 --- a/datasets/GM1954_beekdaelen/GM1954_beekdaelen.derived.ad +++ b/datasets/GM1954_beekdaelen/GM1954_beekdaelen.derived.ad @@ -1,6 +1,6 @@ - area = GM1954_beekdaelen -- id = 129533 -- parent_id = 129533 +- id = 129875 +- parent_id = 129875 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1954_beekdaelen/graph_values.yml b/datasets/GM1954_beekdaelen/graph_values.yml index 9b0df27b35..f28a647ae0 100644 --- a/datasets/GM1954_beekdaelen/graph_values.yml +++ b/datasets/GM1954_beekdaelen/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18783195482504997 - :network_gas: 0.15475495722701235 - :ambient_heat: 0.6574130879479376 + :electricity: 0.1878319563315338 + :network_gas: 0.1547549504478254 + :ambient_heat: 0.6574130932206409 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 16651.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1955_montferland/GM1955_montferland.derived.ad b/datasets/GM1955_montferland/GM1955_montferland.derived.ad index e7e5d4f582..b59aad8302 100644 --- a/datasets/GM1955_montferland/GM1955_montferland.derived.ad +++ b/datasets/GM1955_montferland/GM1955_montferland.derived.ad @@ -1,6 +1,6 @@ - area = GM1955_montferland -- id = 129377 -- parent_id = 129377 +- id = 129719 +- parent_id = 129719 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1955_montferland/graph_values.yml b/datasets/GM1955_montferland/graph_values.yml index 11afc74323..bfde7a96f6 100644 --- a/datasets/GM1955_montferland/graph_values.yml +++ b/datasets/GM1955_montferland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18962254441637041 - :network_gas: 0.14669729218746053 - :ambient_heat: 0.6636801633961691 + :electricity: 0.18962254585802915 + :network_gas: 0.14669728569998658 + :ambient_heat: 0.6636801684419843 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 15970.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1959_altena/GM1959_altena.derived.ad b/datasets/GM1959_altena/GM1959_altena.derived.ad index b5d5988e6b..38c4edcad0 100644 --- a/datasets/GM1959_altena/GM1959_altena.derived.ad +++ b/datasets/GM1959_altena/GM1959_altena.derived.ad @@ -1,6 +1,6 @@ - area = GM1959_altena -- id = 129532 -- parent_id = 129532 +- id = 129874 +- parent_id = 129874 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1959_altena/graph_values.yml b/datasets/GM1959_altena/graph_values.yml index 197a9d02c9..0944112753 100644 --- a/datasets/GM1959_altena/graph_values.yml +++ b/datasets/GM1959_altena/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18941202331302306 - :network_gas: 0.1476446385491018 - :ambient_heat: 0.6629433381378753 + :electricity: 0.1894120247623809 + :network_gas: 0.1476446320269817 + :ambient_heat: 0.6629433432106373 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22525.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1960_west_betuwe/GM1960_west_betuwe.derived.ad b/datasets/GM1960_west_betuwe/GM1960_west_betuwe.derived.ad index 02cfbf113c..26893b4850 100644 --- a/datasets/GM1960_west_betuwe/GM1960_west_betuwe.derived.ad +++ b/datasets/GM1960_west_betuwe/GM1960_west_betuwe.derived.ad @@ -1,6 +1,6 @@ - area = GM1960_west_betuwe -- id = 129530 -- parent_id = 129530 +- id = 129872 +- parent_id = 129872 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1960_west_betuwe/graph_values.yml b/datasets/GM1960_west_betuwe/graph_values.yml index a53dbf21a0..ff52c0f0be 100644 --- a/datasets/GM1960_west_betuwe/graph_values.yml +++ b/datasets/GM1960_west_betuwe/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18983287614192412 - :network_gas: 0.14575079802714705 - :ambient_heat: 0.6644163258309288 + :electricity: 0.18983287757587003 + :network_gas: 0.14575079157438078 + :ambient_heat: 0.664416330849749 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20961.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1961_vijfheerenlanden/GM1961_vijfheerenlanden.derived.ad b/datasets/GM1961_vijfheerenlanden/GM1961_vijfheerenlanden.derived.ad index aa5081b264..f379141ed6 100644 --- a/datasets/GM1961_vijfheerenlanden/GM1961_vijfheerenlanden.derived.ad +++ b/datasets/GM1961_vijfheerenlanden/GM1961_vijfheerenlanden.derived.ad @@ -1,6 +1,6 @@ - area = GM1961_vijfheerenlanden -- id = 129529 -- parent_id = 129529 +- id = 129871 +- parent_id = 129871 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1961_vijfheerenlanden/graph_values.yml b/datasets/GM1961_vijfheerenlanden/graph_values.yml index f99108ddac..caecc2d86e 100644 --- a/datasets/GM1961_vijfheerenlanden/graph_values.yml +++ b/datasets/GM1961_vijfheerenlanden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19031180916332865 - :network_gas: 0.1435955962536282 - :ambient_heat: 0.666092594583043 + :electricity: 0.19031181057963523 + :network_gas: 0.14359558988023927 + :ambient_heat: 0.6660925995401256 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 24175.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1963_hoeksche_waard/GM1963_hoeksche_waard.derived.ad b/datasets/GM1963_hoeksche_waard/GM1963_hoeksche_waard.derived.ad index 7fdb5b4faa..a1b17c7ebf 100644 --- a/datasets/GM1963_hoeksche_waard/GM1963_hoeksche_waard.derived.ad +++ b/datasets/GM1963_hoeksche_waard/GM1963_hoeksche_waard.derived.ad @@ -1,6 +1,6 @@ - area = GM1963_hoeksche_waard -- id = 129534 -- parent_id = 129534 +- id = 129876 +- parent_id = 129876 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1963_hoeksche_waard/graph_values.yml b/datasets/GM1963_hoeksche_waard/graph_values.yml index 42094fc1cd..050055c72d 100644 --- a/datasets/GM1963_hoeksche_waard/graph_values.yml +++ b/datasets/GM1963_hoeksche_waard/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19002588761666497 - :network_gas: 0.14488224511039255 - :ambient_heat: 0.6650918672729426 + :electricity: 0.19002588904351508 + :network_gas: 0.1448822386895577 + :ambient_heat: 0.6650918722669273 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 38171.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1966_het_hogeland/GM1966_het_hogeland.derived.ad b/datasets/GM1966_het_hogeland/GM1966_het_hogeland.derived.ad index 125bd6e710..0f02cae8f2 100644 --- a/datasets/GM1966_het_hogeland/GM1966_het_hogeland.derived.ad +++ b/datasets/GM1966_het_hogeland/GM1966_het_hogeland.derived.ad @@ -1,6 +1,6 @@ - area = GM1966_het_hogeland -- id = 129531 -- parent_id = 129531 +- id = 129873 +- parent_id = 129873 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1966_het_hogeland/graph_values.yml b/datasets/GM1966_het_hogeland/graph_values.yml index 3be50d3dc2..9b863c0302 100644 --- a/datasets/GM1966_het_hogeland/graph_values.yml +++ b/datasets/GM1966_het_hogeland/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.17955021414171665 - :network_gas: 0.19202284524233384 - :ambient_heat: 0.6284269406159495 + :electricity: 0.17955021592857134 + :network_gas: 0.19202283720147584 + :ambient_heat: 0.6284269468699528 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22402.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1969_westerkwartier/GM1969_westerkwartier.derived.ad b/datasets/GM1969_westerkwartier/GM1969_westerkwartier.derived.ad index c7a7d5b589..81959cc16a 100644 --- a/datasets/GM1969_westerkwartier/GM1969_westerkwartier.derived.ad +++ b/datasets/GM1969_westerkwartier/GM1969_westerkwartier.derived.ad @@ -1,6 +1,6 @@ - area = GM1969_westerkwartier -- id = 129537 -- parent_id = 129537 +- id = 129879 +- parent_id = 129879 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1969_westerkwartier/graph_values.yml b/datasets/GM1969_westerkwartier/graph_values.yml index 5f42f78876..c461042b22 100644 --- a/datasets/GM1969_westerkwartier/graph_values.yml +++ b/datasets/GM1969_westerkwartier/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18432013825885166 - :network_gas: 0.17055815507197955 - :ambient_heat: 0.6451217066691688 + :electricity: 0.18432013988813148 + :network_gas: 0.17055814774020941 + :ambient_heat: 0.645121712371659 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 27257.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1970_noardeast_fryslan/GM1970_noardeast_fryslan.derived.ad b/datasets/GM1970_noardeast_fryslan/GM1970_noardeast_fryslan.derived.ad index 9114c8e24e..df31ad47f2 100644 --- a/datasets/GM1970_noardeast_fryslan/GM1970_noardeast_fryslan.derived.ad +++ b/datasets/GM1970_noardeast_fryslan/GM1970_noardeast_fryslan.derived.ad @@ -1,6 +1,6 @@ - area = GM1970_noardeast_fryslan -- id = 129536 -- parent_id = 129536 +- id = 129878 +- parent_id = 129878 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1970_noardeast_fryslan/graph_values.yml b/datasets/GM1970_noardeast_fryslan/graph_values.yml index 9edc216344..ce1d78d1c3 100644 --- a/datasets/GM1970_noardeast_fryslan/graph_values.yml +++ b/datasets/GM1970_noardeast_fryslan/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1817957002327651 - :network_gas: 0.18191814293626343 - :ambient_heat: 0.6362861568309714 + :electricity: 0.181795701946762 + :network_gas: 0.181918135223266 + :ambient_heat: 0.636286162829972 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 20491.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1978_molenlanden/GM1978_molenlanden.derived.ad b/datasets/GM1978_molenlanden/GM1978_molenlanden.derived.ad index 9b8ea7049a..71e1c58698 100644 --- a/datasets/GM1978_molenlanden/GM1978_molenlanden.derived.ad +++ b/datasets/GM1978_molenlanden/GM1978_molenlanden.derived.ad @@ -1,6 +1,6 @@ - area = GM1978_molenlanden -- id = 129535 -- parent_id = 129535 +- id = 129877 +- parent_id = 129877 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1978_molenlanden/graph_values.yml b/datasets/GM1978_molenlanden/graph_values.yml index ac92e1080b..63efeddee9 100644 --- a/datasets/GM1978_molenlanden/graph_values.yml +++ b/datasets/GM1978_molenlanden/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1888821250769305 - :network_gas: 0.15002918412681518 - :ambient_heat: 0.6610886907962542 + :electricity: 0.18888212654557618 + :network_gas: 0.1500291775179001 + :ambient_heat: 0.6610886959365238 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 17330.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1979_eemsdelta/GM1979_eemsdelta.derived.ad b/datasets/GM1979_eemsdelta/GM1979_eemsdelta.derived.ad index 85a3d193c3..1335d737ca 100644 --- a/datasets/GM1979_eemsdelta/GM1979_eemsdelta.derived.ad +++ b/datasets/GM1979_eemsdelta/GM1979_eemsdelta.derived.ad @@ -1,6 +1,6 @@ - area = GM1979_eemsdelta -- id = 129538 -- parent_id = 129538 +- id = 129880 +- parent_id = 129880 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1979_eemsdelta/graph_values.yml b/datasets/GM1979_eemsdelta/graph_values.yml index 03ceed17cb..1fc381434e 100644 --- a/datasets/GM1979_eemsdelta/graph_values.yml +++ b/datasets/GM1979_eemsdelta/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18128763676368229 - :network_gas: 0.18420443191758337 - :ambient_heat: 0.6345079313187343 + :electricity: 0.18128763849436982 + :network_gas: 0.18420442412947782 + :ambient_heat: 0.6345079373761523 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22892.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1980_dijk_en_waard/GM1980_dijk_en_waard.derived.ad b/datasets/GM1980_dijk_en_waard/GM1980_dijk_en_waard.derived.ad index 3fb1d8b237..3d71756491 100644 --- a/datasets/GM1980_dijk_en_waard/GM1980_dijk_en_waard.derived.ad +++ b/datasets/GM1980_dijk_en_waard/GM1980_dijk_en_waard.derived.ad @@ -1,6 +1,6 @@ - area = GM1980_dijk_en_waard -- id = 129539 -- parent_id = 129539 +- id = 129881 +- parent_id = 129881 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1980_dijk_en_waard/graph_values.yml b/datasets/GM1980_dijk_en_waard/graph_values.yml index b6062aa4ec..a23d6974c6 100644 --- a/datasets/GM1980_dijk_en_waard/graph_values.yml +++ b/datasets/GM1980_dijk_en_waard/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.19390003781316914 - :network_gas: 0.1274485435253604 - :ambient_heat: 0.6786514186614704 + :electricity: 0.19390003909391562 + :network_gas: 0.12744853776199266 + :ambient_heat: 0.6786514231440917 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 36193.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1982_land_van_cuijk/GM1982_land_van_cuijk.derived.ad b/datasets/GM1982_land_van_cuijk/GM1982_land_van_cuijk.derived.ad index cc1ed06b71..a90f1ea3de 100644 --- a/datasets/GM1982_land_van_cuijk/GM1982_land_van_cuijk.derived.ad +++ b/datasets/GM1982_land_van_cuijk/GM1982_land_van_cuijk.derived.ad @@ -1,6 +1,6 @@ - area = GM1982_land_van_cuijk -- id = 129540 -- parent_id = 129540 +- id = 129882 +- parent_id = 129882 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1982_land_van_cuijk/graph_values.yml b/datasets/GM1982_land_van_cuijk/graph_values.yml index d4aa7ef6b8..200e119c67 100644 --- a/datasets/GM1982_land_van_cuijk/graph_values.yml +++ b/datasets/GM1982_land_van_cuijk/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18864031774017873 - :network_gas: 0.15111731874632642 - :ambient_heat: 0.660242363513495 + :electricity: 0.18864031921758234 + :network_gas: 0.15111731209800017 + :ambient_heat: 0.6602423686844174 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 39031.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1991_maashorst/GM1991_maashorst.derived.ad b/datasets/GM1991_maashorst/GM1991_maashorst.derived.ad index 66696ba27c..0333d47d98 100644 --- a/datasets/GM1991_maashorst/GM1991_maashorst.derived.ad +++ b/datasets/GM1991_maashorst/GM1991_maashorst.derived.ad @@ -1,6 +1,6 @@ - area = GM1991_maashorst -- id = 129541 -- parent_id = 129541 +- id = 129883 +- parent_id = 129883 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1991_maashorst/graph_values.yml b/datasets/GM1991_maashorst/graph_values.yml index 10a656635a..d884d9359d 100644 --- a/datasets/GM1991_maashorst/graph_values.yml +++ b/datasets/GM1991_maashorst/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18956299640707489 - :network_gas: 0.1469652586243265 - :ambient_heat: 0.6634717449685986 + :electricity: 0.18956299785091352 + :network_gas: 0.1469652521270431 + :ambient_heat: 0.6634717500220434 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 25517.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/GM1992_voorne_aan_zee/GM1992_voorne_aan_zee.derived.ad b/datasets/GM1992_voorne_aan_zee/GM1992_voorne_aan_zee.derived.ad index 9153815d15..6b8413e50b 100644 --- a/datasets/GM1992_voorne_aan_zee/GM1992_voorne_aan_zee.derived.ad +++ b/datasets/GM1992_voorne_aan_zee/GM1992_voorne_aan_zee.derived.ad @@ -1,6 +1,6 @@ - area = GM1992_voorne_aan_zee -- id = 129542 -- parent_id = 129542 +- id = 129884 +- parent_id = 129884 - group = municipality - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/GM1992_voorne_aan_zee/graph_values.yml b/datasets/GM1992_voorne_aan_zee/graph_values.yml index 871ad9abb4..67834b37f0 100644 --- a/datasets/GM1992_voorne_aan_zee/graph_values.yml +++ b/datasets/GM1992_voorne_aan_zee/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1901635713875797 - :network_gas: 0.1442626672278946 - :ambient_heat: 0.6655737613845257 + :electricity: 0.19016357280935733 + :network_gas: 0.14426266082988565 + :ambient_heat: 0.6655737663607569 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 33090.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.0371676180607669 + parent_share: 0.037167618 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.0176994573116793 + parent_share: 0.017699457 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.0323388136990158 + parent_share: 0.032338814 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.0985315173574029 + parent_share: 0.098531517 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.176496686762675 + parent_share: 0.176496687 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.097632076 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.0024774154802166 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.652366326 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.236506747 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.992198732 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.007801268 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.270531400966184 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.531400966183575 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.518304995130804 + parent_share: 0.518304995 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.383243045452293 + parent_share: 0.383243045 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242022457029 + parent_share: 0.038124202 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.9967795658198888 + parent_share: 0.996779566 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.0032204341801112 + parent_share: 0.003220434 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.438476898806052 + parent_share: 0.438476899 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0239827395498924 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2816302997565068 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.6943869606936007 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: From 05e83ea1a124800274ddc1bdce805f738e437780 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 27 Aug 2026 12:29:54 +0200 Subject: [PATCH 5/6] Re-export provinces datasets with heat pump update --- .../PV20_groningen/PV20_groningen.derived.ad | 4 +- datasets/PV20_groningen/graph_values.yml | 60 +++++++++---------- datasets/PV21_fryslan/PV21_fryslan.derived.ad | 4 +- datasets/PV21_fryslan/graph_values.yml | 60 +++++++++---------- datasets/PV22_drenthe/PV22_drenthe.derived.ad | 6 +- datasets/PV22_drenthe/graph_values.yml | 24 ++++---- .../PV23_overijssel.derived.ad | 4 +- datasets/PV23_overijssel/graph_values.yml | 60 +++++++++---------- .../PV24_flevoland/PV24_flevoland.derived.ad | 4 +- datasets/PV24_flevoland/graph_values.yml | 60 +++++++++---------- .../PV25_gelderland.derived.ad | 4 +- datasets/PV25_gelderland/graph_values.yml | 60 +++++++++---------- datasets/PV26_utrecht/PV26_utrecht.derived.ad | 4 +- datasets/PV26_utrecht/graph_values.yml | 60 +++++++++---------- .../PV27_noord_holland.derived.ad | 4 +- datasets/PV27_noord_holland/graph_values.yml | 60 +++++++++---------- .../PV28_zuid_holland.derived.ad | 4 +- datasets/PV28_zuid_holland/graph_values.yml | 60 +++++++++---------- datasets/PV29_zeeland/PV29_zeeland.derived.ad | 4 +- datasets/PV29_zeeland/graph_values.yml | 60 +++++++++---------- .../PV30_noord_brabant.derived.ad | 4 +- datasets/PV30_noord_brabant/graph_values.yml | 60 +++++++++---------- datasets/PV31_limburg/PV31_limburg.derived.ad | 4 +- datasets/PV31_limburg/graph_values.yml | 60 +++++++++---------- 24 files changed, 367 insertions(+), 367 deletions(-) diff --git a/datasets/PV20_groningen/PV20_groningen.derived.ad b/datasets/PV20_groningen/PV20_groningen.derived.ad index 20575d774d..dcc77cbdc2 100644 --- a/datasets/PV20_groningen/PV20_groningen.derived.ad +++ b/datasets/PV20_groningen/PV20_groningen.derived.ad @@ -1,6 +1,6 @@ - area = PV20_groningen -- id = 128474 -- parent_id = 128474 +- id = 129889 +- parent_id = 129889 - group = province - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/PV20_groningen/graph_values.yml b/datasets/PV20_groningen/graph_values.yml index f7643b9259..951fb0b2e1 100644 --- a/datasets/PV20_groningen/graph_values.yml +++ b/datasets/PV20_groningen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 69451.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.14979588602245614 - :network_gas: 0.17612262687649127 - :ambient_heat: 0.6740814871010526 + :electricity: 0.18095954666091138 + :network_gas: 0.18568083955657255 + :ambient_heat: 0.633359613782516 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 283315.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 7538.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20891116280473276 - :network_gas: 0.16435534878106683 - :ambient_heat: 0.6267334884142005 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769945 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853152 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/PV21_fryslan/PV21_fryslan.derived.ad b/datasets/PV21_fryslan/PV21_fryslan.derived.ad index e0f31af230..52ae351cd1 100644 --- a/datasets/PV21_fryslan/PV21_fryslan.derived.ad +++ b/datasets/PV21_fryslan/PV21_fryslan.derived.ad @@ -1,6 +1,6 @@ - area = PV21_fryslan -- id = 128477 -- parent_id = 128477 +- id = 129892 +- parent_id = 129892 - group = province - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/PV21_fryslan/graph_values.yml b/datasets/PV21_fryslan/graph_values.yml index 5f83f0efd3..b79b3ed56e 100644 --- a/datasets/PV21_fryslan/graph_values.yml +++ b/datasets/PV21_fryslan/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 75759.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15175005527470972 - :network_gas: 0.1653746959890966 - :ambient_heat: 0.6828752487361938 + :electricity: 0.18345014278882243 + :network_gas: 0.17447314045858264 + :ambient_heat: 0.6420767167525949 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 302954.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 14218.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2114522189001942 - :network_gas: 0.15419112439922103 - :ambient_heat: 0.6343566567005848 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853152 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/PV22_drenthe/PV22_drenthe.derived.ad b/datasets/PV22_drenthe/PV22_drenthe.derived.ad index 385d49e6a9..511926001c 100644 --- a/datasets/PV22_drenthe/PV22_drenthe.derived.ad +++ b/datasets/PV22_drenthe/PV22_drenthe.derived.ad @@ -1,6 +1,6 @@ - area = PV22_drenthe -- id = 129200 -- parent_id = 129200 +- id = 129887 +- parent_id = 129887 - group = province - enabled.etengine = true - enabled.etmodel = true @@ -141,7 +141,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 = 1560.0 +- area_per_building_residence_equivalent = 130.0 - electric_vehicle_profile_1_share = 0.24 - electric_vehicle_profile_2_share = 0.56 - electric_vehicle_profile_3_share = 0.08 diff --git a/datasets/PV22_drenthe/graph_values.yml b/datasets/PV22_drenthe/graph_values.yml index 115b9f49d6..84421489f5 100644 --- a/datasets/PV22_drenthe/graph_values.yml +++ b/datasets/PV22_drenthe/graph_values.yml @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.18343328738549816 - :network_gas: 0.1745489898853592 - :ambient_heat: 0.6420177227291427 + :electricity: 0.18343328919958857 + :network_gas: 0.17454898172194028 + :ambient_heat: 0.6420177290784712 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 223763.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -995,9 +995,9 @@ households_final_demand_electricity-households_final_demand_for_cooling_electric households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09853152 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.17649668 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,23 +1021,23 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.38324305 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.0381242 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.51830499 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99677957 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00322043 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.51830499 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.38324305 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: diff --git a/datasets/PV23_overijssel/PV23_overijssel.derived.ad b/datasets/PV23_overijssel/PV23_overijssel.derived.ad index dd4feffa0a..48c968fb8c 100644 --- a/datasets/PV23_overijssel/PV23_overijssel.derived.ad +++ b/datasets/PV23_overijssel/PV23_overijssel.derived.ad @@ -1,6 +1,6 @@ - area = PV23_overijssel -- id = 128476 -- parent_id = 128476 +- id = 129891 +- parent_id = 129891 - group = province - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/PV23_overijssel/graph_values.yml b/datasets/PV23_overijssel/graph_values.yml index a56e50b5ab..4865d2f351 100644 --- a/datasets/PV23_overijssel/graph_values.yml +++ b/datasets/PV23_overijssel/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 127436.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15432355882915233 - :network_gas: 0.15122042643966213 - :ambient_heat: 0.6944560147311855 + :electricity: 0.18673547192684983 + :network_gas: 0.15968913754288183 + :ambient_heat: 0.6535753905302684 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 514189.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 20793.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21479186687994847 - :network_gas: 0.1408325324802038 - :ambient_heat: 0.6443756006398478 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/PV24_flevoland/PV24_flevoland.derived.ad b/datasets/PV24_flevoland/PV24_flevoland.derived.ad index d19e8af4f4..019f14fb77 100644 --- a/datasets/PV24_flevoland/PV24_flevoland.derived.ad +++ b/datasets/PV24_flevoland/PV24_flevoland.derived.ad @@ -1,6 +1,6 @@ - area = PV24_flevoland -- id = 128470 -- parent_id = 128470 +- id = 129885 +- parent_id = 129885 - group = province - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/PV24_flevoland/graph_values.yml b/datasets/PV24_flevoland/graph_values.yml index 9a79df6989..07f1c70f3f 100644 --- a/datasets/PV24_flevoland/graph_values.yml +++ b/datasets/PV24_flevoland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 37735.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1638570529384666 - :network_gas: 0.09878620883843357 - :ambient_heat: 0.7373567382230998 + :electricity: 0.19895956546068305 + :network_gas: 0.10468063554709728 + :ambient_heat: 0.6963597989922197 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 172035.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 348.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2270971370308447 - :network_gas: 0.09161145187661882 - :ambient_heat: 0.6812914110925364 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853152 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649668 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/PV25_gelderland/PV25_gelderland.derived.ad b/datasets/PV25_gelderland/PV25_gelderland.derived.ad index 2a70fd0b46..76ffb5798d 100644 --- a/datasets/PV25_gelderland/PV25_gelderland.derived.ad +++ b/datasets/PV25_gelderland/PV25_gelderland.derived.ad @@ -1,6 +1,6 @@ - area = PV25_gelderland -- id = 128478 -- parent_id = 128478 +- id = 129893 +- parent_id = 129893 - group = province - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/PV25_gelderland/graph_values.yml b/datasets/PV25_gelderland/graph_values.yml index 378e4f5140..11e566ccd7 100644 --- a/datasets/PV25_gelderland/graph_values.yml +++ b/datasets/PV25_gelderland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 235258.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1548952093967853 - :network_gas: 0.14807634831768074 - :ambient_heat: 0.6970284422855338 + :electricity: 0.18746607124768458 + :network_gas: 0.15640143575239554 + :ambient_heat: 0.65613249299992 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 920676.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 22136.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2155326622798746 - :network_gas: 0.13786935088049934 - :ambient_heat: 0.6465979868396261 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853152 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649668 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/PV26_utrecht/PV26_utrecht.derived.ad b/datasets/PV26_utrecht/PV26_utrecht.derived.ad index 95a6538127..4a9d4b01af 100644 --- a/datasets/PV26_utrecht/PV26_utrecht.derived.ad +++ b/datasets/PV26_utrecht/PV26_utrecht.derived.ad @@ -1,6 +1,6 @@ - area = PV26_utrecht -- id = 128475 -- parent_id = 128475 +- id = 129890 +- parent_id = 129890 - group = province - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/PV26_utrecht/graph_values.yml b/datasets/PV26_utrecht/graph_values.yml index c3afa57d59..07c54621ea 100644 --- a/datasets/PV26_utrecht/graph_values.yml +++ b/datasets/PV26_utrecht/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 146561.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1570360339703021 - :network_gas: 0.1363018131633383 - :ambient_heat: 0.7066621528663596 + :electricity: 0.19020486076204696 + :network_gas: 0.14407686476888185 + :ambient_heat: 0.6657182744690712 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 593037.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 35393.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21830358662806848 - :network_gas: 0.12678565348772372 - :ambient_heat: 0.6549107598842078 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/PV27_noord_holland/PV27_noord_holland.derived.ad b/datasets/PV27_noord_holland/PV27_noord_holland.derived.ad index d415714b7e..f1d07ec571 100644 --- a/datasets/PV27_noord_holland/PV27_noord_holland.derived.ad +++ b/datasets/PV27_noord_holland/PV27_noord_holland.derived.ad @@ -1,6 +1,6 @@ - area = PV27_noord_holland -- id = 128471 -- parent_id = 128471 +- id = 129886 +- parent_id = 129886 - group = province - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/PV27_noord_holland/graph_values.yml b/datasets/PV27_noord_holland/graph_values.yml index 577f67b99f..63933c303f 100644 --- a/datasets/PV27_noord_holland/graph_values.yml +++ b/datasets/PV27_noord_holland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 382583.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15381080395810795 - :network_gas: 0.15404057823040632 - :ambient_heat: 0.6921486178114857 + :electricity: 0.18608039901836396 + :network_gas: 0.16263696997676283 + :ambient_heat: 0.6512826310048732 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 1357257.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 77002.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.214127072922448 - :network_gas: 0.14349170831020555 - :ambient_heat: 0.6423812187673463 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853152 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649668 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/PV28_zuid_holland/PV28_zuid_holland.derived.ad b/datasets/PV28_zuid_holland/PV28_zuid_holland.derived.ad index 16f9c31265..b9dc61cf70 100644 --- a/datasets/PV28_zuid_holland/PV28_zuid_holland.derived.ad +++ b/datasets/PV28_zuid_holland/PV28_zuid_holland.derived.ad @@ -1,6 +1,6 @@ - area = PV28_zuid_holland -- id = 128479 -- parent_id = 128479 +- id = 129894 +- parent_id = 129894 - group = province - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/PV28_zuid_holland/graph_values.yml b/datasets/PV28_zuid_holland/graph_values.yml index 28d0fb1f72..b8ef9f04ac 100644 --- a/datasets/PV28_zuid_holland/graph_values.yml +++ b/datasets/PV28_zuid_holland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 456582.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15577362305342887 - :network_gas: 0.14324507320614133 - :ambient_heat: 0.7009813037404299 + :electricity: 0.1885893251231618 + :network_gas: 0.15134678586118316 + :ambient_heat: 0.6600638890156552 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 1708278.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 88420.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21667025416618768 - :network_gas: 0.13331898333524697 - :ambient_heat: 0.6500107624985654 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/PV29_zeeland/PV29_zeeland.derived.ad b/datasets/PV29_zeeland/PV29_zeeland.derived.ad index e7bb482fdf..e6fc96837f 100644 --- a/datasets/PV29_zeeland/PV29_zeeland.derived.ad +++ b/datasets/PV29_zeeland/PV29_zeeland.derived.ad @@ -1,6 +1,6 @@ - area = PV29_zeeland -- id = 128473 -- parent_id = 128473 +- id = 129888 +- parent_id = 129888 - group = province - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/PV29_zeeland/graph_values.yml b/datasets/PV29_zeeland/graph_values.yml index 197f634057..3fb487cf7e 100644 --- a/datasets/PV29_zeeland/graph_values.yml +++ b/datasets/PV29_zeeland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 56359.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1533517437854568 - :network_gas: 0.15656540917998762 - :ambient_heat: 0.6900828470345556 + :electricity: 0.18549413408147392 + :network_gas: 0.16527516608199688 + :ambient_heat: 0.6492306998365293 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 188353.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 11311.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21353163732770455 - :network_gas: 0.1458734506891796 - :ambient_heat: 0.6405949119831159 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/PV30_noord_brabant/PV30_noord_brabant.derived.ad b/datasets/PV30_noord_brabant/PV30_noord_brabant.derived.ad index edf5f92c91..d92d4afcfa 100644 --- a/datasets/PV30_noord_brabant/PV30_noord_brabant.derived.ad +++ b/datasets/PV30_noord_brabant/PV30_noord_brabant.derived.ad @@ -1,6 +1,6 @@ - area = PV30_noord_brabant -- id = 128480 -- parent_id = 128480 +- id = 129895 +- parent_id = 129895 - group = province - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/PV30_noord_brabant/graph_values.yml b/datasets/PV30_noord_brabant/graph_values.yml index 7533b5898e..266915d4bf 100644 --- a/datasets/PV30_noord_brabant/graph_values.yml +++ b/datasets/PV30_noord_brabant/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 294540.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15641822966877647 - :network_gas: 0.13969973682172945 - :ambient_heat: 0.7038820335094941 + :electricity: 0.18941405960014635 + :network_gas: 0.14763547524353832 + :ambient_heat: 0.6629504651563154 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 1149763.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 39498.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21750449022131943 - :network_gas: 0.12998203911471992 - :ambient_heat: 0.6525134706639607 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133252 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/PV31_limburg/PV31_limburg.derived.ad b/datasets/PV31_limburg/PV31_limburg.derived.ad index cd66e8ad9d..45f72ff1e5 100644 --- a/datasets/PV31_limburg/PV31_limburg.derived.ad +++ b/datasets/PV31_limburg/PV31_limburg.derived.ad @@ -1,6 +1,6 @@ - area = PV31_limburg -- id = 128481 -- parent_id = 128481 +- id = 129896 +- parent_id = 129896 - group = province - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/PV31_limburg/graph_values.yml b/datasets/PV31_limburg/graph_values.yml index edfbf4e407..7e331942fa 100644 --- a/datasets/PV31_limburg/graph_values.yml +++ b/datasets/PV31_limburg/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 148103.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15477887518465777 - :network_gas: 0.1487161864843822 - :ambient_heat: 0.6965049383309599 + :electricity: 0.18731736679319552 + :network_gas: 0.15707060678408816 + :ambient_heat: 0.6556120264227163 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 518320.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 24454.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2153819366597145 - :network_gas: 0.13847225336113977 - :ambient_heat: 0.6461458099791457 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: From 7ea53bc5b2a9f70d012fd12d0431e0c6fe212b18 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 27 Aug 2026 12:33:55 +0200 Subject: [PATCH 6/6] Re-export RES region datasets with heat pump update --- .../ES01_groningen/ES01_groningen.derived.ad | 4 +- datasets/ES01_groningen/graph_values.yml | 60 +++++++++---------- .../ES02_friesland/ES02_friesland.derived.ad | 4 +- datasets/ES02_friesland/graph_values.yml | 60 +++++++++---------- datasets/ES03_drenthe/ES03_drenthe.derived.ad | 4 +- datasets/ES03_drenthe/graph_values.yml | 60 +++++++++---------- datasets/ES04_twente/ES04_twente.derived.ad | 4 +- datasets/ES04_twente/graph_values.yml | 60 +++++++++---------- .../ES05_west_overijssel.derived.ad | 4 +- .../ES05_west_overijssel/graph_values.yml | 60 +++++++++---------- .../ES06_flevoland/ES06_flevoland.derived.ad | 4 +- datasets/ES06_flevoland/graph_values.yml | 60 +++++++++---------- .../ES07_achterhoek.derived.ad | 4 +- datasets/ES07_achterhoek/graph_values.yml | 60 +++++++++---------- .../ES08_arnhem_nijmegen.derived.ad | 4 +- .../ES08_arnhem_nijmegen/graph_values.yml | 60 +++++++++---------- .../ES09_foodvalley.derived.ad | 4 +- datasets/ES09_foodvalley/graph_values.yml | 60 +++++++++---------- .../ES10_noord_veluwe.derived.ad | 4 +- datasets/ES10_noord_veluwe/graph_values.yml | 60 +++++++++---------- .../ES11_fruitdelta_rivierenland.derived.ad | 4 +- .../graph_values.yml | 60 +++++++++---------- .../ES12_stedendriehoek.derived.ad | 4 +- datasets/ES12_stedendriehoek/graph_values.yml | 60 +++++++++---------- .../ES13_amersfoort.derived.ad | 4 +- datasets/ES13_amersfoort/graph_values.yml | 60 +++++++++---------- datasets/ES14_u16/ES14_u16.derived.ad | 4 +- datasets/ES14_u16/graph_values.yml | 60 +++++++++---------- .../ES15_noord_holland_noord.derived.ad | 4 +- .../ES15_noord_holland_noord/graph_values.yml | 60 +++++++++---------- .../ES16_noord_holland_zuid.derived.ad | 4 +- .../ES16_noord_holland_zuid/graph_values.yml | 60 +++++++++---------- .../ES17_alblasserwaard.derived.ad | 4 +- datasets/ES17_alblasserwaard/graph_values.yml | 60 +++++++++---------- .../ES18_drechtsteden.derived.ad | 4 +- datasets/ES18_drechtsteden/graph_values.yml | 60 +++++++++---------- .../ES19_goeree_overflakkee.derived.ad | 4 +- .../ES19_goeree_overflakkee/graph_values.yml | 60 +++++++++---------- .../ES20_hoeksche_waard.derived.ad | 4 +- datasets/ES20_hoeksche_waard/graph_values.yml | 60 +++++++++---------- .../ES21_holland_rijnland.derived.ad | 4 +- .../ES21_holland_rijnland/graph_values.yml | 60 +++++++++---------- .../ES22_midden_holland.derived.ad | 4 +- datasets/ES22_midden_holland/graph_values.yml | 60 +++++++++---------- .../ES23_rotterdam_den_haag.derived.ad | 4 +- .../ES23_rotterdam_den_haag/graph_values.yml | 60 +++++++++---------- datasets/ES24_zeeland/ES24_zeeland.derived.ad | 4 +- datasets/ES24_zeeland/graph_values.yml | 60 +++++++++---------- .../ES25_hart_van_brabant.derived.ad | 4 +- .../ES25_hart_van_brabant/graph_values.yml | 60 +++++++++---------- .../ES26_metropoolregio_eindhoven.derived.ad | 4 +- .../graph_values.yml | 60 +++++++++---------- .../ES27_noordoost_brabant.derived.ad | 4 +- .../ES27_noordoost_brabant/graph_values.yml | 60 +++++++++---------- .../ES28_west_brabant.derived.ad | 4 +- datasets/ES28_west_brabant/graph_values.yml | 60 +++++++++---------- .../ES29_noord_en_midden_limburg.derived.ad | 4 +- .../graph_values.yml | 60 +++++++++---------- .../ES30_zuid_limburg.derived.ad | 4 +- datasets/ES30_zuid_limburg/graph_values.yml | 60 +++++++++---------- 60 files changed, 960 insertions(+), 960 deletions(-) diff --git a/datasets/ES01_groningen/ES01_groningen.derived.ad b/datasets/ES01_groningen/ES01_groningen.derived.ad index c224b01790..01f5496203 100644 --- a/datasets/ES01_groningen/ES01_groningen.derived.ad +++ b/datasets/ES01_groningen/ES01_groningen.derived.ad @@ -1,6 +1,6 @@ - area = ES01_groningen -- id = 128483 -- parent_id = 128483 +- id = 129897 +- parent_id = 129897 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES01_groningen/graph_values.yml b/datasets/ES01_groningen/graph_values.yml index f7643b9259..951fb0b2e1 100644 --- a/datasets/ES01_groningen/graph_values.yml +++ b/datasets/ES01_groningen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 69451.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.14979588602245614 - :network_gas: 0.17612262687649127 - :ambient_heat: 0.6740814871010526 + :electricity: 0.18095954666091138 + :network_gas: 0.18568083955657255 + :ambient_heat: 0.633359613782516 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 283315.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 7538.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.20891116280473276 - :network_gas: 0.16435534878106683 - :ambient_heat: 0.6267334884142005 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769945 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853152 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES02_friesland/ES02_friesland.derived.ad b/datasets/ES02_friesland/ES02_friesland.derived.ad index 6a2de4e593..79f855fe90 100644 --- a/datasets/ES02_friesland/ES02_friesland.derived.ad +++ b/datasets/ES02_friesland/ES02_friesland.derived.ad @@ -1,6 +1,6 @@ - area = ES02_friesland -- id = 128484 -- parent_id = 128484 +- id = 129898 +- parent_id = 129898 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES02_friesland/graph_values.yml b/datasets/ES02_friesland/graph_values.yml index 5f83f0efd3..b79b3ed56e 100644 --- a/datasets/ES02_friesland/graph_values.yml +++ b/datasets/ES02_friesland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 75759.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15175005527470972 - :network_gas: 0.1653746959890966 - :ambient_heat: 0.6828752487361938 + :electricity: 0.18345014278882243 + :network_gas: 0.17447314045858264 + :ambient_heat: 0.6420767167525949 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 302954.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 14218.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2114522189001942 - :network_gas: 0.15419112439922103 - :ambient_heat: 0.6343566567005848 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853152 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES03_drenthe/ES03_drenthe.derived.ad b/datasets/ES03_drenthe/ES03_drenthe.derived.ad index 7e7a2c6850..f6f504cc3f 100644 --- a/datasets/ES03_drenthe/ES03_drenthe.derived.ad +++ b/datasets/ES03_drenthe/ES03_drenthe.derived.ad @@ -1,6 +1,6 @@ - area = ES03_drenthe -- id = 128485 -- parent_id = 128485 +- id = 129899 +- parent_id = 129899 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES03_drenthe/graph_values.yml b/datasets/ES03_drenthe/graph_values.yml index ec6b8aaf8e..84421489f5 100644 --- a/datasets/ES03_drenthe/graph_values.yml +++ b/datasets/ES03_drenthe/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 51337.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1517368409257958 - :network_gas: 0.16544737490812306 - :ambient_heat: 0.6828157841660812 + :electricity: 0.18343328919958857 + :network_gas: 0.17454898172194028 + :ambient_heat: 0.6420177290784712 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 223763.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1401.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2114350508081594 - :network_gas: 0.15425979676736012 - :ambient_heat: 0.6343051524244805 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES04_twente/ES04_twente.derived.ad b/datasets/ES04_twente/ES04_twente.derived.ad index 2f2380686c..e748114ebd 100644 --- a/datasets/ES04_twente/ES04_twente.derived.ad +++ b/datasets/ES04_twente/ES04_twente.derived.ad @@ -1,6 +1,6 @@ - area = ES04_twente -- id = 128486 -- parent_id = 128486 +- id = 129900 +- parent_id = 129900 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES04_twente/graph_values.yml b/datasets/ES04_twente/graph_values.yml index 6bad201f44..ebaa246c11 100644 --- a/datasets/ES04_twente/graph_values.yml +++ b/datasets/ES04_twente/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 66762.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1544895202971922 - :network_gas: 0.15030763836544286 - :ambient_heat: 0.6952028413373649 + :electricity: 0.18694754861602397 + :network_gas: 0.15873479103470048 + :ambient_heat: 0.6543176603492755 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 282122.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 7500.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21500697327357787 - :network_gas: 0.13997210690568618 - :ambient_heat: 0.645020919820736 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES05_west_overijssel/ES05_west_overijssel.derived.ad b/datasets/ES05_west_overijssel/ES05_west_overijssel.derived.ad index 3334e786a0..df452ccf0c 100644 --- a/datasets/ES05_west_overijssel/ES05_west_overijssel.derived.ad +++ b/datasets/ES05_west_overijssel/ES05_west_overijssel.derived.ad @@ -1,6 +1,6 @@ - area = ES05_west_overijssel -- id = 128487 -- parent_id = 128487 +- id = 129901 +- parent_id = 129901 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES05_west_overijssel/graph_values.yml b/datasets/ES05_west_overijssel/graph_values.yml index fd90d81c61..ccadfa36ae 100644 --- a/datasets/ES05_west_overijssel/graph_values.yml +++ b/datasets/ES05_west_overijssel/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 60674.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15411275963187782 - :network_gas: 0.15237982202467212 - :ambient_heat: 0.6935074183434501 + :electricity: 0.1864661354081358 + :network_gas: 0.16090115366384927 + :ambient_heat: 0.652632710928015 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 232067.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 13293.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21451859947101518 - :network_gas: 0.14192560211593708 - :ambient_heat: 0.6435557984130479 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES06_flevoland/ES06_flevoland.derived.ad b/datasets/ES06_flevoland/ES06_flevoland.derived.ad index 2111f23aff..bde6ccafcf 100644 --- a/datasets/ES06_flevoland/ES06_flevoland.derived.ad +++ b/datasets/ES06_flevoland/ES06_flevoland.derived.ad @@ -1,6 +1,6 @@ - area = ES06_flevoland -- id = 128488 -- parent_id = 128488 +- id = 129902 +- parent_id = 129902 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES06_flevoland/graph_values.yml b/datasets/ES06_flevoland/graph_values.yml index 9a79df6989..07f1c70f3f 100644 --- a/datasets/ES06_flevoland/graph_values.yml +++ b/datasets/ES06_flevoland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 37735.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1638570529384666 - :network_gas: 0.09878620883843357 - :ambient_heat: 0.7373567382230998 + :electricity: 0.19895956546068305 + :network_gas: 0.10468063554709728 + :ambient_heat: 0.6963597989922197 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 172035.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 348.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2270971370308447 - :network_gas: 0.09161145187661882 - :ambient_heat: 0.6812914110925364 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853152 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649668 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES07_achterhoek/ES07_achterhoek.derived.ad b/datasets/ES07_achterhoek/ES07_achterhoek.derived.ad index 225348229b..b9e0fefd63 100644 --- a/datasets/ES07_achterhoek/ES07_achterhoek.derived.ad +++ b/datasets/ES07_achterhoek/ES07_achterhoek.derived.ad @@ -1,6 +1,6 @@ - area = ES07_achterhoek -- id = 128489 -- parent_id = 128489 +- id = 129903 +- parent_id = 129903 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES07_achterhoek/graph_values.yml b/datasets/ES07_achterhoek/graph_values.yml index 6ab0fe68b1..13c5c6b43b 100644 --- a/datasets/ES07_achterhoek/graph_values.yml +++ b/datasets/ES07_achterhoek/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 28865.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15457267964048346 - :network_gas: 0.1498502619773409 - :ambient_heat: 0.6955770583821757 + :electricity: 0.1870538248072374 + :network_gas: 0.15825654746921347 + :ambient_heat: 0.654689627723549 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 133558.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1256.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21511474601890165 - :network_gas: 0.139541015924391 - :ambient_heat: 0.6453442380567073 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES08_arnhem_nijmegen/ES08_arnhem_nijmegen.derived.ad b/datasets/ES08_arnhem_nijmegen/ES08_arnhem_nijmegen.derived.ad index ba02cfcc21..73c459aba8 100644 --- a/datasets/ES08_arnhem_nijmegen/ES08_arnhem_nijmegen.derived.ad +++ b/datasets/ES08_arnhem_nijmegen/ES08_arnhem_nijmegen.derived.ad @@ -1,6 +1,6 @@ - area = ES08_arnhem_nijmegen -- id = 128490 -- parent_id = 128490 +- id = 129904 +- parent_id = 129904 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES08_arnhem_nijmegen/graph_values.yml b/datasets/ES08_arnhem_nijmegen/graph_values.yml index 4e67dcd2da..c4c63fe053 100644 --- a/datasets/ES08_arnhem_nijmegen/graph_values.yml +++ b/datasets/ES08_arnhem_nijmegen/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 83606.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15510077192948116 - :network_gas: 0.14694575438785362 - :ambient_heat: 0.6979534736826651 + :electricity: 0.18772886564153 + :network_gas: 0.15521885923673678 + :ambient_heat: 0.6570522751217333 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 340621.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 13105.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21579895627634899 - :network_gas: 0.1368041748946018 - :ambient_heat: 0.6473968688290493 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853152 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649668 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES09_foodvalley/ES09_foodvalley.derived.ad b/datasets/ES09_foodvalley/ES09_foodvalley.derived.ad index 3ec6f432eb..a31c6215cf 100644 --- a/datasets/ES09_foodvalley/ES09_foodvalley.derived.ad +++ b/datasets/ES09_foodvalley/ES09_foodvalley.derived.ad @@ -1,6 +1,6 @@ - area = ES09_foodvalley -- id = 128491 -- parent_id = 128491 +- id = 129905 +- parent_id = 129905 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES09_foodvalley/graph_values.yml b/datasets/ES09_foodvalley/graph_values.yml index d4b0e72b79..850fab31e0 100644 --- a/datasets/ES09_foodvalley/graph_values.yml +++ b/datasets/ES09_foodvalley/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 39501.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15658927295413444 - :network_gas: 0.13875899875226044 - :ambient_heat: 0.7046517282936051 + :electricity: 0.1896329612768959 + :network_gas: 0.14665041624599126 + :ambient_heat: 0.6637166224771128 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 151540.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1954.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21772576795340923 - :network_gas: 0.1290969281863609 - :ambient_heat: 0.65317730386023 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES10_noord_veluwe/ES10_noord_veluwe.derived.ad b/datasets/ES10_noord_veluwe/ES10_noord_veluwe.derived.ad index def5727a38..658cb375d6 100644 --- a/datasets/ES10_noord_veluwe/ES10_noord_veluwe.derived.ad +++ b/datasets/ES10_noord_veluwe/ES10_noord_veluwe.derived.ad @@ -1,6 +1,6 @@ - area = ES10_noord_veluwe -- id = 128492 -- parent_id = 128492 +- id = 129906 +- parent_id = 129906 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES10_noord_veluwe/graph_values.yml b/datasets/ES10_noord_veluwe/graph_values.yml index f11d9ced2d..f185364e10 100644 --- a/datasets/ES10_noord_veluwe/graph_values.yml +++ b/datasets/ES10_noord_veluwe/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 19407.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15448829392320124 - :network_gas: 0.15031438342239314 - :ambient_heat: 0.6951973226544056 + :electricity: 0.18694598137943724 + :network_gas: 0.1587418436097376 + :ambient_heat: 0.6543121750108251 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 77388.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1058.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21500538385919796 - :network_gas: 0.1399784645632058 - :ambient_heat: 0.6450161515775963 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853152 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES11_fruitdelta_rivierenland/ES11_fruitdelta_rivierenland.derived.ad b/datasets/ES11_fruitdelta_rivierenland/ES11_fruitdelta_rivierenland.derived.ad index d021612d93..92c841a76e 100644 --- a/datasets/ES11_fruitdelta_rivierenland/ES11_fruitdelta_rivierenland.derived.ad +++ b/datasets/ES11_fruitdelta_rivierenland/ES11_fruitdelta_rivierenland.derived.ad @@ -1,6 +1,6 @@ - area = ES11_fruitdelta_rivierenland -- id = 128493 -- parent_id = 128493 +- id = 129907 +- parent_id = 129907 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES11_fruitdelta_rivierenland/graph_values.yml b/datasets/ES11_fruitdelta_rivierenland/graph_values.yml index 621f2aeca3..eb82262af6 100644 --- a/datasets/ES11_fruitdelta_rivierenland/graph_values.yml +++ b/datasets/ES11_fruitdelta_rivierenland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 25000.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15645269656595184 - :network_gas: 0.13951016888726475 - :ambient_heat: 0.7040371345467833 + :electricity: 0.1894581666640645 + :network_gas: 0.14743699316330422 + :ambient_heat: 0.6631048401726313 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 102069.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2687.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21754908096246633 - :network_gas: 0.12980367615013236 - :ambient_heat: 0.6526472428874013 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769945 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853152 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES12_stedendriehoek/ES12_stedendriehoek.derived.ad b/datasets/ES12_stedendriehoek/ES12_stedendriehoek.derived.ad index 5f8d114955..fc56889c3f 100644 --- a/datasets/ES12_stedendriehoek/ES12_stedendriehoek.derived.ad +++ b/datasets/ES12_stedendriehoek/ES12_stedendriehoek.derived.ad @@ -1,6 +1,6 @@ - area = ES12_stedendriehoek -- id = 128494 -- parent_id = 128494 +- id = 129908 +- parent_id = 129908 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES12_stedendriehoek/graph_values.yml b/datasets/ES12_stedendriehoek/graph_values.yml index 4ffebe263a..90aae35590 100644 --- a/datasets/ES12_stedendriehoek/graph_values.yml +++ b/datasets/ES12_stedendriehoek/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 47597.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15267745011991257 - :network_gas: 0.1602740243404808 - :ambient_heat: 0.6870485255396066 + :electricity: 0.18463334627280964 + :network_gas: 0.1691487169313748 + :ambient_heat: 0.6462179367958155 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 154519.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 2825.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21265658614019886 - :network_gas: 0.14937365543920234 - :ambient_heat: 0.6379697584205989 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES13_amersfoort/ES13_amersfoort.derived.ad b/datasets/ES13_amersfoort/ES13_amersfoort.derived.ad index 2c663f2b6d..2e4014f83f 100644 --- a/datasets/ES13_amersfoort/ES13_amersfoort.derived.ad +++ b/datasets/ES13_amersfoort/ES13_amersfoort.derived.ad @@ -1,6 +1,6 @@ - area = ES13_amersfoort -- id = 128495 -- parent_id = 128495 +- id = 129909 +- parent_id = 129909 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES13_amersfoort/graph_values.yml b/datasets/ES13_amersfoort/graph_values.yml index d065b6e575..4e974f39b4 100644 --- a/datasets/ES13_amersfoort/graph_values.yml +++ b/datasets/ES13_amersfoort/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 36895.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.155438201746677 - :network_gas: 0.1450898903932764 - :ambient_heat: 0.6994719078600465 + :electricity: 0.18816032792756884 + :network_gas: 0.15327727608728 + :ambient_heat: 0.6585623959851512 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 132523.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 5929.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2162359708721812 - :network_gas: 0.13505611651127303 - :ambient_heat: 0.6487079126165458 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES14_u16/ES14_u16.derived.ad b/datasets/ES14_u16/ES14_u16.derived.ad index 9f2e7a663e..65eed8b506 100644 --- a/datasets/ES14_u16/ES14_u16.derived.ad +++ b/datasets/ES14_u16/ES14_u16.derived.ad @@ -1,6 +1,6 @@ - area = ES14_u16 -- id = 128496 -- parent_id = 128496 +- id = 129910 +- parent_id = 129910 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES14_u16/graph_values.yml b/datasets/ES14_u16/graph_values.yml index 6729c40f05..7d405c25a2 100644 --- a/datasets/ES14_u16/graph_values.yml +++ b/datasets/ES14_u16/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 100948.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15755731720252591 - :network_gas: 0.1334347553861075 - :ambient_heat: 0.7090079274113665 + :electricity: 0.19087239094595942 + :network_gas: 0.14107297451294062 + :ambient_heat: 0.6680546345410999 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 421495.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 28715.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21897749856486454 - :network_gas: 0.12409000574053965 - :ambient_heat: 0.6569324956945959 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES15_noord_holland_noord/ES15_noord_holland_noord.derived.ad b/datasets/ES15_noord_holland_noord/ES15_noord_holland_noord.derived.ad index fd0d2123c6..f97b150ef2 100644 --- a/datasets/ES15_noord_holland_noord/ES15_noord_holland_noord.derived.ad +++ b/datasets/ES15_noord_holland_noord/ES15_noord_holland_noord.derived.ad @@ -1,6 +1,6 @@ - area = ES15_noord_holland_noord -- id = 128497 -- parent_id = 128497 +- id = 129911 +- parent_id = 129911 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES15_noord_holland_noord/graph_values.yml b/datasets/ES15_noord_holland_noord/graph_values.yml index 48971b0374..0bc3de11eb 100644 --- a/datasets/ES15_noord_holland_noord/graph_values.yml +++ b/datasets/ES15_noord_holland_noord/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 73310.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15420103372993466 - :network_gas: 0.15189431448535928 - :ambient_heat: 0.693904651784706 + :electricity: 0.18657891964943787 + :network_gas: 0.16039362382978944 + :ambient_heat: 0.6530274565207728 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 306393.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 12835.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21463304109572315 - :network_gas: 0.1414678356171051 - :ambient_heat: 0.6438991232871717 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853152 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133252 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES16_noord_holland_zuid/ES16_noord_holland_zuid.derived.ad b/datasets/ES16_noord_holland_zuid/ES16_noord_holland_zuid.derived.ad index 7131edc903..30db086969 100644 --- a/datasets/ES16_noord_holland_zuid/ES16_noord_holland_zuid.derived.ad +++ b/datasets/ES16_noord_holland_zuid/ES16_noord_holland_zuid.derived.ad @@ -1,6 +1,6 @@ - area = ES16_noord_holland_zuid -- id = 128498 -- parent_id = 128498 +- id = 129912 +- parent_id = 129912 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES16_noord_holland_zuid/graph_values.yml b/datasets/ES16_noord_holland_zuid/graph_values.yml index 130ceebf92..7f18dfc009 100644 --- a/datasets/ES16_noord_holland_zuid/graph_values.yml +++ b/datasets/ES16_noord_holland_zuid/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 309273.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15367417909859502 - :network_gas: 0.15479201495772751 - :ambient_heat: 0.6915338059436775 + :electricity: 0.1859058947229703 + :network_gas: 0.16342224046368017 + :ambient_heat: 0.6506718648133496 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 1050864.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 64167.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21394988563849612 - :network_gas: 0.1442004574460131 - :ambient_heat: 0.6418496569154907 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853152 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649668 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES17_alblasserwaard/ES17_alblasserwaard.derived.ad b/datasets/ES17_alblasserwaard/ES17_alblasserwaard.derived.ad index 6f95c8d54e..04dfd9cf9d 100644 --- a/datasets/ES17_alblasserwaard/ES17_alblasserwaard.derived.ad +++ b/datasets/ES17_alblasserwaard/ES17_alblasserwaard.derived.ad @@ -1,6 +1,6 @@ - area = ES17_alblasserwaard -- id = 128499 -- parent_id = 128499 +- id = 129913 +- parent_id = 129913 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES17_alblasserwaard/graph_values.yml b/datasets/ES17_alblasserwaard/graph_values.yml index efbd1a6777..081fba394a 100644 --- a/datasets/ES17_alblasserwaard/graph_values.yml +++ b/datasets/ES17_alblasserwaard/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 10541.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15637580160099182 - :network_gas: 0.13993309119454506 - :ambient_heat: 0.7036911072044633 + :electricity: 0.18935976178004854 + :network_gas: 0.1478798157941853 + :ambient_heat: 0.6627604224257663 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 34603.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1086.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2174495935621774 - :network_gas: 0.130201625751288 - :ambient_heat: 0.6523487806865346 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769945 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853152 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES18_drechtsteden/ES18_drechtsteden.derived.ad b/datasets/ES18_drechtsteden/ES18_drechtsteden.derived.ad index c3d797c0ad..0de65be920 100644 --- a/datasets/ES18_drechtsteden/ES18_drechtsteden.derived.ad +++ b/datasets/ES18_drechtsteden/ES18_drechtsteden.derived.ad @@ -1,6 +1,6 @@ - area = ES18_drechtsteden -- id = 128501 -- parent_id = 128501 +- id = 129915 +- parent_id = 129915 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES18_drechtsteden/graph_values.yml b/datasets/ES18_drechtsteden/graph_values.yml index 8e86ceecc2..dae43c6591 100644 --- a/datasets/ES18_drechtsteden/graph_values.yml +++ b/datasets/ES18_drechtsteden/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 29093.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1554836923695246 - :network_gas: 0.14483969196761456 - :ambient_heat: 0.6996766156628609 + :electricity: 0.18821850544526453 + :network_gas: 0.15301547687170503 + :ambient_heat: 0.6587660176830304 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 130296.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 7942.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.216294879049764 - :network_gas: 0.13482048380094175 - :ambient_heat: 0.6488846371492943 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133252 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES19_goeree_overflakkee/ES19_goeree_overflakkee.derived.ad b/datasets/ES19_goeree_overflakkee/ES19_goeree_overflakkee.derived.ad index 6c5680c260..d5d3e02b09 100644 --- a/datasets/ES19_goeree_overflakkee/ES19_goeree_overflakkee.derived.ad +++ b/datasets/ES19_goeree_overflakkee/ES19_goeree_overflakkee.derived.ad @@ -1,6 +1,6 @@ - area = ES19_goeree_overflakkee -- id = 128500 -- parent_id = 128500 +- id = 129914 +- parent_id = 129914 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES19_goeree_overflakkee/graph_values.yml b/datasets/ES19_goeree_overflakkee/graph_values.yml index bb01040fd1..d6726061a0 100644 --- a/datasets/ES19_goeree_overflakkee/graph_values.yml +++ b/datasets/ES19_goeree_overflakkee/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 6955.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15561869505952025 - :network_gas: 0.14409717717263865 - :ambient_heat: 0.7002841277678411 + :electricity: 0.18839116433771247 + :network_gas: 0.15223851071028563 + :ambient_heat: 0.6593703249520019 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 22021.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 1305.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21646968089732332 - :network_gas: 0.13412127641070445 - :ambient_heat: 0.6494090426919722 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133252 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES20_hoeksche_waard/ES20_hoeksche_waard.derived.ad b/datasets/ES20_hoeksche_waard/ES20_hoeksche_waard.derived.ad index 6f55f0f28e..68be82060b 100644 --- a/datasets/ES20_hoeksche_waard/ES20_hoeksche_waard.derived.ad +++ b/datasets/ES20_hoeksche_waard/ES20_hoeksche_waard.derived.ad @@ -1,6 +1,6 @@ - area = ES20_hoeksche_waard -- id = 128502 -- parent_id = 128502 +- id = 129916 +- parent_id = 129916 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES20_hoeksche_waard/graph_values.yml b/datasets/ES20_hoeksche_waard/graph_values.yml index 3e44bfc118..7f7e38cd57 100644 --- a/datasets/ES20_hoeksche_waard/graph_values.yml +++ b/datasets/ES20_hoeksche_waard/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 5414.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15689626494702877 - :network_gas: 0.13707054279134184 - :ambient_heat: 0.7060331922616294 + :electricity: 0.19002592226283688 + :network_gas: 0.14488208920238907 + :ambient_heat: 0.665091988534774 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 38171.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 523.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21812284093759912 - :network_gas: 0.12750863624960107 - :ambient_heat: 0.6543685228127998 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES21_holland_rijnland/ES21_holland_rijnland.derived.ad b/datasets/ES21_holland_rijnland/ES21_holland_rijnland.derived.ad index f68f6bf5be..ed8692e2db 100644 --- a/datasets/ES21_holland_rijnland/ES21_holland_rijnland.derived.ad +++ b/datasets/ES21_holland_rijnland/ES21_holland_rijnland.derived.ad @@ -1,6 +1,6 @@ - area = ES21_holland_rijnland -- id = 128503 -- parent_id = 128503 +- id = 129917 +- parent_id = 129917 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES21_holland_rijnland/graph_values.yml b/datasets/ES21_holland_rijnland/graph_values.yml index 9cacaabe6a..b9b63cca34 100644 --- a/datasets/ES21_holland_rijnland/graph_values.yml +++ b/datasets/ES21_holland_rijnland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 63504.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15595508303107705 - :network_gas: 0.14224704332907628 - :ambient_heat: 0.7017978736398466 + :electricity: 0.18882145239181253 + :network_gas: 0.15030221161234336 + :ambient_heat: 0.6608763359958442 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 255263.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 17499.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.216905143593508 - :network_gas: 0.1323794256259657 - :ambient_heat: 0.6507154307805263 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES22_midden_holland/ES22_midden_holland.derived.ad b/datasets/ES22_midden_holland/ES22_midden_holland.derived.ad index 9549b831dd..731fa69996 100644 --- a/datasets/ES22_midden_holland/ES22_midden_holland.derived.ad +++ b/datasets/ES22_midden_holland/ES22_midden_holland.derived.ad @@ -1,6 +1,6 @@ - area = ES22_midden_holland -- id = 128504 -- parent_id = 128504 +- id = 129918 +- parent_id = 129918 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES22_midden_holland/graph_values.yml b/datasets/ES22_midden_holland/graph_values.yml index 9714750945..b7266409c5 100644 --- a/datasets/ES22_midden_holland/graph_values.yml +++ b/datasets/ES22_midden_holland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 21981.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15639316063066316 - :network_gas: 0.13983761653135243 - :ambient_heat: 0.7037692228379843 + :electricity: 0.18938197460552256 + :network_gas: 0.1477798579321944 + :ambient_heat: 0.6628381674622832 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 103617.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 6267.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2174720534262251 - :network_gas: 0.13011178629509718 - :ambient_heat: 0.6524161602786777 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853152 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649668 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES23_rotterdam_den_haag/ES23_rotterdam_den_haag.derived.ad b/datasets/ES23_rotterdam_den_haag/ES23_rotterdam_den_haag.derived.ad index 2c70f34d44..ec724c0377 100644 --- a/datasets/ES23_rotterdam_den_haag/ES23_rotterdam_den_haag.derived.ad +++ b/datasets/ES23_rotterdam_den_haag/ES23_rotterdam_den_haag.derived.ad @@ -1,6 +1,6 @@ - area = ES23_rotterdam_den_haag -- id = 128505 -- parent_id = 128505 +- id = 129919 +- parent_id = 129919 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES23_rotterdam_den_haag/graph_values.yml b/datasets/ES23_rotterdam_den_haag/graph_values.yml index 8f285f3a2a..b0858ac323 100644 --- a/datasets/ES23_rotterdam_den_haag/graph_values.yml +++ b/datasets/ES23_rotterdam_den_haag/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 319094.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15562727912325675 - :network_gas: 0.14404996482208804 - :ambient_heat: 0.7003227560546552 + :electricity: 0.18840214129169272 + :network_gas: 0.15218911434455445 + :ambient_heat: 0.6594087443637527 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 1124307.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 53798.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21648079280258095 - :network_gas: 0.13407682878967386 - :ambient_heat: 0.6494423784077451 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES24_zeeland/ES24_zeeland.derived.ad b/datasets/ES24_zeeland/ES24_zeeland.derived.ad index e9a745f73a..e4074db675 100644 --- a/datasets/ES24_zeeland/ES24_zeeland.derived.ad +++ b/datasets/ES24_zeeland/ES24_zeeland.derived.ad @@ -1,6 +1,6 @@ - area = ES24_zeeland -- id = 128506 -- parent_id = 128506 +- id = 129920 +- parent_id = 129920 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES24_zeeland/graph_values.yml b/datasets/ES24_zeeland/graph_values.yml index 197f634057..3fb487cf7e 100644 --- a/datasets/ES24_zeeland/graph_values.yml +++ b/datasets/ES24_zeeland/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 56359.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1533517437854568 - :network_gas: 0.15656540917998762 - :ambient_heat: 0.6900828470345556 + :electricity: 0.18549413408147392 + :network_gas: 0.16527516608199688 + :ambient_heat: 0.6492306998365293 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 188353.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 11311.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21353163732770455 - :network_gas: 0.1458734506891796 - :ambient_heat: 0.6405949119831159 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES25_hart_van_brabant/ES25_hart_van_brabant.derived.ad b/datasets/ES25_hart_van_brabant/ES25_hart_van_brabant.derived.ad index 6fb859c38c..3477704aab 100644 --- a/datasets/ES25_hart_van_brabant/ES25_hart_van_brabant.derived.ad +++ b/datasets/ES25_hart_van_brabant/ES25_hart_van_brabant.derived.ad @@ -1,6 +1,6 @@ - area = ES25_hart_van_brabant -- id = 128507 -- parent_id = 128507 +- id = 129921 +- parent_id = 129921 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES25_hart_van_brabant/graph_values.yml b/datasets/ES25_hart_van_brabant/graph_values.yml index 1fa1d647e8..aa05d85128 100644 --- a/datasets/ES25_hart_van_brabant/graph_values.yml +++ b/datasets/ES25_hart_van_brabant/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 50747.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15794109460851957 - :network_gas: 0.13132397965314238 - :ambient_heat: 0.7107349257383381 + :electricity: 0.19136399791191072 + :network_gas: 0.1388607399048834 + :ambient_heat: 0.6697752621832057 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 208336.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 11713.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2194734442081172 - :network_gas: 0.1221062231675289 - :ambient_heat: 0.658420332624354 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853152 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649668 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES26_metropoolregio_eindhoven/ES26_metropoolregio_eindhoven.derived.ad b/datasets/ES26_metropoolregio_eindhoven/ES26_metropoolregio_eindhoven.derived.ad index 657d079017..e84d42d813 100644 --- a/datasets/ES26_metropoolregio_eindhoven/ES26_metropoolregio_eindhoven.derived.ad +++ b/datasets/ES26_metropoolregio_eindhoven/ES26_metropoolregio_eindhoven.derived.ad @@ -1,6 +1,6 @@ - area = ES26_metropoolregio_eindhoven -- id = 128508 -- parent_id = 128508 +- id = 129922 +- parent_id = 129922 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES26_metropoolregio_eindhoven/graph_values.yml b/datasets/ES26_metropoolregio_eindhoven/graph_values.yml index 8c7007c422..994056532c 100644 --- a/datasets/ES26_metropoolregio_eindhoven/graph_values.yml +++ b/datasets/ES26_metropoolregio_eindhoven/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 93791.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15590520657061233 - :network_gas: 0.14252136386163222 - :ambient_heat: 0.7015734295677555 + :electricity: 0.1887576463677888 + :network_gas: 0.15058933914373338 + :ambient_heat: 0.6606530144884778 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 353326.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 11145.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.2168405851841094 - :network_gas: 0.1326376592635601 - :ambient_heat: 0.6505217555523305 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES27_noordoost_brabant/ES27_noordoost_brabant.derived.ad b/datasets/ES27_noordoost_brabant/ES27_noordoost_brabant.derived.ad index dbe4bdb9d0..a8976d5734 100644 --- a/datasets/ES27_noordoost_brabant/ES27_noordoost_brabant.derived.ad +++ b/datasets/ES27_noordoost_brabant/ES27_noordoost_brabant.derived.ad @@ -1,6 +1,6 @@ - area = ES27_noordoost_brabant -- id = 128509 -- parent_id = 128509 +- id = 129923 +- parent_id = 129923 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES27_noordoost_brabant/graph_values.yml b/datasets/ES27_noordoost_brabant/graph_values.yml index 340d95f33a..dd8d9e9111 100644 --- a/datasets/ES27_noordoost_brabant/graph_values.yml +++ b/datasets/ES27_noordoost_brabant/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 68878.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1561332957979275 - :network_gas: 0.14126687311139874 - :ambient_heat: 0.7025998310906738 + :electricity: 0.18904945753456 + :network_gas: 0.14927618695741415 + :ambient_heat: 0.6616743555080259 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 270924.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 4437.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21713579481102288 - :network_gas: 0.13145682075590623 - :ambient_heat: 0.651407384433071 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133252 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES28_west_brabant/ES28_west_brabant.derived.ad b/datasets/ES28_west_brabant/ES28_west_brabant.derived.ad index b9cfd0b170..fc7831f091 100644 --- a/datasets/ES28_west_brabant/ES28_west_brabant.derived.ad +++ b/datasets/ES28_west_brabant/ES28_west_brabant.derived.ad @@ -1,6 +1,6 @@ - area = ES28_west_brabant -- id = 128510 -- parent_id = 128510 +- id = 129924 +- parent_id = 129924 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES28_west_brabant/graph_values.yml b/datasets/ES28_west_brabant/graph_values.yml index e755fff379..d9be163ade 100644 --- a/datasets/ES28_west_brabant/graph_values.yml +++ b/datasets/ES28_west_brabant/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 81124.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.1563044557470506 - :network_gas: 0.14032549339122166 - :ambient_heat: 0.7033700508617278 + :electricity: 0.18926846318161986 + :network_gas: 0.14829066009278097 + :ambient_heat: 0.6624408767255991 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 317177.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 12203.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21735727956617681 - :network_gas: 0.13057088173529033 - :ambient_heat: 0.6520718386985328 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853152 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.51830499 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324305 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES29_noord_en_midden_limburg/ES29_noord_en_midden_limburg.derived.ad b/datasets/ES29_noord_en_midden_limburg/ES29_noord_en_midden_limburg.derived.ad index 6d4662b4bf..a4894f4183 100644 --- a/datasets/ES29_noord_en_midden_limburg/ES29_noord_en_midden_limburg.derived.ad +++ b/datasets/ES29_noord_en_midden_limburg/ES29_noord_en_midden_limburg.derived.ad @@ -1,6 +1,6 @@ - area = ES29_noord_en_midden_limburg -- id = 128511 -- parent_id = 128511 +- id = 129925 +- parent_id = 129925 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES29_noord_en_midden_limburg/graph_values.yml b/datasets/ES29_noord_en_midden_limburg/graph_values.yml index 5aa81cc7b0..f6ee3f8def 100644 --- a/datasets/ES29_noord_en_midden_limburg/graph_values.yml +++ b/datasets/ES29_noord_en_midden_limburg/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 63679.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15574709045411567 - :network_gas: 0.14339100250236372 - :ambient_heat: 0.7008619070435206 + :electricity: 0.1885553886705303 + :network_gas: 0.15149950012315608 + :ambient_heat: 0.6599451112063136 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 218729.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 5342.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21663590812154976 - :network_gas: 0.1334563675137987 - :ambient_heat: 0.6499077243646516 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769946 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853151 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133252 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: diff --git a/datasets/ES30_zuid_limburg/ES30_zuid_limburg.derived.ad b/datasets/ES30_zuid_limburg/ES30_zuid_limburg.derived.ad index cdfccfaa9a..37c8771e63 100644 --- a/datasets/ES30_zuid_limburg/ES30_zuid_limburg.derived.ad +++ b/datasets/ES30_zuid_limburg/ES30_zuid_limburg.derived.ad @@ -1,6 +1,6 @@ - area = ES30_zuid_limburg -- id = 128512 -- parent_id = 128512 +- id = 129926 +- parent_id = 129926 - group = res - enabled.etengine = true - enabled.etmodel = true diff --git a/datasets/ES30_zuid_limburg/graph_values.yml b/datasets/ES30_zuid_limburg/graph_values.yml index 431e8b14ac..64e25873bf 100644 --- a/datasets/ES30_zuid_limburg/graph_values.yml +++ b/datasets/ES30_zuid_limburg/graph_values.yml @@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation: full_load_hours: 900.0 buildings_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.153893106553106 - :network_gas: 0.153587913957917 - :ambient_heat: 0.692518979488977 + :electricity: 0.186185535173166 + :network_gas: 0.16216385658269 + :ambient_heat: 0.651650608244144 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal: number_of_units: 84424.0 bunkers_total_useful_demand_planes: @@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation: full_load_hours: 900.0 households_space_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.15390817462611026 - :network_gas: 0.15350503955639366 - :ambient_heat: 0.6925867858174961 + :electricity: 0.18620477811092706 + :network_gas: 0.16207726323510926 + :ambient_heat: 0.6517179586539636 households_useful_demand_for_hot_water_after_solar_heater: number_of_units: 299591.0 households_useful_demand_for_space_heating_apartments_1945_1964: @@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945: number_of_units: 19112.0 households_water_heater_hybrid_heatpump_air_water_electricity: input: - :electricity: 0.21425333871996388 - :network_gas: 0.1429866451201421 - :ambient_heat: 0.6427600161598939 + :electricity: 0.0 + :network_gas: 1.0 + :ambient_heat: 0.0 industry_aluminium_electrolysis_current_electricity: input: :electricity: 0.940352020860495 @@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil: parent_share: 0.0 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity: - parent_share: 0.03663165 + parent_share: 0.03716762 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity: - parent_share: 0.01744423 + parent_share: 0.01769945 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity: - parent_share: 0.07891174 + parent_share: 0.03233881 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity: - parent_share: 0.09711067 + parent_share: 0.09853152 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity: - parent_share: 0.14133253 + parent_share: 0.17649669 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity: parent_share: 0.09763207 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity: @@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity: parent_share: 0.00247742 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.65236632 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.23650675 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99219873 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00780127 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity: parent_share: 0.2705314 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity: parent_share: 0.53140097 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity: - parent_share: 0.39225995 + parent_share: 0.518305 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity: - parent_share: 0.50065881 + parent_share: 0.38324304 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity: - parent_share: 0.02127438 + parent_share: 0.0381242 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas: - parent_share: 0.99838843 + parent_share: 0.99677957 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas: - parent_share: 0.00161157 + parent_share: 0.00322043 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas: parent_share: 0.0 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water: - parent_share: 0.43108992 + parent_share: 0.4384769 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas: - parent_share: 0.0240719 + parent_share: 0.02398274 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas: - parent_share: 0.2654386 + parent_share: 0.2816303 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas: - parent_share: 0.7104895 + parent_share: 0.69438696 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets: parent_share: 0.0 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: