From d2aefee03fc911b2b701036b98236569492de126 Mon Sep 17 00:00:00 2001 From: dcdemen Date: Wed, 19 Feb 2025 16:15:18 -0700 Subject: [PATCH] Addressed formatting feedback --- src/interfaces/cfd/CMakeLists.txt | 2 +- src/interfaces/cfd/interface_builder.hpp | 84 ++++++++---------------- 2 files changed, 30 insertions(+), 56 deletions(-) diff --git a/src/interfaces/cfd/CMakeLists.txt b/src/interfaces/cfd/CMakeLists.txt index 7dd061d2a..df5715b7e 100644 --- a/src/interfaces/cfd/CMakeLists.txt +++ b/src/interfaces/cfd/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources(openturbine_library +target_sources(openturbine_library PRIVATE interface.cpp ) diff --git a/src/interfaces/cfd/interface_builder.hpp b/src/interfaces/cfd/interface_builder.hpp index a32246b20..ba45625e2 100644 --- a/src/interfaces/cfd/interface_builder.hpp +++ b/src/interfaces/cfd/interface_builder.hpp @@ -9,122 +9,96 @@ namespace openturbine::cfd { struct InterfaceBuilder { InterfaceBuilder& SetGravity(const std::array& gravity) { - interface_in.gravity = gravity; + interface_input.gravity = gravity; return *this; } InterfaceBuilder& SetMaximumNonlinearIterations(size_t max_iter) { - interface_in.max_iter = max_iter; + interface_input.max_iter = max_iter; return *this; } InterfaceBuilder& SetTimeStep(double time_step) { - interface_in.time_step = time_step; + interface_input.time_step = time_step; return *this; } InterfaceBuilder& SetDampingFactor(double rho_inf) { - interface_in.rho_inf = rho_inf; + interface_input.rho_inf = rho_inf; return *this; } InterfaceBuilder& EnableFloatingPlatform(bool enable) { - interface_in.turbine.floating_platform.enable = enable; + interface_input.turbine.floating_platform.enable = enable; return *this; } - InterfaceBuilder& SetFloatingPlatformPosition(const std::array& position) { - interface_in.turbine.floating_platform.position = position; + InterfaceBuilder& SetFloatingPlatformPosition(const std::array& p) { + interface_input.turbine.floating_platform.position = p; return *this; } - InterfaceBuilder& SetFloatingPlatformVelocity(const std::array& velocity) { - interface_in.turbine.floating_platform.velocity = velocity; + InterfaceBuilder& SetFloatingPlatformVelocity(const std::array& v) { + interface_input.turbine.floating_platform.velocity = v; return *this; } - InterfaceBuilder& SetFloatingPlatformAcceleration(const std::array& acceleration) { - interface_in.turbine.floating_platform.acceleration = acceleration; + InterfaceBuilder& SetFloatingPlatformAcceleration(const std::array& a) { + interface_input.turbine.floating_platform.acceleration = a; return *this; } InterfaceBuilder& SetFloatingPlatformMassMatrix( const std::array, 6>& mass_matrix ) { - interface_in.turbine.floating_platform.mass_matrix = mass_matrix; + interface_input.turbine.floating_platform.mass_matrix = mass_matrix; return *this; } - InterfaceBuilder& SetNumberOfMooringLines(size_t number_of_mooring_lines) { - interface_in.turbine.floating_platform.mooring_lines.resize(number_of_mooring_lines); + InterfaceBuilder& SetNumberOfMooringLines(size_t number) { + interface_input.turbine.floating_platform.mooring_lines.resize(number); return *this; } - InterfaceBuilder& SetMooringLineStiffness(size_t line_number, double stiffness) { - interface_in.turbine.floating_platform.mooring_lines[line_number].stiffness = stiffness; + InterfaceBuilder& SetMooringLineStiffness(size_t line, double stiffness) { + interface_input.turbine.floating_platform.mooring_lines[line].stiffness = stiffness; return *this; } - InterfaceBuilder& SetMooringLineUndeformedLength(size_t line_number, double length) { - interface_in.turbine.floating_platform.mooring_lines[line_number].undeformed_length = length; + InterfaceBuilder& SetMooringLineUndeformedLength(size_t line, double length) { + interface_input.turbine.floating_platform.mooring_lines[line].undeformed_length = length; return *this; } - InterfaceBuilder& SetMooringLineFairleadPosition( - size_t line_number, const std::array& position - ) { - interface_in.turbine.floating_platform.mooring_lines[line_number].fairlead_position = - position; - return *this; - } - - InterfaceBuilder& SetMooringLineFairleadVelocity( - size_t line_number, const std::array& velocity - ) { - interface_in.turbine.floating_platform.mooring_lines[line_number].fairlead_velocity = - velocity; - return *this; - } - - InterfaceBuilder& SetMooringLineFairleadAcceleration( - size_t line_number, const std::array& acceleration - ) { - interface_in.turbine.floating_platform.mooring_lines[line_number].fairlead_acceleration = - acceleration; + InterfaceBuilder& SetMooringLineFairleadPosition(size_t line, const std::array& p) { + interface_input.turbine.floating_platform.mooring_lines[line].fairlead_position = p; return *this; } - InterfaceBuilder& SetMooringLineAnchorPosition( - size_t line_number, const std::array& position - ) { - interface_in.turbine.floating_platform.mooring_lines[line_number].anchor_position = position; + InterfaceBuilder& SetMooringLineAnchorPosition(size_t line, const std::array& p) { + interface_input.turbine.floating_platform.mooring_lines[line].anchor_position = p; return *this; } - InterfaceBuilder& SetMooringLineAnchorVelocity( - size_t line_number, const std::array& velocity - ) { - interface_in.turbine.floating_platform.mooring_lines[line_number].anchor_velocity = velocity; + InterfaceBuilder& SetMooringLineAnchorVelocity(size_t line, const std::array& v) { + interface_input.turbine.floating_platform.mooring_lines[line].anchor_velocity = v; return *this; } - InterfaceBuilder& SetMooringLineAnchorAcceleration( - size_t line_number, const std::array& acceleration - ) { - interface_in.turbine.floating_platform.mooring_lines[line_number].anchor_acceleration = - acceleration; + InterfaceBuilder& SetMooringLineAnchorAcceleration(size_t line, const std::array& a) { + interface_input.turbine.floating_platform.mooring_lines[line].anchor_acceleration = a; return *this; } InterfaceBuilder& SetTurbine(const TurbineInput& turbine_in) { - interface_in.turbine = turbine_in; + interface_input.turbine = turbine_in; return *this; } - [[nodiscard]] Interface Build() const { return Interface(interface_in); } + [[nodiscard]] Interface Build() const { return Interface(interface_input); } private: - InterfaceInput interface_in; + InterfaceInput interface_input; }; } // namespace openturbine::cfd