merge main branch

Author: akeeste

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

@@ -27,7 +27,7 @@ jobs:
       - name: Install MATLAB
         uses: matlab-actions/setup-matlab@v2
         with:
-          release: R2024a
+          release: R2024b
       - name: Get test target folder
         uses: matlab-actions/run-command@v2
         with:

Mooring/MooringMatrix/RM3MooringMatrix.slx

@@ -62,10 +62,6 @@ function removeVTK(testCase)
 
     methods(Test)        
         function testParaview_Visualization_RM3_MoorDyn_Viz(testCase)
-%             assumeError(testCase,                               ...
-%                         @() run("wecSim"),                      ...
-%                         'Simulink:Engine:CallbackEvalErr',      ...
-%                         'Expected failure');
             wecSim
         end        
     end    

Paraview_Visualization/OSWEC_NonLinear_Viz/OSWEC.slx

@@ -39,15 +39,20 @@
 plot(IrrYaw.time_new,IrrYaw.Pos_new,':k','LineWidth',1.4)
 hold on; grid on;
 plot(IrrYaw.time_org,IrrYaw.Pos_org,'-k')
-title('Passive Yaw, irregular wave')
 xlabel('Time(s)'); ylabel('Yaw position (rad)')
+title('Yaw position comparison')
+
 subplot(1,2,2) % plots of yaw position
 plot(IrrYaw.time_new,IrrYaw.Force_new,':k','LineWidth',1.4)
 hold on; grid on;
-plot(IrrYaw.time_org,IrrYaw.Force_org,'-k')
-xlabel('Time(s)'); ylabel('Total Yaw Force (N)')
-legend('New','Original')
-savefig('figYawIrr');
+plot(IrrYaw.time_org,IrrYaw.Force_org,'-k');
+xlabel('Time(s)');
+ylabel('Total Yaw Force (N)');
+legend('New','Original');
+title('Yaw force comparison');
+
+sgtitle('Passive yaw regression, irregular wave')
+savefig('figYawIrr');                
 
 %% Clear output and .slx directory
 try

Paraview_Visualization/RM3_MoorDyn_Viz/TestMoorDynViz.m

@@ -7,18 +7,18 @@
         IrrYaw
     end
 
-    methods(Access = 'public')        
-        function obj = TestPassiveYawRegression(openCompare)            
+    methods(Access = 'public')
+        function obj = TestPassiveYawRegression(openCompare)
             arguments
                 openCompare (1,1) double = 1
-            end            
+            end
             % Assign arguments to test Class
-            obj.openCompare = openCompare;            
+            obj.openCompare = openCompare;
             % Set test directory
-            obj.testDir = fileparts(mfilename('fullpath'));            
+            obj.testDir = fileparts(mfilename('fullpath'));
             % Save the visibility state at construction
-            obj.OriginalDefault = get(0,'DefaultFigureVisible');            
-        end        
+            obj.OriginalDefault = get(0,'DefaultFigureVisible');
+        end
     end
 
     methods (TestMethodSetup)
@@ -27,32 +27,32 @@ function killPlots (~)
         end
     end
 
-    methods(TestClassSetup)                              
-        function runYawIrrTest(testCase)            
+    methods(TestClassSetup)
+        function runYawIrrTest(testCase)
             cd(fullfile(testCase.testDir,   ...
-                        'PassiveYawRegression'))                     
+                        'PassiveYawRegression'))
             runLoadPassiveYawIrr;
             close_system('OSWEC',0)
             testCase.IrrYaw = load('IrrYaw.mat').("IrrYaw");
             cd(fullfile(testCase.testDir));
         end        
     end
 
-    methods(TestClassTeardown)        
-        function plotRegressionTests(testCase)            
+    methods(TestClassTeardown)
+        function plotRegressionTests(testCase)
             % Open new vs. org Comparisons
-            if testCase.openCompare == 1                
+            if testCase.openCompare == 1
                 cd(testCase.testDir);
-                open(fullfile('.','PassiveYawRegression','figYawIrr.fig')); 
-            end            
+                open(fullfile('.','PassiveYawRegression','figYawIrr.fig'));
+            end
             set(0,'DefaultFigureVisible',testCase.OriginalDefault);
             testCase.assertEqual(get(0,'DefaultFigureVisible'),     ...
-                                 testCase.OriginalDefault);            
-            cd(testCase.testDir);            
+                                 testCase.OriginalDefault);
+            cd(testCase.testDir);
         end
     end
 
-    methods(Test)          
+    methods(Test)
         function body1_irregYaw_disp_yaw(testCase)
             % Body1 Displacement in Yaw
             tol = 1e-10;
@@ -66,7 +66,7 @@ function body1_irregYaw_torque_yaw(testCase)
             testCase.verifyEqual(testCase.IrrYaw.Force_diff,0,'AbsTol',tol);
             fprintf(['Body1 Torque in Yaw, Diff = '             ...
                      num2str(testCase.IrrYaw.Force_diff) '\n']);
-        end        
+        end
         function irregYaw_0th_Spectral_Moment(testCase)
             % 0th Order Spectral Moment
             tol = 1e-10;
@@ -75,7 +75,7 @@ function irregYaw_0th_Spectral_Moment(testCase)
             testCase.verifyEqual(new,org,'AbsTol',tol);
             fprintf(['0th Order Spectral Moment, Diff = '       ...
                       num2str(max(abs(org-new))) '\n']);
-        end        
+        end
         function irregYaw_2nd_Spectral_Moment(testCase)
             % 2nd Order Spectral Moment
             tol = 1e-10;
@@ -84,6 +84,6 @@ function irregYaw_2nd_Spectral_Moment(testCase)
             testCase.verifyEqual(new,org,'AbsTol',tol);
             fprintf(['2nd Order Spectral Moment, Diff = '       ...
                      num2str(max(abs(org-new))) '\n']);
-        end        
+        end
     end    
 end