[cig-commits] [commit] master: Add VQ version string (ef5c1c4)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/vq

On branch  : master
Link       : https://github.com/geodynamics/vq/compare/0ca7695073f8b223d815f10653613b02b6c47df8...197914f4e03e55d321cae45161deafb1a5ade706

>---------------------------------------------------------------

commit ef5c1c4b59581e23eba88d2d8f654ed5b6fddb8e
Author: Eric Heien <emheien at ucdavis.edu>
Date:   Tue Oct 28 14:23:05 2014 -0700

    Add VQ version string


>---------------------------------------------------------------

ef5c1c4b59581e23eba88d2d8f654ed5b6fddb8e
 CMakeLists.txt            | 6 ++++++
 config.h.in               | 1 +
 src/core/SimFramework.cpp | 4 +++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f2d1a6..b2f1948 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,12 @@
 cmake_minimum_required (VERSION 2.6) 
 project (VQ)
 
+# Set the version number
+SET(VQ_VERSION_MAJOR 1)
+SET(VQ_VERSION_MINOR 2)
+SET(VQ_VERSION_SUBMINOR 0)
+SET(VQ_VERSION_STR "${VQ_VERSION_MAJOR}.${VQ_VERSION_MINOR}.${VQ_VERSION_SUBMINOR}")
+
 # Enable testing
 INCLUDE (CTest)
 
diff --git a/config.h.in b/config.h.in
index dd6d47b..5fdb5ae 100644
--- a/config.h.in
+++ b/config.h.in
@@ -10,6 +10,7 @@
 #cmakedefine VQ_HAVE_USLEEP_FUNC
 #cmakedefine HDF5_FOUND
 #cmakedefine MPI_C_FOUND
+#cmakedefine VQ_VERSION_STR "@VQ_VERSION_STR@"
 #endif
 
 
diff --git a/src/core/SimFramework.cpp b/src/core/SimFramework.cpp
index 763b90e..cdd1830 100644
--- a/src/core/SimFramework.cpp
+++ b/src/core/SimFramework.cpp
@@ -293,8 +293,10 @@ void SimFramework::init(void) {
 
     // Output multiprocessor information
     width = 30;
+    console() << "# *** Virtual Quake ***" << std::endl;
+    console() << "# *** Version " << VQ_VERSION_STR << " ***" << std::endl;
 #ifdef MPI_C_FOUND
-    console() << std::setw(width) << std::left << "# *** MPI CPU count" << ": " << getWorldSize() << std::endl;
+    console() << std::setw(width) << std::left << "# *** MPI process count" << ": " << getWorldSize() << std::endl;
 #endif
 #ifdef _OPENMP
     console() << std::setw(width) << std::left << "# *** OpenMP Threads" << ": " << omp_get_max_threads() << std::endl;