Development- test_electric_vehicle_batteries#633
Open
parisa-zahedi wants to merge 8 commits into
Open
Conversation
* adapted copper and aluminium time series and refitted rest of * update alu also to usgs * refit eff rest * Update examples/rest_of.ipynb Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update data/raw/rest-of/metals/copper.csv Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update imagematerials/rest_of/preprocessing/resource_efficiency_measures.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Add citation metadata * Update CITATION.cff Co-authored-by: Roel Brouwer <5979700+RoelBrouwer@users.noreply.github.com> * Update CITATION.cff Co-authored-by: Roel Brouwer <5979700+RoelBrouwer@users.noreply.github.com> --------- Co-authored-by: Roel Brouwer <5979700+RoelBrouwer@users.noreply.github.com>
* updated ce measures to current circomod status * refit efficiency and set cap commercial to 15m2 * update paper runs frede * restored unwanted changed
* start quintile implementation * added quintiles to population and floorspace * quintiles as new coord * update quintiles buildings * with working model for quintiles * adapt tests for buildings * buildings examples plot * fixed commercial floorspace projectinos * replaced historic population with better data and rewrote tests after checking (small changes in historic values) * typo in population file name * Fix duplicate assignment of floorspace_commercial_total * added explanation to equalize_quintiles function * equilzing quintiles for historic years * added income quintile description in model
* Fix some linting issues to better create the docs * Uncommited changes * Update docs/source/sectors/infrastructure.rst
updated version of storage preprocessing - pumped hydropower storage (PHS) calculation updated (closer in line with historical projections) - transformed code to xarray format - created option to model behind-the-meter storage separatly, but will not be used at the moment. - storage market shares are not longer calculated from prescribed prices, but prescribed directly via input files - when calculating the remaining storage demand (after subtraction of PHS), a floor is implemented from 2010 onwards, ensuring at least some battery storage will be needed, even in case of high PHS deployment (they fulfill different needs in the electricity system; this is backed up by literature) - removed input parameter scenario, year_start, year_end from electricity preprocessing to align it with buildings and vehicles preprocessing - create image region to country knowledge graph * add file and notebook for testing storage calculations * added knowledge graph for IMAGE regions<->countries * added IHA PHS data; added script for handling those data * adapting aggregate_sum(); corrections on knowledgegraph IMAGE regions adapting aggregate_sum(): to handle no relations found (in fct find_one_relation()), added boolean to make one ValueError optional, now it is possible to aggregate even if not all defined output coordinates have a relation in the input array coordinates. knowledgegraph IMAGE regions: deleted/renamed duplicate Nodes (e.g. "USA" is region name, but was also country name which throws errors, now it's only region name) * aggregate IHA data to IMAGE regions and calc. shares per decade * minor correction; added colour dict. for image regions * added IHA-country dataset * added categories to power generation knowledge graph * calculate phs starting year per region; draft for region specific extrapolation * adapted interpolate_xr() to extrapolate (lin., exp., log.) region specific to 0 * fixed error in interpolate_xr() * added test file for behind-the-meter storage (btm_test.py) * implemented first version of behind-the-meter calculation * extended PHS projections until 2060 using IHA data * added TIMER energy storage projections; BTM in MWh * tested extrapolation by assuming same growth rate as storage_energy * transferred phs calc. to function * added IRENA numbers for comparison to validation plot * added docstrings to phs function * added new PHS data read in statements to storage.py * changed phs file names; temporarily convert storage preproocessing fct to normal script for easier testing * converted btm capacity calc. into function * not sure anymore what was done * added first version market shares; extract Sebastiaans MI in kg/kWh * calculate remaining storage; added files for market shares, lifetimes, MIs * updated version of storage preprocessing is working 1. PHS calculation updated (closer in line with historical projections) 2. transformed code to xarray format 3. created option to model behind-the-meter storage separatly, but will not be used at the moment. 4. storage market shares are not longer calculated from prescribed prices, but prescribed directly via input files 5. when calculating the remaining storage demand (after subtraction of PHS), a floor is implemented from 2010 onwards, ensuring at least some battery storage will be needed, even in case of high PHS deployment (they fulfill different needs in the electricity system; this is backed up by literature) * resolved some errors, but still not working * got rid of scenario, year_start etc as input for preprocessing (now more similar to other sectors) * adjusted storage knowledge graph * fixed minor error; cleaning up files * deleted outcommented function * move image_region_knowledge_graph to .json file * removed unnecessary import in init file * improved formatting after checking w/ ruff * added names to storage dataarrays (MI, shares, lifetimes) * changed set to list in knowledge graph as it caused a test to fail * updated test summaries * moved kg.json into package; deleted outcommented kg in concepts.py
* add test for ElectricVehicleBatteries * hardcode list of expected_outputs --------- Co-authored-by: parisa-zahedi <p.zahedi@uu.nl>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.