-
Notifications
You must be signed in to change notification settings - Fork 18
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature road transport #269
Feature road transport #269
Commits on Aug 21, 2023
-
Configuration menu - View commit details
-
Copy full SHA for a898b4a - Browse repository at this point
Copy the full SHA a898b4aView commit details -
- add jrc-idees url to config file
- get jrc_idees_zipped and jrc_idees_unzipped to run if called specifically: include jrc-idees.smk into Snakefile
Configuration menu - View commit details
-
Copy full SHA for f5e0969 - Browse repository at this point
Copy the full SHA f5e0969View commit details -
- add transport.py file from feature-sector-coupling by brynpickering
- add missing utils functions to utils.py
Configuration menu - View commit details
-
Copy full SHA for 146e083 - Browse repository at this point
Copy the full SHA 146e083View commit details -
get jrc_idees_transport_processed to run in feature_road_transport br…
…anch based on develop - adjust transport.py file to only contain road transport - add missing utils functions to utils.py - adjust default.yaml env to contain styleframe,xarray,netcdf
Configuration menu - View commit details
-
Copy full SHA for 98c498f - Browse repository at this point
Copy the full SHA 98c498fView commit details
Commits on Aug 22, 2023
-
copy eurostat_data_tsv rule from feature-sector-coupling into feature…
…-road-transport-v2: - create eurstat.smk file that only contains eurostat_data_tsv rule - adjust config file to contain eurostat-base-url TODO: move eurostat data files into develop data-repository on git! and then adjust config file accordingly
Configuration menu - View commit details
-
Copy full SHA for 0dd8c18 - Browse repository at this point
Copy the full SHA 0dd8c18View commit details -
transfer annual_energy_balances rule from feature-sector-coupling int…
…o feature-road-transport-v2: - complement annual_energy_balances rule to eurostat.smk - add annual_energy_balance.py to scrips and adjust utils.py to contain all needed functions by it - adjust snakefile to contain eurostat.smk rules
Configuration menu - View commit details
-
Copy full SHA for 7c39862 - Browse repository at this point
Copy the full SHA 7c39862View commit details -
transfer ch_data_xlsx rule from feature-sector-coupling into feature-…
…road-transport-v2: - create ch-stats.smk and add rule: ch_data_xlsx to it - adjust config file to contain all ch-stats urls - include newly added ch-stats.smk into snakefile
Configuration menu - View commit details
-
Copy full SHA for f056224 - Browse repository at this point
Copy the full SHA f056224View commit details -
adjust default.yaml, configfile from feature-sector-coupling:
- remove all ch-stats download links not needed for transport demand: namely only leave for ch-energy-balance.xlsx in - left the wildcard.dataset syntax in for future downloads of futher ch-stats
Configuration menu - View commit details
-
Copy full SHA for af7318c - Browse repository at this point
Copy the full SHA af7318cView commit details -
transfer ch_annual_transport_energy_balance rule from feature-sector-…
…coupling into feature-road-transport-v2: - add transport.py into ch-stats/scripts and adjust utils.py to contain remove digits needed by transport.py
Configuration menu - View commit details
-
Copy full SHA for 72545f3 - Browse repository at this point
Copy the full SHA 72545f3View commit details -
transfer sectoral_annual_energy_balances rule and transport_subsector…
…_annual_energy_balances rule from feature-sector-coupling into feature-road-transport-v2: - transfered blend_and_rename_per_sector.py - adjusted utils by adding merge_da, which is needed by blend_and_rename_per_sector.py - adjusted config to contain eurostat mappings - added carrier-names.csv which is also a mapping for eurostat data
Configuration menu - View commit details
-
Copy full SHA for 72c979a - Browse repository at this point
Copy the full SHA 72c979aView commit details -
created transport_subsector_annual_energy_balances as its own rule, n…
…ot one using sectoral_annual_energy_balances: - deleted the old two rules and wrote the sectoral_annual_energy_balances, to only create the data for the road-transport sector -started adjusting the blend_and_rename_per_sector.py script (removing the industry sector case) - TODO: could remove all cases except the first one conatining the other-road-transport, should we do that would also cause the helper functions to fall out, but they could potentially be used later -TODO: Same question for eurostat-to-sectors in config file, would only need road-transport and other-road-transport
Configuration menu - View commit details
-
Copy full SHA for f230747 - Browse repository at this point
Copy the full SHA f230747View commit details -
transfer annual_road_transport_demand rule from feature-sector-coupli…
…ng into feature-road-transport-v2: - added annual_road_rail_transport_demand.py script to transport scripts - adjusted config to contain future-vehicle-efficiency-percentile
Configuration menu - View commit details
-
Copy full SHA for 9a02429 - Browse repository at this point
Copy the full SHA 9a02429View commit details
Commits on Sep 5, 2023
-
adjust config file to reuse convert_country_code by bryn pickering in…
… eu_country_code_to_iso3
Configuration menu - View commit details
-
Copy full SHA for 87480e6 - Browse repository at this point
Copy the full SHA 87480e6View commit details
Commits on Sep 11, 2023
-
adjust jrc files, to output csv files instead of nc files, so we can …
…use annual_road_transport_demand code provided by bryn pickering on sector-coupled-euro-calliope branch: - jr-idees.smk: just had to adjust the outpath to be csv - transport.py first tried to go from netcdf in the end back to csv, but resulted in almost all values being null -> realised after looking at data from sector-coupled branch, that the renaming isn't done there so could leave that out, yet i left the code changes in, in case it gets used later
Configuration menu - View commit details
-
Copy full SHA for 9f97c9a - Browse repository at this point
Copy the full SHA 9f97c9aView commit details
Commits on Sep 27, 2023
-
transfer annual_energy_balances: rule from sector-coupled-euro-callio…
…pe into feature-road-transport-v2: --by bryn pickering! - get annual_energy_balances rule + annual_energy_balance.py - copy mappings into code - adjust default.yaml to download also ch industry sector data, and adjust eurostat-energy-balances link to include only needed data
Configuration menu - View commit details
-
Copy full SHA for fc81acc - Browse repository at this point
Copy the full SHA fc81accView commit details -
expand annual_energy_balances: rule from sector-coupled-euro-calliope…
… into feature-road-transport-v2: - adjust utils import, and add missing utils functions - update rule, to have correct paths
Configuration menu - View commit details
-
Copy full SHA for 2d038ff - Browse repository at this point
Copy the full SHA 2d038ffView commit details -
transfer annual_transport_demand: rule and annual_transport_demand.py…
… from sector-coupled-euro-calliope into feature-road-transport-v2: - by bryn pickering
Configuration menu - View commit details
-
Copy full SHA for a09662a - Browse repository at this point
Copy the full SHA a09662aView commit details -
adjust annual_transport_demand.py from sector-coupled-euro-calliope i…
…nto feature-road-transport-v2: - fix utils import
Configuration menu - View commit details
-
Copy full SHA for 3447125 - Browse repository at this point
Copy the full SHA 3447125View commit details -
Configuration menu - View commit details
-
Copy full SHA for 78a1ce6 - Browse repository at this point
Copy the full SHA 78a1ce6View commit details -
get transport.smk and annual_transport_demand.py to work:
- remove all rail and other transportation related content - remove unit dependency - adjust annual_transport_demand rule to only output road transport related data - add read_tdf to utils functions
Configuration menu - View commit details
-
Copy full SHA for bbcfd7e - Browse repository at this point
Copy the full SHA bbcfd7eView commit details -
first implementation for transport demand timeseries:
- add new rule into transport.smk create_road_transport_demand_timeseries - create script road_transport_timeseries.py: for creating a road transport demand timeseries
Configuration menu - View commit details
-
Copy full SHA for c663957 - Browse repository at this point
Copy the full SHA c663957View commit details -
adjust implementation for road transport demand timeseries:
- creates timeseries for each vehicle_type for the temporal scope defined in the config - uses the scaling factor out of config and temporary conversion factors for mio km to Mw(h) out of config - creates the bau timeseries for the 3 respective vehicle types: passenger cars, coaches and buses, ldv - make bau positive and other road transport demand negative
Configuration menu - View commit details
-
Copy full SHA for 4d370b9 - Browse repository at this point
Copy the full SHA 4d370b9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9ca1620 - Browse repository at this point
Copy the full SHA 9ca1620View commit details -
annual_transport_demand.py.py:
- clean up: remove debug prints and unnecessary comments
Configuration menu - View commit details
-
Copy full SHA for 82c5522 - Browse repository at this point
Copy the full SHA 82c5522View commit details -
- clean up: change output paths so files are stored under build/data/transport/...
Configuration menu - View commit details
-
Copy full SHA for 290652b - Browse repository at this point
Copy the full SHA 290652bView commit details -
- remove malta out of countries for which jrc idees get downloaded, since malta is not included in spatial scope.
Configuration menu - View commit details
-
Copy full SHA for 4b6ac5c - Browse repository at this point
Copy the full SHA 4b6ac5cView commit details -
- clean up: remove dead code and unnecessary comments
Configuration menu - View commit details
-
Copy full SHA for edef046 - Browse repository at this point
Copy the full SHA edef046View commit details -
- remove blend_and_rename_per_sector.py -> not needed in new version based on sector-coupled branch - adjust eurostat.smk, remove old version of creating eurostat data
Configuration menu - View commit details
-
Copy full SHA for 893a433 - Browse repository at this point
Copy the full SHA 893a433View commit details -
- remove not needed rule, processing of swiss data newly done in annual_energy_balance.py - remove unused script
Configuration menu - View commit details
-
Copy full SHA for 8167b86 - Browse repository at this point
Copy the full SHA 8167b86View commit details -
- remove mapping used for eurostat data creation before in blend and rename - remove unnecessary comments - use conversion factors out of sector-coupled branch
Configuration menu - View commit details
-
Copy full SHA for 1d799fb - Browse repository at this point
Copy the full SHA 1d799fbView commit details -
- add assumption by which distance_per_hour and electricity_per_hour get calculated
Configuration menu - View commit details
-
Copy full SHA for 214dc8b - Browse repository at this point
Copy the full SHA 214dc8bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6915c73 - Browse repository at this point
Copy the full SHA 6915c73View commit details -
add rule aggregate_timeseries to transport.smk:
- implement rule aggregate_timeseries: takes all computed road (bau) transport timeseries and aggregates them -> one for BAU and one for non BAU - aggregate_timeseries.py: script that gets called by rule aggregate_timeseries, which implements the aggregation for all timeseries, depending on the resolution the model runs at currently -> regional resolution is not yet implemented and will raise a NotImplementedError("Regional road transport (bau) has not yet been implemented!")
Configuration menu - View commit details
-
Copy full SHA for 26eea0a - Browse repository at this point
Copy the full SHA 26eea0aView commit details -
add electrified_transport.yaml tech template and build it into snakef…
…ile: - define two new demand techs: one is demand_road_transport_electrified, which contains the demand for the electrified road transport at the resolution of the model. The other one is demand_road_transport_bau_electrified, which is a demand that only gets used when demand_elec and demand_road_transport_electrified are active, since this would lead to double counting and demand_road_transport_bau_electrified is a positive demand that counteracts that. - There is an override defined to turn not use demand_road_transport_bau_electrified, which will be used when we only look at demand_road_transport_electrified at its own. - included the override into test.yaml
Configuration menu - View commit details
-
Copy full SHA for 81be14c - Browse repository at this point
Copy the full SHA 81be14cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 42f6077 - Browse repository at this point
Copy the full SHA 42f6077View commit details -
Configuration menu - View commit details
-
Copy full SHA for 67d0843 - Browse repository at this point
Copy the full SHA 67d0843View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3954349 - Browse repository at this point
Copy the full SHA 3954349View commit details -
clean up utils and remove not needed functions ( were previously used…
…, when solution of different branch was implemented)
Configuration menu - View commit details
-
Copy full SHA for e96d9d4 - Browse repository at this point
Copy the full SHA e96d9d4View commit details -
Configuration menu - View commit details
-
Copy full SHA for b142301 - Browse repository at this point
Copy the full SHA b142301View commit details
Commits on Oct 3, 2023
-
bug fix: notices IS data was missing in annual-road-transport-distanc…
…e-demand.csv, so went over code again and realised, that transport_energy_balance wasn't complemented with fill_missing_countries_and_years and therefore in the creation of transport_energy_per_mode, IS was not computed and therefore later not used to fill jrc data
Configuration menu - View commit details
-
Copy full SHA for 894b548 - Browse repository at this point
Copy the full SHA 894b548View commit details
Commits on Oct 4, 2023
-
adjust fill missing countries and years function:
- Old: Used to expand data for all countries hard coded into the function no matter the config. - New: expands data based on fill-missing-values, which is set in the config
Configuration menu - View commit details
-
Copy full SHA for c2ec0ea - Browse repository at this point
Copy the full SHA c2ec0eaView commit details -
Merge remote-tracking branch 'public/feature-road-transport' into fea…
…ture-road-transport-v2
Configuration menu - View commit details
-
Copy full SHA for 6ad7603 - Browse repository at this point
Copy the full SHA 6ad7603View commit details -
Configuration menu - View commit details
-
Copy full SHA for e0edbe7 - Browse repository at this point
Copy the full SHA e0edbe7View commit details -
Configuration menu - View commit details
-
Copy full SHA for c8d5718 - Browse repository at this point
Copy the full SHA c8d5718View commit details
Commits on Dec 13, 2023
-
move ch-stats.smk, eurostat.smk, jrc-idees.smk rules into newly created download.smk and delete old smk files.
Configuration menu - View commit details
-
Copy full SHA for 7d8cf40 - Browse repository at this point
Copy the full SHA 7d8cf40View commit details -
Add typing for all parameters and return values of all functions in transport.py
Configuration menu - View commit details
-
Copy full SHA for c55ced9 - Browse repository at this point
Copy the full SHA c55ced9View commit details
Commits on Dec 15, 2023
-
Add typing for all parameters and return values of all functions in aggregate_timeseries.py
Configuration menu - View commit details
-
Copy full SHA for d7eb5c3 - Browse repository at this point
Copy the full SHA d7eb5c3View commit details -
Refactor annual_transport_demand.py based on review comments, by introducing constants and functions.
Configuration menu - View commit details
-
Copy full SHA for 05affe9 - Browse repository at this point
Copy the full SHA 05affe9View commit details
Commits on Mar 2, 2024
-
change output path of annual_energy_balances to be stored into data directory
Configuration menu - View commit details
-
Copy full SHA for 089de45 - Browse repository at this point
Copy the full SHA 089de45View commit details -
Configuration menu - View commit details
-
Copy full SHA for ec79a4f - Browse repository at this point
Copy the full SHA ec79a4fView commit details -
rename transport.py -> jrc_idees and move it into transport directory
Configuration menu - View commit details
-
Copy full SHA for e958124 - Browse repository at this point
Copy the full SHA e958124View commit details -
Configuration menu - View commit details
-
Copy full SHA for 138b72c - Browse repository at this point
Copy the full SHA 138b72cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6e9a82c - Browse repository at this point
Copy the full SHA 6e9a82cView commit details
Commits on Mar 7, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 044254c - Browse repository at this point
Copy the full SHA 044254cView commit details -
Configuration menu - View commit details
-
Copy full SHA for ce74154 - Browse repository at this point
Copy the full SHA ce74154View commit details -
This fixes an incompatibility with Python 3.9, see: https://stackoverflow.com/questions/66174862/import-error-cant-import-name-gcd-from-fractions
Configuration menu - View commit details
-
Copy full SHA for 4909bce - Browse repository at this point
Copy the full SHA 4909bceView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7616ca2 - Browse repository at this point
Copy the full SHA 7616ca2View commit details -
Fix historic electrified road transport demand
It must be a supply in fact, cannot be a negative demand.
Configuration menu - View commit details
-
Copy full SHA for 5a7ad6b - Browse repository at this point
Copy the full SHA 5a7ad6bView commit details -
Configuration menu - View commit details
-
Copy full SHA for a842491 - Browse repository at this point
Copy the full SHA a842491View commit details
Commits on Mar 8, 2024
-
Configuration menu - View commit details
-
Copy full SHA for d5bad10 - Browse repository at this point
Copy the full SHA d5bad10View commit details -
Configuration menu - View commit details
-
Copy full SHA for 28ae0e5 - Browse repository at this point
Copy the full SHA 28ae0e5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 71084ed - Browse repository at this point
Copy the full SHA 71084edView commit details -
Configuration menu - View commit details
-
Copy full SHA for a820166 - Browse repository at this point
Copy the full SHA a820166View commit details -
Configuration menu - View commit details
-
Copy full SHA for b546b29 - Browse repository at this point
Copy the full SHA b546b29View commit details