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

CMP: Multiple consumers for floorspace and reisdential energy demand #262

Open
wants to merge 161 commits into
base: master
Choose a base branch
from
Open

CMP: Multiple consumers for floorspace and reisdential energy demand #262

wants to merge 161 commits into from

Commits on Jun 7, 2021

  1. Add offlline information for the flsp-Gompertz function: pop density and 

    parameters
    @jonsampedro
    jonsampedro committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    c04cbcc View commit details
    Browse the repository at this point in the history

  2. Add reference to new function

    @jonsampedro
    jonsampedro committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    747e65d View commit details
    Browse the repository at this point in the history

  3. Changes to write parameters of the Gompetrz flsp function (including 

    binary files with level2 data names)
    @jonsampedro
    jonsampedro committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    1861be6 View commit details
    Browse the repository at this point in the history

  4. delete GCAM_DATA_MAP.Rd

    @jonsampedro
    jonsampedro committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    ba62d27 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2021

  1. Additional changes to write the gompertz parameters in th xml

    @jonsampedro
    jonsampedro committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    5d7f87a View commit details
    Browse the repository at this point in the history

  2. bugfix k parameter

    @jonsampedro
    jonsampedro committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    c476a10 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2021

  1. Changes to write population density into XMLs

    @jonsampedro
    jonsampedro committed Jun 10, 2021
    Configuration menu
    Copy the full SHA
    6297bf2 View commit details
    Browse the repository at this point in the history

  2. Add new function to GCAM-USA

    @jonsampedro
    jonsampedro committed Jun 10, 2021
    Configuration menu
    Copy the full SHA
    b85116b View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2021

  1. Build new structure for xml (allow gompetrz and satiation demand 

    changing prodDmdFnType)
    @jonsampedro
    jonsampedro committed Jun 30, 2021
    Configuration menu
    Copy the full SHA
    6036c2e View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2021

  1. Input files for final DS structure

    @jonsampedro
    jonsampedro committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    9282c80 View commit details
    Browse the repository at this point in the history

  2. Initial commit for cpp files for the flsp function

    @jonsampedro
    jonsampedro committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    156fa10 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2021

  1. Temp commit, new structure (2 cppfiles + BasepcFlsp read from DS)

    @jonsampedro
    jonsampedro committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    fcd860b View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2021

  1. Temp changes to correct errors compiling the cpp files

    @jonsampedro
    jonsampedro committed Jul 20, 2021
    Configuration menu
    Copy the full SHA
    7bc8139 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2021

  1. Temp commit: Solves some errors in the cpp files

    @jonsampedro
    jonsampedro committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    9fb1e21 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2021

  1. temp commit: solves most of cpp errors (only 2 left)

    @jonsampedro
    jonsampedro committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    d2ab343 View commit details
    Browse the repository at this point in the history

  2. tem commit: Additional reduction of cpp errors

    @jonsampedro
    jonsampedro committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    d1da6e0 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2021

  1. Temp commit: more changes for gompertz function

    @jonsampedro
    jonsampedro committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    f946a7a View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2021

  1. Solve the cpp errors and build the executable

    @jonsampedro
    jonsampedro committed Jul 27, 2021
    Configuration menu
    Copy the full SHA
    9b3c5ef View commit details
    Browse the repository at this point in the history

  2. BugFix MI headrers

    @jonsampedro
    jonsampedro committed Jul 27, 2021
    Configuration menu
    Copy the full SHA
    93af1a4 View commit details
    Browse the repository at this point in the history

  3. Roll back commits on satiation impedance (to be addressed in a future 

    CMP)
    @jonsampedro
    jonsampedro committed Jul 27, 2021
    Configuration menu
    Copy the full SHA
    e103081 View commit details
    Browse the repository at this point in the history

  4. Merge tag 'tags/gcam-v5.4' into JS/feature/new-flsp-demand

    @jonsampedro
    jonsampedro committed Jul 27, 2021
    Configuration menu
    Copy the full SHA
    b0052b4 View commit details
    Browse the repository at this point in the history

  5. Changes for flsp demand

    @jonsampedro
    jonsampedro committed Jul 27, 2021
    Configuration menu
    Copy the full SHA
    16be1b1 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2021

  1. Solver error with model solvin

    @jonsampedro
    jonsampedro committed Jul 28, 2021
    Configuration menu
    Copy the full SHA
    83a5a83 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2021

  1. BugFix non-USA regions popDens effect

    @jonsampedro
    jonsampedro committed Jul 29, 2021
    Configuration menu
    Copy the full SHA
    e2ce01c View commit details
    Browse the repository at this point in the history

  2. Include the gompertz function code files (.h and .cpp) to the compiler

    @jonsampedro
    jonsampedro committed Jul 29, 2021
    Configuration menu
    Copy the full SHA
    9618858 View commit details
    Browse the repository at this point in the history

  3. BugFix writeToDebug SubregionalIncome

    @jonsampedro
    jonsampedro committed Jul 29, 2021
    Configuration menu
    Copy the full SHA
    cac05cd View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2021

  1. Minor changes on script comments

    @jonsampedro
    jonsampedro committed Aug 2, 2021
    Configuration menu
    Copy the full SHA
    fa28e97 View commit details
    Browse the repository at this point in the history

  2. Delete unused extdata files

    @jonsampedro
    jonsampedro committed Aug 2, 2021
    Configuration menu
    Copy the full SHA
    326cd50 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2021

  1. Roll back energy price exponent in the satiation demand function

    @jonsampedro
    jonsampedro committed Aug 4, 2021
    Configuration menu
    Copy the full SHA
    bd078f7 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2021

  1. Update parameters and source

    @jonsampedro
    jonsampedro committed Aug 9, 2021
    Configuration menu
    Copy the full SHA
    16a76b3 View commit details
    Browse the repository at this point in the history

  2. Not include the effect of base floorspace to be consistent with the 

    implementation of multiple consumer groups
    @jonsampedro
    jonsampedro committed Aug 9, 2021
    Configuration menu
    Copy the full SHA
    6c73def View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2021

  1. Calculate habitable land within the DS (instead of reading it 

    exogenously)
    @jonsampedro
    jonsampedro committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    9c483b5 View commit details
    Browse the repository at this point in the history

  2. Allocate the created cpp files in the corresponding folders

    @jonsampedro
    jonsampedro committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    9e942eb View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2021

  1. Floorspace includes income groups

    @jonsampedro
    jonsampedro committed Aug 18, 2021
    Configuration menu
    Copy the full SHA
    6d26dcd View commit details
    Browse the repository at this point in the history

  2. Zero the PriceElasticity of floorspace. Required for the new structure 

    and decided by the group
    @jonsampedro
    jonsampedro committed Aug 18, 2021
    Configuration menu
    Copy the full SHA
    59a328e View commit details
    Browse the repository at this point in the history

  3. "Finished" flsp: Writes satiation impedance and the new adder (as 

    bias-correction parameter)
    @jonsampedro
    jonsampedro committed Aug 18, 2021
    Configuration menu
    Copy the full SHA
    3051643 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2021

  1. Changes GCAM "world" Floorspace DS

    @jonsampedro
    jonsampedro committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    fbac55a View commit details
    Browse the repository at this point in the history

  2. Flsp price elasticity to zero

    @jonsampedro
    jonsampedro committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    6789c52 View commit details
    Browse the repository at this point in the history

  3. Changes flsp GCAM "world"

    @jonsampedro
    jonsampedro committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    e247373 View commit details
    Browse the repository at this point in the history

  4. minor change doc

    @jonsampedro
    jonsampedro committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    3c8419e View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2021

  1. Write the impedance and adder parameters for flsp and energy in GCAM and 

    GCAM-USA
    @jonsampedro
    jonsampedro committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    b605684 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2021

  1. Add price files

    @jonsampedro
    jonsampedro committed Aug 26, 2021
    Configuration menu
    Copy the full SHA
    dfb3c7f View commit details
    Browse the repository at this point in the history

  2. Add sysdata with new level2DataNames and mi Headers

    @jonsampedro
    jonsampedro committed Aug 26, 2021
    Configuration menu
    Copy the full SHA
    f155f8f View commit details
    Browse the repository at this point in the history

  3. Write satiation impedance and adder (bias) for non-thermal energy 

    services (includes per SSP and batch for xmls)
    @jonsampedro
    jonsampedro committed Aug 26, 2021
    Configuration menu
    Copy the full SHA
    9c4fcd6 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2021

  1. Add impedance and adder for thermal services (+some corrections in 

    generic services)
    @jonsampedro
    jonsampedro committed Aug 27, 2021
    Configuration menu
    Copy the full SHA
    8e59bd6 View commit details
    Browse the repository at this point in the history

  2. Add CalPrices

    @jonsampedro
    jonsampedro committed Aug 27, 2021
    Configuration menu
    Copy the full SHA
    070611d View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2021

  1. Temp commit: Changes in cpp files that build the executable but still 

    gives an error (k calib coef Inf)
    @jonsampedro
    jonsampedro committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    128076b View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2021

  1. temp commit: simplifies structure for the cpp changes to adjust 

    satiation function (still error)
    @jonsampedro
    jonsampedro committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    5b436c2 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2021

  1. Builds executable (error coeffcient k=Inf)

    @jonsampedro
    jonsampedro committed Sep 1, 2021
    Configuration menu
    Copy the full SHA
    76b606a View commit details
    Browse the repository at this point in the history

  2. Adjust satiation impedance

    @jonsampedro
    jonsampedro committed Sep 1, 2021
    Configuration menu
    Copy the full SHA
    c46f3fe View commit details
    Browse the repository at this point in the history

  3. Minor change satiation level

    @jonsampedro
    jonsampedro committed Sep 1, 2021
    Configuration menu
    Copy the full SHA
    a06b307 View commit details
    Browse the repository at this point in the history

  4. Delete duplicates in thermal services

    @jonsampedro
    jonsampedro committed Sep 1, 2021
    Configuration menu
    Copy the full SHA
    851f004 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2021

  1. BugFix satiation demand unction -> corrects the inf coefficient

    @jonsampedro
    jonsampedro committed Sep 2, 2021
    Configuration menu
    Copy the full SHA
    73534c9 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2021

  1. Take comment out

    @jonsampedro
    jonsampedro committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    5d62fc7 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2021

  1. Modify saiation impedance and adder in the DS and add some queries fo… 

    …r the db

