diff --git a/.github/workflows/run-tests-dev.yml b/.github/workflows/run-tests-dev.yml index a278e3ea..95bab2b5 100644 --- a/.github/workflows/run-tests-dev.yml +++ b/.github/workflows/run-tests-dev.yml @@ -26,7 +26,6 @@ jobs: release: [R2020b, latest] folder: [Body-to-Body_Interactions, Cable, - Desalination, End_Stops, Free_Decay, Generalized_Body_Modes, diff --git a/.github/workflows/run-tests-master.yml b/.github/workflows/run-tests-master.yml index 375832b6..28880679 100644 --- a/.github/workflows/run-tests-master.yml +++ b/.github/workflows/run-tests-master.yml @@ -26,7 +26,6 @@ jobs: release: [R2020b, latest] folder: [Body-to-Body_Interactions, Cable, - Desalination, End_Stops, Free_Decay, Generalized_Body_Modes, diff --git a/Desalination/OSWEC_RO.slx b/Desalination/OSWEC_RO.slx index abff8e5b..06697004 100644 Binary files a/Desalination/OSWEC_RO.slx and b/Desalination/OSWEC_RO.slx differ diff --git a/Desalination/wecSimInputFile.m b/Desalination/wecSimInputFile.m index 092dbc00..87c929cf 100644 --- a/Desalination/wecSimInputFile.m +++ b/Desalination/wecSimInputFile.m @@ -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 @@ -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