Emily Boudreaux
84947a2b12
Composition objects now must be built from vectors of molar abundances. Things such as mass fraction and number fraction are computed on the fly (with some caching for performance). This will allow for many fewer issues when converting from solver space to composition space. BREAKING CHANGE: The entire old API has been broken. There is no longer any need to finalize. In fact the entire concept of finalization has been removed. Further, the entire CompositionEntry and GlobalComposition data structure has been removed. Any code written for the old version will no longer work and major reworking will be needed to use the new version.
70 lines
2.0 KiB
Meson
70 lines
2.0 KiB
Meson
required_headers = [
|
|
'fourdst/composition/atomicSpecies.h',
|
|
'fourdst/composition/species.h',
|
|
'fourdst/composition/composition.h',
|
|
'fourdst/composition/utils.h',
|
|
'fourdst/composition/composition_abstract.h',
|
|
'fourdst/composition/exceptions/exceptions_composition.h'
|
|
]
|
|
|
|
foreach h : required_headers
|
|
if not cpp.has_header(h, include_directories: include_directories('include'))
|
|
error('libcomposition requires the header file ' + h + ' to be present in the fourdst/composition directory.')
|
|
endif
|
|
endforeach
|
|
|
|
species_weight_dep = declare_dependency(
|
|
include_directories: include_directories('include'),
|
|
)
|
|
|
|
message('✅ libcomposition species_weight dependency declared')
|
|
|
|
composition_sources = files(
|
|
'lib/composition.cpp',
|
|
'lib/utils.cpp',
|
|
)
|
|
|
|
|
|
dependencies = [
|
|
species_weight_dep,
|
|
const_dep,
|
|
config_dep,
|
|
log_dep
|
|
]
|
|
|
|
# Define the libcomposition library so it can be linked against by other parts of the build system
|
|
libcomposition = library('composition',
|
|
composition_sources,
|
|
cpp_args: ['-fvisibility=default'],
|
|
dependencies: dependencies,
|
|
install : true)
|
|
|
|
composition_dep = declare_dependency(
|
|
link_with: libcomposition,
|
|
dependencies: dependencies,
|
|
sources: composition_sources,
|
|
)
|
|
|
|
# Make headers accessible
|
|
composition_headers = files(
|
|
'include/fourdst/composition/composition.h',
|
|
)
|
|
install_headers(composition_headers, subdir : 'fourdst/fourdst/composition')
|
|
|
|
composition_headers_utils = files(
|
|
'include/fourdst/composition/utils.h',
|
|
)
|
|
install_headers(composition_headers_utils, subdir : 'fourdst/fourdst/composition/utils')
|
|
|
|
composition_headers_atomic = files(
|
|
'include/fourdst/atomic/atomicSpecies.h',
|
|
'include/fourdst/atomic/elements.h',
|
|
'include/fourdst/atomic/species.h',
|
|
)
|
|
install_headers(composition_headers_atomic, subdir : 'fourdst/fourdst/atomic')
|
|
|
|
composition_exception_headers = files(
|
|
'include/fourdst/composition/exceptions/exceptions_composition.h',
|
|
)
|
|
install_headers(composition_exception_headers, subdir : 'fourdst/fourdst/composition/exceptions')
|