Merge pull request #76 from tboudreaux/dependency/liblogging
SERiF now uses liblogging
This commit is contained in:
@@ -4,7 +4,6 @@ subdir('fourdst')
|
|||||||
|
|
||||||
subdir('mfem')
|
subdir('mfem')
|
||||||
subdir('yaml-cpp')
|
subdir('yaml-cpp')
|
||||||
subdir('quill')
|
|
||||||
subdir('boost')
|
subdir('boost')
|
||||||
subdir('opatIO')
|
subdir('opatIO')
|
||||||
subdir('mpi')
|
subdir('mpi')
|
||||||
|
|||||||
@@ -8,9 +8,10 @@ composition_headers = files(
|
|||||||
)
|
)
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
probe_dep,
|
|
||||||
quill_dep,
|
quill_dep,
|
||||||
species_weight_dep
|
species_weight_dep,
|
||||||
|
logging_dep,
|
||||||
|
config_dep,
|
||||||
]
|
]
|
||||||
|
|
||||||
# Define the libcomposition library so it can be linked against by other parts of the build system
|
# Define the libcomposition library so it can be linked against by other parts of the build system
|
||||||
|
|||||||
@@ -27,11 +27,12 @@
|
|||||||
|
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
#include "probe.h"
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#include "atomicSpecies.h"
|
#include "atomicSpecies.h"
|
||||||
|
|
||||||
|
#include "logging.h"
|
||||||
|
|
||||||
namespace serif::composition {
|
namespace serif::composition {
|
||||||
struct CanonicalComposition {
|
struct CanonicalComposition {
|
||||||
double X = 0.0; ///< Mass fraction of Hydrogen.
|
double X = 0.0; ///< Mass fraction of Hydrogen.
|
||||||
@@ -216,7 +217,7 @@ namespace serif::composition {
|
|||||||
class Composition {
|
class Composition {
|
||||||
private:
|
private:
|
||||||
serif::config::Config& m_config = serif::config::Config::getInstance();
|
serif::config::Config& m_config = serif::config::Config::getInstance();
|
||||||
serif::probe::LogManager& m_logManager = serif::probe::LogManager::getInstance();
|
fourdst::logging::LogManager& m_logManager = fourdst::logging::LogManager::getInstance();
|
||||||
quill::Logger* m_logger = m_logManager.getLogger("log");
|
quill::Logger* m_logger = m_logManager.getLogger("log");
|
||||||
|
|
||||||
bool m_finalized = false; ///< True if the composition is finalized.
|
bool m_finalized = false; ///< True if the composition is finalized.
|
||||||
|
|||||||
Reference in New Issue
Block a user