Deduplicate radiation convolution types via public header

Author: dav-og

include/hydroc/hydro_forces.h

@@ -84,6 +84,9 @@
 // Public hydroc includes (for SystemState)
 #include <hydroc/core/system_state.h>
 
+// Radiation types (canonical definitions - single source of truth)
+#include <hydroc/radiation/radiation_types.h>
+
 namespace hydrochrono::hydro {
 // Forward declarations
 class HydrostaticsComponent;
@@ -299,42 +302,26 @@ class TestHydro {
      */
     double GetRIRFval(int row, int col, int st);
 
-    // Convolution mode selection
-    enum class RadiationConvolutionMode {
-        Baseline,
-        TaperedDirect
-    };
+    // ─────────────────────────────────────────────────────────────────────────
+    // Radiation Convolution Configuration
+    // ─────────────────────────────────────────────────────────────────────────
+    // These types are defined in the radiation module (single source of truth):
+    //   - hydrochrono::hydro::RadiationConvolutionMode (enum)
+    //   - hydrochrono::hydro::TaperedDirectOptions (struct)
+    // See: src/hydro/force_components/radiation_component.h
+    //      src/hydro/radiation/radiation_rirf_processing.h
 
     /**
      * @brief Set the radiation convolution mode. Default is Baseline.
+     * @param mode RadiationConvolutionMode::Baseline or ::TaperedDirect
      */
-    void SetRadiationConvolutionMode(RadiationConvolutionMode mode) {
-        convolution_mode_ = mode;
-        InvalidateRadiationComponent();  // Invalidate component to recreate with new settings
-    }
-
-        struct TaperedDirectOptions {
-            // smoothing: "sg" (Savitzky–Golay) or "moving_average"
-            std::string smoothing = "sg";
-            int window_length = 5;                 // odd, >= 3
-            
-            // RIRF truncation
-            double rirf_end_time = -1.0;           // end RIRF at this time (seconds), -1.0 = use full length
-            
-            // Simple taper control - sensible defaults for improved stability
-            double taper_start_percent = 0.8;      // start taper at 80% (taper last 20%)
-            double taper_end_percent = 1.0;        // end taper at 100% of total time series  
-            double taper_final_amplitude = 0.0;    // final amplitude as fraction of original (0.0 = zero, 1.0 = no change)
-            bool export_plot_csv = false;          // dump before/after CSV summaries (false by default)
-        };
+    void SetRadiationConvolutionMode(hydrochrono::hydro::RadiationConvolutionMode mode);
 
     /**
      * @brief Set options for TaperedDirect preprocessing.
+     * @param opts TaperedDirectOptions struct with smoothing, tapering, and export settings
      */
-    void SetTaperedDirectOptions(const TaperedDirectOptions& opts) {
-        tapered_opts_ = opts;
-        InvalidateRadiationComponent();  // Invalidate component to recreate with new settings
-    }
+    void SetTaperedDirectOptions(const hydrochrono::hydro::TaperedDirectOptions& opts);
 
     /**
      * @brief Set the directory where diagnostics (e.g., CSVs) should be written.
@@ -441,10 +428,11 @@ class TestHydro {
     bool profiling_enabled_ = false;
 
     // Convolution kernel preprocessing (optional)
-    RadiationConvolutionMode convolution_mode_ = RadiationConvolutionMode::Baseline;
+    // Uses canonical types from radiation module (single source of truth)
+    hydrochrono::hydro::RadiationConvolutionMode convolution_mode_;
     bool rirf_processed_ready_ = false;
     std::vector<Eigen::Tensor<double, 3>> rirf_processed_; // per body [dof x col x step]
-    TaperedDirectOptions tapered_opts_;
+    hydrochrono::hydro::TaperedDirectOptions tapered_opts_;
     std::string diagnostics_output_dir_;
 
     void EnsureProcessedRIRF();

include/hydroc/radiation/radiation_types.h

@@ -0,0 +1,42 @@
+/*********************************************************************
+ * @file  radiation_types.h
+ * @brief Public types for radiation damping configuration.
+ *********************************************************************/
+
+#ifndef HYDROC_RADIATION_TYPES_H
+#define HYDROC_RADIATION_TYPES_H
+
+#include <string>
+
+namespace hydrochrono::hydro {
+
+/**
+ * @brief Convolution mode for radiation damping.
+ */
+enum class RadiationConvolutionMode {
+    Baseline,
+    TaperedDirect
+};
+
+/**
+ * @brief Options for TaperedDirect RIRF preprocessing.
+ */
+struct TaperedDirectOptions {
+    // smoothing: "sg" (Savitzky–Golay) or "moving_average"
+    std::string smoothing = "sg";
+    int window_length = 5;                 // odd, >= 3
+    
+    // RIRF truncation
+    double rirf_end_time = -1.0;           // end RIRF at this time (seconds), -1.0 = use full length
+    
+    // Simple taper control - sensible defaults for improved stability
+    double taper_start_percent = 0.8;      // start taper at 80% (taper last 20%)
+    double taper_end_percent = 1.0;        // end taper at 100% of total time series  
+    double taper_final_amplitude = 0.0;    // final amplitude as fraction of original (0.0 = zero, 1.0 = no change)
+    bool export_plot_csv = false;          // dump before/after CSV summaries (false by default)
+};
+
+}  // namespace hydrochrono::hydro
+
+#endif  // HYDROC_RADIATION_TYPES_H
+

src/hydro/config/setup_from_yaml.cpp

@@ -39,6 +39,8 @@
 #include <hydroc/waves/regular_wave.h>
 #include <hydroc/waves/irregular_wave.h>
 #include <hydroc/logging.h>         // For Logger
+#include "../radiation/radiation_rirf_processing.h" // For TaperedDirectOptions (canonical type)
+#include "../force_components/radiation_component.h" // For RadiationConvolutionMode (canonical type)
 #include <filesystem>
 #include <iostream>
 #include <stdexcept>
@@ -201,9 +203,9 @@ std::unique_ptr<TestHydro> SetupHydroFromYAML(
     std::transform(mode.begin(), mode.end(), mode.begin(), ::tolower);
     hydroc::debug::LogDebug("Lowercase mode: '" + mode + "'");
     if (mode == "tapereddirect") {
-        test_hydro->SetRadiationConvolutionMode(TestHydro::RadiationConvolutionMode::TaperedDirect);
+        test_hydro->SetRadiationConvolutionMode(hydrochrono::hydro::RadiationConvolutionMode::TaperedDirect);
         hydroc::debug::LogDebug("Radiation convolution mode: TaperedDirect");
-        TestHydro::TaperedDirectOptions opts;
+        hydrochrono::hydro::TaperedDirectOptions opts;
         opts.smoothing = !hydro_data.td_smoothing.empty() ? hydro_data.td_smoothing : opts.smoothing;
         opts.window_length = std::max(3, hydro_data.td_window_length != 0 ? hydro_data.td_window_length : opts.window_length);
         if (opts.window_length % 2 == 0) opts.window_length += 1; // enforce odd
@@ -232,7 +234,7 @@ std::unique_ptr<TestHydro> SetupHydroFromYAML(
             hydroc::cli::LogInfo(hydroc::cli::CreateAlignedLine("•", "Conv Export CSV", (opts.export_plot_csv ? "true" : "false")));
         }
     } else {
-        test_hydro->SetRadiationConvolutionMode(TestHydro::RadiationConvolutionMode::Baseline);
+        test_hydro->SetRadiationConvolutionMode(hydrochrono::hydro::RadiationConvolutionMode::Baseline);
         hydroc::debug::LogDebug("Radiation convolution mode: Baseline");
         hydroc::cli::LogInfo(hydroc::cli::CreateAlignedLine("•", "Convolution Mode", "Baseline"));
     }

src/hydro/force_components/radiation_component.h

@@ -8,6 +8,7 @@
 
 #include <hydroc/core/force_component.h>
 #include <hydroc/core/system_state.h>
+#include <hydroc/radiation/radiation_types.h>
 #include "../radiation/radiation_rirf_convolution.h"
 #include "../radiation/radiation_rirf_processing.h"
 #include <Eigen/Dense>
@@ -18,14 +19,6 @@ class HydroData;
 
 namespace hydrochrono::hydro {
 
-/**
- * @brief Convolution mode for radiation damping.
- */
-enum class RadiationConvolutionMode {
-    Baseline,
-    TaperedDirect
-};
-
 /**
  * @brief Radiation damping force component (RIRF convolution).
  * 

src/hydro/hydro_forces.cpp

@@ -248,7 +248,9 @@ TestHydro::TestHydro(std::vector<std::shared_ptr<ChBody>> user_bodies,
       num_bodies_(bodies_.size()),
       file_info_(H5FileInfo(h5_file_name, num_bodies_).ReadH5Data()),
       hydro_system_(nullptr),
-      chrono_coupler_(nullptr) {
+      chrono_coupler_(nullptr),
+      convolution_mode_(hydrochrono::hydro::RadiationConvolutionMode::Baseline),
+      tapered_opts_() {
     prev_time = -1;
 
     // Set up time vector
@@ -417,15 +419,7 @@ void TestHydro::EnsureProcessedRIRF() {
 
     const int steps = file_info_.GetRIRFDims(2);
 
-    // Convert TaperedDirectOptions to hydrochrono::hydro::TaperedDirectOptions
-    hydrochrono::hydro::TaperedDirectOptions opts;
-    opts.smoothing = tapered_opts_.smoothing;
-    opts.window_length = tapered_opts_.window_length;
-    opts.rirf_end_time = tapered_opts_.rirf_end_time;
-    opts.taper_start_percent = tapered_opts_.taper_start_percent;
-    opts.taper_end_percent = tapered_opts_.taper_end_percent;
-    opts.taper_final_amplitude = tapered_opts_.taper_final_amplitude;
-    opts.export_plot_csv = tapered_opts_.export_plot_csv;
+    // tapered_opts_ is now the canonical type (single source of truth) - no conversion needed
 
     // Create lambda to get RIRF values from file_info_
     auto get_rirf_val = [this](int body, int row_dof, int col, int step) -> double {
@@ -434,7 +428,7 @@ void TestHydro::EnsureProcessedRIRF() {
 
     // Process RIRF kernels using the dedicated module
     rirf_processed_ = hydrochrono::hydro::ProcessRirfKernels(
-        num_bodies_, steps, rirf_time_vector, get_rirf_val, opts, diagnostics_output_dir_);
+        num_bodies_, steps, rirf_time_vector, get_rirf_val, tapered_opts_, diagnostics_output_dir_);
 
     rirf_processed_ready_ = true;
 }
@@ -443,6 +437,20 @@ void TestHydro::InvalidateRadiationComponent() {
     radiation_component_.reset();
 }
 
+// ─────────────────────────────────────────────────────────────────────────
+// Radiation configuration setters
+// ─────────────────────────────────────────────────────────────────────────
+
+void TestHydro::SetRadiationConvolutionMode(hydrochrono::hydro::RadiationConvolutionMode mode) {
+    convolution_mode_ = mode;
+    InvalidateRadiationComponent();  // Invalidate component to recreate with new settings
+}
+
+void TestHydro::SetTaperedDirectOptions(const hydrochrono::hydro::TaperedDirectOptions& opts) {
+    tapered_opts_ = opts;
+    InvalidateRadiationComponent();  // Invalidate component to recreate with new settings
+}
+
 void TestHydro::EnsureRadiationComponent() {
     if (radiation_component_) {
         return;  // Already created
@@ -493,27 +501,11 @@ std::unique_ptr<hydrochrono::hydro::RadiationComponent> TestHydro::CreateRadiati
 
     const int rirf_steps = file_info_.GetRIRFDims(2);
 
-    // Convert TestHydro::RadiationConvolutionMode to hydrochrono::hydro::RadiationConvolutionMode
-    hydrochrono::hydro::RadiationConvolutionMode component_mode;
-    if (convolution_mode_ == RadiationConvolutionMode::TaperedDirect) {
-        component_mode = hydrochrono::hydro::RadiationConvolutionMode::TaperedDirect;
-    } else {
-        component_mode = hydrochrono::hydro::RadiationConvolutionMode::Baseline;
-    }
-
-    // Convert TestHydro::TaperedDirectOptions to hydrochrono::hydro::TaperedDirectOptions
-    hydrochrono::hydro::TaperedDirectOptions component_opts;
-    component_opts.smoothing = tapered_opts_.smoothing;
-    component_opts.window_length = tapered_opts_.window_length;
-    component_opts.rirf_end_time = tapered_opts_.rirf_end_time;
-    component_opts.taper_start_percent = tapered_opts_.taper_start_percent;
-    component_opts.taper_end_percent = tapered_opts_.taper_end_percent;
-    component_opts.taper_final_amplitude = tapered_opts_.taper_final_amplitude;
-    component_opts.export_plot_csv = tapered_opts_.export_plot_csv;
-
+    // convolution_mode_ and tapered_opts_ are now the canonical types from
+    // hydrochrono::hydro namespace - no conversion needed (single source of truth)
     return std::make_unique<hydrochrono::hydro::RadiationComponent>(
         file_info_, num_bodies_, rirf_steps, rirf_time_vector, rirf_width_vector,
-        component_mode, component_opts, diagnostics_output_dir_);
+        convolution_mode_, tapered_opts_, diagnostics_output_dir_);
 }
 
 // ------------------------------------------------------------
@@ -627,7 +619,7 @@ double TestHydro::GetRIRFval(int row, int col, int st) {
     int col_dof    = col % kDofPerBody;
     int row_dof    = row % kDofPerBody;
 
-    if (convolution_mode_ == RadiationConvolutionMode::TaperedDirect) {
+    if (convolution_mode_ == hydrochrono::hydro::RadiationConvolutionMode::TaperedDirect) {
         EnsureProcessedRIRF();
         // processed tensor is scaled by rho already
         const auto& tensor = rirf_processed_[body_index];

src/hydro/radiation/radiation_rirf_processing.h

@@ -11,23 +11,10 @@
 #include <string>
 #include <vector>
 
-namespace hydrochrono::hydro {
+// Include canonical TaperedDirectOptions from public header
+#include <hydroc/radiation/radiation_types.h>
 
-// Options for TaperedDirect RIRF preprocessing
-struct TaperedDirectOptions {
-    // smoothing: "sg" (Savitzky–Golay) or "moving_average"
-    std::string smoothing = "sg";
-    int window_length = 5;                 // odd, >= 3
-    
-    // RIRF truncation
-    double rirf_end_time = -1.0;           // end RIRF at this time (seconds), -1.0 = use full length
-    
-    // Simple taper control - sensible defaults for improved stability
-    double taper_start_percent = 0.8;      // start taper at 80% (taper last 20%)
-    double taper_end_percent = 1.0;        // end taper at 100% of total time series  
-    double taper_final_amplitude = 0.0;    // final amplitude as fraction of original (0.0 = zero, 1.0 = no change)
-    bool export_plot_csv = false;          // dump before/after CSV summaries (false by default)
-};
+namespace hydrochrono::hydro {
 
 /**
  * @brief Preprocess RIRF kernels for TaperedDirect mode.