Some final things to do before next release:

* Update target finder 2.6 initial guesses * Update calibrate macro TFP * Update to version.h to say 7.0
JGCRI · Jun 5, 2023 · 596d50c · 596d50c
1 parent 164901a
commit 596d50c
Show file tree

Hide file tree

Showing 6 changed files with 4,230 additions and 4,230 deletions.
diff --git a/cvs/objects/util/base/include/version.h b/cvs/objects/util/base/include/version.h
@@ -41,10 +41,10 @@
  * NOTE: ADD 1 TO LATEST SUBVERSION REVISION NUMBER
  */
 //! The latest SVN revision number for identification of the build.
-#define __REVISION_NUMBER__ "gcam-v6.0"
+#define __REVISION_NUMBER__ "gcam-v7.0"
 /*****************************************************************************/
 
 //! GCAM model version.
-#define __ObjECTS_VER__ "6.0"
+#define __ObjECTS_VER__ "7.0"
 
 #endif // _VERSION_H_ 
diff --git a/input/gcamdata/inst/extdata/socioeconomics/gcam_macro_TFP_open.csv b/input/gcamdata/inst/extdata/socioeconomics/gcam_macro_TFP_open.csv
diff --git a/input/policy/forcing_target_2p6_overshoot.xml b/input/policy/forcing_target_2p6_overshoot.xml
@@ -38,7 +38,7 @@
                                           significantly.
      -->
     <!-- Note, the value chosen here is the solved price from the last GCAM release. -->
-    <initial-tax-guess>270.0</initial-tax-guess>
+    <initial-tax-guess>330.0</initial-tax-guess>
     <!-- forward-look | default: 0 | Allow forward looking behavior by skipping
          this many periods.
      -->

diff --git a/input/policy/policy_target_2p6_spa23.xml b/input/policy/policy_target_2p6_spa23.xml
@@ -6,7 +6,7 @@
     <first-tax-year>2040</first-tax-year>
  <path-discount-rate>0.03</path-discount-rate>
     <!-- Note, the value chosen here is the solved price from the last GCAM release. -->
-    <initial-tax-guess>500.0</initial-tax-guess>
+    <initial-tax-guess>1000.0</initial-tax-guess>
 	<tax-name>CO2_LTG</tax-name>
 	<overshoot/>
     <max-tax>8000</max-tax>

diff --git a/input/policy/policy_target_2p6_spa4.xml b/input/policy/policy_target_2p6_spa4.xml
@@ -6,7 +6,7 @@
     <first-tax-year>2025</first-tax-year>
  <path-discount-rate>0.03</path-discount-rate>
     <!-- Note, the value chosen here is the solved price from the last GCAM release. -->
-    <initial-tax-guess>235.0</initial-tax-guess>
+    <initial-tax-guess>600.0</initial-tax-guess>
 	<tax-name>CO2_LTG</tax-name>
 	<max-tax>8000</max-tax>
 	<overshoot/>

diff --git a/input/policy/policy_target_2p6_spa5.xml b/input/policy/policy_target_2p6_spa5.xml
@@ -6,7 +6,7 @@
     <first-tax-year>2040</first-tax-year>
     <path-discount-rate>0.03</path-discount-rate>
     <!-- Note, the value chosen here is the solved price from the last GCAM release. -->
-    <initial-tax-guess>750.0</initial-tax-guess>
+    <initial-tax-guess>950.0</initial-tax-guess>
 	<tax-name>CO2_LTG</tax-name>
 	<overshoot/>
     <max-tax>8000</max-tax>