forked from JGCRI/gcam-core
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request JGCRI#181 in JGCRI/gcam-core from gpk/bugfix/ddgs-…
…prices-shareweights to master * commit '78822386206e5ace5e4778135505699b70fe930b': Update GCAM_DATA_MAP update to documentation, sysdata.rda, address package check issues apply an interpolation rule to DDGS and feedcakes share-weights (s-curve from final cal year to 1 in 2150) * required adding capability to specify interpolation "to-value" for A_an_input_subsector * implement region-specific DDGS and feedcakes prices in the historical years (wasn't being properly computed or applied before) * prices are calculated from weighted average FeedCrops prices in each region re-assign biodiesel feedstocks from OilCrop to PalmFruit in regions with (a) sugar cane ethanol and (b) zero biodiesel production in the final calibration year
- Loading branch information
Showing
9 changed files
with
108 additions
and
58 deletions.
There are no files selected for viewing
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
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
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 file not shown.
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
# File: A21.rsrc_info.csv | ||
# Title: Name and characteristics of resource for secondary outputs from refining | ||
# Units: 1975$/kg | ||
# Column types: ccccnnn | ||
# Column types: cccc | ||
# ---------- | ||
resource,market,output-unit,price-unit,1971,2010,2015 | ||
DDGS and feedcakes,regional,Mt,1975$/kg,0.05,0.05,0.05 | ||
resource,market,output-unit,price-unit | ||
DDGS and feedcakes,regional,Mt,1975$/kg |
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.