(Solves correctly)
    @jonsampedro
    jonsampedro committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    3c495ac View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2021

  1. Temp commit: some changes related to adjSat

    @jonsampedro
    jonsampedro committed Sep 14, 2021
    Configuration menu
    Copy the full SHA
    fee00f9 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2021

  1. Roll back zero prelast for flsp demand

    @jonsampedro
    jonsampedro committed Sep 15, 2021
    Configuration menu
    Copy the full SHA
    4d924da View commit details
    Browse the repository at this point in the history

  2. Modifications to write the coefficient in the DS (woks correctly)

    @jonsampedro
    jonsampedro committed Sep 15, 2021
    Configuration menu
    Copy the full SHA
    bd41f5f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'JS/feature/adjSatfunction' into JS/feature/building_mul… 

    …t_cons
    @jonsampedro
    jonsampedro committed Sep 15, 2021
    Configuration menu
    Copy the full SHA
    1db4a7a View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2021

  1. Adjust coefficient calculation

    @jonsampedro
    jonsampedro committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    38a68c4 View commit details
    Browse the repository at this point in the history

  2. Correct MI headers for bias-adder and add a new query: Servive Output 

    per gcam-consumer
    @jonsampedro
    jonsampedro committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    fe3db03 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2021

  1. Correct solution with no adder

    @jonsampedro
    jonsampedro committed Sep 23, 2021
    Configuration menu
    Copy the full SHA
    0c3ccc9 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2021

  1. Adjust thermal building input for "GetBiassAdder"

    @jonsampedro
    jonsampedro committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    c7deccc View commit details
    Browse the repository at this point in the history

  2. Solves dividing the BiasAdder equally across groups

    @jonsampedro
    jonsampedro committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    ffadba3 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2021

  1. Add income distribution projections (Task 1.3)

    @jonsampedro
    jonsampedro committed Sep 28, 2021
    Configuration menu
    Copy the full SHA
    c9894bc View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2021

  1. Add calibarted prices

    @jonsampedro
    jonsampedro committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    562f437 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2021

  1. update to xcode project file (include gompertz function code files)

    @pkyle
    pkyle committed Oct 14, 2021
    Configuration menu
    Copy the full SHA
    d3c1140 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2021

  1. Write coefficient and multiple consumer groups in the transportation 

    sector
    @jonsampedro
    jonsampedro committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    06e29f0 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2021

  1. Rename Gompertz function parameters for consistency

    @jonsampedro
    jonsampedro committed Oct 25, 2021
    Configuration menu
    Copy the full SHA
    1d70efd View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2021

  1. Delete the (now) unused satiation parameters from the resid 

    gcam.consumer in the building xml file (creates a problem with the DB that
needs to be fixed)
    @jonsampedro
    jonsampedro committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    c0a036c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'JS/feature/new-flsp-demand' of https://stash.pnnl.gov/s… 

    …cm/jgcri/gcam-core into JS/feature/new-flsp-demand
    @jonsampedro
    jonsampedro committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    911c54e View commit details
    Browse the repository at this point in the history

  3. BugFix: Write output DB

    @jonsampedro
    jonsampedro committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    c108513 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2021

  1. Add new asumption for floorspace in historical years (2005:2015): 

    Combine oberved data with estimated values
    @jonsampedro
    jonsampedro committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    0d596a0 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2021

  1. Adjust historical flsp in USA based on AEO assumptions

    @jonsampedro
    jonsampedro committed Nov 1, 2021
    Configuration menu
    Copy the full SHA
    b2231ba View commit details
    Browse the repository at this point in the history

  2. BugFix, header comma

    @jonsampedro
    jonsampedro committed Nov 1, 2021
    Configuration menu
    Copy the full SHA
    e84d8ea View commit details
    Browse the repository at this point in the history

  3. Add precursors as inputs to avoid warning message

    @jonsampedro
    jonsampedro committed Nov 1, 2021
    Configuration menu
    Copy the full SHA
    4dc88f8 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2021

  1. Update rda data files

    @jonsampedro
    jonsampedro committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    8743c64 View commit details
    Browse the repository at this point in the history

  2. Adjust USA flsp calibration based on AEO projections

    @jonsampedro
    jonsampedro committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    c0d2105 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2021

  1. update gcamdata documentation

    @pkyle
    pkyle committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    29c9c53 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2021

  1. Add prop shares for supplysectors and building inputs (temp)

    @jonsampedro
    jonsampedro committed Nov 13, 2021
    Configuration menu
    Copy the full SHA
    b483c86 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2021

  1. Revert "Write coefficient and multiple consumer groups in the transpo… 

    …rtation"

