Merge remote-tracking branch 'upstream/main' into feature/mixedPolytrope

# Conflicts:
#	.gitignore
#	build-config/meson.build
#	meson.build
#	meson_options.txt
#	src/composition/public/composition.h
#	src/config/public/config.h
#	src/constants/public/const.h
#	src/meson.build
#	tests/composition_sandbox/comp.cpp

build-config/meson.build

@@ -6,4 +6,18 @@ subdir('quill')
 subdir('boost')
 subdir('opatIO')
 subdir('mpi')
-subdir('hypre')
+subdir('hypre')
+subdir('pybind')
+
+# Set the config file error handling options
+configErr = get_option('config_error_handling')
+
+# build up any -D flags we need
+commonCppArgs = []
+if configErr == 'warn'
+    commonCppArgs += ['-DCONFIG_WARN']
+elif configErr == 'harsh'
+    commonCppArgs += ['-DCONFIG_HARSH']
+endif
+
+add_project_arguments(commonCppArgs, language: 'cpp')