Merge branch 'main' into feature/pythonInterface/eos

assets/dynamic/index.yaml

@@ -1,4 +1,4 @@
-#eos:
-#  helm: "eos/helm_table.dat"
+eos:
+  helm: "eos/helm_table.dat"
 mesh:
   polySphere: "mesh/core_midres.msh"

build-config/yaml-cpp/meson.build

@@ -2,7 +2,8 @@ yaml_cpp_cmake_options = cmake.subproject_options()
 yaml_cpp_cmake_options.add_cmake_defines({
  'CMAKE_POLICY_VERSION_MINIMUM': '3.5',
  'BUILD_SHARED_LIBS': 'ON',
- 'CMAKE_SKIP_INSTALL_RULES': 'ON'
+ 'CMAKE_SKIP_INSTALL_RULES': 'ON',
+ 'YAML_CPP_BUILD_TESTS': 'OFF'
 })
 yaml_cpp_sp = cmake.subproject(
     'yaml-cpp',

tests/network/approx8Test.cpp

@@ -30,14 +30,14 @@ TEST_F(approx8Test, setStiff) {
 TEST_F(approx8Test, evaluate) {
     serif::network::approx8::Approx8Network network;
     serif::network::NetIn netIn;
-    
+
     std::vector<double> comp = {0.708, 2.94e-5, 0.276, 0.003, 0.0011, 9.62e-3, 1.62e-3, 5.16e-4};
 
     netIn.composition = comp;
     netIn.temperature = 1e7;
     netIn.density = 1e2;
     netIn.energy = 0.0;
-    
+
     netIn.tmax = 3.15e17;
     netIn.dt0 = 1e12;
 

tests/network/meson.build

@@ -11,7 +11,7 @@ foreach test_file : test_sources
   test_exe = executable(
       exe_name,
       test_file,
-      dependencies: [gtest_dep, network_dep, gtest_main],
+      dependencies: [gtest_dep, gtest_main, network_dep],
       include_directories: include_directories('../../src/network/public'),
       link_with: libnetwork,  # Link the dobj library
       install_rpath: '@loader_path/../../src'  # Ensure runtime library path resolves correctly

tests/resource/resourceManagerTest.cpp

@@ -36,7 +36,7 @@ TEST_F(resourceManagerTest, getAvaliableResources) {
     serif::config::Config::getInstance().loadConfig(TEST_CONFIG);
     serif::resource::ResourceManager& rm = serif::resource::ResourceManager::getInstance();
     std::vector<std::string> resources = rm.getAvailableResources();
-    std::set<std::string> expected = {"eos:helm", "mesh:sphere"};
+    std::set<std::string> expected = {"eos:helm", "mesh:polySphere"};
     std::set<std::string> actual(resources.begin(), resources.end());
     EXPECT_EQ(expected, actual);
 }