This reverts commit 06e29f0.
    @jonsampedro
    jonsampedro committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    9270e48 View commit details
    Browse the repository at this point in the history

  2. Add consumer groups to HDDCDD

    @jonsampedro
    jonsampedro committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    0a712a8 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2021

  1. Add estimation of parameters into the DS

    @jonsampedro
    jonsampedro committed Nov 22, 2021
    Configuration menu
    Copy the full SHA
    3665058 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2021

  1. Round parameters and add documentation file

    @jonsampedro
    jonsampedro committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    0ab3dd5 View commit details
    Browse the repository at this point in the history

  2. Round L102.ceds_GFED_nonco2_tg_R_S_F to the 12th digit to eliminate 

    differences between OS or local default R options (avoid warning message)
    @jonsampedro
    jonsampedro committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    1127508 View commit details
    Browse the repository at this point in the history

  3. Add strip_attributes to L144.hab_land_flsp_fin

    @jonsampedro
    jonsampedro committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    0bfe97f View commit details
    Browse the repository at this point in the history

  4. More strip_attributes

    @jonsampedro
    jonsampedro committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    3dc1c53 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2021

  1. Delete data files (temp)

    @jonsampedro
    jonsampedro committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    cf3c642 View commit details
    Browse the repository at this point in the history

  2. Add new data files

    @jonsampedro
    jonsampedro committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    030c5ee View commit details
    Browse the repository at this point in the history

  3. Small fixes including: 

    * whitespace fixes (spaces instead of tabs)
