feat(libcomposition): SERiF now uses libcomposition instead of internal composition module

This commit is contained in:
2025-06-21 12:26:02 -04:00
parent acf7ac0b56
commit 1b26404a86
35 changed files with 77 additions and 12904 deletions

View File

@@ -12,12 +12,11 @@ network_headers = files(
dependencies = [
boost_dep,
const_dep,
quill_dep,
mfem_dep,
config_dep,
probe_dep,
species_weight_dep,
composition_dep,
logging_dep
]
# Define the libnetwork library so it can be linked against by other parts of the build system

View File

@@ -501,7 +501,7 @@ namespace serif::network::approx8{
netOut.num_steps = num_steps;
const std::vector<std::string> symbols = {"H-1", "He-3", "He-4", "C-12", "N-14", "O-16", "Ne-20", "Mg-24"};
netOut.composition = serif::composition::Composition(symbols, outComposition);
netOut.composition = fourdst::composition::Composition(symbols, outComposition);
return netOut;
}

View File

@@ -58,7 +58,7 @@ namespace serif::network {
* @endcode
*/
struct NetIn {
serif::composition::Composition composition; ///< Composition of the network
fourdst::composition::Composition composition; ///< Composition of the network
double tMax; ///< Maximum time
double dt0; ///< Initial time step
double temperature; ///< Temperature in Kelvin
@@ -81,7 +81,7 @@ namespace serif::network {
* @endcode
*/
struct NetOut {
serif::composition::Composition composition; ///< Composition of the network after evaluation
fourdst::composition::Composition composition; ///< Composition of the network after evaluation
int num_steps; ///< Number of steps taken in the evaluation
double energy; ///< Energy in ergs after evaluation
};