From 50a5c2cd06bb80c7d4b5ef0891337e03c0acce6d Mon Sep 17 00:00:00 2001 From: Emily Boudreaux Date: Fri, 5 Jun 2026 10:23:53 +0200 Subject: [PATCH] MERGE: Merge standard abundances branch with updated install rules branch --- .../fourdst/composition/{ => utils}/utils.h | 0 src/composition/lib/composition.cpp | 2 +- .../lib/io/standard_compositions.cpp | 2 +- src/composition/lib/utils.cpp | 2 +- src/composition/meson.build | 29 +++++++++++++------ tests/composition/compositionTest.cpp | 3 +- tests/composition/sandbox/sandbox.cpp | 2 +- 7 files changed, 25 insertions(+), 15 deletions(-) rename src/composition/include/fourdst/composition/{ => utils}/utils.h (100%) diff --git a/src/composition/include/fourdst/composition/utils.h b/src/composition/include/fourdst/composition/utils/utils.h similarity index 100% rename from src/composition/include/fourdst/composition/utils.h rename to src/composition/include/fourdst/composition/utils/utils.h diff --git a/src/composition/lib/composition.cpp b/src/composition/lib/composition.cpp index ec25c1c..3cf3ee2 100644 --- a/src/composition/lib/composition.cpp +++ b/src/composition/lib/composition.cpp @@ -38,7 +38,7 @@ #include #include "fourdst/composition/utils/composition_hash.h" -#include "fourdst/composition/utils.h" +#include "../include/fourdst/composition/utils/utils.h" #include "fourdst/composition/exceptions/exceptions_composition.h" diff --git a/src/composition/lib/io/standard_compositions.cpp b/src/composition/lib/io/standard_compositions.cpp index c69881d..5bd02ad 100644 --- a/src/composition/lib/io/standard_compositions.cpp +++ b/src/composition/lib/io/standard_compositions.cpp @@ -4,7 +4,7 @@ #include "fourdst/composition/composition.h" #include "fourdst/atomic/atomicSpecies.h" #include "fourdst/atomic/species.h" -#include "fourdst/composition/utils.h" +#include "../../include/fourdst/composition/utils/utils.h" #include #include diff --git a/src/composition/lib/utils.cpp b/src/composition/lib/utils.cpp index 2d21910..e165972 100644 --- a/src/composition/lib/utils.cpp +++ b/src/composition/lib/utils.cpp @@ -2,7 +2,7 @@ #include "fourdst/composition/exceptions/exceptions_composition.h" #include "fourdst/atomic/atomicSpecies.h" #include "fourdst/atomic/species.h" -#include "fourdst/composition/utils.h" +#include "../include/fourdst/composition/utils/utils.h" #include "fourdst/logging/logging.h" #include diff --git a/src/composition/meson.build b/src/composition/meson.build index 91af284..3736f23 100644 --- a/src/composition/meson.build +++ b/src/composition/meson.build @@ -26,7 +26,6 @@ composition_sources = files( 'lib/utils.cpp', 'lib/decorators/composition_masked.cpp', 'lib/io/standard_compositions.cpp' - ) @@ -55,16 +54,28 @@ composition_dep = declare_dependency( composition_headers = files( 'include/fourdst/composition/composition.h', 'include/fourdst/composition/composition_abstract.h', - 'include/fourdst/composition/io/standard_compositions.h', - 'include/fourdst/composition/io/StandardAbundancesBinary.h' - ) -install_headers(composition_headers, subdir : 'fourdst/fourdst/composition') +install_headers(composition_headers, subdir : 'fourdst/composition') composition_headers_utils = files( - 'include/fourdst/composition/utils.h', + 'include/fourdst/composition/utils/utils.h', + 'include/fourdst/composition/utils/composition_hash.h' ) -install_headers(composition_headers_utils, subdir : 'fourdst/fourdst/composition/utils') +install_headers(composition_headers_utils, subdir : 'fourdst/composition/utils') + +composition_headers_io = files( + 'include/fourdst/composition/io/standard_compositions.h', + 'include/fourdst/composition/io/StandardAbundancesBinary.h' +) + +install_headers(composition_headers_io, subdir : 'fourdst/composition/io') + +composition_headers_decorators = files( + 'include/fourdst/composition/decorators/composition_masked.h', + 'include/fourdst/composition/decorators/composition_decorator_abstract.h', +) + +install_headers(composition_headers_decorators, subdir : 'fourdst/composition/decorators') composition_headers_atomic = files( 'include/fourdst/atomic/atomicSpecies.h', @@ -72,12 +83,12 @@ composition_headers_atomic = files( 'include/fourdst/atomic/species.h', ) -install_headers(composition_headers_atomic, subdir : 'fourdst/fourdst/atomic') +install_headers(composition_headers_atomic, subdir : 'fourdst/atomic') composition_exception_headers = files( 'include/fourdst/composition/exceptions/exceptions_composition.h', ) -install_headers(composition_exception_headers, subdir : 'fourdst/fourdst/composition/exceptions') +install_headers(composition_exception_headers, subdir : 'fourdst/composition/exceptions') v = meson.project_version() diff --git a/tests/composition/compositionTest.cpp b/tests/composition/compositionTest.cpp index ffd74ee..693f58d 100644 --- a/tests/composition/compositionTest.cpp +++ b/tests/composition/compositionTest.cpp @@ -9,7 +9,7 @@ #include "fourdst/atomic/species.h" #include "fourdst/composition/composition.h" #include "fourdst/composition/exceptions/exceptions_composition.h" -#include "fourdst/composition/utils.h" +#include "fourdst/composition/utils/utils.h" #include "fourdst/composition/decorators/composition_masked.h" #include "fourdst/composition/io/standard_compositions.h" #include "fourdst/composition/utils/composition_hash.h" @@ -511,7 +511,6 @@ TEST_F(compositionTest, standardSolarCompositions) { std::string string_comp = io::SolarCompositions_to_string_map.at(comp); std::string string_iso = io::IsotopicPercentages_to_string_map.at(iso); - // std::println("Testing: {} with {}", string_comp, string_iso); EXPECT_NO_THROW(get_composition_record(comp, iso, 0.02, 0.28)); EXPECT_NO_THROW(get_composition_record(string_comp, string_iso, 0.02, 0.28)); } diff --git a/tests/composition/sandbox/sandbox.cpp b/tests/composition/sandbox/sandbox.cpp index 589d130..82be862 100644 --- a/tests/composition/sandbox/sandbox.cpp +++ b/tests/composition/sandbox/sandbox.cpp @@ -4,7 +4,7 @@ #include "fourdst/composition/composition.h" #include "fourdst/atomic/atomicSpecies.h" #include "fourdst/atomic/species.h" -#include "fourdst/composition/utils.h" +#include "../../../src/composition/include/fourdst/composition/utils/utils.h" #include #include