Skip to content

Commit

Permalink
Forcing branch to match dev and updating PTO-Sim (WEC-Sim#1064)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jleonqu
jleonqu authored Jul 10, 2023
1 parent 650e3db commit 636eed5
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 46 deletions.
4 changes: 2 additions & 2 deletions source/functions/postProcessWecSim.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@
if exist('ptoSim','var')
for iPtoB = 1:simu.numPtoSim
%iPtoB
eval(['ptoSim' num2str(iPtoB) '_out.name = ptoSim(' num2str(iPtoB) ').name;'])
eval(['ptoSim' num2str(iPtoB) '_out.type = ptoSim(' num2str(iPtoB) ').type;'])
%eval(['ptoSim' num2str(iPtoB) '_out.name = ptoSim(' num2str(iPtoB) ').name;'])
eval(['ptoSim' num2str(iPtoB) '_out.typeNum = ptoSim(' num2str(iPtoB) ').typeNum;'])
if iPtoB == 1; ptosimOutput = ptoSim1_out; end
ptosimOutput(iPtoB) = eval(['ptoSim' num2str(iPtoB) '_out']);
eval(['clear ptoSim' num2str(iPtoB) '_out'])
Expand Down
56 changes: 37 additions & 19 deletions source/objects/ptoSimClass.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
'crank', 'NOT DEFINED',... % [m] Crank length
'offset', 'NOT DEFINED',... % [m] Offset length
'rodLength', 'NOT DEFINED') % [m] Rod length
name (1,:) {mustBeText} = 'NOT DEFINED' % Electric Block Name
%name (1,:) {mustBeText} = 'NOT DEFINED' % Electric Block Name
rectifyingCheckValve (1,1) struct = struct(... % hydraulic Block properties
'Cd', 'NOT DEFINED',... % Discharge accumulator
'Amax', 'NOT DEFINED',... % Maximum opening area of the valve
Expand All @@ -109,27 +109,45 @@
% type: This property must be defined to specify the
% type of block that will be used. The type value of each block is
% presented below:
% Type = 1 ---- Electric generator equivalent circuit
% Type = 2 ---- Hydraulic cylinder
% Type = 3 ---- Hydraulic accumulator
% Type = 4 ---- Rectifying check valve
% Type = 5 ---- Hydraulic motor
% Type = 6 ---- Linear crank
% Type = 7 ---- Adjustable rod
% Type = 8 ---- Check valve
% Type = 9 ---- Direct drive linear generator
% Type = 10 ---- Direct drive Rotary generator
type = [] % PTOSim Block type
number = [] % PTOSim number
% type = 'electricGen' ---- Electric generator equivalent circuit
% type = 'hydraulicCyl' ---- Hydraulic cylinder
% type = 'hydraulicAcc' ---- Hydraulic accumulator
% type = 'rectCheckValve' ---- Rectifying check valve
% type = 'hydraulicMotor' ---- Hydraulic motor
% type = 'linCrank' ---- Linear crank
% type = 'adjustableRod' ---- Adjustable rod
% type = 'checkValve' ---- Check valve
% type = 'ddLinearGen' ---- Direct drive linear generator
% type = 'ddRotaryGen' ---- Direct drive Rotary generator
type = 'NOT DEFINED'; % PTOSim Block type
number = [] % PTOSim block number
typeNum = []; % Number to represent different type of PTO-Sim blocks
end

methods
function obj = ptoSimClass(name)
% Initilization function
if exist('name','var')
obj.name = name;
else
error('The ptoSim class number(s) in the wecSimInputFile must be specified in ascending order starting from 1. The ptoSimClass() function should be called first to initialize each ptoSim block with a name.')
function obj = ptoSimClass(type)
obj.type = type;
switch obj.type
case {'electricGen'} % Electric generator equivalent circuit
obj.typeNum = 1;
case {'hydraulicCyl'} % Hydraulic cylinder
obj.typeNum = 2;
case {'hydraulicAcc'} % Hydraulic accumulator
obj.typeNum = 3;
case {'rectCheckValve'} % Rectifying check valve
obj.typeNum = 4;
case {'hydraulicMotor'} % Hydraulic Motor
obj.typeNum = 5;
case {'linCrank'} % Linear crank
obj.typeNum = 6;
case {'adjustableRod'} % Adjustable rod
obj.typeNum = 7;
case {'checkValve'} % Check valve
obj.typeNum = 8;
case {'ddLinearGen'} % Direct drive linear generator
obj.typeNum = 9;
case {'ddRotaryGen'} % Direct drive rotary generator
obj.typeNum = 10;
end
end

Expand Down
49 changes: 24 additions & 25 deletions source/objects/responseClass.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@
% * ``Lines`` (`struct`) = [1 x 1] Contains the time and fairlead tensions
% * ``Line#`` (`struct`) = [1 x 1] One structure for each mooring line: Line1, Line2, etc. Each line structure contains node positions in x, y, z and segment tensions
%
%.. autoattribute:: objects.responseClass.ptosim
%.. autoattribute:: objects.responseClass.ptoSim
%
% * ``time`` (`struct`) = [# of time-steps x 1] Simulation timeseries
%
% There are additional ``output.ptosim`` structs corresponding to the Simulink blocks used:
% There are additional ``output.ptoSim`` structs corresponding to the Simulink blocks used:
%
% * ``pistonCF`` (`struct`) = [1 x # of pistons] Structure containing timeseries of compressible fluid piston properties including absolute power, force, position, velocity
% * ``pistonNCF`` (`array`) = [1 x # of pistons] Structure containing timeseries of non-compressible fluid piston properties including absolute power, force, top pressure and bottom pressure
Expand All @@ -127,7 +127,7 @@
moorDyn = struct() % This property contains a structure for each instance of the ``mooringClass`` using MoorDyn (i.e. for each MoorDyn block)
mooring = struct() % This property contains a structure for each instance of the ``mooringClass`` using the mooring matrix (i.e. for each MooringMatrix block)
ptos = struct() % This property contains a structure for each instance of the ``ptoClass`` (i.e. for each PTO block). PTO motion is relative from frame F to frame B. PTO forces act on frame F.
ptosim = struct() % This property contains a structure for each instance of the ``ptoSimClass`` (i.e. for each PTO-Sim block).
ptoSim = struct() % This property contains a structure for each instance of the ``ptoSimClass`` (i.e. for each PTO-Sim block).
wave = struct() % This property contains a structure for each instance of the ``waveClass``
end

Expand Down Expand Up @@ -235,7 +235,6 @@
end
% PTO-Sim
if isstruct(ptosimOutput)
%names = {'HydPistonCompressible','GasHydAccumulator','RectifyingCheckValve','HydraulicMotorV2','ElectricMachineEC'};
hydPistonCompressibleSignals = {'pressureA','forcePTO','pressureB'};
gasHydAccumulatorSignals = {'pressure','flowRate'};
rectifyingCheckValveSignals = {'flowRateA','flowRateB','flowRateC','flowRateD'};
Expand All @@ -248,32 +247,32 @@
rotaryGeneratorSignals = {'absPower','Torque','fricTorque','Ia','Ib','Ic','Va','Vb','Vc','elecPower','vel'};

for ii = 1:length(ptosimOutput)
obj.ptosim(ii).name = ptosimOutput(ii).name;
obj.ptosim(ii).time = ptosimOutput(ii).time;
obj.ptosim(ii).type = ptosimOutput(ii).type;
if ptosimOutput(ii).type == 1
%obj.ptoSim(ii).name = ptosimOutput(ii).name;
obj.ptoSim(ii).time = ptosimOutput(ii).time;
obj.ptoSim(ii).typeNum = ptosimOutput(ii).typeNum;
if ptosimOutput(ii).typeNum == 1
signals = electricMachineECSignals;
elseif ptosimOutput(ii).type == 2
elseif ptosimOutput(ii).typeNum == 2
signals = hydPistonCompressibleSignals;
elseif ptosimOutput(ii).type == 3
elseif ptosimOutput(ii).typeNum == 3
signals = gasHydAccumulatorSignals;
elseif ptosimOutput(ii).type == 4
elseif ptosimOutput(ii).typeNum == 4
signals = rectifyingCheckValveSignals;
elseif ptosimOutput(ii).type == 5
elseif ptosimOutput(ii).typeNum == 5
signals = hydraulicMotorSignals;
elseif ptosimOutput(ii).type == 6
elseif ptosimOutput(ii).typeNum == 6
signals = linearCrankSignals;
elseif ptosimOutput(ii).type == 7
elseif ptosimOutput(ii).typeNum == 7
signals = adjustableRodSignals;
elseif ptosimOutput(ii).type == 8
elseif ptosimOutput(ii).typeNum == 8
signals = checkValveSignals;
elseif ptosimOutput(ii).type == 9
elseif ptosimOutput(ii).typeNum == 9
signals = linearGeneratorSignals;
elseif ptosimOutput(ii).type == 10
elseif ptosimOutput(ii).typeNum == 10
signals = rotaryGeneratorSignals;
end
for jj = 1:length(signals)
obj.ptosim(ii).(signals{jj}) = ptosimOutput(ii).signals.values(:,jj);
obj.ptoSim(ii).(signals{jj}) = ptosimOutput(ii).signals.values(:,jj);
end
end
end
Expand Down Expand Up @@ -751,18 +750,18 @@ function writeText(obj)
end
end
%ptoSim
if isfield(obj.ptosim,'time')
f1 = fields(obj.ptosim);
if isfield(obj.ptoSim,'time')
f1 = fields(obj.ptoSim);
count = 1;
header = {'time'};
data = obj.ptosim.time;
data = obj.ptoSim.time;
for ifld1=1:(length(f1)-1)
f2 = fields(obj.ptosim.(f1{ifld1}));
for iins = 1:length(obj.ptosim.(f1{ifld1}))
f2 = fields(obj.ptoSim.(f1{ifld1}));
for iins = 1:length(obj.ptoSim.(f1{ifld1}))
for ifld2 = 1:length(f2)
count = count+1;
header{count} = [f1{ifld1} num2str(iins) '_' f2{ifld2}];
data(:,count) = obj.ptosim.(f1{ifld1}).(f2{ifld2});
data(:,count) = obj.ptoSim.(f1{ifld1}).(f2{ifld2});
end
end
end
Expand All @@ -772,7 +771,7 @@ function writeText(obj)
numChar = max(tmp)+2; clear tmp;
header_fmt = ['%' num2str(numChar) 's '];
data_fmt = [repmat('%10.5f ',1,length(header)) '\n'];
filename = ['output/ptosim.txt'];
filename = ['output/ptoSim.txt'];
fid = fopen(filename,'w+');
for ii=1:length(header)
fprintf(fid,header_fmt,header{ii});
Expand Down

0 comments on commit 636eed5

Please sign in to comment.