diff --git a/Doxyfile b/Doxyfile index 23ab799..f2091e7 100644 --- a/Doxyfile +++ b/Doxyfile @@ -48,7 +48,7 @@ PROJECT_NAME = fourdst::libcomposition # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = v2.2.1 +PROJECT_NUMBER = v2.2.2 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewers a diff --git a/meson.build b/meson.build index a707531..d668cee 100644 --- a/meson.build +++ b/meson.build @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # *********************************************************************** # -project('libcomposition', 'cpp', version: 'v2.2.1', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0') +project('libcomposition', 'cpp', version: 'v2.2.2', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0') # Add default visibility for all C++ targets add_project_arguments('-fvisibility=default', language: 'cpp') diff --git a/src/composition/include/fourdst/composition/utils.h b/src/composition/include/fourdst/composition/utils.h index 6c5707c..8f1c8c0 100644 --- a/src/composition/include/fourdst/composition/utils.h +++ b/src/composition/include/fourdst/composition/utils.h @@ -4,6 +4,8 @@ #include "fourdst/atomic/atomicSpecies.h" #include +#include +#include namespace fourdst::composition { /** @@ -87,4 +89,6 @@ namespace fourdst::composition { Composition buildCompositionFromMassFractions( std::map massFractions ); + + std::optional getSpecies(const std::string& symbol); } \ No newline at end of file diff --git a/src/composition/lib/composition.cpp b/src/composition/lib/composition.cpp index 0d73ade..6b8f570 100644 --- a/src/composition/lib/composition.cpp +++ b/src/composition/lib/composition.cpp @@ -34,6 +34,7 @@ #include "fourdst/atomic/atomicSpecies.h" #include "fourdst/atomic/species.h" #include "fourdst/composition/composition.h" +#include "fourdst/composition/utils.h" #include "fourdst/composition/exceptions/exceptions_composition.h" @@ -62,13 +63,6 @@ namespace { return sorted; } - std::optional getSpecies(const std::string& symbol) { - if (!fourdst::atomic::species.contains(symbol)) { - return std::nullopt; - } - return fourdst::atomic::species.at(symbol); - } - void throw_unknown_symbol(quill::Logger* logger, const std::string& symbol) { LOG_ERROR(logger, "Symbol {} is not a valid species symbol (not in the species database)", symbol); throw fourdst::composition::exceptions::UnknownSymbolError("Symbol " + symbol + " is not a valid species symbol (not in the species database)"); diff --git a/src/composition/lib/utils.cpp b/src/composition/lib/utils.cpp index 16b86c7..2d21910 100644 --- a/src/composition/lib/utils.cpp +++ b/src/composition/lib/utils.cpp @@ -14,13 +14,6 @@ #include "quill/LogMacros.h" namespace { - std::optional getSpecies(const std::string& symbol) { - if (!fourdst::atomic::species.contains(symbol)) { - return std::nullopt; - } - return fourdst::atomic::species.at(symbol); - } - quill::Logger* getLogger() { static quill::Logger* logger = fourdst::logging::LogManager::getInstance().getLogger("log"); return logger; @@ -193,4 +186,11 @@ namespace fourdst::composition { return buildCompositionFromMassFractions(species, massFractionVector); } + std::optional getSpecies(const std::string& symbol) { + if (!fourdst::atomic::species.contains(symbol)) { + return std::nullopt; + } + return fourdst::atomic::species.at(symbol); + } + } \ No newline at end of file