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.

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

Updates to the wecSimInputFile.m for various test cases based on PR #692 #10

Merged
merged 9 commits into from
Sep 15, 2021
2 changes: 1 addition & 1 deletion Desalination/wecSimInputFile.m
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
simu.dt = 0.01; %Simulation time-step [s] for a convolution function in the radiation force calculation
simu.rampTime = 50;
simu.CITime = 30;
simu.morisonElement = 1;

%% Wave Information
%% Irregular Waves using PM Spectrum with Convolution Integral Calculation
Expand All @@ -27,6 +26,7 @@
body(1).mass = 127000; % User-Defined mass [kg]
body(1).momOfInertia = [1.85e6 1.85e6 1.85e6]; % Moment of Inertia [kg-m^2]
body(1).geometryFile = './geometry/flap.stl'; % Geometry File
body(1).morisonElement.option = 1;
body(1).morisonElement.cd = ones (5,3);
body(1).morisonElement.ca = zeros(5,3);
body(1).morisonElement.characteristicArea = zeros(5,3);
Expand Down
20 changes: 10 additions & 10 deletions Free_Decay/1m-ME/wecSimInputFile.m
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
simu.CITime = 15;
simu.explorer = 'off';
simu.adjMassWeightFun = 0.47761120825;
% simu.morisonElement = 1; % Turn Morison Element on with option 1
% simu.morisonElement = 2; % Turn Morison Element on with option 2

%% Wave Information
% No Waves CIC
Expand All @@ -21,15 +19,17 @@
body(1).momOfInertia = [20907301 21306090.66 37085481.11];
body(1).initDisp.initLinDisp = [ 0 0 1]; % Initial Displacement [m]

% Morison Element Option 1 Implementation
% body(1).morisonElement.cd = [1 0 0];
% body(1).morisonElement.ca = [1 0 0];
% body(1).morisonElement.characteristicArea = [1 0 0];
% body(1).morisonElement.VME = [0.01];
% body(1).morisonElement.rgME = [0 0 -2];
% body(1).morisonElement.z = [0 1 0];
% % Morison Element Option 1 Implementation
body(1).morisonElement.option = 1; % Turn Morison Element on with option 1
body(1).morisonElement.cd = [1 0 0];
body(1).morisonElement.ca = [1 0 0];
body(1).morisonElement.characteristicArea = [1 0 0];
body(1).morisonElement.VME = [0.01];
body(1).morisonElement.rgME = [0 0 -2];
body(1).morisonElement.z = [0 1 0];

% Morison Element Option 2 Implementation
% % Morison Element Option 2 Implementation
% body(1).morisonElement.option = 2; % Turn Morison Element on with option 2
% body(1).morisonElement.cd = [0 0 1];
% body(1).morisonElement.ca = [0 0 1];
% body(1).morisonElement.characteristicArea = [0 0 1];
Expand Down
2 changes: 1 addition & 1 deletion Nonlinear_Hydro/ode4/Regular/wecSimInputFile.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
simu.endTime=150;
simu.dt = 0.05;
simu.rho=1025;
simu.nlHydro = 2; % Non-linear hydro on/off

%% Wave Information
% Regular Waves
Expand All @@ -24,6 +23,7 @@
body(1).geometryFile = '../../geometry/elipsoid.stl' ;
body(1).viscDrag.cd=[1 0 1 0 1 0];
body(1).viscDrag.characteristicArea=[25 0 pi*5^2 0 pi*5^5 0];
body(1).nlHydro = 2; % Non-linear hydro on/off

%% PTO and Constraint Parameters
% Fixed Constraint
Expand Down
2 changes: 1 addition & 1 deletion Nonlinear_Hydro/ode4/RegularCIC/wecSimInputFile.m
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
simu.endTime=150;
simu.dt = 0.05;
simu.rho=1025;
simu.nlHydro = 2; % Non-linear hydro on/off

%% Wave Information
% Regular Waves
Expand All @@ -25,6 +24,7 @@
body(1).geometryFile = '../../geometry/elipsoid.stl' ;
body(1).viscDrag.cd=[1 0 1 0 1 0];
body(1).viscDrag.characteristicArea=[25 0 pi*5^2 0 pi*5^5 0];
body(1).nlHydro = 2; % Non-linear hydro on/off

