Multi wave class bug fix v2 (WEC-Sim#1373)

* fixes a bug that happens when multiple waves are defined * Adjusts the lin block version to 2020b * reduce number of From blocks in exc force blocks, mask update respectively * Allows QTF calculation for multiple wave instances * revert change to rm3.h 5 --------- Co-authored-by: akeeste <[email protected]>
akeeste · Dec 3, 2024 · bdad54a · bdad54a
1 parent 2c12e29
commit bdad54a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/source/functions/initializeWecSim.m b/source/functions/initializeWecSim.m
@@ -292,7 +292,7 @@
     for kk = 1:length(idx)
         ii = idx(kk);
         for iH = 1:length(body(ii).hydroData)
-            body(ii).hydroForcePre(waves(1), simu, iH);
+            body(ii).hydroForcePre(waves, simu, iH);
         end
     end
 end; clear kk idx ii

diff --git a/source/lib/WEC-Sim/WECSim_Lib_Body_Elements.slx b/source/lib/WEC-Sim/WECSim_Lib_Body_Elements.slx
diff --git a/source/objects/bodyClass.m b/source/objects/bodyClass.m
@@ -390,11 +390,12 @@ function dragForcePre(obj,rho)
             obj.dof = length(obj.quadDrag.drag);
         end
 
-        function hydroForcePre(obj, waves, simu, iH)
+        function hydroForcePre(obj, waveObj, simu, iH)
             % HydroForce Pre-processing calculations
             % 1. Set the linear hydrodynamic restoring coefficient, viscous drag, and linear damping matrices
             % 2. Set the wave excitation force
             % 3. Loop through all included hydroData files
+            waves = waveObj(1);
             w = waves.omega; 
             direction = waves.direction;
             cicTime = simu.cicTime;
@@ -488,7 +489,7 @@ function hydroForcePre(obj, waves, simu, iH)
                 if ~isfield(obj.hydroData(iH).hydro_coeffs.excitation, 'QTFs')
                     error('QTF coefficients are not defined for the body object "%s"', obj.name);
                 else
-                    obj.qtfExcitation(waveAmpTime, iH);
+                    obj.qtfExcitation(waveObj, iH);
                 end
             end
         end
@@ -746,10 +747,17 @@ function noExcitation(obj, iH)
             obj.hydroForce.(hfName).fExt.im=zeros(1,nDOF);
         end
 
-        function qtfExcitation(obj, waveAmpTime, iH)
+        function qtfExcitation(obj, wavesObj, iH)
             % second order excitation force
             % Used by hydroForcePre
             hfName = ['hf' num2str(iH)];
+
+            waveAmpTime(:,1) = wavesObj(1).waveAmpTime(:,1);
+            waveAmpTime(:,2) = wavesObj(1).waveAmpTime(:,2);
+
+            for iWaves = 2 : length(wavesObj)
+                waveAmpTime(:,2) = waveAmpTime(:,2) + wavesObj(iWaves).waveAmpTime(:,2);
+            end
 
             F_max = 1 / (waveAmpTime(2,1) - waveAmpTime(1,1)); % Maximum samplng freq.
             Amp_freq = fft(waveAmpTime(:,2));