CMP: Multiple consumers for floorspace and reisdential energy demand #262
Conversation
This file contains 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
binary files with level2 data names)
changing prodDmdFnType)
the global version
calibrated prices in the DS and the code files
… jumps created by the adder
Schuch666
pushed a commit
to Schuch666/gcam-core
that referenced
this pull request
Jun 6, 2023
Merge in JGCRI/gcam-core from pw/feature/hydrogen_det_ind to master Squashed commit of the following: commit bf1f88b Merge: 4fd8bbb 631cf61 Author: Pralit Patel <[email protected]> Date: Fri Jun 3 18:02:10 2022 -0400 Merge remote-tracking branch 'origin/master' into pw/feature/hydrogen_det_ind commit 4fd8bbb Author: fuhr472 <[email protected]> Date: Wed Jun 1 11:11:23 2022 -0400 Clarify comments per reviewer requests, mostly by moving down summary comments from the top of the code block, down to the lines where they are actually applied commit 30abc96 Author: Page Kyle <[email protected]> Date: Wed Jun 1 00:49:38 2022 -0600 improve code commenting and delete unnecessary (commented out) rows, as per pull request review comments commit 2860a2d Author: Page Kyle <[email protected]> Date: Tue May 31 20:40:08 2022 -0600 silence R package checks of un-binded variable names in gcamdata/R code commit 2d6a852 Author: Page Kyle <[email protected]> Date: Tue May 31 15:22:40 2022 -0600 drop international aviation BEV technology terminal share-weight to 0.1 (speculative technology, was becoming dominant in 2.6 scenarios) commit 3b4ff65 Author: Page Kyle <[email protected]> Date: Tue May 31 14:22:36 2022 -0600 clean up comments and re-build documentation (no changes to XML files from this commit) commit ef95138 Author: Page Kyle <[email protected]> Date: Fri May 27 18:10:38 2022 -0600 remove EMF-37 hydrogen T&D infrastructure XML files that were not intended to be on this branch re-build GCAM_DATA_MAP after recent revisions commit 2b2f04a Author: Page Kyle <[email protected]> Date: Fri May 27 15:19:20 2022 -0600 remove EMF37 policy and transport R code files that were unintentionally migrated from sha/projects/gcam-policy branch commit 45a2e9f Author: Page Kyle <[email protected]> Date: Fri May 27 11:34:54 2022 -0600 revise A25.globaltech_coef to specify that the electricity input to NGSR is for compression and refrigeration (this energy requirement had been getting dropped, supplanted with the electricity requirements of NGSR production only) commit b0f6475 Author: Page Kyle <[email protected]> Date: Wed May 11 13:50:40 2022 -0600 reduce coefficient of hydrogen liquefaction from 9.2 kwh/kg in 2025 to 8 kwh/kg in 2040 and 7 kwh/kg in 2060 based on email exchange with Amgad Elgowainy 5/11/2022 commit a69bc10 Author: Page Kyle <[email protected]> Date: Wed May 11 13:38:57 2022 -0600 revise representation of renewable electrolysis to assign a ratio of electrolyzer:renewable capacity that is less than 1 commit a583e96 Author: Patrick O'Rourke <[email protected]> Date: Sat May 7 14:34:56 2022 -0400 Update green hydrogen minicam.non.energy.input name - Change from "non-energy" to "electrolyzer" commit 38d9b20 Author: Page Kyle <[email protected]> Date: Fri May 6 15:25:46 2022 -0600 remove A25.stubtech_cost and replace with calculations performed in zchunk_L225.hydrogen and zchunk_LA125.hydrogen commit dd11833 Author: Patrick O'Rourke <[email protected]> Date: Tue May 3 16:56:14 2022 -0400 Regionalize Green H2 - Add regional wind and solar assumptions, with electrolzer separated from wind turbines or solar panels - Set global green H2 to USA regional values commit 9b047c9 Author: Page Kyle <[email protected]> Date: Mon May 2 10:10:40 2022 -0600 move airCO2 PrimaryFuelCO2Coef from Ccoef.xml to the dac_*.xml files. Avoids warning message in model run about not being able to find the airCO2 market when DAC is not read in commit 4ea40c4 Author: Page Kyle <[email protected]> Date: Sun May 1 23:18:58 2022 -0600 revise emission_factor_controls.xml to only delete gdp-control functions from technologies that have them this avoids error messages XML parsing commit 78282a5 Author: Page Kyle <[email protected]> Date: Wed Apr 27 23:15:25 2022 -0600 modify zchunk_L253.emission_controls.R to avoid trying to assign emissions factors to district heat in Taiwan (which is not modeled) commit 9a9cd06 Author: Page Kyle <[email protected]> Date: Wed Apr 27 17:43:18 2022 -0600 revise "industrial energy use" to "other industrial energy use" in A53.em_ctrl_param_china_industry.csv commit 081d0a8 Merge: f0ea4a0 952b050 Author: Page Kyle <[email protected]> Date: Wed Apr 27 12:41:18 2022 -0600 Merge branch 'master' into pw/feature/hydrogen_det_ind NOT YET TESTED Resolve all conflicts Rebuild package data Use master version of util/testing-framework commit f0ea4a0 Merge: 0b368f7 ae27b64 Author: Page Kyle <[email protected]> Date: Tue Apr 26 15:36:57 2022 -0600 Merge branch 'pw/feature/hydrogen_det_ind' into pw/feature/hydrogen_usa ... and 158 more commits
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I open this pull request to merge the branch with multiple consumers in floorspace and residential energy into the core.