Pulling bugfix PR WEC-Sim#1473 into dev (WEC-Sim#1480)

* Match PR 1478 on main (WEC-Sim#1479)

* match PR 1478 changes on main

---------

Co-authored-by: jtgrasb <87095491+jtgrasb@users.noreply.github.com>
Co-authored-by: akeeste <akeeste@sandia.gov>

* Fixing Regression Tests for RM3 (WEC-Sim#1473)

* Fixing Regression Tests for RM3

* Updating the correct _org.mat files

* resolving figure issues

---------

Co-authored-by: Ruehl <kmruehl@sandia.gov>

---------

Co-authored-by: dforbush2 <dforbus@sandia.gov>
Co-authored-by: jtgrasb <87095491+jtgrasb@users.noreply.github.com>
Co-authored-by: akeeste <akeeste@sandia.gov>
Co-authored-by: Jorge Leon <72461917+jleonqu@users.noreply.github.com>

Author: 5 people

tests/RegressionTests/IrregularWaves/irregularCIC/irregularCIC_org.mat

@@ -19,7 +19,6 @@
 % and Tp=8[s]. The RM3 WEC models has 2 bodies, restricted to heave motion
 % only, and has PTO damping=1200[kN-s/m].
 
-global plotNO
 locdir=pwd;
 %% Run Simulation
 wecSim;                     % Run Simulation
@@ -75,7 +74,7 @@
 save('irregularCIC','irregularCIC')
 
 %% Plot Old vs. New Comparison
-if plotNO==1 % global variable 
+if testCase.openCompare==1 
     cd ../..
     plotOldNew(B1,B2,Rel,[irregularCIC.B1_H_max ,irregularCIC.B1_H_I],...
         [irregularCIC.B2_H_max ,irregularCIC.B2_H_I],...

tests/RegressionTests/IrregularWaves/irregularCIC/runLoadIrregularCIC.m

@@ -19,7 +19,6 @@
 % and Tp=8[s]. The RM3 WEC models has 2 bodies, restricted to heave motion
 % only, and has PTO damping=1200[kN-s/m]. 
 
-global plotNO
 locdir=pwd;
 %% Run Simulation
 wecSim;                     % Run Simulation
@@ -75,7 +74,7 @@
 save('irregularSS','irregularSS')
 
 %% Plot Old vs. New Comparison
-if plotNO==1 % global variable 
+if testCase.openCompare==1 
     cd ../..
     plotOldNew(B1,B2,Rel,[irregularSS.B1_H_max ,irregularSS.B1_H_I],...
         [irregularSS.B2_H_max ,irregularSS.B2_H_I],...

tests/RegressionTests/IrregularWaves/irregularSS/irregularSS_org.mat

@@ -18,26 +18,21 @@
 % irregular waves.
 
 %% Load Data
-cd irregularCIC
-load('irregularCIC_org.mat')       % Load WEC-Sim Run Data
-cd .. ; cd irregularSS
-load('irregularSS_org.mat')        % Load WEC-Sim Run Data
-cd ..
-
+load('./irregularCIC/irregularCIC.mat')       % Load WEC-Sim Run Data
+load('./irregularSS/irregularSS.mat')        % Load WEC-Sim Run Data
 
 %% Plot Heave Comparisons
 h=figure('units','normalized','outerposition',[0 0 1 1]);
 % First Row = All simulations, all times
 % Second Row = All simulations, t=350-400s
-% Third Row = Original and New WEC-Sim runs only, t=350-400s
 
 %First Column: Body 1 Heave
 startTime = 100;
 subplot(2,3,1)
 m = plot(irregularCIC.B1.WEC_Sim_new.time,irregularCIC.B1.WEC_Sim_new.heave,'r--',...
       irregularCIC.B1.WEC_Sim_new.time, irregularSS.B1.WEC_Sim_new.heave,'b-.');
-% a = get(m(1),'LineWidth')+1;
-% set(m(1),'LineWidth',a)  
+a = get(m(1),'LineWidth')+1;
+set(m(1),'LineWidth',a)  
 xlabel('time(s)')
 ylabel('Heave(m)')
 title('Float 1DOF 1200PTO')
@@ -49,6 +44,8 @@
        irregularCIC.B1.WEC_Sim_new.heave(find(irregularCIC.B1.WEC_Sim_new.time==startTime):end),'r--',...
         irregularSS.B1.WEC_Sim_new.time(find(  irregularSS.B1.WEC_Sim_new.time==startTime):end),...
         irregularSS.B1.WEC_Sim_new.heave(find( irregularSS.B1.WEC_Sim_new.time==startTime):end),'b-.');
+a=get(m(1),'LineWidth')+1;
+set(m(1),'LineWidth',a)
 xlabel('time(s)')
 ylabel('Heave(m)')
 xlim([100 200])
@@ -58,6 +55,8 @@
 subplot(2,3,2)
 m = plot(irregularCIC.B2.WEC_Sim_new.time,irregularCIC.B2.WEC_Sim_new.heave,'r--',...
       irregularSS.B2.WEC_Sim_new.time, irregularSS.B2.WEC_Sim_new.heave,'b-.');
+a=get(m(1),'LineWidth')+1;
+set(m(1),'LineWidth',a)
 xlabel('time(s)')
 ylabel('Heave(m)')
 title('Spar/Plate 1DOF 1200PTO')
@@ -69,6 +68,8 @@
        irregularCIC.B2.WEC_Sim_new.heave(find(irregularCIC.B2.WEC_Sim_new.time==startTime):end),'r--',...
         irregularSS.B2.WEC_Sim_new.time(find(  irregularSS.B2.WEC_Sim_new.time==startTime):end),...
         irregularSS.B2.WEC_Sim_new.heave(find( irregularSS.B2.WEC_Sim_new.time==startTime):end),'b-.');
+a=get(m(1),'LineWidth')+1;
+set(m(1),'LineWidth',a)
 xlabel('time(s)')
 ylabel('Heave(m)')
 xlim([100 200])
@@ -78,6 +79,8 @@
 subplot(2,3,3)
 m = plot(irregularCIC.Rel.WEC_Sim_new.time,irregularCIC.Rel.WEC_Sim_new.heave,'r--',...
       irregularSS.Rel.WEC_Sim_new.time, irregularSS.Rel.WEC_Sim_new.heave,'b-.');
+a=get(m(1),'LineWidth')+1;
+set(m(1),'LineWidth',a)
 xlabel('time(s)')
 ylabel('Heave(m)')
 title('Relative Motion 1DOF 1200PTO')
@@ -92,9 +95,13 @@
        irregularCIC.Rel.WEC_Sim_new.heave(find(irregularCIC.Rel.WEC_Sim_new.time==startTime):end),'r--',...
         irregularSS.Rel.WEC_Sim_new.time(find(  irregularSS.Rel.WEC_Sim_new.time==startTime):end),...
         irregularSS.Rel.WEC_Sim_new.heave(find( irregularSS.Rel.WEC_Sim_new.time==startTime):end),'b-.');
+a=get(m(1),'LineWidth')+1;
+set(m(1),'LineWidth',a)
 xlabel('time(s)')
 ylabel('Heave(m)')
 xlim([100 200])
 ylim([-2 2])
 
+savefig(fullfile('figIrrSolver')); 
+
 clear a h l m B1_H_Tolerance B2_H_Tolerance Rel_H_Tolerance str1 str2

tests/RegressionTests/IrregularWaves/irregularSS/runLoadIrregularSS.m

@@ -18,20 +18,14 @@
 % regular waves.
 
 %% Load Data
-cd regular
-load('regular_org.mat')       % Load WEC-Sim Run Data
-cd .. ; cd regularCIC
-load('regularCIC_org.mat')    % Load WEC-Sim Run Data
-cd .. ; cd regularSS
-load('regularSS_org.mat')     % Load WEC-Sim Run Data
-cd .. 
-
+load('./regular/regular.mat')       
+load('./regularCIC/regularCIC.mat')    
+load('./regularSS/regularSS.mat')     
 
 %% Plot Heave Comparisons
 h=figure('units','normalized','outerposition',[0 0 1 1]);
 % First Row = All simulations, all times
 % Second Row = All simulations, t=350-400s
-% Third Row = Original and New WEC-Sim runs only, t=350-400s
 
 %First Column: Body 1 Heave
 startTime = 100;
@@ -118,4 +112,6 @@
 xlim([100 150])
 ylim([-2 2])
 
+savefig(fullfile('figRegSolver'));  
+
 clear a h l m B1_H_Tolerance B2_H_Tolerance Rel_H_Tolerance str1 str2

tests/RegressionTests/IrregularWaves/printPlotIrregular.m

@@ -19,7 +19,6 @@
 % and Tp=8[s]. The RM3 WEC models has 2 bodies, restricted to heave motion
 % only, and has PTO damping=1200[kN-s/m].
 
-global plotNO
 locdir=pwd;
 %% Run Simulation
 wecSim;                     % Run Simulation
@@ -67,7 +66,7 @@
 save('regular','regular')
 
 %% Plot Old vs. New Comparison
-if plotNO==1 % global variable 
+if testCase.openCompare==1 
 cd ../.. 
     plotOldNew(B1,B2,Rel,[regular.B1_H_max ,regular.B1_H_I],...
         [regular.B2_H_max ,regular.B2_H_I]...

tests/RegressionTests/RegularWaves/printPlotRegular.m

@@ -19,7 +19,6 @@
 % and Tp=8[s]. The RM3 WEC models has 2 bodies, restricted to heave motion
 % only, and has PTO damping=1200[kN-s/m]. 
 
-global plotNO
 locdir=pwd;
 %% Run Simulation
 
@@ -68,8 +67,7 @@
 save('regularCIC','regularCIC');  
 
 %% Plot Old vs. New Comparison
-
-if plotNO==1
+if testCase.openCompare==1 
     cd ../..
     plotOldNew(B1,B2,Rel,[regularCIC.B1_H_max ,regularCIC.B1_H_I],...
         [regularCIC.B2_H_max ,regularCIC.B2_H_I],...