MERGE: Merge standard abundances branch with updated install rules branch

2026-06-05 10:23:53 +02:00
parent 376df477e3
commit 50a5c2cd06
7 changed files with 25 additions and 15 deletions
--- a/src/composition/lib/composition.cpp
+++ b/src/composition/lib/composition.cpp
@@ -38,7 +38,7 @@
 #include <numeric>

 #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"

--- 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 <string>
 #include <vector>
--- 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 <numeric>