waveClass default to "EqualEnergy"

WEC-Sim · Sep 7, 2017 · 3dde205 · 3dde205
1 parent e7055ab
commit 3dde205
Show file tree

Hide file tree

Showing 17 changed files with 13 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -58,14 +58,13 @@ $ cat .gitignore
 *build_exception*
 
 # Tutorials
-!/tutorials/verificationCases/RegularWaves/*.mat
-!/tutorials/verificationCases/IrregularWaves/*.mat
 /tutorials/BEMIO/**/*.h5
-!/tutorials/verificationCases/IrregularWaves/irregularSS/irregularSS_org.mat
-!/tutorials/verificationCases/IrregularWaves/irregularCIC/irregularCIC_org.mat
+/tutorials/verificationCases/**/**/*.mat
 !/tutorials/verificationCases/RegularWaves/regular/regular_org.mat
 !/tutorials/verificationCases/RegularWaves/regularCIC/regularCIC_org.mat
 !/tutorials/verificationCases/RegularWaves/regularSS/regularSS_org.mat
+!/tutorials/verificationCases/IrregularWaves/irregularSS/irregularSS_org.mat
+!/tutorials/verificationCases/IrregularWaves/irregularCIC/irregularCIC_org.mat
 
 # moorDyn
 source/functions/moorDyn/*

diff --git a/USERS_GUIDE.html b/USERS_GUIDE.html
diff --git a/source/objects/waveClass.m b/source/objects/waveClass.m
@@ -30,7 +30,7 @@
                                              'numPointsX', 50, ...              % Visualization number of points in x direction.
                                              'numPointsY', 50)                  % Visualization number of points in y direction.
         statisticsDataLoad          = [];                                   % File name to load wave statistics data for wecSimMCR
-        freqDisc                    = 'Traditional'                         % Method of frequency discretization for irregular waves. Options for this variable are 'EqualEnergy' or 'Traditional'. (default = 'EqualEnergy').
+        freqDisc                    = 'EqualEnergy'                         % Method of frequency discretization for irregular waves. Options for this variable are 'EqualEnergy' or 'Traditional'. (default = 'EqualEnergy').
     end
 
     properties (SetAccess = 'private', GetAccess = 'public')%internal

diff --git a/tutorials/verificationCases/IrregularWaves/irregularCIC/irregularCIC.mat b/tutorials/verificationCases/IrregularWaves/irregularCIC/irregularCIC.mat
diff --git a/tutorials/verificationCases/IrregularWaves/irregularCIC/irregularCIC_org.mat b/tutorials/verificationCases/IrregularWaves/irregularCIC/irregularCIC_org.mat
diff --git a/tutorials/verificationCases/IrregularWaves/irregularSS/irregularSS.mat b/tutorials/verificationCases/IrregularWaves/irregularSS/irregularSS.mat
diff --git a/tutorials/verificationCases/IrregularWaves/irregularSS/irregularSS_org.mat b/tutorials/verificationCases/IrregularWaves/irregularSS/irregularSS_org.mat
diff --git a/tutorials/verificationCases/RegularWaves/regular/regular.mat b/tutorials/verificationCases/RegularWaves/regular/regular.mat
diff --git a/tutorials/verificationCases/RegularWaves/regular/regular_org.mat b/tutorials/verificationCases/RegularWaves/regular/regular_org.mat
diff --git a/tutorials/verificationCases/RegularWaves/regular/wecSimInputFile.m b/tutorials/verificationCases/RegularWaves/regular/wecSimInputFile.m
@@ -2,7 +2,7 @@
 simu = simulationClass();               % Initialize Simulation Class
 simu.simMechanicsFile = 'RM3.slx';      % Specify Simulink Model File
 simu.rampTime = 100;                    % Wave Ramp Time [s]
-simu.endTime=150;                       % Simulation End Time [s]
+simu.endTime=200;                       % Simulation End Time [s]
 simu.dt = 0.1;                          % Simulation Time-Step [s]
 simu.explorer = 'off';
 

diff --git a/tutorials/verificationCases/RegularWaves/regularCIC/regularCIC.mat b/tutorials/verificationCases/RegularWaves/regularCIC/regularCIC.mat
diff --git a/tutorials/verificationCases/RegularWaves/regularCIC/regularCIC_org.mat b/tutorials/verificationCases/RegularWaves/regularCIC/regularCIC_org.mat
diff --git a/tutorials/verificationCases/RegularWaves/regularCIC/wecSimInputFile.m b/tutorials/verificationCases/RegularWaves/regularCIC/wecSimInputFile.m
@@ -2,7 +2,7 @@
 simu = simulationClass();               % Initialize Simulation Class
 simu.simMechanicsFile = 'RM3.slx';      % Specify Simulink Model File
 simu.rampTime = 100;                    % Wave Ramp Time [s]
-simu.endTime=150;                       % Simulation End Time [s]
+simu.endTime=200;                       % Simulation End Time [s]
 simu.dt = 0.1;                          % Simulation Time-Step [s]
 simu.explorer = 'off';
 simu.CITime = 20;

diff --git a/tutorials/verificationCases/RegularWaves/regularSS/regularSS.mat b/tutorials/verificationCases/RegularWaves/regularSS/regularSS.mat
diff --git a/tutorials/verificationCases/RegularWaves/regularSS/regularSS_org.mat b/tutorials/verificationCases/RegularWaves/regularSS/regularSS_org.mat
diff --git a/tutorials/verificationCases/RegularWaves/regularSS/wecSimInputFile.m b/tutorials/verificationCases/RegularWaves/regularSS/wecSimInputFile.m
@@ -2,7 +2,7 @@
 simu = simulationClass();               % Initialize Simulation Class
 simu.simMechanicsFile = 'RM3.slx';      % Specify Simulink Model File
 simu.rampTime = 100;                    % Wave Ramp Time [s]
-simu.endTime=150;                       % Simulation End Time [s]
+simu.endTime=200;                       % Simulation End Time [s]
 simu.dt = 0.1;                          % Simulation Time-Step [s]
 simu.explorer = 'off';
 simu.ssCalc = 1;

diff --git a/tutorials/verificationCases/plotOldNew.m b/tutorials/verificationCases/plotOldNew.m
@@ -46,7 +46,7 @@ function plotOldNew(B1,B2,Rel,InfoDiffB1, InfoDiffB2, InfoDiffRel,titstr)
 a=text(10,1.2,str2);set(a,'FontSize',12)
 b=get(n(1),'LineWidth')+1;
 set(n(1),'LineWidth',b)
-xlim([0 150])
+xlim([0 200])
 ylim([-2 2])
 
 subplot(2,3,4)
@@ -58,7 +58,7 @@ function plotOldNew(B1,B2,Rel,InfoDiffB1, InfoDiffB2, InfoDiffRel,titstr)
 set(m(1),'LineWidth',a)
 xlabel('time(s)')
 ylabel('Heave(m)')
-xlim([100 150])
+xlim([100 200])
 ylim([-2 2])
 
 %Second Column: Body 2 Heave
@@ -74,7 +74,7 @@ function plotOldNew(B1,B2,Rel,InfoDiffB1, InfoDiffB2, InfoDiffRel,titstr)
 a=text(10,0.15,str2);set(a,'FontSize',12)
 b=get(n(1),'LineWidth')+1;
 set(n(1),'LineWidth',b)
-xlim([0 150])
+xlim([0 200])
 ylim([-0.2 0.2])
 
 subplot(2,3,5)
@@ -86,7 +86,7 @@ function plotOldNew(B1,B2,Rel,InfoDiffB1, InfoDiffB2, InfoDiffRel,titstr)
 set(m(1),'LineWidth',a)
 xlabel('time(s)')
 ylabel('Heave(m)')
-xlim([100 150])
+xlim([100 200])
 ylim([-0.2 0.2])
 
 %Third Column: Relative Heave
@@ -102,7 +102,7 @@ function plotOldNew(B1,B2,Rel,InfoDiffB1, InfoDiffB2, InfoDiffRel,titstr)
 a=text(10,1.2,str2);set(a,'FontSize',12)
 b=get(n(1),'LineWidth')+1;
 set(n(1),'LineWidth',b)
-xlim([0 150])
+xlim([0 200])
 ylim([-2 2])
 l=legend('WEC-Sim Org','WEC-Sim New');
 set(l,'Position',[0.92 0.90 0.07 0.07],'Units','normalized',...
@@ -117,7 +117,7 @@ function plotOldNew(B1,B2,Rel,InfoDiffB1, InfoDiffB2, InfoDiffRel,titstr)
 set(m(1),'LineWidth',a)
 xlabel('time(s)')
 ylabel('Heave(m)')
-xlim([100 150])
+xlim([100 200])
 ylim([-2 2])
 
 end