* clarify unit conversions in gompertz function
* Remove STATE flags from gompertz params which do not need that flag
    @pralitp
    pralitp committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    02b54f8 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/master' into JS/feature/new-flsp… 

    …-demand
    @pralitp
    pralitp committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    e30e5f5 View commit details
    Browse the repository at this point in the history

  5. Add data files from PIC

    @jonsampedro
    jonsampedro committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    0ddabf0 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'JS/feature/new-flsp-demand' of https://stash.pnnl.gov/s… 

    …cm/jgcri/gcam-core into JS/feature/new-flsp-demand
    @jonsampedro
    jonsampedro committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    2a448d0 View commit details
    Browse the repository at this point in the history

  7. Local data files

    @jonsampedro
    jonsampedro committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    a1ca700 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2021

  1. Add new data files from PIC

    @jonsampedro
    jonsampedro committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    049bf6d View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2021

  1. Merge branch 'JS/feature/new-flsp-demand' into JS/feature/building_mu… 

    …lt_cons
    @jonsampedro
    jonsampedro committed Dec 1, 2021
    Configuration menu
    Copy the full SHA
    c5a02b8 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2021

  1. Changes in the DS to distinguish between modern and traditional fuels

    @jonsampedro
    jonsampedro committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    6f4684d View commit details
    Browse the repository at this point in the history

  2. Add input coefficients to the cpp files

    @jonsampedro
    jonsampedro committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    b46bcde View commit details
    Browse the repository at this point in the history

  3. Add conditional service densities

    @jonsampedro
    jonsampedro committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    fca64d9 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2021

  1. Structure that works with multiple consumers (still calibration errors)

    @jonsampedro
    jonsampedro committed Dec 17, 2021
    Configuration menu
    Copy the full SHA
    bb434a8 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2022

  1. Adjust function to report services per consumer group

    @jonsampedro
    jonsampedro committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    689ec6a View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2022

  1. Correct calibration of thermal load

    @jonsampedro
    jonsampedro committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    11f8c08 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2022

  1. Correct satiation impedance (sector price)

    @jonsampedro
    jonsampedro committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    36675c1 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2022

  1. Adjust shares for Africa

    @jonsampedro
    jonsampedro committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    77d6fac View commit details
    Browse the repository at this point in the history

  2. Update data map file

    @jonsampedro
    jonsampedro committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    4b47932 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2022

  1. Minor change cpp file

    @jonsampedro
    jonsampedro committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    ba634fe View commit details
    Browse the repository at this point in the history

  2. Add non-CO2 emissions to multiple consumer representaton

    @jonsampedro
    jonsampedro committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    ca8c092 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2022

  1. Adjust HFC emissions

    @jonsampedro
    jonsampedro committed Jan 28, 2022
    Configuration menu
    Copy the full SHA
    9bc8d1d View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2022

  1. Adjustment to flsp per capita to avoid the 2015-2020 decrease associated 

    with the adder
    @jonsampedro
    jonsampedro committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    58a07fa View commit details
    Browse the repository at this point in the history

  2. Add subnational socioeconomic queries

    @jonsampedro
    jonsampedro committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    18a0f9f View commit details
    Browse the repository at this point in the history

  3. Adjust gompertz coeffcients for USA: re-estimated based on AEO 

    harmonizaton
    @jonsampedro
    jonsampedro committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    56805e7 View commit details
    Browse the repository at this point in the history

  4. Correct satiation adders for the residential energy demands

    @jonsampedro
    jonsampedro committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    33c5300 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2022

  1. Major revisions for residential energy demand: 

    * Implementation of deciles from Task 1.3
