From 2f900e967d0cf6726ff76cd2a006bbe6fca6957c Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Fri, 2 Oct 2015 15:30:58 +0200
Subject: [PATCH] [AppL] Replace logog init/shutdn with LogogSetup.
---
Applications/CLI/ogs.cpp | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/Applications/CLI/ogs.cpp b/Applications/CLI/ogs.cpp
index 944f1a67958..fb522a180a7 100644
--- a/Applications/CLI/ogs.cpp
+++ b/Applications/CLI/ogs.cpp
@@ -21,17 +21,14 @@
#include <petsc.h>
#endif
-// ThirdParty/logog
-#include "logog/include/logog.hpp"
-
// ThirdParty/tclap
#include "tclap/CmdLine.h"
// BaseLib
#include "BaseLib/BuildInfo.h"
#include "BaseLib/FileTools.h"
-#include "BaseLib/LogogSimpleFormatter.h"
+#include "Applications/ApplicationsLib/LogogSetup.h"
#include "Applications/ApplicationsLib/ProjectData.h"
#include "ProcessLib/NumericsConfig.h"
@@ -94,12 +91,6 @@ int main(int argc, char *argv[])
PetscInitialize(&argc, &argv, nullptr, help);
#endif
- // logog
- LOGOG_INITIALIZE();
- BaseLib::LogogSimpleFormatter *fmt(new BaseLib::LogogSimpleFormatter);
- logog::Cout *logog_cout(new logog::Cout);
- logog_cout->SetFormatter(*fmt);
-
// Parse CLI arguments.
TCLAP::CmdLine cmd("OpenGeoSys-6 software.\n"
"Copyright (c) 2012-2015, OpenGeoSys Community "
@@ -120,6 +111,8 @@ int main(int argc, char *argv[])
cmd.add(project_arg);
cmd.parse(argc, argv);
+ ApplicationsLib::LogogSetup logog_setup;
+
#ifdef USE_LIS
lis_initialize(&argc, &argv);
#endif
@@ -155,15 +148,10 @@ int main(int argc, char *argv[])
#ifdef USE_PETSC
PetscFinalize();
#endif
-
#ifdef USE_MPI
MPI_Finalize();
#endif
- delete fmt;
- delete logog_cout;
- LOGOG_SHUTDOWN();
-
#ifdef USE_LIS
lis_finalize();
#endif
--
GitLab