diff --git a/.gitignore b/.gitignore index e5dad0c0..6a500fb0 100644 --- a/.gitignore +++ b/.gitignore @@ -70,6 +70,7 @@ $ cat .gitignore savedData*.mat WECCCOMP/**/SS*.mat WECCCOMP/**/SS*.fig +!WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/waveData/*.mat Passive_Yaw/**/IrrYaw.mat Passive_Yaw/**/figYawIrr.fig yaw*.mat diff --git a/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/waveData/SS1_excM_stored.mat b/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/waveData/SS1_excM_stored.mat new file mode 100644 index 00000000..1e5fe6df Binary files /dev/null and b/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/waveData/SS1_excM_stored.mat differ diff --git a/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/waveData/SS2_excM_stored.mat b/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/waveData/SS2_excM_stored.mat new file mode 100644 index 00000000..30f56fca Binary files /dev/null and b/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/waveData/SS2_excM_stored.mat differ diff --git a/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/waveData/SS3_excM_stored.mat b/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/waveData/SS3_excM_stored.mat new file mode 100644 index 00000000..a17134cb Binary files /dev/null and b/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/waveData/SS3_excM_stored.mat differ diff --git a/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/waveData/SS4_excM_stored.mat b/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/waveData/SS4_excM_stored.mat new file mode 100644 index 00000000..0f78d318 Binary files /dev/null and b/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/waveData/SS4_excM_stored.mat differ diff --git a/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/waveData/SS5_excM_stored.mat b/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/waveData/SS5_excM_stored.mat new file mode 100644 index 00000000..fa285faa Binary files /dev/null and b/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/waveData/SS5_excM_stored.mat differ diff --git a/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/waveData/SS6_excM_stored.mat b/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/waveData/SS6_excM_stored.mat new file mode 100644 index 00000000..79f456cb Binary files /dev/null and b/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/waveData/SS6_excM_stored.mat differ diff --git a/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/wecSimInputFile.m b/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/wecSimInputFile.m index 5b21498f..1b35d6fd 100644 --- a/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/wecSimInputFile.m +++ b/WECCCOMP/WECCCOMP_Nonlinear_Model_Predictive/wecSimInputFile.m @@ -47,9 +47,7 @@ % waves = waveClass('regularCIC'); % Initialize waveClass % waves.height = Hm0; % Wave Height [m] % waves.period = Tp; % Wave Period [s] -% waves.wavegauge1loc = [-1.70, 0]; % Wave Gauge 1 x-location -% waves.wavegauge2loc = [-1.50, 0]; % Wave Gauge 2 x-location -% waves.wavegauge3loc = [-1.25, 0]; % Wave Gauge 3 x-location +% waves.marker.location = [-1.70, 0; -1.50, 0;-1.25, 0]; % Wave Gauge locations %%%%%%%%%%%%%%%%%%%% Irregular Waves %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% waves = waveClass('irregular'); % Initialize waveClass