* Historical floorspace calibrated at decile level and added up +
  adjustment on per capita floorspace (min Base)
* Revisions to estimate coal and TradBio services (not by flsp)
* Add non-CO2 emissions
    @jonsampedro
    jonsampedro committed Feb 14, 2022
    Configuration menu
    Copy the full SHA
    378b6ca View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2022

  1. Adjust floorspace and traditional fuels

    @jonsampedro
    jonsampedro committed Feb 18, 2022
    Configuration menu
    Copy the full SHA
    cd85bf5 View commit details
    Browse the repository at this point in the history

  2. Rewrite adder for floorspace (no shares) and add TradBio to all regions

    @jonsampedro
    jonsampedro committed Feb 18, 2022
    Configuration menu
    Copy the full SHA
    dfa5b3e View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2022

  1. Major revisions: new income decile projections, new service allocation, 

    add prices for TradBio calibration and bugfixes
    @jonsampedro
    jonsampedro committed Mar 1, 2022
    Configuration menu
    Copy the full SHA
    a5809a0 View commit details
    Browse the repository at this point in the history

  2. Adjust bias adder (converge in 2030) and bugfixes (Africa electric 

    heating + building prices)
    @jonsampedro
    jonsampedro committed Mar 1, 2022
    Configuration menu
    Copy the full SHA
    3a17cd8 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2022

  1. Correct cpp files to have time-varying BiasAdder

    @jonsampedro
    jonsampedro committed Mar 2, 2022
    Configuration menu
    Copy the full SHA
    fccc3f0 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2022

  1. Delete unused TRadBio sectors to avoid dependency-finder warning

    @jonsampedro
    jonsampedro committed Mar 4, 2022
    Configuration menu
    Copy the full SHA
    4fc6db0 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2022

  1. Adjustments for running SSPs with no errors nor warnings

    @jonsampedro
    jonsampedro committed Mar 7, 2022
    Configuration menu
    Copy the full SHA
    2addc55 View commit details
    Browse the repository at this point in the history

  2. Adjust commercial satiation adder per SSP

    @jonsampedro
    jonsampedro committed Mar 7, 2022
    Configuration menu
    Copy the full SHA
    bc8bba1 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2022

  1. Correct future shell efficiency trajectories

    @jonsampedro
    jonsampedro committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    8182663 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2022

  1. BugFix shell conductance

    @jonsampedro
    jonsampedro committed Mar 14, 2022
    Configuration menu
    Copy the full SHA
    77bdd65 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2022

  1. Merge branch 'master' into JS/feature/building_mult_cons

    @jonsampedro
    jonsampedro committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    b8a38ae View commit details
    Browse the repository at this point in the history

  2. Correct satiation impedance parsing

    @jonsampedro
    jonsampedro committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    c20e6f2 View commit details
    Browse the repository at this point in the history

  3. Parse thermal coefficient

    @jonsampedro
    jonsampedro committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    a9786e5 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2022

  1. Move from hab-land to popDens

    @jonsampedro
    jonsampedro committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    e374982 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2022

  1. Clean code

    @jonsampedro
    jonsampedro committed Mar 25, 2022
    Configuration menu
    Copy the full SHA
    ea12b34 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2022

  1. add new queries

    @jonsampedro
    jonsampedro committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    63a7284 View commit details
    Browse the repository at this point in the history

  2. Allocate residential coal to heating and others to keep consistency with 

    GCAM-USA
    @jonsampedro
    jonsampedro committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    a7747b2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into JS/feature/building_mult_cons

    @jonsampedro
    jonsampedro committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    9e12c7d View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2022

  1. temp commit: delete correct sectors in GCAM-USA bulding file (solving 

    issues)
    @jonsampedro
    jonsampedro committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    5e38bed View commit details
    Browse the repository at this point in the history

  2. Edit queries

    @jonsampedro
    jonsampedro committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    ed4d929 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2022

  1. BugFix: add max model base years

    @jonsampedro
    jonsampedro committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    d577fe1 View commit details
    Browse the repository at this point in the history

  2. Adjustments to GCAM-USA to be consistent with the new building sector in 

    the global version
    @jonsampedro
    jonsampedro committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    d16c987 View commit details
    Browse the repository at this point in the history

  3. Roll back re-mapping to TradBio

    @jonsampedro
    jonsampedro committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    161ebd7 View commit details
    Browse the repository at this point in the history

  4. Delete query: service output per gcam consumer

    @jonsampedro
    jonsampedro committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    83e5fd0 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2022

  1. Delete TradBio in USA region to avoid warning severe error

    @jonsampedro
    jonsampedro committed Apr 13, 2022
    Configuration menu
    Copy the full SHA
    487c752 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2022

  1. BugFix: data for the estimation of parameters

    @jonsampedro
    jonsampedro committed Apr 19, 2022
    Configuration menu
    Copy the full SHA
    95c3ac5 View commit details
    Browse the repository at this point in the history

  2. Add correct precursors

    @jonsampedro
    jonsampedro committed Apr 19, 2022
    Configuration menu
    Copy the full SHA
    e0339f8 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2022

  1. Adjust calibration prices

    @jonsampedro
    jonsampedro committed Apr 21, 2022
    Configuration menu
    Copy the full SHA
    10a0180 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2022

  1. Merge branch 'master' into JS/feature/building_mult_cons

    @jonsampedro
    jonsampedro committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    50c01d1 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2022

  1. Add a price-corrector coefficient to capture the difference between 

    calibrated prices in the DS and the code files
    @jonsampedro
    jonsampedro committed Apr 25, 2022
    Configuration menu
    Copy the full SHA
    4b37728 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2022

  1. Merge branch 'master' into JS/feature/building_mult_cons

    @jonsampedro
    jonsampedro committed Apr 27, 2022
    Configuration menu
    Copy the full SHA
    a04e670 View commit details
    Browse the repository at this point in the history

  2. BugFix GCAM_data_map

    @jonsampedro
    jonsampedro committed Apr 27, 2022
    Configuration menu
    Copy the full SHA
    be189a5 View commit details
    Browse the repository at this point in the history

  3. BugFix join df

    @jonsampedro
    jonsampedro committed Apr 27, 2022
    Configuration menu
    Copy the full SHA
    01c88b1 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2022

  1. Adjust HFC MACC curves for cooling with multiple consumers

    @jonsampedro
    jonsampedro committed Apr 28, 2022
    Configuration menu
    Copy the full SHA
    a4799e8 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2022

  1. Add SSP-specific subregional income distribution pathways for future 

    periods
    @jonsampedro
    jonsampedro committed Apr 29, 2022
    Configuration menu
    Copy the full SHA
    fb381e5 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2022

  1. Add base service density for bugFix

    @jonsampedro
    jonsampedro committed May 2, 2022
    Configuration menu
    Copy the full SHA
    e365390 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2022

  1. BugFix: Change the approach to adjust "negative values" and eliminate… 

    … jumps created by the adder
    @jonsampedro
    jonsampedro committed May 12, 2022
    Configuration menu
    Copy the full SHA
    a74ea39 View commit details
    Browse the repository at this point in the history

  2. In the adjustment, set the adder to final calibration period

    @jonsampedro
    jonsampedro committed May 12, 2022
    Configuration menu
    Copy the full SHA
    3fca83f View commit details
    Browse the repository at this point in the history

