Backport GCAM Dev #1248
Open
Backport GCAM Dev #1248
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
…hafer et al. 2019
…replacement for fossil emissions coefficients
…logy for first technology-level resource xml data read into all_energy_emissions.xml and adding node equivalences
…ogy from being included in technology node equivalence
…to resource nonCO2
…ssumed no duplicate country_names within iso_GCAM_regID
…ining by iso. further cleanup on LA121.liquids.R
…ssary new constant
…d very high fertilizer IO coef of MiscCropTree in selected basins
Merge in JGCRI/gcam-core from maw/bugfix/misc_6pt0_fixes to master Squashed commit of the following: commit 1e8594ae5e24f514fcde12951edeb4f3f2295229 Merge: 0ca72effc 72b83efc1 Author: Pralit Patel <[email protected]> Date: Mon Dec 19 13:58:38 2022 -0500 Merge remote-tracking branch 'origin/master' into maw/bugfix/misc_6pt0_fixes commit 0ca72effcb9409c77b9ee559cf18918d35c6a472 Author: Pralit Patel <[email protected]> Date: Fri Dec 16 12:58:06 2022 -0500 More updates to address PR comments commit a4c6f13a377d01e1c9247b43d6cde086b6b9cbf7 Author: Pralit Patel <[email protected]> Date: Wed Dec 7 20:08:10 2022 -0800 Update Visual Studio project file for FixedFinalDemand commit cbbcd0c7918ee00a3dde7c6485f5765060c9398e Author: Pralit Patel <[email protected]> Date: Wed Dec 7 22:40:27 2022 -0500 Rebuild gcamdata package doc commit 3bb3b23da9226cafd07f708194e5a8b24d103fe0 Author: Pralit Patel <[email protected]> Date: Wed Dec 7 22:36:22 2022 -0500 Address PR comments in cpp files commit 60d81a40bf5064c7217dd98eb210fa92f2664223 Author: Page Kyle <[email protected]> Date: Tue Dec 6 20:15:38 2022 -0700 replace hard-wired GCAM_region_ID == 1 with gcam.USA_CODE commit 0ccd3db4e1ee173c504476ef2fbb2a0ee1636610 Merge: 7fde4caab 74b041779 Author: marideeweber <[email protected]> Date: Mon Dec 5 09:49:39 2022 -0800 Merge branch 'maw/bugfix/misc_6pt0_fixes' of https://stash.pnnl.gov/scm/jgcri/gcam-core into maw/bugfix/misc_6pt0_fixes commit 74b04177983c12d9df268fc400fe4ebbb4b2d840 Author: Pralit Patel <[email protected]> Date: Fri Dec 2 15:20:09 2022 -0500 Some more refactoring to save memory / STATE variables: * Add postCalc to NonCO2Emissions where we can instead move calibrating emissions coef and saving adjusted emiss coefs * Move saving adjusted emiss coefs to LinearControl objects as they are the only ones that need it and are relatively rarely instatiated commit 163567085f4e7757880489e57b0aa6431358a78b Author: Pralit Patel <[email protected]> Date: Thu Dec 1 14:41:37 2022 -0500 Remove tech change object and associated scaler from Technology as it is never utilized commit b449dc3f2d4d17998f4c1bf70e3ae2499a6606fe Author: Pralit Patel <[email protected]> Date: Thu Dec 1 12:17:32 2022 -0500 Remove some little used or duplicative levers in the land allocator which can handled using a more generic approach: * carbon increase rate / could be replicated by price adjust on CO2_LUC * land expansion constraint / could be replicated with land constraint policy commit 2266728cd4e00de294de5e548f015bc6b1481b83 Author: Pralit Patel <[email protected]> Date: Thu Dec 1 10:56:17 2022 -0500 A bandaid fix: the SSP2 2.6 initial price is too drastic of shock to solve. Setting it a bit lower and allowing it to work up seems to let it solve through without issue. commit 7c66772559cdbd300edf27f417052586be032b1f Author: Pralit Patel <[email protected]> Date: Thu Dec 1 10:52:31 2022 -0500 Try again with the un-tagging of unmanged land value as STATE. We can move forward with this as long as we: 1. Have an initial call in initCalc to ensure the values get set in the nodes. 2. The calls during World.calc are still necessary to trigger unmanged land leaf profit calculations which are dynmamic. However, given the initial call to set the unmanaged values during initCalc the if statement in the nodes will avoid setting them again thus still no need for STATE commit 9631d412fddef9be49bdbcf37381a2662b0d9251 Author: Pralit Patel <[email protected]> Date: Wed Nov 30 22:43:56 2022 -0500 Revert "We call setUnmanagedLandValue during World.calc even though those values" This reverts commit a2addef07e95e79048891d724909f94350f649c5. commit e2b2eb0b5013b7bbdd4e5ba34dc7ec122c7fab64 Author: Pralit Patel <[email protected]> Date: Wed Nov 30 17:36:46 2022 -0500 Some preconditioner tweaks that I noticed: * Could in advertently set a price to zero of lower bound was zero in some caes * Reset demand scale when the market was projected to be "off" but clearly the supply and demand are both "on" commit 302eb4ec101cd250437664731ce7a51ab4255acb Author: Pralit Patel <[email protected]> Date: Wed Nov 30 14:02:08 2022 -0500 Use the Kahan method when accumulating supplies and demands to correct for round off / truncation error. This makes GCAM robust to changes in accumulation order such as when GCAM Parallel is enabled. Thus model iteration counts are now stable from run to run even when GCAM Parallel is enabled. commit c187c12fc5e129d3a3562cff44a447e11fe1e7da Author: Pralit Patel <[email protected]> Date: Wed Nov 23 11:47:12 2022 -0500 Pull in testing frameworks fixes (try 2) commit 743da2249eebf62e229245da2f3282c53d3fcead Author: Page Kyle <[email protected]> Date: Tue Nov 22 20:53:57 2022 -0500 revise hydrogen tech mappings in A44.share_serv_fuel (no consequence for final XML files) commit 3f893c217aae0060bc3020c9b1d4433ed0c8abe8 Author: Pralit Patel <[email protected]> Date: Mon Nov 21 10:47:55 2022 -0500 Update testing framework to fix PIC status updates not showing up in PR commit 666797882e31173388c2aabad595173e712bf646 Author: Pralit Patel <[email protected]> Date: Fri Nov 18 17:06:47 2022 -0500 Avoid saving emissions control reduction and instead just return it directly and thus avoid another STATE variable commit 0024314aff9f5b90d1e2cf728d7e9a8c4b6b81cb Author: Pralit Patel <[email protected]> Date: Fri Nov 18 16:22:34 2022 -0500 Fix so that cal-min-profit-rate can be provided in the same units as expected in the land allocator (i.e. adjust by yield * 1e9) ... and 28 more commits
…tting fugitive co2 emissions between conventional and unconventional oil for regions with historical unconventional oil production
…ntional oil and adding some constants
Merge in JGCRI/gcam-core from xz/feature/cropremap-agupdate to master Squashed commit of the following: commit b37a4b81a45f8fc7132f47b12c213202fafca81b Author: Zhao, Xin <[email protected]> Date: Sat Jan 14 00:08:05 2023 -0500 Make changes on harvest frequency adjustments. Previously the are of tree crops was adjusted when converting harvested area to land cover. We treat tree crops differently now. So the area is more accurate. commit e4153f477b3d3165dbe3976d1be868ea7d5b6499 Author: Zhao, Xin <[email protected]> Date: Sat Apr 22 15:11:27 2023 -0400 Update assumptions of nonfeedcost calculation to minimium chances of negative values. The fix aims to imporve the solution. Number of iteration decreased by 37%. commit 4ec4596a84e60ce0f7fa00180de693ac375f68ed Author: Pralit Patel <[email protected]> Date: Thu Apr 6 13:32:56 2023 -0400 Same fix as last commit except for biomass Fertilizer commit 3b90e4dacc13d092b050af6fbbeb4000eacbaca6 Author: Pralit Patel <[email protected]> Date: Thu Apr 6 07:50:37 2023 -0700 Fix slight bug from last clean up where we forgot to apply to fertilizer IO coefficient before adjusting the nonLandVariable cost. commit 567c33f868880e7d2b1b2d59bf79614a857e2ff2 Author: Pralit Patel <[email protected]> Date: Fri Mar 31 15:20:26 2023 -0400 Pull in testing framework fix commit 158b6a083cc970157ca9ed9ebdb32357c5864ae0 Merge: 83dfc05bc 92e325248 Author: Pralit Patel <[email protected]> Date: Fri Mar 31 15:12:24 2023 -0400 Merge remote-tracking branch 'origin/master' into xz/feature/cropremap-agupdate commit 83dfc05bc237d3e71417530f142b470f9ad2a75b Author: Zhao, Xin <[email protected]> Date: Wed Mar 29 00:51:20 2023 -0400 Minor changes made to address Pralit's PR comments commit 0608b475ab80dbdb80750306864dbd5dc1a58717 Author: Pralit Patel <[email protected]> Date: Tue Mar 28 21:30:46 2023 -0400 Forgot to include the item to item_code mapping file. commit 073749beef3dd421ff6873b484c70bc122957b31 Author: Pralit Patel <[email protected]> Date: Tue Mar 28 13:16:44 2023 -0400 Speed up L100 SUA processing, mostly by reducing the size of the data by reading it in long format and omiting missing data and relying on ID codes and factors. Unfortunately, dropping data complicates the processing significantly and in subtle ways as we have to constantly protect against potentially empty vectors. Ultimately the speedup is significant, however. commit 6feed8b1c56d9077cab64c59e24e1c50443c1527 Author: Zhao, Xin <[email protected]> Date: Fri Mar 3 18:11:35 2023 -0500 update the get_data_list function to read optional_file commit a09e7b88630c232a17b50b3f8020aee0a87adf79 Author: Zhao, Xin <[email protected]> Date: Fri Jan 13 08:45:24 2023 -0500 Update get_data_list in key AgLU modules. commit deedc7b9f74ec9ae44a2f4b7fe47d23b042859ee Merge: 5d1940563 3df1b9fb1 Author: Zhao, Xin <[email protected]> Date: Tue Jan 10 16:37:15 2023 -0500 Merge branch 'xz/feature/cropremap-agupdate' of https://stash.pnnl.gov/scm/jgcri/gcam-core into xz/feature/cropremap-agupdate commit 5d19405637e05e6546467960f668dab7c4c2973c Author: Zhao, Xin <[email protected]> Date: Tue Jan 10 16:35:50 2023 -0500 Quick fixes to address Page's comments to PR. commit 1debddd42144469f17867dc040b54c201b8f2854 Author: Zhao, Xin <[email protected]> Date: Tue Jan 10 02:08:37 2023 -0500 quick add_precursors bugfix and add regional prices in main query commit 3df1b9fb1262318dd0eff3c76467143bd89d760d Author: Pralit Patel <[email protected]> Date: Fri Jan 6 14:17:09 2023 -0500 Formalize Xin's approach to loading data in batch by adding `get_data_list`. I've converted module_aglu_L202.an_input to use it, still to do is convert all of the other chunks that are using Xin's original approach. commit 048bef380feca46c23e3ba25b62f860f1c75bea3 Author: Zhao, Xin <[email protected]> Date: Sun Nov 27 14:16:39 2022 -0500 Fix items names in Ag demand queries commit 54662e7d4848e05efd9c375773fdc5b06e41c74a Author: Zhao, Xin <[email protected]> Date: Fri Nov 25 04:47:59 2022 -0500 Adjustment to ensure DM pasture production match IMAGE in base year. Also, pasture yield had very strong assumptions. It is now differentiated by regions & grazing intensity is added. The land needed for pasture is a lot higher since the yield is lower effectively. commit 0f6a9e43d19809433005586fb11c40b673e3b4e0 Author: Zhao, Xin <[email protected]> Date: Thu Nov 24 18:15:49 2022 -0500 Address water content related balancing issue in livestock products. The IO coefficient from IMAGE was dry mater ton per dry matter ton. We compare IMAGE meat ourput vs. FAO meat output to get regional water content for livestock products and use that to change IO coefficient or feed conversion ratio to wet ton per dry ton basis. Note that for feed crops, FAO wet ton input was later used. commit 206cdc8974c3dd15499bcc93f7cb0cac8f7bca0d Author: Zhao, Xin <[email protected]> Date: Wed Nov 23 00:01:40 2022 -0500 update data map commit 909b2e0cbfc75880b780eef0c71609c02b1cc287 Author: Zhao, Xin <[email protected]> Date: Tue Nov 22 23:26:48 2022 -0500 Remove regional fert price adjustments after the implicit land subsidy incorporation in GCAM CPP. Also relatied processing is moved from L2072 to L2052. Clean up code & remove unused files including old IMAGE data. ... and 62 more commits
Merge in JGCRI/gcam-core from yo/bugfix/gcamusa-industrial-ghg to master Squashed commit of the following: commit 48bfffc03981be5f3e0664686315503e48a21af1 Merge: 5e4e275b3 9333d55af Author: Pralit Patel <[email protected]> Date: Tue May 2 15:07:10 2023 -0400 Merge remote-tracking branch 'origin/master' into yo/bugfix/gcamusa-industrial-ghg commit 5e4e275b363cf9f56fe39f284e711d5c1ba5b4dd Author: Yang Ou <[email protected]> Date: Thu Apr 20 23:43:46 2023 -0400 Update generate_package_data.R commit 2e5675e716449ec71965edd448f002cc53e3ea39 Author: Yang Ou <[email protected]> Date: Thu Apr 20 23:42:04 2023 -0400 Revert "Update ModelInterface_headers.txt" This reverts commit a5729d927aad8df827c5fdf591789fc5fc9bf3c9. commit 747dc43e6ccb71b8a754c656c30927bd138daf16 Author: Yang Ou <[email protected]> Date: Tue Apr 18 17:00:29 2023 -0400 address PR comments commit 6a1364ae75c3bb4a112a7203035324a82fe0ea2a Author: Yang Ou <[email protected]> Date: Sat Apr 8 21:05:29 2023 -0400 Revert "update data map" This reverts commit 1b32eb9b41ffe0efb36de9b4705d137c7d2487fb. commit a5729d927aad8df827c5fdf591789fc5fc9bf3c9 Author: Yang Ou <[email protected]> Date: Fri Mar 17 12:02:33 2023 -0400 Update ModelInterface_headers.txt commit 10690dca4e71eb1bdb2263ece3339627cab2621b Author: Yang Ou <[email protected]> Date: Sun Mar 12 11:32:56 2023 -0400 Update configuration_usa.xml minor naming change commit 65ff44a0b62bbc7d9b7fff4ea6188d3aee4ffbf8 Author: Yang Ou <[email protected]> Date: Sun Mar 12 11:32:10 2023 -0400 Update configuration_usa.xml also move the GHG part after the nonGHG part, because the ind_urb_processing_sectors_USA.xml needs to be read prior to ind_urb_proc_ghg_emissions_USA.xml commit 77871b9bcc69d6210ce00f02471fc3496dba3bdb Author: Yang Ou <[email protected]> Date: Sat Mar 11 22:11:26 2023 -0500 Update zchunk_batch_ind_urb_proc_emissions_USA_xml.R minor header fix commit ef3b7ca6cfdad2b74f9ff39735e71fc11c8e0105 Author: Yang Ou <[email protected]> Date: Sat Feb 25 09:58:57 2023 -0500 remove NA rows commit cdc416d9fb8f20e23276aecbcbf88a979adc0082 Author: Yang Ou <[email protected]> Date: Fri Feb 24 21:34:26 2023 -0500 Update zchunk_L277.ghg_prc_USA.R commit 1b32eb9b41ffe0efb36de9b4705d137c7d2487fb Author: Yang Ou <[email protected]> Date: Sun Feb 5 10:23:04 2023 -0500 update data map commit 70c0b75859ae79a352013625ae356bda3a6cad72 Author: Yang Ou <[email protected]> Date: Sat Feb 4 22:36:46 2023 -0500 Update zchunk_batch_ind_urb_proc_emissions_USA_xml.R commit 7d198171d3c860d21a26e01fd691a3f28abd08ee Merge: 53c3af8b5 bf0e6505c Author: Yang Ou <[email protected]> Date: Sat Feb 4 22:36:40 2023 -0500 Merge branch 'master' into yo/bugfix/gcamusa-industrial-ghg commit 53c3af8b58f367000ee049eb122fcfd45f497bd9 Author: Yang Ou <[email protected]> Date: Fri Feb 3 12:47:05 2023 -0500 state-level ghg emissions in processes sectors
hydrates) has almost no slope. This is almost cretainly a bug. Although what the final cost should be is of course hugely uncertain. For now we will increase it enough to give it some slope to help with solution. Given the huge quantity of resource available this will make very little change to actual results.
Merge in JGCRI/gcam-core from mtb/feature/gas-trade-CMP to master Squashed commit of the following: commit f5a9fdd6257580f96c60e2b5ffed27d7b06528d9 Author: Pralit Patel <[email protected]> Date: Fri May 12 02:27:35 2023 -0400 One more small fix to Pri Energy w/CCS query to deal with energy trade and pull in the corresponding fix in the anamoly detector as well commit a38264f6df0ede72afcc8f62529df07a0fc6c764 Author: brinday <[email protected]> Date: Thu May 11 21:40:24 2023 -0400 Update Main_queries.xml add traded pipeline and LNG sectors rewrite to primary energy query commit 813ebbd088febf04ac59de4c47d99d11cc03eb7c Merge: 4ce025df7 f3428ae63 Author: Pralit Patel <[email protected]> Date: Thu May 11 10:22:07 2023 -0400 Merge remote-tracking branch 'origin/master' into mtb/feature/gas-trade-CMP commit 4ce025df79d9b3a1c48778308277de6c387f0dd8 Author: brinday <[email protected]> Date: Fri May 5 10:35:40 2023 -0400 update configuration files to remove the USA price adjuster from all xmls commit f0f41944ed0ab04bd1257968a206aca5ff3aa2f4 Author: brinday <[email protected]> Date: Thu May 4 14:29:55 2023 -0400 Update sysdata.rda commit a34646340dc75a33af0532cc52ce619d15880991 Author: brinday <[email protected]> Date: Thu May 4 13:10:07 2023 -0400 Revert "Revert "remove A21.stubtech_interp_R.csv and GCAM_region_pipeline_bloc.csv. Replace them with mapping files for both import and export pipeline blocs"" This reverts commit 02f90804b0295256f22087d587adbf105d69f1a1. commit 846db6caaff1e429db1b6542bf8c4773a68bb621 Author: brinday <[email protected]> Date: Thu May 4 12:51:49 2023 -0400 Revert "remove A21.stubtech_interp_R.csv and GCAM_region_pipeline_bloc.csv. Replace them with mapping files for both import and export pipeline blocs" This reverts commit 3cbac196259e25be08862d47ae467015496ba739. commit 02f90804b0295256f22087d587adbf105d69f1a1 Author: brinday <[email protected]> Date: Thu May 4 11:15:21 2023 -0400 Revert "remove A21.stubtech_interp_R.csv and GCAM_region_pipeline_bloc.csv. Replace them with mapping files for both import and export pipeline blocs" This reverts commit 3cbac196259e25be08862d47ae467015496ba739. commit 8dd154e2d45e45aa93139028d0bf0cdff6a67d14 Merge: b69717f41 3fd6edd62 Author: brinday <[email protected]> Date: Wed May 3 17:32:29 2023 -0400 Merge branch 'master' of https://stash.pnnl.gov/scm/jgcri/gcam-core into mtb/feature/gas-trade-CMP commit b69717f41a095eb14643a691f2d1e70989193507 Author: brinday <[email protected]> Date: Wed May 3 17:24:34 2023 -0400 declare stringr as dependency in DESCRIPTION commit 3cbac196259e25be08862d47ae467015496ba739 Author: brinday <[email protected]> Date: Wed May 3 17:22:04 2023 -0400 remove A21.stubtech_interp_R.csv and GCAM_region_pipeline_bloc.csv. Replace them with mapping files for both import and export pipeline blocs commit be2756b659cf0bc4e7e4f3845095f170ae157502 Author: brinday <[email protected]> Date: Tue May 2 10:03:27 2023 -0400 Remove all USA price and shareweight tuning commit 30c3cb572b991477b1de7410cdc13bde260ff6ea Author: brinday <[email protected]> Date: Tue May 2 09:58:07 2023 -0400 Revert "add in code for USA imported NG shareweight adj" This reverts commit 7b923e2160741578c42d6389c7c94d9ee3f0012c. commit 7b923e2160741578c42d6389c7c94d9ee3f0012c Author: brinday <[email protected]> Date: Thu Dec 8 06:08:03 2022 -0500 add in code for USA imported NG shareweight adj commit 7bbcad8338c8f0e85d8881ac8ba1cd828d2c3fe2 Author: brinday <[email protected]> Date: Thu Dec 1 08:38:49 2022 -0500 update PSD parameters commit 858882f5d8f3aff3a43f76b2114bc888da7158bb Author: brinday <[email protected]> Date: Thu Dec 1 08:38:07 2022 -0500 remove BP data (not used) commit 39d85eff53d28f3f65f7e119b59c3e90ba5f0a45 Author: brinday <[email protected]> Date: Fri Nov 4 10:03:49 2022 -0400 remove extra sensitivity files commit 402a58e40b25457857bb42ad2713377875762d50 Merge: b155bd859 e7636ae3e Author: brinday <[email protected]> Date: Fri Nov 4 09:58:24 2022 -0400 Merge remote-tracking branch 'origin/mtb/feature/gas-trade' into mtb/feature/gas-trade-CMP commit b155bd85986add9a80df48623e5e6dcd8764fea7 Author: brinday <[email protected]> Date: Wed Nov 2 09:26:52 2022 -0400 updated config files to include USA adjustment xml commit efa0a9d3d7d0016aeeaad95d39a85fbad8bed1a8 Author: brinday <[email protected]> Date: Tue Nov 1 11:54:25 2022 -0400 add USA gas price adjustment ... and 51 more commits
Merge in JGCRI/gcam-core from siddarth/feature/iron_steel_trade to master Squashed commit of the following: commit 3873f8172a72504bd180f31ba324910048abf673 Author: Pralit Patel <[email protected]> Date: Fri May 26 14:07:30 2023 -0400 Rebuilt package data one last time commit d40944b526e822acdd885d004a0e8836bcbbf00a Author: siddarthd96 <[email protected]> Date: Fri May 26 10:54:25 2023 -0400 Add iron and steel trade queries commit 01cbbebc2292bed802c37462c4124f46c778794e Author: siddarthd96 <[email protected]> Date: Wed May 17 08:37:12 2023 -0400 Update Pre-Built Data commit 5f862a55c38f6f45f65735b92624a81aa3b190ed Merge: 1c672be75 2b869d4b3 Author: siddarthd96 <[email protected]> Date: Tue May 16 23:09:50 2023 -0400 Merge branch 'master' into siddarth/feature/iron_steel_trade commit 1c672be75543780edd262fb93306d7580bf2e4db Author: siddarthd96 <[email protected]> Date: Tue May 16 17:23:34 2023 -0400 Add comment to cement module commit c39a52bacda72b0431b55a9094d6450e6f420698 Author: siddarthd96 <[email protected]> Date: Tue May 16 15:54:21 2023 -0400 Modify traded iron and steel share weight to fixed commit 40555a0e48323f42ff1ad8107155b3a43e721824 Author: siddarthd96 <[email protected]> Date: Tue May 16 15:53:48 2023 -0400 Modify the tolerance level for iron and steel scalar data commit 602238a9c5147bd22999b5b8c4d45c3aa0d791d8 Author: siddarthd96 <[email protected]> Date: Tue May 16 15:53:11 2023 -0400 Reduce the share-weights for Hydrogen-based DRI commit ca9dd9c4866662a7258f6caf45f40b7bf3908099 Author: siddarthd96 <[email protected]> Date: Tue May 16 15:52:50 2023 -0400 Round logit exponent values for traded and regional steel commit 84ee0ae0e1b6a48725a55e3edfae0d3e2e5d7578 Author: siddarthd96 <[email protected]> Date: Tue May 16 15:52:17 2023 -0400 Add gas input to EAF with scrap commit 9abd15507a2de40901d814c1fbe7dda339be5e55 Author: siddarthd96 <[email protected]> Date: Thu May 11 18:27:56 2023 -0400 Update the EAF DRI estimation methodology and data The EAF-DRI data which was in the CORE wasn't documented and comparison with literature showed many inconsistencies. In this commit, we improve the EAF-DRI data and its estimation methodology, document the sources, and make the process more transparent. In addition, we also add steel production by process data till 2019 for future BYU. commit bc8fbd6fc783abc2ce6f09698d3e305228102062 Merge: 00e6c5ccb 5c778b49a Author: siddarthd96 <[email protected]> Date: Thu May 11 10:34:05 2023 -0400 Merge branch 'siddarth/feature/iron_steel_trade' of https://stash.pnnl.gov/scm/jgcri/gcam-core into siddarth/feature/iron_steel_trade commit 00e6c5ccb17562ed52a39a29460815ead82452b4 Author: siddarthd96 <[email protected]> Date: Thu May 11 10:33:25 2023 -0400 Add iron and steel data until 2019-2020 for future-proofing the development commit 5c778b49a3f3a77a8b7e068dab12992778a9706c Merge: 1107a3fa6 f3428ae63 Author: Pralit Patel <[email protected]> Date: Thu May 11 10:27:44 2023 -0400 Merge remote-tracking branch 'origin/master' into siddarth/feature/iron_steel_trade commit 1107a3fa6f7b0be8af399b047d0562679e7b97a6 Merge: eedb8d607 3fd6edd62 Author: siddarthd96 <[email protected]> Date: Mon May 8 17:50:15 2023 -0400 Merge branch 'master' into siddarth/feature/iron_steel_trade commit eedb8d6079f17a9e095a5948126c8a6cdb1b1da3 Author: siddarthd96 <[email protected]> Date: Fri Apr 28 13:49:36 2023 -0400 Additional Bug Fixes commit cbc77bffb1b5b1a2ea88224a257f68365e93a698 Author: siddarthd96 <[email protected]> Date: Fri Apr 28 13:44:59 2023 -0400 Reserve Temporary Increase in Solver Iteration and Fix Bugs commit 314e9fb1d231d7687675f865999b797bd26199f5 Author: siddarthd96 <[email protected]> Date: Thu Apr 27 14:41:58 2023 -0400 Adjust Africa_Western income elasticities to lower steel consumption in SSP scenarios commit 7e1212dbdb277eff794a58f6fd63b6a9f0ebe746 Author: siddarthd96 <[email protected]> Date: Wed Apr 26 11:34:50 2023 -0400 Update zchunk_L232.industry_USA.R and zchunk_batch_industry_USA_xml.R to make the iron and steel trade development compatible with GCAM-USA commit 05486f26de5b2f97bcb74bd8b0c77acc0e823c86 Author: siddarthd96 <[email protected]> Date: Mon Apr 24 15:54:23 2023 -0400 Updated Prebuilt Data ... and 48 more commits
- fix units in rsrc_unconv_oil_prod_bbld.csv (million barrels of oil per day, not billions) - forcing_target_ files: fix comment related to hotelling rate (updated to 3% in GCAM v6.0, but the comment says <!-- path-discount-rate | default: 0.05 | The hotelling rate -->)
Merge in JGCRI/gcam-core from shk/feature/macro_v2 to master Squashed commit of the following: commit 26d5b52e9e7bfe69a7fdded1ba4324ddc8926b4e Author: Pralit Patel <[email protected]> Date: Thu Jun 1 11:41:06 2023 -0400 We missed iron and steel from the final energy service tracking! commit bd0e69a5d2b5c306dda12510f84430906746d44b Author: Pralit Patel <[email protected]> Date: Wed May 31 15:39:56 2023 -0400 Update configuration "tag" for socioeconomics_macro.xml to just "macro" so as to be unique commit 66cce4e6c21589b6581a6b8e925fc88b261d309a Author: Pralit Patel <[email protected]> Date: Wed May 31 15:34:41 2023 -0400 Fix sources for the Penn World Table data commit f45b70214083ea71617ac3be844d53f57507dc7a Author: Pralit Patel <[email protected]> Date: Wed May 31 09:54:22 2023 -0400 Add comments to update_macro_productivity.R to fill in the details and why/when etc commit 2c233651eae107c73f44148465b4a01fde49f1a6 Author: Pralit Patel <[email protected]> Date: Wed May 31 03:24:29 2023 -0400 Address PR comments wrt capping trial GDP values at a value that isn't extremely small given the scale of GDP commit 819e8d87b10ec7db46ad1227e542be7a84858425 Author: Pralit Patel <[email protected]> Date: Wed May 31 03:22:45 2023 -0400 Fix for OutputAccounting which should not assume a market will exists (i.e. GCAM-USA) to retrieve output units from commit a0ec22d1a230744e14153e5d31001554541ea22b Author: Pralit Patel <[email protected]> Date: Wed May 31 03:20:33 2023 -0400 Remove the socioeoncomics_macro_USA chunks. The XMLs were not actually used and these were creating confusion. All of the safeguarding needed to ensure we can run GCAM-USA without macro parameters is done in the C++ side. commit 0af2c44ddc5fd400d51360f84984c220d48b31e8 Author: Matthew Binsted <[email protected]> Date: Tue May 30 18:28:41 2023 -0400 Updating Visual Studios project files to reflect latest macro model changes. commit 73ecd8e9516794169016c8bc5764c75cf61e0c7d Merge: 3c22c61ca bdfb2c885 Author: Pralit Patel <[email protected]> Date: Tue May 30 17:16:44 2023 -0400 Merge remote-tracking branch 'origin/master' into shk/feature/macro_v2 commit 3c22c61caa8748eefad4f8cf0bdd7776b8b1bb98 Author: Pralit Patel <[email protected]> Date: Tue May 30 16:42:53 2023 -0400 Fix comment in CalcBasePrice commit 01bd776c5dd14c6fc16b7c857c5e59a6c185323e Author: Pralit Patel <[email protected]> Date: Tue May 30 16:41:34 2023 -0400 Address most PR comments. Note: given the more reasonable asum;tions about trn_freight FCR we expect results to change a bit commit 5e4498f3bcfdc274762d568fe4bfd696777cab2f Author: Pralit Patel <[email protected]> Date: Sun May 28 13:28:19 2023 -0400 Some solver fixes to ensure negative emissions budget doesn't cause problems in reference scenarios now that it is an RES market instead of TAX. Also clean up the preconditioner logic and remove case that tried to help when on fence between binding/not-binding. It seemed to cause problems at times for net zero constraint commit 0687055ae8696b8efbfb41acc4d8a63c7cce05a7 Author: Pralit Patel <[email protected]> Date: Sun May 28 01:17:17 2023 -0400 Address PR comments for L180 commit 594617cbc52e2f5243316fb74ff5d1bf270c5c09 Author: Pralit Patel <[email protected]> Date: Sun May 28 01:15:58 2023 -0400 Ensure we always read in a reasonable depreciation rate so we canc calculate reasonable values in the historical period given we will rely on these values for consumer durables at least commit 1fc85a97e01e258bcb4e5b953b393003d70dd6c9 Author: Pralit Patel <[email protected]> Date: Sun May 28 01:09:16 2023 -0400 Move consumer durable from consumption to investment by adding it ontop of savings then treating it together with the rest of energy investments. This implies we must calibrate a "savings rate" for consumer durables to add on top of the standard savings rate. Which implies our historical estimate of CD should be reasonable thus needing to fix an issue of accounting when a tech swtiches from no vintaging to vintaging. commit 5c949007281258ca2f99e705697644d2e0ef6a71 Author: Pralit Patel <[email protected]> Date: Sat May 27 14:07:45 2023 -0400 Clean up object/header names to differentiate between total factor productivity and per-factor productivity. And add the boiler plate for users to be able to set per-factor productivity assumptions via assumption CSV, even though it will just be set to zeros for now. commit f76eeab49b5775c89ffdfd55b25c41b653fd9440 Author: Pralit Patel <[email protected]> Date: Sat May 27 14:04:45 2023 -0400 Address PR comments for C++ changes commit af4b72b79c279814d24db69bef243d54fa9317e8 Author: Pralit Patel <[email protected]> Date: Fri May 26 10:26:13 2023 -0400 Fillout Main_queries for more macro related queries. Add GDP-PPP to national accounts for reporting. commit 89974644ff31e4986d845efa1ed3e92d242e5a56 Author: Pralit Patel <[email protected]> Date: Wed May 24 23:16:28 2023 -0400 Fixes to solar_adv/low again related to the fact that rooftop_pv needs to be a TrackingNonEnergyInput commit 157b1b6aeaac90718648472339fbf649d197ca00 Author: Pralit Patel <[email protected]> Date: Wed May 24 23:14:51 2023 -0400 Revert a hold over change in MarketRES which was causing solution problems in Ref scenarios with Open GDP ... and 108 more commits
Merge in JGCRI/gcam-core from enl/feature/chunk-rename to master Squashed commit of the following: commit 141cfdd2bbe03d38f421280ca273a609a8cd9cd4 Author: enlochner <[email protected]> Date: Sun Jun 4 16:13:09 2023 -0500 Remove successive mutates commit 39924b6d553cfb0729f1039616689b4f8f0935ce Author: enlochner <[email protected]> Date: Sun Jun 4 15:23:50 2023 -0500 Rename macro chunks commit 2a2158fc47f6114a3e713bfc2f72e632cf4502b0 Merge: cb5b30a31 2b555554c Author: enlochner <[email protected]> Date: Sun Jun 4 14:57:03 2023 -0500 Merge branch 'master' into enl/feature/chunk-rename commit cb5b30a312a319131c69e32213cd10610e28a223 Author: enlochner <[email protected]> Date: Sun Jun 4 14:46:24 2023 -0500 Add export line to script commit 89656b4206be23a31fff8ba88f0c66816e535141 Author: enlochner <[email protected]> Date: Sun Jun 4 11:33:20 2023 -0500 Rename gcamdata chunks commit beac6e8745667a04de25e265ab7349954a963134 Merge: d1ec8dc4d bdfb2c885 Author: enlochner <[email protected]> Date: Sat Jun 3 15:29:34 2023 -0500 Merge branch 'master' into enl/feature/chunk-rename commit d1ec8dc4d0f5fea7df2d1387cdf57f8fe8d3771e Author: enlochner <[email protected]> Date: Mon May 8 13:30:24 2023 -0500 Small updates to chunk rename function commit ba6cb95ec3af14986a92e399a9c4a39ce2a83769 Author: enlochner <[email protected]> Date: Sat May 6 16:32:07 2023 -0500 Add chunk rename function to data system commit a7e4cd5e9997989835dbe646a6ee43a9c72492da Author: enlochner <[email protected]> Date: Sat May 6 15:22:32 2023 -0500 Add test that checks if chunks need to be renamed commit 21848d08f4f04b869c208e8b398f358ba778d1fd Author: enlochner <[email protected]> Date: Thu Jan 5 12:29:51 2023 -0600 Update GCAM_DATA_MAP commit 885f55cb8850337cdda99689a5d23830046313a5 Author: enlochner <[email protected]> Date: Thu Jan 5 09:26:32 2023 -0600 gcamdata changes to get timeshift test to pass commit eec7fc3660775d409f1c7d250223126beb476ed9 Author: enlochner <[email protected]> Date: Tue Nov 1 13:21:58 2022 -0500 Updates to get tests to pass including removing consecutive mutates commit 6b3c93726cfbe55315f72cceb77681940fda909a Author: enlochner <[email protected]> Date: Wed Oct 26 11:35:16 2022 -0500 Fix capitalization errors in constants commit ea8c28f53ecc288631a743aa49a2aa10b7b733fe Author: enlochner <[email protected]> Date: Mon Oct 24 22:08:34 2022 -0500 Update xml script module names commit 4d69d080e044c785b59c654519e1d0055a5de8a4 Author: enlochner <[email protected]> Date: Mon Oct 24 21:02:49 2022 -0500 Rename xml chunks commit ea4fad8398da5d9bb29dfd712879d53d9b2616d9 Author: enlochner <[email protected]> Date: Mon Oct 24 15:25:55 2022 -0500 Update module names for gcamusa chunks commit f969d2d49bf41496da1aaff2de03aa4c8faf2773 Author: enlochner <[email protected]> Date: Mon Oct 24 13:54:21 2022 -0500 Rename gcamusa files with zgcamusa in front, and remove _USA for simplicity commit f804dd092cf27208829071b077185a4437928457 Author: enlochner <[email protected]> Date: Mon Oct 24 13:52:53 2022 -0500 Remove successive mutates from R chunks commit a26cf19dfeefe38fff75abb334bbb521cf5b1870 Author: enlochner <[email protected]> Date: Mon Oct 24 10:08:12 2022 -0500 Remove module_aglu_L151.ag_MIRCA_ctry_C_GLU_irr from exported functions commit 4c0ca482286ec12c9d028680d65b43936af30c5d Author: enlochner <[email protected]> Date: Mon Oct 24 09:59:15 2022 -0500 Documentation updates for file renaming ... and 6 more commits
* Update target finder 2.6 initial guesses * Update calibrate macro TFP * Update to version.h to say 7.0
|
Should I be merging this into dev instead of main? |
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.
Updating GitHub repo to be up to date with Stash development