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.

Sign up for GitHub

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

Jump to bottom

Shift to US$2017 for currency units #523

Merged
merged 54 commits into from
Sep 20, 2024
Merged

Shift to US$2017 for currency units #523

merged 54 commits into from
Sep 20, 2024

Commits on Jul 15, 2024

  1. update unit conversion to USD 2017

    @fbenke-pik
    fbenke-pik committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    2915d90 View commit details
    Browse the repository at this point in the history

  2. drop price conversion in BP reference data

    @fbenke-pik
    fbenke-pik committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    7cd959b View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. convert unit in calcCO2Prices

    @fbenke-pik
    fbenke-pik committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    a5e9054 View commit details
    Browse the repository at this point in the history

  2. convert unit in calcCostsWeathering

    @fbenke-pik
    fbenke-pik committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    8b84568 View commit details
    Browse the repository at this point in the history

  3. convert unit in calcDiffInvestCosts

    @fbenke-pik
    fbenke-pik committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    d6811da View commit details
    Browse the repository at this point in the history

  4. convert unit calcEconometricEmiParameter

    @fbenke-pik
    fbenke-pik committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    9d7e6ea View commit details
    Browse the repository at this point in the history

  5. convert prices in calcEU_ReferenceScenario

    @fbenke-pik
    fbenke-pik committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    b0c2d48 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. update unit conversion in calcPETaxes

    @fbenke-pik
    fbenke-pik committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    83e447e View commit details
    Browse the repository at this point in the history

  2. update monetary unit conversion in convertIIASA_subs_taxes

    @fbenke-pik
    fbenke-pik committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    600bd49 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. Merge branch 'master' into update_2024

    @fbenke-pik
    fbenke-pik committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    e9bce4a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/pik-piam/mrremind into up… 

    …date_2024
    @fbenke-pik
    fbenke-pik committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    c488077 View commit details
    Browse the repository at this point in the history

  3. convert unit in calcFossilExtraction

    @fbenke-pik
    fbenke-pik committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    7eb4a0f View commit details
    Browse the repository at this point in the history

  4. switch NA replacement strategy in convertGDP

    @fbenke-pik
    fbenke-pik committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    b90023d View commit details
    Browse the repository at this point in the history

  5. convert currency units in calcINNOPATHS

    @fbenke-pik
    fbenke-pik committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    756d5b2 View commit details
    Browse the repository at this point in the history

  6. move jrc idees mappings to library

    @fbenke-pik
    fbenke-pik committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    18d03e5 View commit details
    Browse the repository at this point in the history

  7. connvert currency units in calcJRC_IDEES

    @fbenke-pik
    fbenke-pik committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    4166c09 View commit details
    Browse the repository at this point in the history

  8. convert currency in calcTaxConvergence

    @fbenke-pik
    fbenke-pik committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    e2769c1 View commit details
    Browse the repository at this point in the history

  9. convert currency in calcTaxLimits

    @fbenke-pik
    fbenke-pik committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    00686e7 View commit details
    Browse the repository at this point in the history

  10. convert currency in calcTaxXport

    @fbenke-pik
    fbenke-pik committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    8db99f2 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. remove := operator from mutate

    @fbenke-pik
    fbenke-pik committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    5065918 View commit details
    Browse the repository at this point in the history

  2. convert currency units in convertUNIDO

    @fbenke-pik
    fbenke-pik committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    c73a8f9 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. Merge branch 'master' into update_2024

    @fbenke-pik
    fbenke-pik committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    4d6392c View commit details
    Browse the repository at this point in the history

  2. apply autoformat

    @fbenke-pik
    fbenke-pik committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    b55e9b4 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. convert unit in calcCostsTrandePeFinancial

    @fbenke-pik
    fbenke-pik committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    58fd7c5 View commit details
    Browse the repository at this point in the history

  2. convert costs in convertGEA2021

    @fbenke-pik
    fbenke-pik committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    53e9506 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. specify parameters to calcMACCsCH4 and calcMACCsN2O explicitly

    @fbenke-pik
    fbenke-pik committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    6d0a8ab View commit details
    Browse the repository at this point in the history

  2. convert GDP in calcBiomassPrices

    @fbenke-pik
    fbenke-pik committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    7d30475 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/pik-piam/mrremind into up… 

    …date_2024
    @fbenke-pik
    fbenke-pik committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    1a9e69b View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. convert prices in calcBP

    @fbenke-pik
    fbenke-pik committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    856ed5c View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. increment version (dev)

    @fbenke-pik
    fbenke-pik committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    f4c93db View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. change default unit assumption for units from Int to US

    @fbenke-pik
    fbenke-pik committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    7fb6a9a View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2024

  1. unify unit naming in calc functions

    @fbenke-pik
    fbenke-pik committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    629f600 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. Merge branch 'master' of https://github.com/pik-piam/mrremind into up… 

    …date_2024
    @fbenke-pik
    fbenke-pik committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    959500b View commit details
    Browse the repository at this point in the history

  2. bugfix in convertIIASA_subs_taxes

    @fbenke-pik
    fbenke-pik committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    49fd3a3 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. Merge branch 'master' into update_2024

    @fbenke-pik
    fbenke-pik committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    79fea0c View commit details
    Browse the repository at this point in the history

  2. add GDPuc as dependency

    @fbenke-pik
    fbenke-pik committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    d438438 View commit details
    Browse the repository at this point in the history

  3. adjust unit in calcEDGETransport

    @fbenke-pik
    fbenke-pik committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    18ae072 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2024

  1. Merge branch 'master' into update_2024

    @fbenke-pik
    fbenke-pik committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    ea7df33 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. Merge branch 'master' into update_2024

    @fbenke-pik
    fbenke-pik committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    a465f9a View commit details
    Browse the repository at this point in the history

  2. adjust replace_NAs parameter in unit conversion

    @fbenke-pik
    fbenke-pik committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    775cee4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/pik-piam/mrremind into up… 

    …date_2024
    @fbenke-pik
    fbenke-pik committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    5f54a26 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. Merge branch 'master' of https://github.com/pik-piam/mrremind into up… 

    …date_2024
    @fbenke-pik
    fbenke-pik committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    e169276 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. increment to dev version

    @fbenke-pik
    fbenke-pik committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    1ff1f6f View commit details
    Browse the repository at this point in the history

  2. convert currencty in convertTransportSubsidies

    @fbenke-pik
    fbenke-pik committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    22a6df5 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. fix minor bug in calcMacroInvestments

    @fbenke-pik
    fbenke-pik committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    6a6db58 View commit details
    Browse the repository at this point in the history

  2. fix bug in calcCostsWeathering

    @fbenke-pik
    fbenke-pik committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    4389a0c View commit details
    Browse the repository at this point in the history

  3. fix bug in calcBiomassPrices

    @fbenke-pik
    fbenke-pik committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    c5f8d78 View commit details
    Browse the repository at this point in the history

  4. fix bug in convertGEA2012

    @fbenke-pik
    fbenke-pik committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    6ba9f01 View commit details
    Browse the repository at this point in the history

  5. remove no longer needed workaround

    @fbenke-pik
    fbenke-pik committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    dbd2d75 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. fix bug in calcCO2Prices

    @fbenke-pik
    fbenke-pik committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    0aa98f5 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. Merge branch 'master' of https://github.com/pik-piam/mrremind into up… 

    …date_2024
    @fbenke-pik
    fbenke-pik committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    15ef815 View commit details
    Browse the repository at this point in the history

  2. increment dev version

    @fbenke-pik
    fbenke-pik committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    da8377a View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. Merge branch 'master' of https://github.com/pik-piam/mrremind into up… 

    …date_2024
    @fbenke-pik
    fbenke-pik committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    4c627b3 View commit details
    Browse the repository at this point in the history

  2. increment version

    @fbenke-pik
    fbenke-pik committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    28de8d4 View commit details
    Browse the repository at this point in the history