Commits on May 26, 2022

  1. Merge branch 'master' into JS/feature/building_mult_cons

    @jonsampedro
    jonsampedro committed May 26, 2022
    Configuration menu
    Copy the full SHA
    0647288 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2022

  1. Merge branch 'master' into JS/feature/building_mult_cons

    @jonsampedro
    jonsampedro committed May 31, 2022
    Configuration menu
    Copy the full SHA
    c23792a View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2022

  1. Adjust electric heating in China

    @jonsampedro
    jonsampedro committed Jun 10, 2022
    Configuration menu
    Copy the full SHA
    398aa63 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2022

  1. Update income shares based on latets pridr release

    @jonsampedro
    jonsampedro committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    8d6985f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into JS/feature/building_mult_cons

    @jonsampedro
    jonsampedro committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    fc12098 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2022

  1. Update prebuilt data

    @jonsampedro
    jonsampedro committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    dda9b1e View commit details
    Browse the repository at this point in the history

  2. Expand elec heating sw to further regions (beyond China)

    @jonsampedro
    jonsampedro committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    f94705c View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2022

  1. Update income distribution paths from pridr

    @jonsampedro
    jonsampedro committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    dc59271 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. correct satiation impedance for SSP scenarios

    Jon Sampedro committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    44df533 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2024

  1. add decreasing EFs for resid TradBio following SSP2-trends from Rao e… 

    …t al 2017
    jon committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    dfae0f3 View commit details
    Browse the repository at this point in the history