Owc fix: no need for h5 (#81)

* try to update libraries again

* fix simscapeinstrumentationlogging error

* fix OWC case to not need custom h5 file

* update readme and dependencies

* clean up directory and add missing files

* adding missing WAMIT hst for GBM

* adding Floating OWC case back

* adding BEM files for Floating OWC

* updating input file

* Update OWC to be consistent with flex body updates from variable mass

* Resolves the lib conflicts

* Resolves conflicts

* Fixes a bug

* Fixes a bug

* Removes the Floating OWC from the testing

* Fixes a bug in OWC products

* Fixes a bug with TestOWC

* Fixes a bug with products.txt

---------

Co-authored-by: akeeste <akeeste@sandia.gov>
Co-authored-by: Ruehl <kmruehl@sandia.gov>
Co-authored-by: jtgrasb <87095491+jtgrasb@users.noreply.github.com>
Co-authored-by: Shabara <mshabara@nrel.gov>
Co-authored-by: Mohamed Shabara <84589678+MShabara@users.noreply.github.com>

Author: 5 people

.github/workflows/run-tests-reusable.yml

@@ -53,13 +53,13 @@ jobs:
           ref: ${{ inputs.base_ref }}
           path: './WEC-Sim'
       - name: Check out MoorDyn
-        if: matrix.folder == 'Mooring' || matrix.folder == 'OWC'
+        if: matrix.folder == 'Mooring' 
         uses: actions/checkout@v4
         with:
           repository: WEC-Sim/MoorDyn
           path: './MoorDyn'
       - name: Copy MoorDyn Files
-        if: matrix.folder == 'Mooring' || matrix.folder == 'OWC' 
+        if: matrix.folder == 'Mooring' 
         run: |
             cp * ../WEC-Sim/source/functions/moorDyn
             ls ../WEC-Sim/source/functions/moorDyn

OWC/FloatingOWC_W2W/FloatingOWC_W2W/OWC_rigid.slx

@@ -15,5 +15,8 @@ representation of their dynamic behavior. Additionally, the model accounts for t
 
 An optimal control strategy is implemented to maximize turbine efficiency by dynamically adjusting system parameters based on operating speed.
 
-**Relevant Citation(s)**
-Shabara, Mohamed A., et al. "Optimal Control of Floating Oscillating Water Column Wave Energy Converters." 2025 American Control Conference (ACC), IEEE, 2025.
+This model is based on the research detailed in:
+
+Shabara, Mohamed A., et al. "Optimal Control of Floating Oscillating Water Column Wave Energy Converters." The 9th IEEE Conference on Control Technology and Applications (CCTA) 2025.
+
+**Acknowledgment:** This material is based upon work supported by the U.S.Department of Energy’s Office of Energy Efficiency and Renewable Energy under the Water Power Technologies Office Award Number DE-EE0008895

OWC/FloatingOWC_W2W/README.md

@@ -56,7 +56,7 @@
 ];
 
 % Load the STL file
-stlData = stlread('../../_Common_Input_Files/Floating_OWC/geometry/Sparbuoy_Floater.stl'); % Replace with the path to your STL file
+stlData = stlread('./geometry/Sparbuoy_Floater.stl'); % Replace with the path to your STL file
 
 vertices = stlData.Points;  % Extract vertices and faces from the STL data
 vertices(:,3) = vertices(:,3) + body(1, 1).centerGravity(3);

…oating_OWC/geometry/Sparbuoy_Floater.stl …ingOWC_W2W/geometry/Sparbuoy_Floater.stl_Common_Input_Files/Floating_OWC/geometry/Sparbuoy_Floater.stl renamed to OWC/FloatingOWC_W2W/geometry/Sparbuoy_Floater.stl _Common_Input_Files/Floating_OWC/geometry/Sparbuoy_Floater.stl renamed to OWC/FloatingOWC_W2W/geometry/Sparbuoy_Floater.stl

@@ -13,10 +13,10 @@
 simu.dt = 0.01; 						   % Simulation time-step [s]
 
 %% Wave Information
-% % noWaveCIC, no waves with radiation wecSimCIC
+% noWaveCIC, no waves with radiation wecSimCIC
 % waves = waveClass('noWaveCIC');       % Initialize Wave Class and Specify Type
 
-% % Regular Waves
+% Regular Waves
 waves = waveClass('regular');           % Initialize Wave Class and Specify Type
 waves.height = 4.5;                     % Wave Height [m]
 waves.period = 11.2;                      % Wave Period [s]
@@ -62,17 +62,20 @@
 
 %% Body Data
 % Floater
-body(1) = bodyClass('../../_Common_Input_Files/Floating_OWC/hydroData/floatingOWC.h5');
-body(1).geometryFile = '../../_Common_Input_Files/Floating_OWC/geometry/Sparbuoy_Floater.stl';    % Location of Geomtry File
+body(1) = bodyClass('./hydroData/floatingOWC.h5');
+body(1).geometryFile = './geometry/Sparbuoy_Floater.stl';    % Location of Geomtry File
 body(1).mass = 'equilibrium';                                                               % Body Mass. The 'equilibrium' Option Sets it to the Displaced Water Weight.
 body(1).inertia =   1.0e+09*[1.5310    1.5310    0.1118];                                   % Moment of Inertia [kg*m^2]
 % body(1).quadDrag.cd = [1.25, 1.25, 1.25, 1.25, 1.25 , 0.1];
 % body(1).quadDrag.area = [250, 250, 201, 250, 250, 100];
 
 % Spar/Plate
-body(2) = bodyClass('../../_Common_Input_Files/Floating_OWC/hydroData/floatingOWC.h5');
-body(2).geometryFile = '../../_Common_Input_Files/Floating_OWC/geometry/Sparbuoy_OWC.stl';
-body(2).mass = 'equilibrium';
+waterColumnMass = 4493450;
+waterColumnHeight = 50.69;
+
+body(2) = bodyClass('./hydroData/floatingOWC.h5');
+body(2).geometryFile = './geometry/Sparbuoy_OWC.stl';
+body(2).mass = waterColumnMass;
 
 
 
@@ -126,10 +129,8 @@
 airChamber(1).Ae = (pi / 4) * airChamber(1).owcDiameter^2;        % Air chamber area - Circular in this model
 airChamber(1).rho_air = 1.25;
 airChamber(1).Vo = airChamber(1).Ae * airChamber(1).airChamberHeight;           % Inital Volume of the air chamber
-% airChamber(1).mass = 4493450;
-airChamber(1).Mass = pi * (airChamber(1).owcDiameter^2)/4 * airChamber(1).airChamberHeight * 1025;
-Izz = 0.5* airChamber(1).Mass * (airChamber(1).owcDiameter/2)^2; 
-Ixx = airChamber(1).Mass * (3 * (airChamber(1).owcDiameter/2)^2 + airChamber(1).airChamberHeight^2) /12;
+Izz = 0.5* waterColumnMass * (airChamber(1).owcDiameter/2)^2; 
+Ixx = waterColumnMass * (3 * (airChamber(1).owcDiameter/2)^2 + waterColumnHeight^2) /12;
 
 body(2).inertia =  [Ixx    Ixx   Izz];