fix: solver and mesh path loading in YAML runner

Author: dav-og

.gitignore

@@ -60,3 +60,4 @@ build-config.json
 /tests/regression/run_hydrochrono/iea_sphere/decay/outputs
 /tests/regression/run_hydrochrono/oswec/decay/outputs
 /tests/regression/run_hydrochrono/rm3/decay/outputs
+/data/demos/run_hydrochrono/**/outputs

CMakeLists.txt

@@ -619,27 +619,33 @@ endif()
 # Flat install tree for public distribution
 option(HC_INSTALL_DEV_DEMOS "Install developer demo executables" OFF)
 
-# Install main CLI only (if built)
+# Install main CLI and project shared libraries (if built)
 if(TARGET run_hydrochrono)
     install(TARGETS run_hydrochrono  CONFIGURATIONS Release DESTINATION bin COMPONENT runtime)
 endif()
+if(TARGET HydroChrono)
+    install(TARGETS HydroChrono      CONFIGURATIONS Release RUNTIME DESTINATION bin COMPONENT runtime)
+endif()
+if(TARGET HydroChronoGUI)
+    install(TARGETS HydroChronoGUI   CONFIGURATIONS Release RUNTIME DESTINATION bin COMPONENT runtime)
+endif()
 
 # On Windows, install DLLs
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
     message(STATUS "Set DLLs for installation")
 
-    # Chrono DLLs
-    foreach(tgt ${CHRONO_TARGETS})
-        get_target_property(tgt_DLL ${tgt} IMPORTED_LOCATION_RELEASE)
-        get_target_property(tgt_DLL_d ${tgt} IMPORTED_LOCATION_DEBUG)
-        if(EXISTS ${tgt_DLL})
-            message(STATUS "  Chrono DLL ${tgt_DLL}")
-            install(FILES ${tgt_DLL} DESTINATION bin COMPONENT runtime)
-        endif()
-        if(EXISTS ${tgt_DLL_d})
-            install(FILES ${tgt_DLL_d} DESTINATION bin COMPONENT runtime)
-        endif()
-    endforeach()
+    # Chrono DLLs — glob ALL DLLs from the Chrono bin directory to catch
+    # transitive dependencies (e.g., Chrono_fsitdpf_vsg, yaml-cpp) that may
+    # not be listed in CHRONO_TARGETS.
+    get_target_property(_chrono_core_dll Chrono::Chrono_core IMPORTED_LOCATION_RELEASE)
+    if(_chrono_core_dll)
+        get_filename_component(_chrono_dll_dir "${_chrono_core_dll}" DIRECTORY)
+        file(GLOB _chrono_dlls "${_chrono_dll_dir}/*.dll")
+        foreach(_dll ${_chrono_dlls})
+            message(STATUS "  Chrono DLL ${_dll}")
+            install(FILES "${_dll}" DESTINATION bin COMPONENT runtime)
+        endforeach()
+    endif()
 
     # HDF5 DLLs
     foreach(tgt ${HDF5_TARGETS})
@@ -725,6 +731,20 @@ install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/RUN-TESTS.ps1
         DESTINATION tests COMPONENT python-tests)
 
 # MSVC runtime DLLs and ZIP packaging via CPack
+# InstallRequiredSystemLibraries handles msvcp/vcruntime/ucrt, but not vcomp (OpenMP).
+# Append the OpenMP runtime so it's included in the package.
+if(MSVC AND OpenMP_CXX_FOUND)
+    get_filename_component(_msvc_dir "${CMAKE_CXX_COMPILER}" DIRECTORY)
+    find_file(_vcomp_dll "vcomp140.dll"
+        PATHS "${_msvc_dir}" "${_msvc_dir}/../../../redist/x64" "C:/Windows/System32"
+        NO_DEFAULT_PATH)
+    if(_vcomp_dll)
+        list(APPEND CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS "${_vcomp_dll}")
+        message(STATUS "  OpenMP DLL ${_vcomp_dll}")
+    else()
+        message(WARNING "vcomp140.dll not found — OpenMP runtime will be missing from package")
+    endif()
+endif()
 include(InstallRequiredSystemLibraries)
 set(CPACK_GENERATOR "ZIP")
 set(CPACK_PACKAGE_NAME "HydroChrono")

