From 5b12b873ec271d0486243f0c3911bb35c910a21e Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 19 Mar 2019 11:24:16 +0100
Subject: [PATCH] [BL] Fixed ogs --help / --version info.
---
Applications/CLI/ogs.cpp | 6 +++---
Applications/DataExplorer/main.cpp | 2 +-
Applications/DataExplorer/mainwindow.cpp | 2 +-
Applications/FileIO/Gmsh/GMSHInterface.cpp | 2 +-
Applications/Utils/FileConverter/ConvertSHPToGLI.cpp | 4 ++--
Applications/Utils/FileConverter/FEFLOW2OGS.cpp | 4 ++--
Applications/Utils/FileConverter/GMSH2OGS.cpp | 4 ++--
Applications/Utils/FileConverter/GocadSGridReaderMain.cpp | 4 ++--
Applications/Utils/FileConverter/MeshToRaster.cpp | 4 ++--
Applications/Utils/FileConverter/OGS2VTK.cpp | 4 ++--
Applications/Utils/FileConverter/TIN2VTK.cpp | 4 ++--
Applications/Utils/FileConverter/TecPlotTools.cpp | 4 ++--
Applications/Utils/FileConverter/VTK2OGS.cpp | 4 ++--
Applications/Utils/FileConverter/VTK2TIN.cpp | 4 ++--
Applications/Utils/FileConverter/convertGEO.cpp | 4 ++--
.../Utils/FileConverter/generateMatPropsFromMatID.cpp | 4 ++--
Applications/Utils/GeoTools/MoveGeometry.cpp | 4 ++--
Applications/Utils/GeoTools/TriangulatePolyline.cpp | 4 ++--
Applications/Utils/MeshEdit/AddTopLayer.cpp | 4 ++--
.../MeshEdit/CreateBoundaryConditionsAlongPolylines.cpp | 4 ++--
Applications/Utils/MeshEdit/ExtractSurface.cpp | 4 ++--
Applications/Utils/MeshEdit/MapGeometryToMeshSurface.cpp | 4 ++--
Applications/Utils/MeshEdit/MoveMesh.cpp | 4 ++--
Applications/Utils/MeshEdit/NodeReordering.cpp | 4 ++--
.../Utils/MeshEdit/ResetPropertiesInPolygonalRegion.cpp | 4 ++--
Applications/Utils/MeshEdit/UnityPreprocessing.cpp | 4 ++--
Applications/Utils/MeshEdit/appendLinesAlongPolyline.cpp | 4 ++--
Applications/Utils/MeshEdit/checkMesh.cpp | 4 ++--
Applications/Utils/MeshEdit/convertToLinearMesh.cpp | 4 ++--
.../Utils/MeshEdit/createLayeredMeshFromRasters.cpp | 6 +++---
Applications/Utils/MeshEdit/createQuadraticMesh.cpp | 4 ++--
Applications/Utils/MeshEdit/editMaterialID.cpp | 4 ++--
Applications/Utils/MeshEdit/queryMesh.cpp | 4 ++--
Applications/Utils/MeshEdit/removeMeshElements.cpp | 4 ++--
Applications/Utils/MeshEdit/reviseMesh.cpp | 4 ++--
Applications/Utils/MeshEdit/swapNodeCoordinateAxes.cpp | 4 ++--
.../MeshGeoTools/computeSurfaceNodeIDsInPolygonalRegion.cpp | 4 ++--
.../Utils/MeshGeoTools/constructMeshesFromGeometry.cpp | 4 ++--
Applications/Utils/MeshGeoTools/identifySubdomains.cpp | 4 ++--
.../ModelPreparation/ComputeNodeAreasFromSurfaceMesh.cpp | 4 ++--
.../Utils/ModelPreparation/PartitionMesh/PartitionMesh.cpp | 4 ++--
.../ModelPreparation/convertVtkDataArrayToVtkDataArray.cpp | 4 ++--
Applications/Utils/ModelPreparation/createNeumannBc.cpp | 4 ++--
Applications/Utils/ModelPreparation/scaleProperty.cpp | 4 ++--
Applications/Utils/OGSFileConverter/main.cpp | 4 ++--
Applications/Utils/PostProcessing/postLIE.cpp | 4 ++--
Applications/Utils/SWMMConverter/SWMMConverter.cpp | 4 ++--
.../createMeshElemPropertiesFromASCRaster.cpp | 4 ++--
.../Utils/SimpleMeshCreation/generateStructuredMesh.cpp | 4 ++--
BaseLib/BuildInfo.cpp.in | 1 -
BaseLib/BuildInfo.h | 1 -
51 files changed, 97 insertions(+), 99 deletions(-)
diff --git a/Applications/CLI/ogs.cpp b/Applications/CLI/ogs.cpp
index 7fab427db70..b2492c6bec9 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 ce4cd7283da..ee99061ff72 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 2aac07fb356..43bc60ce80f 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 94bf289ef3c..8b56c2eb60b 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 8bf21fbd2e8..9d8c834950c 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 2287ed0c716..0854d0a68cf 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 9748133c26f..56298eb6e46 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 3fbf80f92ea..f62674ee896 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 8f2f64ee22d..4b355b17b3a 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 974a7d241f2..c4d6c6176bf 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 9b5d3cbdd37..966e64440ea 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 951578be01a..df79bcfb973 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 2a19247cf3a..67f373f6937 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 f11eed83fd4..6877836c58f 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 c50f35ae2b2..3353a0b0098 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 c92811f3392..a5ce5361242 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 3bac4c3477a..d6e87b8033f 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 c5b2e74e15c..bce66b08345 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 bb4174e10b0..47f3d119a97 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 3214427ddcf..0d465e9cf17 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 951071698d1..75e31e621c8 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 80f11768f3f..79aa2fbc544 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 fcb47ddae11..3130ad8ffef 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 11e65cc0810..5ca4dde0477 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 50a4f666ad6..ab92bc16ab7 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 8659d23c86a..bfc284d22ea 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 cd35ea5bbb5..91586584edf 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 4636a5b3d30..8fbf8053fbf 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 93333baa20a..ab5eb03dc1e 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 2cd9ca66ba3..7fcc812b58a 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 b6af02c6a73..94f29ca944a 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 330cdf83abb..4db9b383fb5 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 3ed896685a3..ccdec0b80da 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 648e91665bb..d6f275078b2 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 dbd87f3ab37..beef0654bb4 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 3d1d145a82d..9057d44e28c 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 7a2cd92698b..8cd31a738fd 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 96ea73c624c..216c31c2cdb 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 afab1abb42a..b107310ae0e 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 3614095d5d0..654f30bb721 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 b31dd4e6115..98e49068096 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 1a2e6cf6560..613c48c1318 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 4a35bc69cac..2976613b3ef 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 85c81bae3b8..aad6f5437f1 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 f6876f9c6b0..4cece56e1f9 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 01321a05898..fe9cc2babc9 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 e7f671f4c3d..dae12ad9bb6 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 c0580b91681..422f287e995 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 f62dcdde5b0..9ff3d2846d3 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 9e6955c745a..a6eb516b9d2 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 1eda014d139..08e067764ae 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;
--
GitLab