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

Update of CES mark-up cost implementation: industry mark-up cost budget-neutral as tax, adapt some default cost, refactoring #980

Merged
merged 19 commits into from
Nov 8, 2022
Merged

Update of CES mark-up cost implementation: industry mark-up cost budget-neutral as tax, adapt some default cost, refactoring #980

merged 19 commits into from
Nov 8, 2022

Commits on Jul 26, 2022

  1. declare vm_costCESMkup as a variable which can also be negative to be… 

    … able to use the implementation also for negative CES mark-up cost
    Felix Schreyer committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    c29edfa View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2022

  1. adapt CES mark-up cost implementation: make some of mark-up cost budg… 

    …et-neutral by a tax implementation and adapt default values of mark-up cost in industry to better align economic subsitution rates with technical subsitution rates
    Felix Schreyer committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    51cd56d View commit details
    Browse the repository at this point in the history

  2. improve description of CES tax

    Felix Schreyer committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    3936b57 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2022

  1. use snaphot for R libraries

    Felix Schreyer committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    bde4f8b View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2022

  1. Revert "Merge pull request remindmodel#919 from Loisel/feature" 

    This reverts commit 4d669d8, reversing
changes made to bea06e3.
    Felix Schreyer committed Aug 12, 2022
    Configuration menu
    Copy the full SHA
    c92c540 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2022

  1. use remind2 CES report branch for reporting and cs2 scripts

    Felix Schreyer committed Aug 19, 2022
    Configuration menu
    Copy the full SHA
    320d0a1 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2022

  1. alter feelhth_otherInd default mark-up cost to avoid SEC increase in … 

    …electrification scenarios
    Felix Schreyer committed Sep 16, 2022
    Configuration menu
    Copy the full SHA
    a871bb3 View commit details
    Browse the repository at this point in the history

  2. adapt description of CES mark-up cost in buildings and industry

    Felix Schreyer committed Sep 16, 2022
    Configuration menu
    Copy the full SHA
    454c200 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of github.com:remindmodel/remind into CESMkup_… 

    …Update
    Felix Schreyer committed Sep 16, 2022
    Configuration menu
    Copy the full SHA
    2666ff7 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2022

  1. Remove iterative script from REMIND. 

    This is now part of edgeTransport.
    @Loisel
    Loisel authored and Felix Schreyer committed Sep 20, 2022
    Configuration menu
    Copy the full SHA
    594a5dc View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2022

  1. make documentation of CES mark-up cost consistent

    Felix Schreyer committed Sep 26, 2022
    Configuration menu
    Copy the full SHA
    a2892cf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:remindmodel/remind into CESMkup_… 

    …Update
    Felix Schreyer committed Sep 26, 2022
    Configuration menu
    Copy the full SHA
    3b74209 View commit details
    Browse the repository at this point in the history

  3. fix some left-over issues from merge with develop branch

    Felix Schreyer committed Sep 26, 2022
    Configuration menu
    Copy the full SHA
    012620e View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2022

  1. Merge branch 'develop' of github.com:remindmodel/remind into CESMkup_… 

    …Update
    Felix Schreyer committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    8fcf5aa View commit details
    Browse the repository at this point in the history

  2. change commeting prefix for comments on CES mark-up cost in buildings… 

    … in industry to show up in goxygen documentation
    Felix Schreyer committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    038a522 View commit details
    Browse the repository at this point in the history

  3. remove deprecated variable from core declarations that was left over … 

    …from merge
    Felix Schreyer committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    32a2813 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2022

  1. update CES parameter version in default.cfg

    Felix Schreyer committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    6361750 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:remindmodel/remind into CESMkup_… 

    …Update
    Felix Schreyer committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    10cfa0b View commit details
    Browse the repository at this point in the history

  3. update ariadne scenario config w.r.t CES mark-up cost as default valu… 

    …es have changed and some other configurations following recent Ariadne runs
    Felix Schreyer committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    9fa21e2 View commit details
    Browse the repository at this point in the history