%% PTO and Constraint Parameters
% Fixed Constraint
Expand Down
2 changes: 1 addition & 1 deletion Nonlinear_Hydro/ode45/Regular/wecSimInputFile.m
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
simu.endTime=150;
simu.dt = 0.05;
simu.rho=1025;
simu.nlHydro = 2; % Non-linear hydro on/off

%% Wave Information
% Regular Waves
Expand All @@ -25,6 +24,7 @@
body(1).geometryFile = '../../geometry/elipsoid.stl' ;
body(1).viscDrag.cd=[1 0 1 0 1 0];
body(1).viscDrag.characteristicArea=[25 0 pi*5^2 0 pi*5^5 0];
body(1).nlHydro = 2; % Non-linear hydro on/off

%% PTO and Constraint Parameters
% Fixed Constraint
Expand Down
2 changes: 1 addition & 1 deletion Nonlinear_Hydro/ode45/RegularCIC/wecSimInputFile.m
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
simu.endTime=150;
simu.dt = 0.05;
simu.rho=1025;
simu.nlHydro = 2; % Non-linear hydro on/off

%% Wave Information
% Regular Waves
Expand All @@ -25,6 +24,7 @@
body(1).geometryFile = '../../geometry/elipsoid.stl' ;
body(1).viscDrag.cd=[1 0 1 0 1 0];
body(1).viscDrag.characteristicArea=[25 0 pi*5^2 0 pi*5^5 0];
body(1).nlHydro = 2; % Non-linear hydro on/off

%% PTO and Constraint Parameters
% Fixed Constraint
Expand Down
4 changes: 2 additions & 2 deletions Paraview_Visualization/OSWEC_NonLinear_Viz/wecSimInputFile.m
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
simu.rampTime = 8*5;
simu.endTime=8*15;
simu.dt = 0.1;
simu.nlHydro = 2; % Turns non-linear hydro on
simu.pressureDis = 1; % Saves pressures data for Paraview
simu.paraview = 1; % Saves data to *.vtp for Paraview

Expand All @@ -27,6 +26,7 @@
body(1).momOfInertia = [1.85e6 1.85e6 1.85e6];
% body(1).viz.color = [1 1 0]; % [RGB] body color (default [1 1 0])
% body(1).viz.opacity =1; % body opacity (default 1)
body(1).nlHydro = 2; % Turns non-linear hydro on

% Base (Non-hydro Body)
body(2) = bodyClass(''); % Initialize bodyClass without an *.h5 file
Expand All @@ -37,7 +37,7 @@
body(2).momOfInertia = [1 1 1]; % Specify MOI
body(2).cg = [0 0 -10.9]; % Specify Cg
body(2).cb = [0 0 0]; % Specify Cb
body(2).dispVol = 0; % Specify Displaced Volume
body(2).dispVol = 0; % Specify Displaced Volume

%% PTO and Constraint Parameters
% Fixed Constraint
Expand Down
1 change: 0 additions & 1 deletion Passive_Yaw/PassiveYawOFF/wecSimInputFile.m
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
simu.CITime = 40; % Specify CI Time [s]
simu.yawNonLin=0;
simu.yawThresh=1;
simu.nlHydro=0;

%% Wave Information
% Regular Waves
Expand Down
1 change: 0 additions & 1 deletion Passive_Yaw/PassiveYawON/wecSimInputFile.m
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
simu.CITime = 40; % Specify CI Time [s]
simu.yawNonLin=1;
simu.yawThresh=0.01;
simu.nlHydro=0;

%% Wave Information
% % Regular Waves
Expand Down
Binary file modified WECCCOMP_Fault_Implementation/WaveStar.slx
Binary file not shown.
2 changes: 1 addition & 1 deletion WECCCOMP_Fault_Implementation/wecSimInputFile.m
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
body(1).mass = 3.075*rhoMult; % Define mass [kg]
body(1).momOfInertia = [0 0.001450 0]*rhoMult; % Moment of Inertia [kg*m^2]
body(1).geometryFile = 'geometry/Float.stl'; % Geometry File
body(1).linearDamping = [0 0 0 0 1.8 0]; % Linear Viscous Drag Coefficient Determined From Experimetnal Tests
body(1).linearDamping(5,5) = 1.8; % Linear Viscous Drag Coefficient Determined From Experimetnal Tests

%% Arm - Rotates
body(2) = bodyClass(''); % Initialize bodyClass
Expand Down
2 changes: 1 addition & 1 deletion wecSimAppTest.m
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@

% Run the tests
results = runner.run(suite);

results.table
end