tboudreaux/libcomposition
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MERGE: Merge standard abundances branch with updated install rules branch

Browse Source
This commit is contained in:
Emily Boudreaux
2026-06-05 10:23:53 +02:00
parent 376df477e3
commit 50a5c2cd06
7 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/composition/include/fourdst/composition/utils.h → src/composition/include/fourdst/composition/utils/utils.h
View File

2
src/composition/lib/composition.cpp
View File

@@ -38,7 +38,7 @@
#include <numeric> #include <numeric>
#include "fourdst/composition/utils/composition_hash.h" #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" #include "fourdst/composition/exceptions/exceptions_composition.h"

2
src/composition/lib/io/standard_compositions.cpp
View File

@@ -4,7 +4,7 @@
#include "fourdst/composition/composition.h" #include "fourdst/composition/composition.h"
#include "fourdst/atomic/atomicSpecies.h" #include "fourdst/atomic/atomicSpecies.h"
#include "fourdst/atomic/species.h" #include "fourdst/atomic/species.h"
#include "fourdst/composition/utils.h" #include "../../include/fourdst/composition/utils/utils.h"
#include <string> #include <string>
#include <vector> #include <vector>

2
src/composition/lib/utils.cpp
View File

@@ -2,7 +2,7 @@
#include "fourdst/composition/exceptions/exceptions_composition.h" #include "fourdst/composition/exceptions/exceptions_composition.h"
#include "fourdst/atomic/atomicSpecies.h" #include "fourdst/atomic/atomicSpecies.h"
#include "fourdst/atomic/species.h" #include "fourdst/atomic/species.h"
#include "fourdst/composition/utils.h" #include "../include/fourdst/composition/utils/utils.h"
#include "fourdst/logging/logging.h" #include "fourdst/logging/logging.h"
#include <numeric> #include <numeric>

29
src/composition/meson.build
View File

@@ -26,7 +26,6 @@ composition_sources = files(
'lib/utils.cpp', 'lib/utils.cpp',
'lib/decorators/composition_masked.cpp', 'lib/decorators/composition_masked.cpp',
'lib/io/standard_compositions.cpp' 'lib/io/standard_compositions.cpp'
) )
@@ -55,16 +54,28 @@ composition_dep = declare_dependency(
composition_headers = files( composition_headers = files(
'include/fourdst/composition/composition.h', 'include/fourdst/composition/composition.h',
'include/fourdst/composition/composition_abstract.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( 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( composition_headers_atomic = files(
'include/fourdst/atomic/atomicSpecies.h', 'include/fourdst/atomic/atomicSpecies.h',
@@ -72,12 +83,12 @@ composition_headers_atomic = files(
'include/fourdst/atomic/species.h', '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( composition_exception_headers = files(
'include/fourdst/composition/exceptions/exceptions_composition.h', '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() v = meson.project_version()

3
tests/composition/compositionTest.cpp
View File

@@ -9,7 +9,7 @@
#include "fourdst/atomic/species.h" #include "fourdst/atomic/species.h"
#include "fourdst/composition/composition.h" #include "fourdst/composition/composition.h"
#include "fourdst/composition/exceptions/exceptions_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/decorators/composition_masked.h"
#include "fourdst/composition/io/standard_compositions.h" #include "fourdst/composition/io/standard_compositions.h"
#include "fourdst/composition/utils/composition_hash.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_comp = io::SolarCompositions_to_string_map.at(comp);
std::string string_iso = io::IsotopicPercentages_to_string_map.at(iso); 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(comp, iso, 0.02, 0.28));
EXPECT_NO_THROW(get_composition_record(string_comp, string_iso, 0.02, 0.28)); EXPECT_NO_THROW(get_composition_record(string_comp, string_iso, 0.02, 0.28));
} }

2
tests/composition/sandbox/sandbox.cpp
View File

@@ -4,7 +4,7 @@
#include "fourdst/composition/composition.h" #include "fourdst/composition/composition.h"
#include "fourdst/atomic/atomicSpecies.h" #include "fourdst/atomic/atomicSpecies.h"
#include "fourdst/atomic/species.h" #include "fourdst/atomic/species.h"
#include "fourdst/composition/utils.h" #include "../../../src/composition/include/fourdst/composition/utils/utils.h"
#include <string> #include <string>
#include <vector> #include <vector>