Skip to content
Snippets Groups Projects
Verified Commit 1fd7a779 authored by Thomas Lambert's avatar Thomas Lambert :helicopter:
Browse files

refactor: allow proper runs with coaxial settings 

Make sure we can properly initiate the objects when using coaxial rotors as
well.
parent c96e8509
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/classes/@Oper/Oper.m
+ 4
− 4
View file @ 1fd7a779
......@@ -53,10 +53,10 @@ classdef Oper < handle
properties (GetAccess = public, SetAccess = protected)
alt (1, 1) double {mustBeNonnegative} % Altitude, [m]
speed (1, 1) double {mustBeNonnegative} % Axial speed, [m/s]
rpm (1, 1) double {mustBeNonnegative} % Rotor rotation speed, [rpm]
rps (1, 1) double {mustBeNonnegative} % Rotor rotation speed, [rps]
omega (1, 1) double {mustBeNonnegative} % Rotor rotation speed, [rad/s]
coll (1, 1) double {mustBeFinite} % Rotor collective pitch, [rad]
rpm (:, 1) double {mustBeNonnegative} % Rotor rotation speed, [rpm]
rps (:, 1) double {mustBeNonnegative} % Rotor rotation speed, [rps]
omega (:, 1) double {mustBeNonnegative} % Rotor rotation speed, [rad/s]
coll (:, 1) double {mustBeFinite} % Rotor collective pitch, [rad]
Flow (1, 1) Flow % Flow object, describing the external flow properties
end
......
src/configs/templatecoax.m
+ 1
− 1
View file @ 1fd7a779
......@@ -33,7 +33,7 @@ if strcmp(Sim.Misc.appli, 'heli')
else
rotorShift = [-1, 0, 0];
end
Blade(2).hubPos = Blade(1).hubPos - rotorShift; % Shift second rotor w.r.t the application type
Blade(2).hubPos = Blade(1).hubPos + rotorShift; % Shift second rotor w.r.t the application type
% ==================================================================================================
% ===================================== Operating points ===========================================
......
src/rotare.m
+ 53
− 26
View file @ 1fd7a779
......@@ -72,15 +72,22 @@ function [OpRot] = rotare(configFile)
% Validate the config file and load the sanitized structures
[Sim, Mod, Uflow, Uop, Uaf, Ublade] = validateconfig(configFile);
if Sim.Out.console
fprintf('Running Rotare with file %s\n\n', configFile);
end
% Construct objects
Af = createairfoils(Uaf);
Rot = Rotor(Ublade.nBlades, Af, Ublade.radius, Ublade.chord, Ublade.twist, Ublade.iAirfoil, ...
Ublade.nElem);
Rot.name = Sim.Save.filename;
Rot.pitchRef = Ublade.pitchRef;
Rot.appli = Sim.Misc.appli;
for i = numel(Ublade):-1:1
Rot(i) = Rotor(Ublade(i).nBlades, Af, Ublade(i).radius, Ublade(i).chord, ...
Ublade(i).twist, Ublade(i).iAirfoil, Ublade(i).nElem, Ublade(i).hubPos);
Rot(i).name = Sim.Save.filename;
Rot(i).pitchRef = Ublade(i).pitchRef;
Rot(i).appli = Sim.Misc.appli;
end
if Sim.Out.show3D
% TODO: Allow plot for multiple rotors
Rot.plot('all', Sim.Out.hubType);
end
......@@ -89,6 +96,8 @@ function [OpRot] = rotare(configFile)
for iSolv = 1:length(Mod.solvers)
Mod.solver = Mod.solvers{iSolv};
printperfs(Sim.Out, 'hline');
% ==========================================================================================
% =================================== BEMT resolution ======================================
% ==========================================================================================
......@@ -99,30 +108,29 @@ function [OpRot] = rotare(configFile)
for iAlt = 1:length(Uop.altitude)
for iSpeed = 1:length(Uop.speed)
for iRpm = 1:length(Uop.rpm)
for iColl = 1:length(Uop.collective)
for iRpm = 1:size(Uop.rpm, 2)
for iColl = 1:size(Uop.collective, 2)
tStart = tic; % Start timer for CPU time
% Set current operating conditions and update fluid properties
Op = Oper(Uop.altitude(iAlt), Uop.speed(iSpeed), Uop.rpm(iRpm), ...
Uop.collective(iColl), Uflow.fluid);
for i = length(Rot):-1:1 % Reverse loop to improve pre-alloc
% Print current operating conditions in the console
printperfs(Sim.Out, 'header', ...
Mod.solver, Op.alt, Op.speed, Op.rpm, Op.coll);
% Set current operating conditions and update fluid properties
Op(i) = Oper(Uop.altitude(iAlt), Uop.speed(iSpeed), ...
Uop.rpm(i, iRpm), Uop.collective(i, iColl), Uflow.fluid);
% Instantiate operating rotor object
for i = length(Rot):-1:1 % Reverse loop to improve pre-alloc
OpRot(i, iOperPoint) = OperRotor(Rot(i), Op);
OpRot(i, iOperPoint).nonDim = Sim.Misc.nonDim;
% Instantiate operating rotor object
OpRot(iOperPoint, i) = OperRotor(Rot(i), Op(i));
OpRot(iOperPoint, i).nonDim = Sim.Misc.nonDim;
end
% Print current operating conditions in the console
printperfs(Sim.Out, 'header', Mod.solver, Op);
% Run BEMT solver
bemt(OpRot(:, iOperPoint), Mod);
bemt(OpRot(iOperPoint, :), Mod);
% Keep track of CPU time for the solution
OpRot(i, iOperPoint).cpuTime = toc(tStart);
OpRot(iOperPoint, i).cpuTime = toc(tStart);
iOperPoint = iOperPoint + 1;
......@@ -132,7 +140,6 @@ function [OpRot] = rotare(configFile)
end
if Sim.Out.console
disp('=============');
disp(' ');
end
......@@ -160,14 +167,34 @@ function printperfs(Opts, type, varargin)
if Opts.console
switch type
case 'header'
narginchk(7, 7);
fprintf(['|| %s || Altitude: %0.1f m | ' ...
'Speed: %0.1f m/s | ' ...
'RPM: %0.01f rpm | ' ...
'Collective: %0.01f deg\n\n'], ...
varargin{1}, varargin{2}, varargin{3}, varargin{4}, rad2deg(varargin{5}));
narginchk(4, 4);
solver = varargin{1};
Op = varargin{2};
fprintf(['|| %8s || Altitude: %7.1f m | ' ...
'Speed: %5.1f m/s | ' ...
'RPM: %7.1f rpm | ' ...
'Collective: %4.01f deg\n'], ...
solver, Op(1).alt, Op(1).speed, Op(1).rpm, ...
rad2deg(Op(1).coll));
for i = 2:numel(Op)
fprintf(['|| || | ' ...
' | ' ...
' %7.1f rpm | ' ...
' %4.01f deg\n'], ...
Op(i).rpm, rad2deg(Op(i).coll));
end
fprintf(['|| || | ' ...
' | ' ...
' |\n']);
case 'results'
case 'hline'
fprintf('=============================================================');
fprintf('========================================\n');
otherwise
error('ROTARE:printperfs:UnknownType', ...
'Type must be ''header'' or ''results''. Found %s', type);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment