diff --git a/examples/patchkernel_example_00001.cpp b/examples/patchkernel_example_00001.cpp index 561eafc46c..4c67f6573f 100644 --- a/examples/patchkernel_example_00001.cpp +++ b/examples/patchkernel_example_00001.cpp @@ -37,7 +37,6 @@ #include #endif -#include "bitpit_IO.hpp" #include "bitpit_patchkernel.hpp" using namespace bitpit; diff --git a/examples/voloctree_adaptation_example_00001.cpp b/examples/voloctree_adaptation_example_00001.cpp index da46785b12..1c6c21741a 100644 --- a/examples/voloctree_adaptation_example_00001.cpp +++ b/examples/voloctree_adaptation_example_00001.cpp @@ -28,7 +28,7 @@ #include #endif -#include "bitpit_IO.hpp" +#include "bitpit_common.hpp" #include "bitpit_voloctree.hpp" using namespace bitpit; diff --git a/src/IO/bitpit_IO.hpp b/src/IO/bitpit_IO.hpp index 3188d75bfb..5c9883d539 100644 --- a/src/IO/bitpit_IO.hpp +++ b/src/IO/bitpit_IO.hpp @@ -37,14 +37,12 @@ * @{ * @defgroup VTKEnums VTK Enumerations * @} - * @defgroup Logger Logger * @} */ #include "binary_archive.hpp" #include "configuration.hpp" #include "index_generator.hpp" -#include "logger.hpp" #include "VTK.hpp" #include "DGF.hpp" #include "GenericIO.hpp" diff --git a/src/LA/system_solvers_large.cpp b/src/LA/system_solvers_large.cpp index 0db8464f92..e73c1d913e 100644 --- a/src/LA/system_solvers_large.cpp +++ b/src/LA/system_solvers_large.cpp @@ -26,7 +26,7 @@ #include #include -#include "bitpit_IO.hpp" +#include "bitpit_common.hpp" #include "system_solvers_large.hpp" diff --git a/src/PABLO/ParaTree.hpp b/src/PABLO/ParaTree.hpp index 83b17c8422..1299459f72 100644 --- a/src/PABLO/ParaTree.hpp +++ b/src/PABLO/ParaTree.hpp @@ -67,7 +67,7 @@ #include "tree_constants.hpp" #include "LocalTree.hpp" #include "Map.hpp" -#include "bitpit_IO.hpp" +#include "bitpit_common.hpp" #include #include #include diff --git a/src/POD/pod_kernel.hpp b/src/POD/pod_kernel.hpp index eb32928550..e66ee6f26f 100644 --- a/src/POD/pod_kernel.hpp +++ b/src/POD/pod_kernel.hpp @@ -33,8 +33,8 @@ #include #include "pod_common.hpp" +#include "bitpit_common.hpp" #include "bitpit_patchkernel.hpp" -#include "bitpit_IO.hpp" namespace bitpit { diff --git a/src/RBF/rbf.cpp b/src/RBF/rbf.cpp index 1051eef8ad..0797464a97 100644 --- a/src/RBF/rbf.cpp +++ b/src/RBF/rbf.cpp @@ -28,8 +28,8 @@ #include "bitpit_private_lapacke.hpp" +#include "bitpit_common.hpp" #include "bitpit_operators.hpp" -#include "bitpit_IO.hpp" #include "bitpit_SA.hpp" #include "rbf.hpp" diff --git a/src/common/bitpit_common.hpp b/src/common/bitpit_common.hpp index ad39e41aaa..97819cd294 100644 --- a/src/common/bitpit_common.hpp +++ b/src/common/bitpit_common.hpp @@ -32,6 +32,7 @@ * @defgroup common_strings String manipulation * @defgroup common_binary Binary streams * @defgroup common_hashing Hashing + * @defgroup common_logger Logger * @defgroup common_misc Miscellaneous * @defgroup common_macro Macros * @defgroup common_constants Constants @@ -42,6 +43,7 @@ #include "compiler.hpp" #include "constants.hpp" #include "fileHandler.hpp" +#include "logger.hpp" #include "utils.hpp" #include "moduleEnd.hpp" diff --git a/src/IO/logger.cpp b/src/common/logger.cpp similarity index 99% rename from src/IO/logger.cpp rename to src/common/logger.cpp index 9565600e81..27dc6a445a 100644 --- a/src/IO/logger.cpp +++ b/src/common/logger.cpp @@ -27,18 +27,22 @@ #include #include #include -#include +#include +#include +#include +#include #include #include #include +#include "fileHandler.hpp" #include "logger.hpp" namespace bitpit{ /*! \class LoggerBuffer - \ingroup Logger + \ingroup common_logger \brief Stream buffer for the message logger. This class implements a stream buffer used by the message logger. @@ -416,7 +420,7 @@ const std::string LoggerBuffer::getTimestamp() const /*! \class Logger - \ingroup Logger + \ingroup common_logger \brief Message logger. This class implements a message logger. The logger allows to write @@ -877,7 +881,7 @@ void Logger::print(const std::string &message, log::Priority priority, log::Visi /*! \class LoggerManager - \ingroup Logger + \ingroup common_logger \brief Manager for the loggers. This class implements a manager for the loggers. The manager allowes the diff --git a/src/IO/logger.hpp b/src/common/logger.hpp similarity index 99% rename from src/IO/logger.hpp rename to src/common/logger.hpp index f39e2a3fcb..d3d3e39737 100644 --- a/src/IO/logger.hpp +++ b/src/common/logger.hpp @@ -25,11 +25,10 @@ #define __BITPIT_LOGGER_HPP__ #include +#include #include #include -#include "bitpit_common.hpp" - #define BITPIT_DEBUG_COUT(...) BITPIT_OVERLOAD_CALL(BITPIT_DEBUG_COUT, __VA_ARGS__) #if BITPIT_ENABLE_DEBUG #define BITPIT_DEBUG_COUT_0() bitpit::log::cout() @@ -259,7 +258,7 @@ class LoggerManager /*! - \ingroup Logger + \ingroup common_logger \brief The namespace 'log' contains routines for interacting with the message logger. */ diff --git a/src/communications/communications.cpp b/src/communications/communications.cpp index af4b83e52c..da747b8b42 100644 --- a/src/communications/communications.cpp +++ b/src/communications/communications.cpp @@ -24,7 +24,7 @@ #if BITPIT_ENABLE_MPI==1 -#include "bitpit_IO.hpp" +#include "bitpit_common.hpp" #include "communications.hpp" #include "communications_tags.hpp" diff --git a/src/discretization/reconstruction.cpp b/src/discretization/reconstruction.cpp index 449edaa06c..3f8d6ad75e 100644 --- a/src/discretization/reconstruction.cpp +++ b/src/discretization/reconstruction.cpp @@ -26,7 +26,6 @@ #include #include -#include "bitpit_IO.hpp" #include "bitpit_LA.hpp" #include "bitpit_operators.hpp" diff --git a/src/patchkernel/patch_manager.hpp b/src/patchkernel/patch_manager.hpp index 7e037623cc..0f6dcc3931 100644 --- a/src/patchkernel/patch_manager.hpp +++ b/src/patchkernel/patch_manager.hpp @@ -29,8 +29,6 @@ #include #include -#include "bitpit_IO.hpp" - namespace bitpit { class PatchManager { diff --git a/src/surfunstructured/surfunstructured.cpp b/src/surfunstructured/surfunstructured.cpp index ad0db7cd36..d13e32d60a 100644 --- a/src/surfunstructured/surfunstructured.cpp +++ b/src/surfunstructured/surfunstructured.cpp @@ -23,6 +23,7 @@ \*---------------------------------------------------------------------------*/ #include "bitpit_common.hpp" +#include "bitpit_IO.hpp" #include "surfunstructured.hpp" diff --git a/src/surfunstructured/surfunstructured.hpp b/src/surfunstructured/surfunstructured.hpp index 61d7eaa869..3863ea0915 100644 --- a/src/surfunstructured/surfunstructured.hpp +++ b/src/surfunstructured/surfunstructured.hpp @@ -28,7 +28,6 @@ #include #include -#include "bitpit_IO.hpp" #include "bitpit_patchkernel.hpp" namespace bitpit { diff --git a/src/voloctree/voloctree.cpp b/src/voloctree/voloctree.cpp index c0d96c274f..1b9e938bed 100644 --- a/src/voloctree/voloctree.cpp +++ b/src/voloctree/voloctree.cpp @@ -25,7 +25,7 @@ #include #include -#include "bitpit_IO.hpp" +#include "bitpit_common.hpp" #include "voloctree.hpp" diff --git a/test/LA/test_LA_parallel_00001.cpp b/test/LA/test_LA_parallel_00001.cpp index 42da1a59a1..096b4437d3 100644 --- a/test/LA/test_LA_parallel_00001.cpp +++ b/test/LA/test_LA_parallel_00001.cpp @@ -26,7 +26,6 @@ #include #include "bitpit_common.hpp" -#include "bitpit_IO.hpp" #include "bitpit_LA.hpp" using namespace bitpit; diff --git a/test/PABLO/test_PABLO_00001.cpp b/test/PABLO/test_PABLO_00001.cpp index 3737b7467a..a6f6c30083 100644 --- a/test/PABLO/test_PABLO_00001.cpp +++ b/test/PABLO/test_PABLO_00001.cpp @@ -28,7 +28,6 @@ #include "bitpit_common.hpp" #include "bitpit_PABLO.hpp" -#include "bitpit_IO.hpp" using namespace std; using namespace bitpit; diff --git a/test/PABLO/test_PABLO_00002.cpp b/test/PABLO/test_PABLO_00002.cpp index a0532c037a..fcd0c66a3d 100644 --- a/test/PABLO/test_PABLO_00002.cpp +++ b/test/PABLO/test_PABLO_00002.cpp @@ -28,7 +28,6 @@ #include "bitpit_common.hpp" #include "bitpit_PABLO.hpp" -#include "bitpit_IO.hpp" using namespace std; using namespace bitpit; diff --git a/test/PABLO/test_PABLO_00003.cpp b/test/PABLO/test_PABLO_00003.cpp index b7643d28ad..9c81c323b4 100644 --- a/test/PABLO/test_PABLO_00003.cpp +++ b/test/PABLO/test_PABLO_00003.cpp @@ -28,7 +28,6 @@ #include "bitpit_common.hpp" #include "bitpit_PABLO.hpp" -#include "bitpit_IO.hpp" using namespace std; using namespace bitpit; diff --git a/test/PABLO/test_PABLO_00004.cpp b/test/PABLO/test_PABLO_00004.cpp index 19095f3d9d..e04d1b4d2c 100644 --- a/test/PABLO/test_PABLO_00004.cpp +++ b/test/PABLO/test_PABLO_00004.cpp @@ -28,7 +28,6 @@ #include "bitpit_common.hpp" #include "bitpit_PABLO.hpp" -#include "bitpit_IO.hpp" using namespace std; using namespace bitpit; diff --git a/test/PABLO/test_PABLO_00005.cpp b/test/PABLO/test_PABLO_00005.cpp index 512fb412f1..0329648fea 100644 --- a/test/PABLO/test_PABLO_00005.cpp +++ b/test/PABLO/test_PABLO_00005.cpp @@ -28,7 +28,6 @@ #include "bitpit_common.hpp" #include "bitpit_PABLO.hpp" -#include "bitpit_IO.hpp" using namespace std; using namespace bitpit; diff --git a/test/PABLO/test_PABLO_parallel_00001.cpp b/test/PABLO/test_PABLO_parallel_00001.cpp index 3c4fd9ce0c..ed943aba94 100644 --- a/test/PABLO/test_PABLO_parallel_00001.cpp +++ b/test/PABLO/test_PABLO_parallel_00001.cpp @@ -26,7 +26,6 @@ #include "bitpit_common.hpp" #include "bitpit_PABLO.hpp" -#include "bitpit_IO.hpp" using namespace std; using namespace bitpit; diff --git a/test/PABLO/test_PABLO_parallel_00002.cpp b/test/PABLO/test_PABLO_parallel_00002.cpp index dd78cc94da..55e6ffdc6d 100644 --- a/test/PABLO/test_PABLO_parallel_00002.cpp +++ b/test/PABLO/test_PABLO_parallel_00002.cpp @@ -26,7 +26,6 @@ #include "bitpit_common.hpp" #include "bitpit_PABLO.hpp" -#include "bitpit_IO.hpp" using namespace std; using namespace bitpit; diff --git a/test/PABLO/test_PABLO_parallel_00003.cpp b/test/PABLO/test_PABLO_parallel_00003.cpp index 71fdc38120..561fc2121e 100644 --- a/test/PABLO/test_PABLO_parallel_00003.cpp +++ b/test/PABLO/test_PABLO_parallel_00003.cpp @@ -26,7 +26,6 @@ #include "bitpit_common.hpp" #include "bitpit_PABLO.hpp" -#include "bitpit_IO.hpp" using namespace bitpit; diff --git a/test/PABLO/test_PABLO_parallel_00004.cpp b/test/PABLO/test_PABLO_parallel_00004.cpp index 43515677b5..e51e288abb 100644 --- a/test/PABLO/test_PABLO_parallel_00004.cpp +++ b/test/PABLO/test_PABLO_parallel_00004.cpp @@ -26,7 +26,6 @@ #include "bitpit_common.hpp" #include "bitpit_PABLO.hpp" -#include "bitpit_IO.hpp" using namespace bitpit; diff --git a/test/PABLO/test_PABLO_parallel_00006.cpp b/test/PABLO/test_PABLO_parallel_00006.cpp index 49e21a3f74..3cb5798b59 100644 --- a/test/PABLO/test_PABLO_parallel_00006.cpp +++ b/test/PABLO/test_PABLO_parallel_00006.cpp @@ -24,7 +24,6 @@ #include "bitpit_common.hpp" #include "bitpit_PABLO.hpp" -#include "bitpit_IO.hpp" #include diff --git a/test/RBF/test_RBF_00001.cpp b/test/RBF/test_RBF_00001.cpp index eaf655ff39..4bf813be26 100644 --- a/test/RBF/test_RBF_00001.cpp +++ b/test/RBF/test_RBF_00001.cpp @@ -27,6 +27,7 @@ #include #endif +#include "bitpit_common.hpp" #include "bitpit_IO.hpp" #include "bitpit_RBF.hpp" diff --git a/test/RBF/test_RBF_00003.cpp b/test/RBF/test_RBF_00003.cpp index 05eb0f26ce..20724f1d3b 100644 --- a/test/RBF/test_RBF_00003.cpp +++ b/test/RBF/test_RBF_00003.cpp @@ -34,6 +34,7 @@ #include "bitpit_operators.hpp" #include "bitpit_IO.hpp" +#include "bitpit_common.hpp" #include "bitpit_RBF.hpp" using namespace bitpit; diff --git a/test/communications/test_communications_parallel_00001.cpp b/test/communications/test_communications_parallel_00001.cpp index 3d0e5d4bfa..a0c0742026 100644 --- a/test/communications/test_communications_parallel_00001.cpp +++ b/test/communications/test_communications_parallel_00001.cpp @@ -24,7 +24,7 @@ #include -#include "bitpit_IO.hpp" +#include "bitpit_common.hpp" #include "bitpit_communications.hpp" using namespace bitpit; diff --git a/test/communications/test_communications_parallel_00002.cpp b/test/communications/test_communications_parallel_00002.cpp index 22a0b826d1..23461671e9 100644 --- a/test/communications/test_communications_parallel_00002.cpp +++ b/test/communications/test_communications_parallel_00002.cpp @@ -24,7 +24,7 @@ #include -#include "bitpit_IO.hpp" +#include "bitpit_common.hpp" #include "bitpit_communications.hpp" using namespace bitpit; diff --git a/test/discretization/test_discretization_00001.cpp b/test/discretization/test_discretization_00001.cpp index 99db739d34..82a4d58036 100644 --- a/test/discretization/test_discretization_00001.cpp +++ b/test/discretization/test_discretization_00001.cpp @@ -27,7 +27,7 @@ # include #endif -#include "bitpit_IO.hpp" +#include "bitpit_common.hpp" #include "bitpit_discretization.hpp" #include "bitpit_volcartesian.hpp" diff --git a/test/levelset/test_levelset_parallel_00003.cpp b/test/levelset/test_levelset_parallel_00003.cpp index ec35f2daf1..4e2463fab0 100644 --- a/test/levelset/test_levelset_parallel_00003.cpp +++ b/test/levelset/test_levelset_parallel_00003.cpp @@ -28,7 +28,7 @@ #include -#include "bitpit_IO.hpp" +#include "bitpit_common.hpp" #include "bitpit_surfunstructured.hpp" #include "bitpit_voloctree.hpp" #include "bitpit_levelset.hpp" diff --git a/test/surfunstructured/test_surfunstructured_00001.cpp b/test/surfunstructured/test_surfunstructured_00001.cpp index 35db4a78d9..4d33372976 100644 --- a/test/surfunstructured/test_surfunstructured_00001.cpp +++ b/test/surfunstructured/test_surfunstructured_00001.cpp @@ -41,7 +41,6 @@ // BitPit # include "bitpit_common.hpp" // Utilities and common definitions -# include "bitpit_IO.hpp" // Input/output # include "bitpit_operators.hpp" // STL containers operators # include "bitpit_patchkernel.hpp" // BitPit base patch # include "bitpit_surfunstructured.hpp" // BitPit surftri patch diff --git a/test/surfunstructured/test_surfunstructured_parallel_00005.cpp b/test/surfunstructured/test_surfunstructured_parallel_00005.cpp index 6ba4e35db9..3a2ea77104 100644 --- a/test/surfunstructured/test_surfunstructured_parallel_00005.cpp +++ b/test/surfunstructured/test_surfunstructured_parallel_00005.cpp @@ -23,7 +23,6 @@ \*---------------------------------------------------------------------------*/ #include "bitpit_common.hpp" -#include "bitpit_IO.hpp" #include "bitpit_CG.hpp" #include "bitpit_surfunstructured.hpp" diff --git a/test/surfunstructured/test_surfunstructured_parallel_00008.cpp b/test/surfunstructured/test_surfunstructured_parallel_00008.cpp index 13e26bc740..b4ba311049 100644 --- a/test/surfunstructured/test_surfunstructured_parallel_00008.cpp +++ b/test/surfunstructured/test_surfunstructured_parallel_00008.cpp @@ -23,7 +23,6 @@ \*---------------------------------------------------------------------------*/ #include "bitpit_common.hpp" -#include "bitpit_IO.hpp" #include "bitpit_CG.hpp" #include "bitpit_surfunstructured.hpp" diff --git a/test/voloctree/test_voloctree_00001.cpp b/test/voloctree/test_voloctree_00001.cpp index b464a39d13..b2ac6c4f81 100644 --- a/test/voloctree/test_voloctree_00001.cpp +++ b/test/voloctree/test_voloctree_00001.cpp @@ -28,7 +28,6 @@ #endif #include "bitpit_common.hpp" -#include "bitpit_IO.hpp" #include "bitpit_voloctree.hpp" using namespace bitpit; diff --git a/test/voloctree/test_voloctree_00002.cpp b/test/voloctree/test_voloctree_00002.cpp index 173aee0b32..3d1a6c47af 100644 --- a/test/voloctree/test_voloctree_00002.cpp +++ b/test/voloctree/test_voloctree_00002.cpp @@ -29,7 +29,6 @@ #endif #include "bitpit_common.hpp" -#include "bitpit_IO.hpp" #include "bitpit_voloctree.hpp" using namespace bitpit; diff --git a/test/voloctree/test_voloctree_00003.cpp b/test/voloctree/test_voloctree_00003.cpp index a123f0d40d..4056c5c25b 100644 --- a/test/voloctree/test_voloctree_00003.cpp +++ b/test/voloctree/test_voloctree_00003.cpp @@ -28,7 +28,6 @@ #endif #include "bitpit_common.hpp" -#include "bitpit_IO.hpp" #include "bitpit_voloctree.hpp" using namespace bitpit; diff --git a/test/voloctree/test_voloctree_parallel_00001.cpp b/test/voloctree/test_voloctree_parallel_00001.cpp index 82ac22a427..9e5bacb839 100644 --- a/test/voloctree/test_voloctree_parallel_00001.cpp +++ b/test/voloctree/test_voloctree_parallel_00001.cpp @@ -27,7 +27,6 @@ #include #include "bitpit_common.hpp" -#include "bitpit_IO.hpp" #include "bitpit_voloctree.hpp" using namespace bitpit; diff --git a/test/voloctree/test_voloctree_parallel_00002.cpp b/test/voloctree/test_voloctree_parallel_00002.cpp index 4ad07aa03f..f84053efda 100644 --- a/test/voloctree/test_voloctree_parallel_00002.cpp +++ b/test/voloctree/test_voloctree_parallel_00002.cpp @@ -26,7 +26,6 @@ #include #include "bitpit_common.hpp" -#include "bitpit_IO.hpp" #include "bitpit_voloctree.hpp" using namespace bitpit; diff --git a/test/voloctree/test_voloctree_parallel_00004.cpp b/test/voloctree/test_voloctree_parallel_00004.cpp index 45217495d9..a0f7270b7a 100644 --- a/test/voloctree/test_voloctree_parallel_00004.cpp +++ b/test/voloctree/test_voloctree_parallel_00004.cpp @@ -26,7 +26,6 @@ #include #include "bitpit_common.hpp" -#include "bitpit_IO.hpp" #include "bitpit_voloctree.hpp" using namespace bitpit; diff --git a/test/volunstructured/test_volunstructured_00001.cpp b/test/volunstructured/test_volunstructured_00001.cpp index 414dc9b2f6..f4e65c9aab 100644 --- a/test/volunstructured/test_volunstructured_00001.cpp +++ b/test/volunstructured/test_volunstructured_00001.cpp @@ -25,7 +25,6 @@ #include #include "bitpit_common.hpp" -#include "bitpit_IO.hpp" #include "bitpit_operators.hpp" #include "bitpit_volunstructured.hpp"