Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BUGFIX: Desalination Application #28

Merged
merged 2 commits into from
May 17, 2023
Merged

BUGFIX: Desalination Application #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42ded5a
updating oswecRO slx
kmruehl May 17, 2023
ecd1e59
removing desal test from runner
kmruehl May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/run-tests-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
release: [R2020b, latest]
folder: [Body-to-Body_Interactions,
Cable,
Desalination,
End_Stops,
Free_Decay,
Generalized_Body_Modes,
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/run-tests-master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
release: [R2020b, latest]
folder: [Body-to-Body_Interactions,
Cable,
Desalination,
End_Stops,
Free_Decay,
Generalized_Body_Modes,
Expand Down
Binary file modified Desalination/OSWEC_RO.slx
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions Desalination/wecSimInputFile.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
simu.simMechanicsFile = 'OSWEC_RO.slx'; % Specify Simulink Model File
%simu.mode = 'rapid-accelerator'; % Specify Simulation Mode ('normal','accelerator','rapid-accelerator')
simu.explorer='off'; % Turn SimMechanics Explorer (on/off)
simu.solver = 'ode4'; %simu.solver = 'ode4' for fixed step & simu.solver = 'ode45' for variable step
simu.startTime = 0; % Simulation Start Time [s]
simu.rampTime = 50;
simu.endTime=300;
simu.solver = 'ode4'; %simu.solver = 'ode4' for fixed step & simu.solver = 'ode45' for variable step
simu.dt = 0.01; %Simulation time-step [s] for a convolution function in the radiation force calculation
simu.rampTime = 50;
simu.cicEndTime = 30;

%% Wave Information
Expand Down Expand Up @@ -55,7 +55,7 @@
constraint(4).location = [0+0.9 0 -7];

pto(1) = ptoClass('PTO1'); % Initialize ptoClass for PTO1
pto(1).stiffness = 0; % PTO Stiffness Coeff [Nm/rad]
pto(1).damping = 0; % PTO Damping Coeff [Nsm/rad]
pto(1).stiffness = 0; % PTO Stiffness Coeff [Nm/rad]
pto(1).damping = 0; % PTO Damping Coeff [Nsm/rad]
pto(1).location = [2.35106397378+0.9 0 -7.849998936]; % PTO Global Location [m]
pto(1).orientation.z = [-4.7021271782/5 0 1.7/5]; % PTO orientation
pto(1).orientation.z = [-4.7021271782/5 0 1.7/5]; % PTO orientation