Merge pull request #70 in JGCRI/gcam-core from bugfix/version to master

* commit '536bd7ba7bc7a443d86d0222da50caf05bf94dc9': Add missing space to print statement Update version number to 5.1
JGCRI · Jul 9, 2018 · 020607b · 020607b
2 parents a0a9205 + 536bd7b
commit 020607b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/cvs/objects/technologies/source/ag_production_technology.cpp b/cvs/objects/technologies/source/ag_production_technology.cpp
@@ -363,7 +363,7 @@ void AgProductionTechnology::setCalYields(const std::string& aRegionName) {
         else if ( mCalValue->getCalOutput() > 0 ) {
             ILogger& mainLog = ILogger::getLogger( "main_log" );
             mainLog.setLevel( ILogger::WARNING );
-            mainLog << "Caloutput read in but no land read in for technology"
+            mainLog << "Caloutput read in but no land read in for technology "
                 << aRegionName << " " << mName << endl;
             mYield=0;
         }

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-v5.0"
+#define __REVISION_NUMBER__ "gcam-v5.1"
 /*****************************************************************************/
 
 //! GCAM model version.
-#define __ObjECTS_VER__ "5.0"
+#define __ObjECTS_VER__ "5.1"
 
 #endif // _VERSION_H_ 
diff --git a/input/gcamdata/DESCRIPTION b/input/gcamdata/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: gcamdata
 Type: Package
 Title: Build the GCAM Input Datasets
-Version: 1.0
+Version: 5.1
 Date: 2018-05-19
 Authors@R: c(person("Ben", "Bond-Lamberty", 
                 email = "[email protected]",