Skip to content
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

Merged

Commits on Aug 21, 2023

  1. copy jrc-idees.smk newest version into feature-road-transport

    brynpickering authored and SimonS898 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    a898b4a View commit details
    Browse the repository at this point in the history
  2. - 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
    SimonS898 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    f5e0969 View commit details
    Browse the repository at this point in the history
  3. - add transport.py file from feature-sector-coupling by brynpickering

    - add missing utils functions to utils.py
    brynpickering authored and SimonS898 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    146e083 View commit details
    Browse the repository at this point in the history
  4. 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
    SimonS898 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    98c498f View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. 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
    brynpickering authored and SimonS898 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    0dd8c18 View commit details
    Browse the repository at this point in the history
  2. 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
    brynpickering authored and SimonS898 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    7c39862 View commit details
    Browse the repository at this point in the history
  3. 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
    SimonS898 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    f056224 View commit details
    Browse the repository at this point in the history
  4. 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
    SimonS898 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    af7318c View commit details
    Browse the repository at this point in the history
  5. 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
    brynpickering authored and SimonS898 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    72545f3 View commit details
    Browse the repository at this point in the history
  6. 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
    brynpickering authored and SimonS898 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    72c979a View commit details
    Browse the repository at this point in the history
  7. 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
    SimonS898 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    f230747 View commit details
    Browse the repository at this point in the history
  8. 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
    brynpickering authored and SimonS898 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    9a02429 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. adjust config file to reuse convert_country_code by bryn pickering in…

    … eu_country_code_to_iso3
    SimonS898 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    87480e6 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. 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
    SimonS898 committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    9f97c9a View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2023

  1. 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
    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    fc81acc View commit details
    Browse the repository at this point in the history
  2. 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
    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    2d038ff View commit details
    Browse the repository at this point in the history
  3. transfer annual_transport_demand: rule and annual_transport_demand.py…

    … from sector-coupled-euro-calliope into feature-road-transport-v2:
    
    - by bryn pickering
    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    a09662a View commit details
    Browse the repository at this point in the history
  4. adjust annual_transport_demand.py from sector-coupled-euro-calliope i…

    …nto feature-road-transport-v2:
    
    - fix utils import
    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    3447125 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    78a1ce6 View commit details
    Browse the repository at this point in the history
  6. 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
    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    bbcfd7e View commit details
    Browse the repository at this point in the history
  7. 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
    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    c663957 View commit details
    Browse the repository at this point in the history
  8. 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
    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    4d370b9 View commit details
    Browse the repository at this point in the history
  9. road_transport_timeseries.py:

    - clean up and comments
    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    9ca1620 View commit details
    Browse the repository at this point in the history
  10. annual_transport_demand.py.py:

    - clean up: remove debug prints and unnecessary comments
    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    82c5522 View commit details
    Browse the repository at this point in the history
  11. transport.smk:

    - clean up: change output paths so files are stored under build/data/transport/...
    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    290652b View commit details
    Browse the repository at this point in the history
  12. jrc-idees.smk:

    - remove malta out of countries for which jrc idees get downloaded, since malta is not included in spatial scope.
    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    4b6ac5c View commit details
    Browse the repository at this point in the history
  13. transport.py:

    - clean up: remove dead code and unnecessary comments
    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    edef046 View commit details
    Browse the repository at this point in the history
  14. eurostat clean up:

    - 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
    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    893a433 View commit details
    Browse the repository at this point in the history
  15. ch-stats cleanup:

    - remove not needed rule, processing of swiss data newly done in annual_energy_balance.py
    - remove unused script
    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    8167b86 View commit details
    Browse the repository at this point in the history
  16. config clean up:

    - remove mapping used for eurostat data creation before in blend and rename
    - remove unnecessary comments
    - use conversion factors out of sector-coupled branch
    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    1d799fb View commit details
    Browse the repository at this point in the history
  17. road_transport_timeseries.py:

    - add assumption by which distance_per_hour and electricity_per_hour get calculated
    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    214dc8b View commit details
    Browse the repository at this point in the history
  18. road_transport_timeseries.py:

    - remove debug print
    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    6915c73 View commit details
    Browse the repository at this point in the history
  19. 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!")
    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    26eea0a View commit details
    Browse the repository at this point in the history
  20. 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
    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    81be14c View commit details
    Browse the repository at this point in the history
  21. documentation first draft

    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    42f6077 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    67d0843 View commit details
    Browse the repository at this point in the history
  23. general clean up

    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    3954349 View commit details
    Browse the repository at this point in the history
  24. clean up utils and remove not needed functions ( were previously used…

    …, when solution of different branch was implemented)
    SimonS898 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    e96d9d4 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    b142301 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2023

  1. 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
    SimonS898 committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    894b548 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2023

  1. 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
    SimonS898 committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    c2ec0ea View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6ad7603 View commit details
    Browse the repository at this point in the history
  3. fix merge hiccup

    SimonS898 committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    e0edbe7 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c8d5718 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. Review Changes:

    move ch-stats.smk, eurostat.smk, jrc-idees.smk rules into newly created download.smk and delete old smk files.
    SimonS898 committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    7d8cf40 View commit details
    Browse the repository at this point in the history
  2. Review Changes:

    Add typing for all parameters and return values of all functions in transport.py
    SimonS898 committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    c55ced9 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2023

  1. Review Changes:

    Add typing for all parameters and return values of all functions in aggregate_timeseries.py
    SimonS898 committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    d7eb5c3 View commit details
    Browse the repository at this point in the history
  2. Review Changes:

    Refactor annual_transport_demand.py based on review comments, by introducing constants and functions.
    SimonS898 committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    05affe9 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2024

  1. Review Changes:

    change output path of annual_energy_balances to be stored into data directory
    SimonS898 committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    089de45 View commit details
    Browse the repository at this point in the history
  2. Review Changes:

    squash
    SimonS898 committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    ec79a4f View commit details
    Browse the repository at this point in the history
  3. Review Changes:

    rename transport.py -> jrc_idees and move it into transport directory
    SimonS898 committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    e958124 View commit details
    Browse the repository at this point in the history
  4. Review Changes:

    start review annual_energy_balance.py
    SimonS898 committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    138b72c View commit details
    Browse the repository at this point in the history
  5. Review Changes:

    rename download rules
    SimonS898 committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    6e9a82c View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Add changes from review

    timtroendle committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    044254c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ce74154 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4909bce View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7616ca2 View commit details
    Browse the repository at this point in the history
  5. Fix historic electrified road transport demand

    It must be a supply in fact, cannot be a negative demand.
    timtroendle committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    5a7ad6b View commit details
    Browse the repository at this point in the history
  6. Add minor cleanups

    timtroendle committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    a842491 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. Configuration menu
    Copy the full SHA
    d5bad10 View commit details
    Browse the repository at this point in the history
  2. Fix schema

    timtroendle committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    28ae0e5 View commit details
    Browse the repository at this point in the history
  3. Update CHANGELOG

    timtroendle committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    71084ed View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a820166 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b546b29 View commit details
    Browse the repository at this point in the history