Merge pull request #79 from Project-SEA-Stack/feature/chrono-fsi-interface

Refactor Chrono linkage and improve build, data, and test infrastructure

Author: dav-og

.gitignore

@@ -44,7 +44,6 @@ _build/
 
 # General
 build/
-data/
 demos/F3OF/f3of/
 sandbox/
 Testing/Temporary/CTestCostData.txt

CMakeLists.txt

@@ -0,0 +1,41 @@
+message(STATUS "Add run_hydrochrono program")
+
+add_executable(run_hydrochrono
+    run_hydrochrono.cpp
+    ../include/hydroc/runner/run_from_yaml.h
+    ../src/hydro/runner/run_from_yaml.cpp
+    ../src/utils/misc_options.cpp
+)
+
+# Set C++ standard
+target_compile_features(run_hydrochrono PUBLIC ${HC_CXX_STANDARD})
+
+target_link_libraries(run_hydrochrono
+    PRIVATE HydroChrono HydroChronoGUI Chrono::Chrono_parsers
+)
+
+# Safety net: if HDF5 was not propagated, link executable explicitly as well
+if(HC_HDF5_TARGETS)
+    target_link_libraries(run_hydrochrono PRIVATE ${HC_HDF5_TARGETS})
+elseif(DEFINED HDF5_CXX_LIBRARIES OR DEFINED HDF5_LIBRARIES)
+    target_link_libraries(run_hydrochrono PRIVATE ${HDF5_CXX_LIBRARIES} ${HDF5_LIBRARIES})
+endif()
+
+target_include_directories(run_hydrochrono
+    PRIVATE
+        ${PROJECT_SOURCE_DIR}/include
+        ${PROJECT_SOURCE_DIR}/src/utils
+        # Fallback include paths for Chrono Parsers when using a build-tree Chrono_DIR
+        $<IF:$<BOOL:${Chrono_DIR}>,${Chrono_DIR}/../../install/include,>
+        $<IF:$<BOOL:${Chrono_DIR}>,${Chrono_DIR}/../include,>
+        $<IF:$<BOOL:${Chrono_DIR}>,${Chrono_DIR}/../../src,>
+)
+
+if(MSVC)
+    set_target_properties(run_hydrochrono PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "$<TARGET_FILE_DIR:run_hydrochrono>")
+endif()
+
+set_target_properties(run_hydrochrono PROPERTIES
+    OUTPUT_NAME "run_hydrochrono"
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+)

app/CMakeLists.txt

@@ -4,6 +4,7 @@
  */
 
 #include <hydroc/runner/run_from_yaml.h>
+#include <hydroc/config.h>
 #include <hydroc/version.h>
 #include "../src/utils/misc_options.h"
 #include <hydroc/logging.h>

app/run_hydrochrono.cpp

@@ -744,12 +744,25 @@ function Package-Artifacts {
         }
         $hdf5Bin = Join-Path $hdf5Root "bin"
         if (Test-Path $hdf5Bin) {
+            Write-Info "Copying HDF5 DLLs from: $hdf5Bin"
+            $hdf5Count = 0
             Get-ChildItem -Path $hdf5Bin -Filter "*.dll" -ErrorAction SilentlyContinue | ForEach-Object {
                 $dest = Join-Path $installBin $_.Name
-                if (-not (Test-Path $dest)) {
-                    Copy-Item -Path $_.FullName -Destination $dest -Force -ErrorAction SilentlyContinue
-                }
+                Copy-Item -Path $_.FullName -Destination $dest -Force -ErrorAction SilentlyContinue
+                $hdf5Count++
             }
+            Write-Info "Copied $hdf5Count HDF5 DLL(s)"
+        } else {
+            Write-Warning "HDF5 bin directory not found: $hdf5Bin"
+        }
+        
+        # Copy Irrlicht DLL
+        $irrlichtDll = Join-Path $Config.IrrlichtDir "bin\Win64-VisualStudio\Irrlicht.dll"
+        if (Test-Path $irrlichtDll) {
+            Copy-Item -Path $irrlichtDll -Destination $installBin -Force -ErrorAction SilentlyContinue
+            Write-Info "Copied Irrlicht.dll"
+        } else {
+            Write-Warning "Irrlicht.dll not found at: $irrlichtDll"
         }
         # Also copy DLLs from this project's build bin (Release/Debug) into install\bin
         $hcDllSource = Join-Path (Get-Location) "bin\$BuildType"

build.ps1

@@ -0,0 +1,24 @@
+#ifndef HYDROC_CONFIG_H
+#define HYDROC_CONFIG_H
+
+/**
+ * @file config.h
+ * @brief HydroChrono configuration header file.
+ *
+ * This header file is automatically created during the CMake configuration
+ * of HydroChrono and is tailored for a BUILD or INSTALL tree.
+ */
+
+// If HydroChrono was built with Irrlicht support, define HYDROCHRONO_HAVE_IRRLICHT
+@HC_HAS_IRRLICHT@
+
+// If HydroChrono was built with VSG support, define HYDROCHRONO_HAVE_VSG
+@HC_HAS_VSG@
+
+// Path to HydroChrono data directory
+@HC_DATA_DIR@
+
+// Path to Chrono data directory
+@CH_DATA_DIR@
+
+#endif