From e72d1ba5e9784df5b80bca46459858d369392e3e Mon Sep 17 00:00:00 2001 From: Emily Boudreaux Date: Sat, 21 Jun 2025 08:26:04 -0400 Subject: [PATCH] refactor(liblogging): changed SERiF to use liblogging --- build-config/meson.build | 1 - src/composition/meson.build | 5 +++-- src/composition/public/composition.h | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build-config/meson.build b/build-config/meson.build index 4937af3..9a48c5a 100644 --- a/build-config/meson.build +++ b/build-config/meson.build @@ -4,7 +4,6 @@ subdir('fourdst') subdir('mfem') subdir('yaml-cpp') -subdir('quill') subdir('boost') subdir('opatIO') subdir('mpi') diff --git a/src/composition/meson.build b/src/composition/meson.build index d97cbec..aea1eac 100644 --- a/src/composition/meson.build +++ b/src/composition/meson.build @@ -8,9 +8,10 @@ composition_headers = files( ) dependencies = [ - probe_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 diff --git a/src/composition/public/composition.h b/src/composition/public/composition.h index 3dcf8a0..27959d6 100644 --- a/src/composition/public/composition.h +++ b/src/composition/public/composition.h @@ -27,11 +27,12 @@ #include -#include "probe.h" #include "config.h" #include "atomicSpecies.h" +#include "logging.h" + namespace serif::composition { struct CanonicalComposition { double X = 0.0; ///< Mass fraction of Hydrogen. @@ -216,7 +217,7 @@ namespace serif::composition { class Composition { private: 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"); bool m_finalized = false; ///< True if the composition is finalized.