src/hydro/runner/run_from_yaml.cpp

@@ -197,19 +197,52 @@ bool ResolveInputFiles(const std::filesystem::path& input_dir,
     return true;
 }
 
+// ---------------------------------------------------------------------------
+// Thin subclass of ChParserMbsYAML that exposes the protected
+// m_script_directory member.  When HydroChrono loads model and solver
+// data from separate YAML files (rather than via ChParserMbsYAML::LoadFile),
+// this directory is never set, which breaks relative-path resolution for
+// mesh files referenced in model YAML (e.g. "../../assets/geometry/flap.obj").
+// ---------------------------------------------------------------------------
+namespace {
+class HCParser : public chrono::parsers::ChParserMbsYAML {
+  public:
+    HCParser() : ChParserMbsYAML() {}
+    /// Set the base directory used by GetDatafilePath() when data_path is RELATIVE.
+    void SetScriptDir(const std::string& dir) { m_script_directory = dir; }
+};
+}  // namespace
+
 std::shared_ptr<chrono::ChSystem> InitializeChronoSystem(const std::string& model_file, const std::string& sim_file) {
     hydroc::debug::LogDebug("Initializing Chrono system from YAML inputs...");
 
     try {
         hydroc::debug::LogDebug("Creating Chrono YAML parser");
-        auto parser = chrono::parsers::ChParserMbsYAML();
+        HCParser parser;
+        
+        // Tell the parser where the model file lives so that relative mesh
+        // paths (data_path type: RELATIVE) are resolved correctly.
+        std::filesystem::path model_dir = std::filesystem::path(model_file).parent_path();
+        parser.SetScriptDir(model_dir.generic_string());
+        hydroc::debug::LogDebug(std::string("Script directory set to: ") + model_dir.generic_string());
 
-        // Load simulation settings (solver, integrator, visualization, etc.)
+        // Load simulation settings (end_time, gravity, visualization, etc.)
         hydroc::debug::LogDebug(std::string("Loading simulation file: ") + sim_file);
         auto sim_yaml = YAML::LoadFile(sim_file);
         parser.LoadSimData(sim_yaml);
-        if (sim_yaml["solver"])
-            parser.LoadSolverData(sim_yaml);
+        
+        // Load solver/integrator/contact-method settings.
+        // HydroChrono nests these under the "simulation" key, while the Chrono
+        // parser's LoadSolverData() expects them as direct children of the node.
+        // Additionally, HydroChrono puts time_step at the simulation level,
+        // while Chrono expects it inside the integrator block.
+        auto sim_node = sim_yaml["simulation"];
+        if (sim_node && sim_node["contact_method"]) {
+            // Promote time_step into the integrator block if needed
+            if (sim_node["time_step"] && sim_node["integrator"] && !sim_node["integrator"]["time_step"])
+                sim_node["integrator"]["time_step"] = sim_node["time_step"];
+            parser.LoadSolverData(sim_node);
+        }
 
         hydroc::debug::LogDebug("Creating system");
         auto system = parser.CreateSystem();
@@ -220,7 +253,6 @@ std::shared_ptr<chrono::ChSystem> InitializeChronoSystem(const std::string& mode
         parser.LoadModelData(model_yaml);
 
         hydroc::debug::LogDebug("Analyzing mesh files referenced in YAML model");
-        std::filesystem::path model_dir = std::filesystem::path(model_file).parent_path();
         hydroc::debug::LogDebug(std::string("Model directory: ") + model_dir.generic_string());
 
         hydroc::debug::LogDebug("Populating system");