Skip to content

Commit

Permalink
Common input files (WEC-Sim#50)
Browse files Browse the repository at this point in the history 
* common RM3 hydroData and geometry

* common OSWEC hydroData and geometry files

* multiple wave headings

* update input files

* consolidate sphere hydrodata

* update input files

* revert nonlinear hydro files back to original

* fix tests

* remove outdated comments from input files
  • Loading branch information
@akeeste
akeeste authored Nov 30, 2023
1 parent 58029cb commit 7d6eaa1
Show file tree
Hide file tree
Showing 122 changed files with 328 additions and 1,986,985 deletions.
14 changes: 7 additions & 7 deletions Body-to-Body_Interactions/B2B_Case1/wecSimInputFile.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@

%% Body Data
% Float
body(1) = bodyClass('../hydroData/rm3.h5');
body(1).geometryFile = '../geometry/float.stl';
body(1).mass = 'equilibrium';
body(1).inertia = [20907301 21306090.66 37085481.11];
body(1) = bodyClass('../../_Common_Input_Files/RM3/hydroData/rm3.h5');
body(1).geometryFile = '../../_Common_Input_Files/RM3/geometry/float.stl';
body(1).mass = 'equilibrium';
body(1).inertia = [20907301 21306090.66 37085481.11];

% Spar/Plate
body(2) = bodyClass('../hydroData/rm3.h5');
body(2).geometryFile = '../geometry/plate.stl';
body(2).mass = 'equilibrium';
body(2) = bodyClass('../../_Common_Input_Files/RM3/hydroData/rm3.h5');
body(2).geometryFile = '../../_Common_Input_Files/RM3/geometry/plate.stl';
body(2).mass = 'equilibrium';
body(2).inertia = [94419614.57 94407091.24 28542224.82];

%% PTO and Constraint Parameters
Expand Down
14 changes: 7 additions & 7 deletions Body-to-Body_Interactions/B2B_Case2/wecSimInputFile.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@

%% Body Data
% Float
body(1) = bodyClass('../hydroData/rm3.h5');
body(1).geometryFile = '../geometry/float.stl';
body(1).mass = 'equilibrium';
body(1).inertia = [20907301 21306090.66 37085481.11];
body(1) = bodyClass('../../_Common_Input_Files/RM3/hydroData/rm3.h5');
body(1).geometryFile = '../../_Common_Input_Files/RM3/geometry/float.stl';
body(1).mass = 'equilibrium';
body(1).inertia = [20907301 21306090.66 37085481.11];

% Spar/Plate
body(2) = bodyClass('../hydroData/rm3.h5');
body(2).mass = 'equilibrium';
body(2) = bodyClass('../../_Common_Input_Files/RM3/hydroData/rm3.h5');
body(2).geometryFile = '../../_Common_Input_Files/RM3/geometry/plate.stl';
body(2).mass = 'equilibrium';
body(2).inertia = [94419614.57 94407091.24 28542224.82];
body(2).geometryFile = '../geometry/plate.stl';

%% PTO and Constraint Parameters
% Floating (3DOF) Joint
Expand Down
16 changes: 8 additions & 8 deletions Body-to-Body_Interactions/B2B_Case3/wecSimInputFile.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@

%% Body Data
% Float
body(1) = bodyClass('../hydroData/rm3.h5');
body(1).geometryFile = '../geometry/float.stl';
body(1).mass = 'equilibrium';
body(1).inertia = [20907301 21306090.66 37085481.11];
body(1) = bodyClass('../../_Common_Input_Files/RM3/hydroData/rm3.h5');
body(1).geometryFile = '../../_Common_Input_Files/RM3/geometry/float.stl';
body(1).mass = 'equilibrium';
body(1).inertia = [20907301 21306090.66 37085481.11];

% Spar/Plate
body(2) = bodyClass('../hydroData/rm3.h5');
body(2).mass = 'equilibrium';
body(2).inertia = [94419614.57 94407091.24 28542224.82];
body(2).geometryFile = '../geometry/plate.stl';
body(2) = bodyClass('../../_Common_Input_Files/RM3/hydroData/rm3.h5');
body(2).geometryFile = '../../_Common_Input_Files/RM3/geometry/plate.stl';
body(2).mass = 'equilibrium';
body(2).inertia = [94419614.57 94407091.24 28542224.82];

%% PTO and Constraint Parameters
% Floating (3DOF) Joint
Expand Down
8 changes: 4 additions & 4 deletions Body-to-Body_Interactions/B2B_Case4/wecSimInputFile.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@

%% Body Data
% Float
body(1) = bodyClass('../hydroData/rm3.h5');
body(1).geometryFile = '../geometry/float.stl';
body(1) = bodyClass('../../_Common_Input_Files/RM3/hydroData/rm3.h5');
body(1).geometryFile = '../../_Common_Input_Files/RM3/geometry/float.stl';
body(1).mass = 'equilibrium';
body(1).inertia = [20907301 21306090.66 37085481.11];

% Spar/Plate
body(2) = bodyClass('../hydroData/rm3.h5');
body(2) = bodyClass('../../_Common_Input_Files/RM3/hydroData/rm3.h5');
body(2).mass = 'equilibrium';
body(2).inertia = [94419614.57 94407091.24 28542224.82];
body(2).geometryFile = '../geometry/plate.stl';
body(2).geometryFile = '../../_Common_Input_Files/RM3/geometry/plate.stl';

%% PTO and Constraint Parameters
% Floating (3DOF) Joint
Expand Down
16 changes: 8 additions & 8 deletions Body-to-Body_Interactions/B2B_Case5/wecSimInputFile.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@

%% Body Data
% Float
body(1) = bodyClass('../hydroData/rm3.h5');
body(1).geometryFile = '../geometry/float.stl';
body(1).mass = 'equilibrium';
body(1).inertia = [20907301 21306090.66 37085481.11];
body(1) = bodyClass('../../_Common_Input_Files/RM3/hydroData/rm3.h5');
body(1).geometryFile = '../../_Common_Input_Files/RM3/geometry/float.stl';
body(1).mass = 'equilibrium';
body(1).inertia = [20907301 21306090.66 37085481.11];

% Spar/Plate
body(2) = bodyClass('../hydroData/rm3.h5');
body(2).mass = 'equilibrium';
body(2).inertia = [94419614.57 94407091.24 28542224.82];
body(2).geometryFile = '../geometry/plate.stl';
body(2) = bodyClass('../../_Common_Input_Files/RM3/hydroData/rm3.h5');
body(2).geometryFile = '../../_Common_Input_Files/RM3/geometry/plate.stl';
body(2).mass = 'equilibrium';
body(2).inertia = [94419614.57 94407091.24 28542224.82];

%% PTO and Constraint Parameters
% Floating (3DOF) Joint
Expand Down
14 changes: 7 additions & 7 deletions Body-to-Body_Interactions/B2B_Case6/wecSimInputFile.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@

%% Body Data
% Float
body(1) = bodyClass('../hydroData/rm3.h5');
body(1).geometryFile = '../geometry/float.stl';
body(1).mass = 'equilibrium';
body(1).inertia = [20907301 21306090.66 37085481.11];
body(1) = bodyClass('../../_Common_Input_Files/RM3/hydroData/rm3.h5');
body(1).geometryFile = '../../_Common_Input_Files/RM3/geometry/float.stl';
body(1).mass = 'equilibrium';
body(1).inertia = [20907301 21306090.66 37085481.11];

% Spar/Plate
body(2) = bodyClass('../hydroData/rm3.h5');
body(2).mass = 'equilibrium';
body(2) = bodyClass('../../_Common_Input_Files/RM3/hydroData/rm3.h5');
body(2).geometryFile = '../../_Common_Input_Files/RM3/geometry/plate.stl';
body(2).mass = 'equilibrium';
body(2).inertia = [94419614.57 94407091.24 28542224.82];
body(2).geometryFile = '../geometry/plate.stl';

%% PTO and Constraint Parameters
% Floating (3DOF) Joint
Expand Down
2 changes: 1 addition & 1 deletion Body-to-Body_Interactions/TestB2B.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
properties
OriginalDefault
testDir
h5Dir = "hydroData"
h5Dir = '../_Common_Input_Files/RM3/hydroData/'
h5Name = 'rm3.h5'
outName = 'rm3.out'
end
Expand Down
4 changes: 2 additions & 2 deletions Controls/Declutching/wecSimInputFile.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

%% Body Data
% Sphere
body(1) = bodyClass('../hydroData/sphere.h5'); % Create the body(1) Variable
body(1).geometryFile = '../geometry/sphere.stl'; % Location of Geomtry File
body(1) = bodyClass('../../_Common_Input_Files/Sphere/hydroData/sphere.h5'); % Create the body(1) Variable
body(1).geometryFile = '../../_Common_Input_Files/Sphere/geometry/sphere.stl'; % Location of Geomtry File
body(1).mass = 'equilibrium'; % Body Mass
body(1).inertia = [20907301 21306090.66 37085481.11]; % Moment of Inertia [kg*m^2]

Expand Down
4 changes: 2 additions & 2 deletions Controls/Latching/wecSimInputFile.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

%% Body Data
% Sphere
body(1) = bodyClass('../hydroData/sphere.h5'); % Create the body(1) Variable
body(1).geometryFile = '../geometry/sphere.stl'; % Location of Geomtry File
body(1) = bodyClass('../../_Common_Input_Files/Sphere/hydroData/sphere.h5'); % Create the body(1) Variable
body(1).geometryFile = '../../_Common_Input_Files/Sphere/geometry/sphere.stl'; % Location of Geomtry File
body(1).mass = 'equilibrium'; % Body Mass
body(1).inertia = [20907301 21306090.66 37085481.11]; % Moment of Inertia [kg*m^2]

Expand Down
4 changes: 2 additions & 2 deletions Controls/MPC/wecSimInputFile.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

%% Body Data
% Sphere
body(1) = bodyClass('../hydroData/sphere.h5'); % Create the body(1) Variable
body(1).geometryFile = '../geometry/sphere.stl'; % Location of Geomtry File
body(1) = bodyClass('../../_Common_Input_Files/Sphere/hydroData/sphere.h5'); % Create the body(1) Variable
body(1).geometryFile = '../../_Common_Input_Files/Sphere/geometry/sphere.stl'; % Location of Geomtry File
body(1).mass = 'equilibrium'; % Body Mass
body(1).inertia = [20907301 21306090.66 37085481.11]; % Moment of Inertia [kg*m^2]

Expand Down
4 changes: 2 additions & 2 deletions Controls/Passive (P)/wecSimInputFile.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

%% Body Data
% Sphere
body(1) = bodyClass('../hydroData/sphere.h5'); % Create the body(1) Variable
body(1).geometryFile = '../geometry/sphere.stl'; % Location of Geomtry File
body(1) = bodyClass('../../_Common_Input_Files/Sphere/hydroData/sphere.h5'); % Create the body(1) Variable
body(1).geometryFile = '../../_Common_Input_Files/Sphere/geometry/sphere.stl'; % Location of Geomtry File
body(1).mass = 'equilibrium'; % Body Mass
body(1).inertia = [20907301 21306090.66 37085481.11]; % Moment of Inertia [kg*m^2]

Expand Down
4 changes: 2 additions & 2 deletions Controls/Reactive (PI)/wecSimInputFile.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

%% Body Data
% Sphere
body(1) = bodyClass('../hydroData/sphere.h5'); % Create the body(1) Variable
body(1).geometryFile = '../geometry/sphere.stl'; % Location of Geomtry File
body(1) = bodyClass('../../_Common_Input_Files/Sphere/hydroData/sphere.h5'); % Create the body(1) Variable
body(1).geometryFile = '../../_Common_Input_Files/Sphere/geometry/sphere.stl'; % Location of Geomtry File
body(1).mass = 'equilibrium'; % Body Mass
body(1).inertia = [20907301 21306090.66 37085481.11]; % Moment of Inertia [kg*m^2]

Expand Down
4 changes: 2 additions & 2 deletions Controls/ReactiveWithPTO/wecSimInputFile.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

%% Body Data
% Sphere
body(1) = bodyClass('../hydroData/sphere.h5'); % Create the body(1) Variable
body(1).geometryFile = '../geometry/sphere.stl'; % Location of Geomtry File
body(1) = bodyClass('../../_Common_Input_Files/Sphere/hydroData/sphere.h5'); % Create the body(1) Variable
body(1).geometryFile = '../../_Common_Input_Files/Sphere/geometry/sphere.stl'; % Location of Geomtry File
body(1).mass = 'equilibrium'; % Body Mass
body(1).inertia = [20907301 21306090.66 37085481.11]; % Moment of Inertia [kg*m^2]

Expand Down
2 changes: 1 addition & 1 deletion Controls/TestControls.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
properties
OriginalDefault
testDir
h5Dir = "hydroData"
h5Dir = '../_Common_Input_Files/Sphere/hydroData/'
h5Name = 'sphere.h5'
outName = 'sphere.out'
end
Expand Down
2 changes: 1 addition & 1 deletion Desalination/TestDesalination.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
properties
OriginalDefault
testDir
h5Dir = "hydroData"
h5Dir = '../_Common_Input_Files/OSWEC/hydroData/'
h5Name = 'oswec.h5'
outName = 'oswec.out'
hasH5 = false
Expand Down
11 changes: 0 additions & 11 deletions Desalination/hydroData/bemio.m
View file

This file was deleted.

Loading

0 comments on commit 7d6eaa1

Please sign in to comment.