diff --git a/Applications/CLI/ogs.cpp b/Applications/CLI/ogs.cpp
index 7fab427db703d29fcb7e9a5d8726a8451a6a6d55..b2492c6bec91dbbb74f57a0c04b6f1e3338bc3eb 100644
--- a/Applications/CLI/ogs.cpp
+++ b/Applications/CLI/ogs.cpp
@@ -58,11 +58,11 @@ int main(int argc, char* argv[])
"See accompanying file LICENSE.txt or "
"http://www.opengeosys.org/project/license\n"
"version: " +
- BaseLib::BuildInfo::git_describe + "\n" +
+ BaseLib::BuildInfo::ogs_version + "\n" +
"CMake arguments: " +
BaseLib::BuildInfo::cmake_args,
' ',
- BaseLib::BuildInfo::git_describe);
+ BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> reference_path_arg(
"r", "reference",
@@ -126,7 +126,7 @@ int main(int argc, char* argv[])
logog_setup.setLevel(log_level_arg.getValue());
INFO("This is OpenGeoSys-6 version %s.",
- BaseLib::BuildInfo::git_describe.c_str());
+ BaseLib::BuildInfo::ogs_version.c_str());
#ifndef _WIN32 // On windows this command line option is not present.
// Enable floating point exceptions
diff --git a/Applications/DataExplorer/main.cpp b/Applications/DataExplorer/main.cpp
index ce4cd7283dadc939a33cb902a64662ac848cee26..ee99061ff729464e88ebbdc472a92a179bc9a203 100644
--- a/Applications/DataExplorer/main.cpp
+++ b/Applications/DataExplorer/main.cpp
@@ -40,7 +40,7 @@ int main(int argc, char* argv[])
QLocale::setDefault(QLocale::German);
auto w = std::make_unique<MainWindow>();
w->setWindowTitle( w->windowTitle() + " - " +
- QString::fromStdString(BaseLib::BuildInfo::git_describe));
+ QString::fromStdString(BaseLib::BuildInfo::ogs_version));
if (QCoreApplication::arguments().size()>1) {
w->loadFileOnStartUp(QCoreApplication::arguments().at(1));
}
diff --git a/Applications/DataExplorer/mainwindow.cpp b/Applications/DataExplorer/mainwindow.cpp
index 2aac07fb356bfed835cbd3b0996e4e268096cd10..43bc60ce80fec4077588d03b5892ae167bc60c39 100644
--- a/Applications/DataExplorer/mainwindow.cpp
+++ b/Applications/DataExplorer/mainwindow.cpp
@@ -730,7 +730,7 @@ void MainWindow::about()
{
QString about("<a href='http://www.opengeosys.org'>http://www.opengeosys.org</a><br /><br />");
about.append(QString("Version: <a href='https://github.com/ufz/ogs/releases/tag/%2'>%1</a><br /><br />")
- .arg(QString::fromStdString(BaseLib::BuildInfo::git_describe))
+ .arg(QString::fromStdString(BaseLib::BuildInfo::ogs_version))
.arg(QString::fromStdString(BaseLib::BuildInfo::ogs_version)));
about.append(QString("Git commit: <a href='https://github.com/ufz/ogs/commit/%1'>%1</a><br />")
diff --git a/Applications/FileIO/Gmsh/GMSHInterface.cpp b/Applications/FileIO/Gmsh/GMSHInterface.cpp
index 94bf289ef3c35fc818202bfae5538af3ed028406..8b56c2eb60b4e5332f47cd9c17e668329aa28521 100644
--- a/Applications/FileIO/Gmsh/GMSHInterface.cpp
+++ b/Applications/FileIO/Gmsh/GMSHInterface.cpp
@@ -74,7 +74,7 @@ GMSHInterface::~GMSHInterface()
bool GMSHInterface::write()
{
- _out << "// GMSH input file created by OpenGeoSys " << BaseLib::BuildInfo::git_describe;
+ _out << "// GMSH input file created by OpenGeoSys " << BaseLib::BuildInfo::ogs_version;
#ifdef BUILD_TIMESTAMP
_out << " built on " << BaseLib::BuildInfo::build_timestamp;
#endif
diff --git a/Applications/Utils/FileConverter/ConvertSHPToGLI.cpp b/Applications/Utils/FileConverter/ConvertSHPToGLI.cpp
index 8bf21fbd2e8eb849f963ed000d5fe983e4bce721..9d8c834950c48d79a212fb7efaec6eccd4d9019d 100644
--- a/Applications/Utils/FileConverter/ConvertSHPToGLI.cpp
+++ b/Applications/Utils/FileConverter/ConvertSHPToGLI.cpp
@@ -137,11 +137,11 @@ int main (int argc, char* argv[])
TCLAP::CmdLine cmd(
"Converts points contained in shape file\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> shapefile_arg("s",
"shape-file",
"the name of the shape file ",
diff --git a/Applications/Utils/FileConverter/FEFLOW2OGS.cpp b/Applications/Utils/FileConverter/FEFLOW2OGS.cpp
index 2287ed0c7167a1b1ee0ab682f7e33f5006fb284e..0854d0a68cfb183441df698d3b993c3c08a96117 100644
--- a/Applications/Utils/FileConverter/FEFLOW2OGS.cpp
+++ b/Applications/Utils/FileConverter/FEFLOW2OGS.cpp
@@ -40,11 +40,11 @@ int main (int argc, char* argv[])
"unstructured grid file (new OGS file format) or to the old OGS file "
"format - see options.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> ogs_mesh_arg(
"o",
diff --git a/Applications/Utils/FileConverter/GMSH2OGS.cpp b/Applications/Utils/FileConverter/GMSH2OGS.cpp
index 9748133c26fa361c46db68c042da5ad01a10c2df..56298eb6e46777b9651f362bebf41a8bcf6948c0 100644
--- a/Applications/Utils/FileConverter/GMSH2OGS.cpp
+++ b/Applications/Utils/FileConverter/GMSH2OGS.cpp
@@ -45,11 +45,11 @@ int main (int argc, char* argv[])
"unstructured grid file (new OGS file format) or to the old OGS file "
"format - see options.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> ogs_mesh_arg(
"o",
diff --git a/Applications/Utils/FileConverter/GocadSGridReaderMain.cpp b/Applications/Utils/FileConverter/GocadSGridReaderMain.cpp
index 3fbf80f92eae00354097f15a950f33e31cbadf59..f62674ee8964393ef1a281f54e55772d90794c6a 100644
--- a/Applications/Utils/FileConverter/GocadSGridReaderMain.cpp
+++ b/Applications/Utils/FileConverter/GocadSGridReaderMain.cpp
@@ -32,11 +32,11 @@ int main(int argc, char* argv[])
"Reads a Gocad stratigraphic grid file (file ending sg) and writes the "
"data in the vtk unstructured grid file format.\n\n OpenGeoSys-6 "
"software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<bool> face_set_arg(
"f", "generate-face-sets",
diff --git a/Applications/Utils/FileConverter/MeshToRaster.cpp b/Applications/Utils/FileConverter/MeshToRaster.cpp
index 8f2f64ee22d3e8fe048eb395c2e5a78c23f61288..4b355b17b3a97c1bfbecab15d46ce6585768e190 100644
--- a/Applications/Utils/FileConverter/MeshToRaster.cpp
+++ b/Applications/Utils/FileConverter/MeshToRaster.cpp
@@ -32,11 +32,11 @@ int main(int argc, char* argv[])
"regular grid superimposed on the mesh. If no mesh element is located "
"beneath a pixel it is set to NODATA.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> input_arg("i", "input-file",
"Mesh input file (*.vtu, *.msh)",
true, "", "string");
diff --git a/Applications/Utils/FileConverter/OGS2VTK.cpp b/Applications/Utils/FileConverter/OGS2VTK.cpp
index 974a7d241f2c24d95ad8791b3e11296038ef3f12..c4d6c6176bff8895bc1a65a66483862b97c1ce60 100644
--- a/Applications/Utils/FileConverter/OGS2VTK.cpp
+++ b/Applications/Utils/FileConverter/OGS2VTK.cpp
@@ -29,11 +29,11 @@ int main (int argc, char* argv[])
TCLAP::CmdLine cmd(
"Converts OGS mesh into VTK mesh.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> mesh_in("i", "mesh-input-file",
"the name of the file containing the input mesh", true,
"", "file name of input mesh");
diff --git a/Applications/Utils/FileConverter/TIN2VTK.cpp b/Applications/Utils/FileConverter/TIN2VTK.cpp
index 9b5d3cbdd375083d80715ed449772c80a1db53ef..966e64440ea7b548550019e4f62280ed344f4d55 100644
--- a/Applications/Utils/FileConverter/TIN2VTK.cpp
+++ b/Applications/Utils/FileConverter/TIN2VTK.cpp
@@ -39,11 +39,11 @@ int main (int argc, char* argv[])
TCLAP::CmdLine cmd(
"Converts TIN file into VTU file.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> inArg("i", "input-tin-file",
"the name of the file containing the input TIN", true,
"", "string");
diff --git a/Applications/Utils/FileConverter/TecPlotTools.cpp b/Applications/Utils/FileConverter/TecPlotTools.cpp
index 951578be01a6d94e9334fa06d2e998c140d19bdf..df79bcfb9736129d648b3ad2cb391e6d0647162a 100644
--- a/Applications/Utils/FileConverter/TecPlotTools.cpp
+++ b/Applications/Utils/FileConverter/TecPlotTools.cpp
@@ -409,11 +409,11 @@ int main(int argc, char* argv[])
TCLAP::CmdLine cmd(
"TecPlot Parser\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> input_arg("i", "input-file", "TecPlot input file", true, "", "string");
cmd.add(input_arg);
TCLAP::ValueArg<std::string> output_arg("o", "output-file", "output mesh file", false, "", "string");
diff --git a/Applications/Utils/FileConverter/VTK2OGS.cpp b/Applications/Utils/FileConverter/VTK2OGS.cpp
index 2a19247cf3a9f09011cad58ba655cde30cff5ffc..67f373f69370736d0643d4a449a59e0a99d7e383 100644
--- a/Applications/Utils/FileConverter/VTK2OGS.cpp
+++ b/Applications/Utils/FileConverter/VTK2OGS.cpp
@@ -29,11 +29,11 @@ int main (int argc, char* argv[])
TCLAP::CmdLine cmd(
"Converts VTK mesh into OGS mesh.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> mesh_in("i", "mesh-input-file",
"the name of the file containing the input mesh", true,
"", "file name of input mesh");
diff --git a/Applications/Utils/FileConverter/VTK2TIN.cpp b/Applications/Utils/FileConverter/VTK2TIN.cpp
index f11eed83fd4f3d236af252fae6ee1b8810cdc5cc..6877836c58fa40b7cb1ea5e2a2ca8ebced3081f8 100644
--- a/Applications/Utils/FileConverter/VTK2TIN.cpp
+++ b/Applications/Utils/FileConverter/VTK2TIN.cpp
@@ -40,11 +40,11 @@ int main (int argc, char* argv[])
TCLAP::CmdLine cmd(
"Converts VTK mesh into TIN file.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> mesh_in("i", "mesh-input-file",
"the name of the file containing the input mesh", true,
"", "file name of input mesh");
diff --git a/Applications/Utils/FileConverter/convertGEO.cpp b/Applications/Utils/FileConverter/convertGEO.cpp
index c50f35ae2b27d3486525e3307c8b9b9c94b27ba6..3353a0b0098f0ea62d9669520b3f512cfe728b29 100644
--- a/Applications/Utils/FileConverter/convertGEO.cpp
+++ b/Applications/Utils/FileConverter/convertGEO.cpp
@@ -29,11 +29,11 @@ int main (int argc, char* argv[])
"Currently *.gml (OGS6 XML-based format) and *.gli (OGS5 format) "
"formats are supported.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> argInputFileName("i", "input-file",
"the name of the geometry file to be converted", true,
"", "file name");
diff --git a/Applications/Utils/FileConverter/generateMatPropsFromMatID.cpp b/Applications/Utils/FileConverter/generateMatPropsFromMatID.cpp
index c92811f33926790701a03d5f13a5133e6c0dda9c..a5ce5361242fbbd519be28708ded5379ae0978b0 100644
--- a/Applications/Utils/FileConverter/generateMatPropsFromMatID.cpp
+++ b/Applications/Utils/FileConverter/generateMatPropsFromMatID.cpp
@@ -35,11 +35,11 @@ int main (int argc, char* argv[])
"Creates a new file for material properties and sets the material ids "
"in the msh-file to 0\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> mesh_arg("m",
"mesh",
diff --git a/Applications/Utils/GeoTools/MoveGeometry.cpp b/Applications/Utils/GeoTools/MoveGeometry.cpp
index 3bac4c3477aebf6ff11589bfe9a61ed923c041b7..d6e87b8033fdcb5fd2b04b8c5ee81e41f9d72aea 100644
--- a/Applications/Utils/GeoTools/MoveGeometry.cpp
+++ b/Applications/Utils/GeoTools/MoveGeometry.cpp
@@ -31,11 +31,11 @@ int main(int argc, char *argv[])
TCLAP::CmdLine cmd(
"Moves the points of a geometry by a given displacement vector\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<double> z_arg
("z", "z", "displacement in z direction", false, 0.0, "z-displacement");
cmd.add(z_arg);
diff --git a/Applications/Utils/GeoTools/TriangulatePolyline.cpp b/Applications/Utils/GeoTools/TriangulatePolyline.cpp
index c5b2e74e15cc7c2362ef5736cd7169eded64c4fa..bce66b0834550e7ab51bbc222a7fe79f92502157 100644
--- a/Applications/Utils/GeoTools/TriangulatePolyline.cpp
+++ b/Applications/Utils/GeoTools/TriangulatePolyline.cpp
@@ -45,11 +45,11 @@ int main(int argc, char *argv[])
TCLAP::CmdLine cmd(
"Triangulates the specified polyline in the given geometry file.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> input_arg("i", "input", "GML input file (*.gml)", true, "", "string");
TCLAP::ValueArg<std::string> output_arg("o", "output", "GML output file (*.gml)", true, "", "string");
TCLAP::ValueArg<std::string> name_arg("n", "name", "Name of polyline in given file", true, "", "string");
diff --git a/Applications/Utils/MeshEdit/AddTopLayer.cpp b/Applications/Utils/MeshEdit/AddTopLayer.cpp
index bb4174e10b0a4f8be34b90e7320ab1f41356b743..47f3d119a975d0794a7fe6f82958fa56c7e98465 100644
--- a/Applications/Utils/MeshEdit/AddTopLayer.cpp
+++ b/Applications/Utils/MeshEdit/AddTopLayer.cpp
@@ -30,11 +30,11 @@ int main (int argc, char* argv[])
"The documentation is available at "
"https://docs.opengeosys.org/docs/tools/meshing/addtoplayer.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> mesh_arg("i", "input-mesh-file",
"the name of the file containing the mesh", true,
"", "file name");
diff --git a/Applications/Utils/MeshEdit/CreateBoundaryConditionsAlongPolylines.cpp b/Applications/Utils/MeshEdit/CreateBoundaryConditionsAlongPolylines.cpp
index 3214427ddcf7600ba1d4fe5baa9dc4e20d598c3e..0d465e9cf1709ff85c4c5a30412b818bd34ed310 100644
--- a/Applications/Utils/MeshEdit/CreateBoundaryConditionsAlongPolylines.cpp
+++ b/Applications/Utils/MeshEdit/CreateBoundaryConditionsAlongPolylines.cpp
@@ -131,11 +131,11 @@ int main (int argc, char* argv[])
"https://docs.opengeosys.org/docs/tools/model-preparation/"
"create-boundary-conditions-along-a-polyline.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<bool> gml_arg("", "gml",
"if switched on write found nodes to file in gml format", false, false, "bool");
cmd.add(gml_arg);
diff --git a/Applications/Utils/MeshEdit/ExtractSurface.cpp b/Applications/Utils/MeshEdit/ExtractSurface.cpp
index 951071698d134650290151b33c0547bda560be16..75e31e621c8237701f60dc463fe787a6f0ad5ec4 100644
--- a/Applications/Utils/MeshEdit/ExtractSurface.cpp
+++ b/Applications/Utils/MeshEdit/ExtractSurface.cpp
@@ -39,11 +39,11 @@ int main (int argc, char* argv[])
"available at "
"https://docs.opengeosys.org/docs/tools/meshing/extract-surface.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> mesh_in(
"i", "mesh-input-file",
"the name of the file containing the input mesh", true, "",
diff --git a/Applications/Utils/MeshEdit/MapGeometryToMeshSurface.cpp b/Applications/Utils/MeshEdit/MapGeometryToMeshSurface.cpp
index 80f11768f3f131f4c69c0343ff27d23ac1eb1694..79aa2fbc544ba70e4a2fcbc4745c55f89594c2e2 100644
--- a/Applications/Utils/MeshEdit/MapGeometryToMeshSurface.cpp
+++ b/Applications/Utils/MeshEdit/MapGeometryToMeshSurface.cpp
@@ -32,11 +32,11 @@ int main (int argc, char* argv[])
"https://docs.opengeosys.org/docs/tools/model-preparation/"
"map-geometric-object-to-the-surface-of-a-mesh.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> mesh_in("m", "mesh-file",
"the name of the file containing the mesh", true,
"", "file name");
diff --git a/Applications/Utils/MeshEdit/MoveMesh.cpp b/Applications/Utils/MeshEdit/MoveMesh.cpp
index fcb47ddae112c5092b42d264b75a4fc6aeb11209..3130ad8ffef163a4307c086e899914757ee458eb 100644
--- a/Applications/Utils/MeshEdit/MoveMesh.cpp
+++ b/Applications/Utils/MeshEdit/MoveMesh.cpp
@@ -33,11 +33,11 @@ int main(int argc, char *argv[])
"displacement vector is given, moves the mesh nodes such that the "
"centroid of the given mesh is in the origin.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
// Define a value argument and add it to the command line.
// A value arg defines a flag and a type of value that it expects,
// such as "-m meshfile".
diff --git a/Applications/Utils/MeshEdit/NodeReordering.cpp b/Applications/Utils/MeshEdit/NodeReordering.cpp
index 11e65cc0810f2e37cd0596a0035cf77d91677f90..5ca4dde04774f1c1e7e7b072ef695eb86624c34d 100644
--- a/Applications/Utils/MeshEdit/NodeReordering.cpp
+++ b/Applications/Utils/MeshEdit/NodeReordering.cpp
@@ -153,11 +153,11 @@ int main (int argc, char* argv[])
"Method 2 is the re-ordering with and without InSitu-Lib in OGS6.\n"
"Method 3 is the re-ordering of nonlinear nodes.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::UnlabeledValueArg<std::string> input_mesh_arg("input_mesh",
"the name of the input mesh file",
true, "", "oldmesh.msh");
diff --git a/Applications/Utils/MeshEdit/ResetPropertiesInPolygonalRegion.cpp b/Applications/Utils/MeshEdit/ResetPropertiesInPolygonalRegion.cpp
index 50a4f666ad6ccf5b451522f6c25fae4fceb3a4bb..ab92bc16ab7594cdf90c7d48d0c82ebffe7f24e2 100644
--- a/Applications/Utils/MeshEdit/ResetPropertiesInPolygonalRegion.cpp
+++ b/Applications/Utils/MeshEdit/ResetPropertiesInPolygonalRegion.cpp
@@ -36,11 +36,11 @@ int main (int argc, char* argv[])
"https://docs.opengeosys.org/docs/tools/model-preparation/"
"set-properties-in-polygonal-region.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> mesh_out("o", "mesh-output-file",
"the name of the file the mesh will be written to, format depends on "
"the given file name extension", true, "", "file name");
diff --git a/Applications/Utils/MeshEdit/UnityPreprocessing.cpp b/Applications/Utils/MeshEdit/UnityPreprocessing.cpp
index 8659d23c86a40c09aa251dc97a61a24d6e7a3c3b..bfc284d22ead6b08fe180ee5e6b4df8dbe91cac6 100644
--- a/Applications/Utils/MeshEdit/UnityPreprocessing.cpp
+++ b/Applications/Utils/MeshEdit/UnityPreprocessing.cpp
@@ -190,11 +190,11 @@ int main (int argc, char* argv[])
TCLAP::CmdLine cmd(
"Prepares OGS-meshes for use in Unity.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> mesh_arg("i", "input",
"the file containing the original OGS mesh", true,
diff --git a/Applications/Utils/MeshEdit/appendLinesAlongPolyline.cpp b/Applications/Utils/MeshEdit/appendLinesAlongPolyline.cpp
index cd35ea5bbb5fd6393ebdf1ba29eef2ab718aebcd..91586584edf173c6d700f95d78d9a2bea1be91ea 100644
--- a/Applications/Utils/MeshEdit/appendLinesAlongPolyline.cpp
+++ b/Applications/Utils/MeshEdit/appendLinesAlongPolyline.cpp
@@ -30,11 +30,11 @@ int main (int argc, char* argv[])
TCLAP::CmdLine cmd(
"Append line elements into a mesh.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> mesh_in("i", "mesh-input-file",
"the name of the file containing the input mesh", true,
"", "file name of input mesh");
diff --git a/Applications/Utils/MeshEdit/checkMesh.cpp b/Applications/Utils/MeshEdit/checkMesh.cpp
index 4636a5b3d30e8ae25f077153f88fe6144e0a80bb..8fbf8053fbf41b18bf8c2c3a78486adba8a88134 100644
--- a/Applications/Utils/MeshEdit/checkMesh.cpp
+++ b/Applications/Utils/MeshEdit/checkMesh.cpp
@@ -36,11 +36,11 @@ int main(int argc, char *argv[])
TCLAP::CmdLine cmd(
"Checks mesh properties.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::UnlabeledValueArg<std::string> mesh_arg("mesh-file","input mesh file",true,"","string");
cmd.add( mesh_arg );
TCLAP::SwitchArg valid_arg("v","validation","validate the mesh");
diff --git a/Applications/Utils/MeshEdit/convertToLinearMesh.cpp b/Applications/Utils/MeshEdit/convertToLinearMesh.cpp
index 93333baa20a3fbc57d58193e8539af4c9b9b4aec..ab5eb03dc1ec7e2fa76fa625f791f1b523fd8d8a 100644
--- a/Applications/Utils/MeshEdit/convertToLinearMesh.cpp
+++ b/Applications/Utils/MeshEdit/convertToLinearMesh.cpp
@@ -30,11 +30,11 @@ int main(int argc, char *argv[])
TCLAP::CmdLine cmd(
"Convert a non-linear mesh to a linear mesh.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> input_arg("i", "input-mesh-file","input mesh file",true,"","string");
cmd.add( input_arg );
TCLAP::ValueArg<std::string> output_arg("o", "output-mesh-file","output mesh file",true,"","string");
diff --git a/Applications/Utils/MeshEdit/createLayeredMeshFromRasters.cpp b/Applications/Utils/MeshEdit/createLayeredMeshFromRasters.cpp
index 2cd9ca66ba3b6d5e65dbe9dd158743d7b46eb1fa..7fcc812b58aa796999d6857b39acd9e5c2920abf 100644
--- a/Applications/Utils/MeshEdit/createLayeredMeshFromRasters.cpp
+++ b/Applications/Utils/MeshEdit/createLayeredMeshFromRasters.cpp
@@ -65,11 +65,11 @@ int main (int argc, char* argv[])
"files representing subsurface layers. Supported raster formats are "
"ArcGIS ascii rasters (*.asc) and Surfer Grids (*.grd).\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> mesh_arg("i", "input-mesh-file",
"The name of the file containing the 2D input mesh.", true, "", "input file name");
@@ -80,7 +80,7 @@ int main (int argc, char* argv[])
true, "", "output file name");
cmd.add(mesh_out_arg);
- TCLAP::ValueArg<std::string> raster_path_arg("r", "raster-list",
+ TCLAP::ValueArg<std::string> raster_path_arg("r", "raster-list",
"An ascii-file containing a list of raster files, starting from top (DEM) to bottom.",
true, "", "list of raster files");
cmd.add(raster_path_arg);
diff --git a/Applications/Utils/MeshEdit/createQuadraticMesh.cpp b/Applications/Utils/MeshEdit/createQuadraticMesh.cpp
index b6af02c6a737a636947b5be38399c6eeae4620d6..94f29ca944a311d55e904cfce85c6cc427d259e6 100644
--- a/Applications/Utils/MeshEdit/createQuadraticMesh.cpp
+++ b/Applications/Utils/MeshEdit/createQuadraticMesh.cpp
@@ -30,11 +30,11 @@ int main(int argc, char *argv[])
TCLAP::CmdLine cmd(
"Create quadratic order mesh.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> input_arg("i", "input-mesh-file","input mesh file",true,"","string");
cmd.add( input_arg );
diff --git a/Applications/Utils/MeshEdit/editMaterialID.cpp b/Applications/Utils/MeshEdit/editMaterialID.cpp
index 330cdf83abb49aa8a617d7b775a7e94055e66444..4db9b383fb509afa5646d1bee9d8c002367cd6ba 100644
--- a/Applications/Utils/MeshEdit/editMaterialID.cpp
+++ b/Applications/Utils/MeshEdit/editMaterialID.cpp
@@ -25,11 +25,11 @@ int main (int argc, char* argv[])
TCLAP::CmdLine cmd(
"Edit material IDs of mesh elements.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::SwitchArg replaceArg("r", "replace", "replace material IDs", false);
TCLAP::SwitchArg condenseArg("c", "condense", "condense material IDs", false);
TCLAP::SwitchArg specifyArg("s", "specify", "specify material IDs by element types (-e)", false);
diff --git a/Applications/Utils/MeshEdit/queryMesh.cpp b/Applications/Utils/MeshEdit/queryMesh.cpp
index 3ed896685a3630876acd388bc0ba3078c8db2625..ccdec0b80daa60f73f36b8ac89f4000d42c3660a 100644
--- a/Applications/Utils/MeshEdit/queryMesh.cpp
+++ b/Applications/Utils/MeshEdit/queryMesh.cpp
@@ -31,11 +31,11 @@ int main(int argc, char *argv[])
TCLAP::CmdLine cmd(
"Query mesh information.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::UnlabeledValueArg<std::string> mesh_arg("mesh-file","input mesh file",true,"","string");
cmd.add( mesh_arg );
TCLAP::MultiArg<std::size_t> eleId_arg("e","element-id","element ID",false,"number");
diff --git a/Applications/Utils/MeshEdit/removeMeshElements.cpp b/Applications/Utils/MeshEdit/removeMeshElements.cpp
index 648e91665bbfa7860c1f1a794bee426878acb4c2..d6f275078b222bc8153c254cadaf54b4e5e05988 100644
--- a/Applications/Utils/MeshEdit/removeMeshElements.cpp
+++ b/Applications/Utils/MeshEdit/removeMeshElements.cpp
@@ -77,11 +77,11 @@ int main (int argc, char* argv[])
"https://docs.opengeosys.org/docs/tools/meshing/"
"remove-mesh-elements.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
// Bounding box params
TCLAP::ValueArg<double> zLargeArg("", "z-max", "largest allowed extent in z-dimension",
diff --git a/Applications/Utils/MeshEdit/reviseMesh.cpp b/Applications/Utils/MeshEdit/reviseMesh.cpp
index dbd87f3ab37360223a0a51cc1c7fe9f81f75ba73..beef0654bb4850f5c5cca3d46ce719acf8125006 100644
--- a/Applications/Utils/MeshEdit/reviseMesh.cpp
+++ b/Applications/Utils/MeshEdit/reviseMesh.cpp
@@ -34,11 +34,11 @@ int main(int argc, char *argv[])
TCLAP::CmdLine cmd(
"Mesh revision tool.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> input_arg("i", "input-mesh-file","input mesh file",true,"","string");
cmd.add( input_arg );
TCLAP::ValueArg<std::string> output_arg("o", "output-mesh-file","output mesh file",true,"","string");
diff --git a/Applications/Utils/MeshEdit/swapNodeCoordinateAxes.cpp b/Applications/Utils/MeshEdit/swapNodeCoordinateAxes.cpp
index 3d1d145a82d94b8994a216d4e69bc9e17ac5a381..9057d44e28ceba4a784dc0e04065c2f40520c3df 100644
--- a/Applications/Utils/MeshEdit/swapNodeCoordinateAxes.cpp
+++ b/Applications/Utils/MeshEdit/swapNodeCoordinateAxes.cpp
@@ -95,11 +95,11 @@ int main(int argc, char *argv[])
TCLAP::CmdLine cmd(
"Swap node coordinate values.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> input_arg("i", "input-mesh-file","input mesh file",true,"","string");
cmd.add( input_arg );
TCLAP::ValueArg<std::string> output_arg("o", "output-mesh-file","output mesh file",true,"","string");
diff --git a/Applications/Utils/MeshGeoTools/computeSurfaceNodeIDsInPolygonalRegion.cpp b/Applications/Utils/MeshGeoTools/computeSurfaceNodeIDsInPolygonalRegion.cpp
index 7a2cd92698b213b8daafa420cd85c94e76abee76..8cd31a738fd084089e96fa86162ed94a25d61aff 100644
--- a/Applications/Utils/MeshGeoTools/computeSurfaceNodeIDsInPolygonalRegion.cpp
+++ b/Applications/Utils/MeshGeoTools/computeSurfaceNodeIDsInPolygonalRegion.cpp
@@ -74,11 +74,11 @@ int main (int argc, char* argv[])
"https://docs.opengeosys.org/docs/tools/model-preparation/"
"computesurfacenodeidsinpolygonalregion.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> mesh_in("m", "mesh-input-file",
"the name of the file containing the input mesh", true,
"", "file name of input mesh");
diff --git a/Applications/Utils/MeshGeoTools/constructMeshesFromGeometry.cpp b/Applications/Utils/MeshGeoTools/constructMeshesFromGeometry.cpp
index 96ea73c624c4ca2d384d6a234fccb91f91fb9ba7..216c31c2cdb78d09c6f542b9421b5938987139c7 100644
--- a/Applications/Utils/MeshGeoTools/constructMeshesFromGeometry.cpp
+++ b/Applications/Utils/MeshGeoTools/constructMeshesFromGeometry.cpp
@@ -36,11 +36,11 @@ int main(int argc, char* argv[])
TCLAP::CmdLine cmd(
"Converts a geometry defined on a given mesh to distinct meshes.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<double> search_length_arg(
"s",
diff --git a/Applications/Utils/MeshGeoTools/identifySubdomains.cpp b/Applications/Utils/MeshGeoTools/identifySubdomains.cpp
index afab1abb42a3178279068a8c080732bc42811379..b107310ae0e178cbe70d1d6706e5666d060f6e5c 100644
--- a/Applications/Utils/MeshGeoTools/identifySubdomains.cpp
+++ b/Applications/Utils/MeshGeoTools/identifySubdomains.cpp
@@ -48,11 +48,11 @@ int main(int argc, char* argv[])
"Checks if the subdomain meshes are part of the bulk mesh and writes "
"the 'bulk_node_ids' and the 'bulk_element_ids' in each of them.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<bool> force_overwrite_arg(
"f",
diff --git a/Applications/Utils/ModelPreparation/ComputeNodeAreasFromSurfaceMesh.cpp b/Applications/Utils/ModelPreparation/ComputeNodeAreasFromSurfaceMesh.cpp
index 3614095d5d0ea1901b6ff6339a39a4399556c029..654f30bb721ae639b9344367f2b7488e92ed7e3a 100644
--- a/Applications/Utils/ModelPreparation/ComputeNodeAreasFromSurfaceMesh.cpp
+++ b/Applications/Utils/ModelPreparation/ComputeNodeAreasFromSurfaceMesh.cpp
@@ -63,11 +63,11 @@ int main (int argc, char* argv[])
"The tool computes the area per node of the surface mesh and writes "
"the information as txt and csv data.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> mesh_in("i", "mesh-input-file",
"the name of the file containing the input mesh", true,
"", "file name of input mesh");
diff --git a/Applications/Utils/ModelPreparation/PartitionMesh/PartitionMesh.cpp b/Applications/Utils/ModelPreparation/PartitionMesh/PartitionMesh.cpp
index b31dd4e6115668afc1a4050561db5c68be007b49..98e49068096d81274746015d6bcf5c8c66c78880 100644
--- a/Applications/Utils/ModelPreparation/PartitionMesh/PartitionMesh.cpp
+++ b/Applications/Utils/ModelPreparation/PartitionMesh/PartitionMesh.cpp
@@ -47,11 +47,11 @@ int main(int argc, char* argv[])
"Note: If this tool is installed as a system command,\n"
"\tthe command must be run with its full path.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> mesh_input(
"i", "mesh-input-file",
"the name of the file containing the input mesh", true, "",
diff --git a/Applications/Utils/ModelPreparation/convertVtkDataArrayToVtkDataArray.cpp b/Applications/Utils/ModelPreparation/convertVtkDataArrayToVtkDataArray.cpp
index 1a2e6cf6560c728029a4f197a251edf695f2f5a9..613c48c1318c1194bc5847acb8a3c91a02e1f93c 100644
--- a/Applications/Utils/ModelPreparation/convertVtkDataArrayToVtkDataArray.cpp
+++ b/Applications/Utils/ModelPreparation/convertVtkDataArrayToVtkDataArray.cpp
@@ -62,11 +62,11 @@ int main(int argc, char* argv[])
"Converts a double or floating point cell data array of a vtk "
"unstructured grid into a int or double cell data array.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> new_property_data_type_arg(
"t",
diff --git a/Applications/Utils/ModelPreparation/createNeumannBc.cpp b/Applications/Utils/ModelPreparation/createNeumannBc.cpp
index 4a35bc69cac305b213e4eef7a61c1ae44b9e95a2..2976613b3eff5e7c6e7df87429d0004beffd5f70 100644
--- a/Applications/Utils/ModelPreparation/createNeumannBc.cpp
+++ b/Applications/Utils/ModelPreparation/createNeumannBc.cpp
@@ -83,11 +83,11 @@ int main(int argc, char* argv[])
"mesh node ids. Such surface meshes can be created using the OGS-6 "
"tool ExtractSurface.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> in_mesh("i",
"in-mesh",
diff --git a/Applications/Utils/ModelPreparation/scaleProperty.cpp b/Applications/Utils/ModelPreparation/scaleProperty.cpp
index 85c81bae3b885b1e4b596e69bdf85ad8398209a6..aad6f5437f1b81ad141dc313469cd37ee9107e44 100644
--- a/Applications/Utils/ModelPreparation/scaleProperty.cpp
+++ b/Applications/Utils/ModelPreparation/scaleProperty.cpp
@@ -28,11 +28,11 @@ int main(int argc, char* argv[])
TCLAP::CmdLine cmd(
"Scales a property of a mesh.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> out_mesh_arg(
"o",
diff --git a/Applications/Utils/OGSFileConverter/main.cpp b/Applications/Utils/OGSFileConverter/main.cpp
index f6876f9c6b01f00cb09de46c2e9f8b8809fa8863..4cece56e1f961c0f05aacafa493b330a07ff38c1 100644
--- a/Applications/Utils/OGSFileConverter/main.cpp
+++ b/Applications/Utils/OGSFileConverter/main.cpp
@@ -26,11 +26,11 @@ int main(int argc, char* argv[])
TCLAP::CmdLine cmd(
"A conversion tool for ogs5 and ogs6 files.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> gmsh_path_arg("g", "gmsh-path",
"the path to the gmsh binary",
false, "", "path as string");
diff --git a/Applications/Utils/PostProcessing/postLIE.cpp b/Applications/Utils/PostProcessing/postLIE.cpp
index 01321a05898d1743c041ae8217a80c02485888f7..fe9cc2babc95120fefec1953043237a121039f49 100644
--- a/Applications/Utils/PostProcessing/postLIE.cpp
+++ b/Applications/Utils/PostProcessing/postLIE.cpp
@@ -121,11 +121,11 @@ int main(int argc, char* argv[])
TCLAP::CmdLine cmd(
"Post-process results of the LIE approach.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> arg_out_file(
"o", "output-file", "the name of the new PVD or VTU file", true, "",
"path");
diff --git a/Applications/Utils/SWMMConverter/SWMMConverter.cpp b/Applications/Utils/SWMMConverter/SWMMConverter.cpp
index e7f671f4c3d458922d381968457ae6b9f22ffb2d..dae12ad9bb6139fdeb3f98ef9a1fc4c6bba4d985 100644
--- a/Applications/Utils/SWMMConverter/SWMMConverter.cpp
+++ b/Applications/Utils/SWMMConverter/SWMMConverter.cpp
@@ -172,11 +172,11 @@ int main(int argc, char* argv[])
"Read files for the Storm Water Management Model (SWMM) and converts "
"them into OGS data structures.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> mesh_output_arg(
"m", "mesh", "mesh output file (*.vtu)", false, "", "mesh output file");
cmd.add(mesh_output_arg);
diff --git a/Applications/Utils/SimpleMeshCreation/createMeshElemPropertiesFromASCRaster.cpp b/Applications/Utils/SimpleMeshCreation/createMeshElemPropertiesFromASCRaster.cpp
index c0580b91681327d4bc69a1b1fec4600b9740e7cf..422f287e9953df5f85e7eb72721d94b2ed23ba46 100644
--- a/Applications/Utils/SimpleMeshCreation/createMeshElemPropertiesFromASCRaster.cpp
+++ b/Applications/Utils/SimpleMeshCreation/createMeshElemPropertiesFromASCRaster.cpp
@@ -40,11 +40,11 @@ int main(int argc, char* argv[])
"Generates properties for mesh elements of an input mesh deploying a "
"ASC raster file.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
TCLAP::ValueArg<std::string> out_mesh_arg(
"o",
diff --git a/Applications/Utils/SimpleMeshCreation/generateStructuredMesh.cpp b/Applications/Utils/SimpleMeshCreation/generateStructuredMesh.cpp
index f62dcdde5b0959091989c04266059a772a1b6a08..9ff3d2846d36b4b55c7368d21197fe0548715082 100644
--- a/Applications/Utils/SimpleMeshCreation/generateStructuredMesh.cpp
+++ b/Applications/Utils/SimpleMeshCreation/generateStructuredMesh.cpp
@@ -67,11 +67,11 @@ int main (int argc, char* argv[])
"https://docs.opengeosys.org/docs/tools/meshing/"
"structured-mesh-generation.\n\n"
"OpenGeoSys-6 software, version " +
- BaseLib::BuildInfo::git_describe +
+ BaseLib::BuildInfo::ogs_version +
".\n"
"Copyright (c) 2012-2019, OpenGeoSys Community "
"(http://www.opengeosys.org)",
- ' ', BaseLib::BuildInfo::git_describe);
+ ' ', BaseLib::BuildInfo::ogs_version);
auto tclapOutput = std::make_unique<BaseLib::TCLAPCustomOutput>();
cmd.setOutput(tclapOutput.get());
diff --git a/BaseLib/BuildInfo.cpp.in b/BaseLib/BuildInfo.cpp.in
index 9e6955c745ac8de59896cf0934a629cad86b76bc..a6eb516b9d257512fe8e251de56f410f737a341b 100644
--- a/BaseLib/BuildInfo.cpp.in
+++ b/BaseLib/BuildInfo.cpp.in
@@ -27,7 +27,6 @@ namespace BuildInfo
const std::string git_version_sha1("@GIT_SHA1@");
const std::string git_version_sha1_short("@GIT_SHA1_SHORT@");
- const std::string git_describe("@GIT_DESCRIBE@");
const std::string ogs_version("@OGS_VERSION@");
const std::string cmake_args("@CMAKE_ARGS_ESCAPED@");
diff --git a/BaseLib/BuildInfo.h b/BaseLib/BuildInfo.h
index 1eda014d1394911afca551e6ae5ba605a71a41ff..08e067764ae7e987f315a13f181b4deac8a843cf 100644
--- a/BaseLib/BuildInfo.h
+++ b/BaseLib/BuildInfo.h
@@ -30,7 +30,6 @@ namespace BuildInfo
extern BASELIB_EXPORT const std::string git_version_sha1;
extern BASELIB_EXPORT const std::string git_version_sha1_short;
- extern BASELIB_EXPORT const std::string git_describe;
extern BASELIB_EXPORT const std::string ogs_version;
extern BASELIB_EXPORT const std::string cmake_args;