tboudreaux/SERiF
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/pythonInterface/eos

Browse Source
This commit is contained in:
Emily Boudreaux
2025-06-12 14:19:56 -04:00
parent 54e408a4af 0ab6af4840
commit e5d796f177
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/dynamic/index.yaml
View File

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

3
build-config/yaml-cpp/meson.build
View File

@@ -2,7 +2,8 @@ yaml_cpp_cmake_options = cmake.subproject_options()
yaml_cpp_cmake_options.add_cmake_defines({ yaml_cpp_cmake_options.add_cmake_defines({
'CMAKE_POLICY_VERSION_MINIMUM': '3.5', 'CMAKE_POLICY_VERSION_MINIMUM': '3.5',
'BUILD_SHARED_LIBS': 'ON', '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_sp = cmake.subproject(
'yaml-cpp', 'yaml-cpp',

4
tests/network/approx8Test.cpp
View File

@@ -30,14 +30,14 @@ TEST_F(approx8Test, setStiff) {
TEST_F(approx8Test, evaluate) { TEST_F(approx8Test, evaluate) {
serif::network::approx8::Approx8Network network; serif::network::approx8::Approx8Network network;
serif::network::NetIn netIn; 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}; 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.composition = comp;
netIn.temperature = 1e7; netIn.temperature = 1e7;
netIn.density = 1e2; netIn.density = 1e2;
netIn.energy = 0.0; netIn.energy = 0.0;
netIn.tmax = 3.15e17; netIn.tmax = 3.15e17;
netIn.dt0 = 1e12; netIn.dt0 = 1e12;

2
tests/network/meson.build
View File

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

2
tests/resource/resourceManagerTest.cpp
View File

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