Changeset 314

Timestamp:

01/07/10 15:10:02

Author:

gdusek

Message:

changes to mulitple files due to recent merge

Files:

• DPWP/trunk/DPWP/adcp_matlab/confplot.m (modified) (6 diffs)
• DPWP/trunk/DPWP/adcp_matlab/radialtouvw.m (modified) (7 diffs)
• DPWP/trunk/DPWP/adcp_matlab/specmultiplot.m (modified) (3 diffs)
• DPWP/trunk/DPWP/diwasp_1_1GD/dirspec.m (modified) (1 diff)
• DPWP/trunk/DPWP/nortek/nortek_radialtouvw.m (modified) (2 diffs)
• DPWP/trunk/DPWP/nortek/nortek_specmultiplot.m (modified) (8 diffs)
• DPWP/trunk/DPWP/nortek/nortek_waveplot.m (modified) (9 diffs)

DPWP/trunk/DPWP/adcp_matlab/confplot.m

@@ -1 @@
-EMEP,rangeE,radialE,spec,sysinfo
+uvw,range,radial
-
-%set up the wavesmon data in a structure
-
-%what is the magnetic variation to nearest degree
-magvar=10;
-
-%first change to m^2/Hz/deg
-wmon.S=spec/(360*1000*1000);
-
-%what is the start angle
-heading=sysinfo(18,:);
-heading=heading/100;
-sangle=heading+magvar;
-
-%what is the frequency and dir resolution for those generated in DIWASP
-freqres=0.01;
-freqs=[0.01:0.01:.4];
-dirres=2;
-dirs=[-180:2:180];
-
-
-
-
-
-
-
-
+
-
-%calculate just the frequency energy spectrum
-
-
-
-
+
+
+
-
-%Compute the coefficient for the upper and lower error bounds for the power
-%spectrum assuming 95% confidence.  Added on 9/17/08
-E
+
-chiUp=chi2inv(.975,degF);
-chiLow=chi2inv(.025,degF);
@@ -45 +24 @@
-
-%calculate the conf limits throughout the frequency spectrum
-EMEPradialfreqUP=EMEP
-EMEPradialfreqLOW=EMEP
+radialfreqUP=
+radialfreqLOW=
-
-%same thing for the Puvw and range
@@ -54 +33 @@
-coeffUp2=degF2/chiLow2;
-coeffLow2=degF2/chiUp2;
-
-
+;
+;
-
-%calculate the conf limits throughout the frequency spectrum
-EMEPfreqUP=EMEP
-EMEPfreqLOW=EMEP
-EMEPrangefreqUP=EMEP
-EMEPrangefreqLOW=EMEP
+uvwfreqUP=uvw
+uvwfreqLOW=uvw
+rangefreqUP=
+rangefreqLOW=
-
-scrsz = get(0,'ScreenSize');
@@ -67 +46 @@
-
-%plot the frequency energy spectrum
-EMEP
+uvw
-hold on
-plot([0.1,0.1],[10^logCoeffLow2,10^logCoeffUp2],'b.-');
@@ -73 +52 @@
-%plot(freqs,EMEPfreqLOW,'b--');
-
-EMEP
+
-plot([0.11,0.11],[10^logCoeffLow2,10^logCoeffUp2],'r.-');
-%plot(freqs,EMEPrangefreqUP,'r--');
-%plot(freqs,EMEPrangefreqLOW,'r--');
-
-EMEP
+
-plot([0.12,0.12],[10^logCoeffLow,10^logCoeffUp],'g.-');
-%plot(freqs,EMEPradialfreqUP,'g--');
@@ -85 +64 @@
-%set(gca,'ytick',[-4 -3 -2 -1 0 1]);
-axis(axis);
-
-
-
+
+
-xlabel('frequency in Hz');
-ylabel('m^2 / hz');

DPWP/trunk/DPWP/adcp_matlab/radialtouvw.m

@@ -22 +22 @@
-
-%whats the magnetic variation
-
+ 
-
-%set up sysinfo file
@@ -63 +63 @@
-for i=1:orbOut
-    
-
+ 
-    std_orbit(i)=nanstd(orbit(:,i));
-    ibad_std=find(abs(orbit(:,i)) > 4*std_orbit(i));
@@ -133 +133 @@
-d = -SH.*CR + CH.*SP.*SR; e = CH.*CP; f = -SH.*SR - CH.*SP.*CR;
-g = -CP.*SR;              h = SP;     j = CP.*CR;
-
+
-
-%reshape the orbital matrix to 3 dimensions
@@ -186 +186 @@
-g = CP.*SR;              h = SP;     j = CP.*CR;
-
+
+
-%transform the original x,y,z positions to the new positions accounting for
-%heading, pitch and roll... we also add adcpheight back in
@@ -249 +251 @@
-ID.fs=2;
-%depth
-adcpheight+mean(press));
+0.4+mean(press)); %note changed for work with the FRF ADCP**********************
-%the spectral matrix structure
-SM.freqs=[0.01:0.01:0.4];
@@ -265 +267 @@
-    % the layout
-    ID.layout = [ 0 0 0 0 0 0 0 0 0 0;0 0 0 0 0 0 0 0 0 0; 
-2height bin2height bin2height bin3height bin3height bin3height bin4height bin4height bin4
+3height bin3height bin3height bin4height bin4height bin4height bin5height bin5height bin5
-    % the data
-2), v_all(:,2), w_all(:,2), u_all(:,3), v_all(:,3), w_all(:,3), u_all(:,4), v_all(:,4), w_all(:,4
+3), v_all(:,3), w_all(:,3), u_all(:,4), v_all(:,4), w_all(:,4), u_all(:,5), v_all(:,5), w_all(:,5
-    
-elseif data_type == 2
@@ -284 +286 @@
-    % the datatypes
-    ID.datatypes={'radial' 'radial' 'radial' 'radial' 'radial' 'radial' 'radial' 'radial' 'radial' 'radial' 'radial' 'radial'};
-
-
-
-
+ using bins 2,3,4
+%
+%
+%
-    % the data
-
+%
-
-    % the layout using bins 3,4,5
-%
-%
-%
+
+
+
-    % the data
-
-
+
+
+
-end
-

DPWP/trunk/DPWP/adcp_matlab/specmultiplot.m

@@ -60 +60 @@
-
-    %set up data with radial velocities, freq and dir at default
-
-
+
+
+
-    % run diwasp to generate this spectrum with EMEP
-    [radialE, EPout]=dirspec(ID,SM,EP,{'PLOTTYPE',0,'MESSAGE',0});
@@ -107 +108 @@
-%this changes the coordinates from axis to compass (and from direction TO,
-%to direction FROM)
-% NEED TO ADJUST THIS TO AUTOMATICALLY ACOUNT FOR USER INPUTTED SM.dirs!!!
-newspec2d=zeros(size(spec2d));
-for i= 1:size(spec2d,1)
@@ -134 +134 @@
-end
-
-
+%
-
-%Use this to organize spec IF SM.dirs=[-180:2:178]

DPWP/trunk/DPWP/diwasp_1_1GD/dirspec.m

@@ -152 +152 @@
-%What are the number of sensors (data series) used to compute the power
-%spectrum?  If we aren't using radial velocities it is just 1.
+
-dataUsed=1;
-

DPWP/trunk/DPWP/nortek/nortek_radialtouvw.m

@@ -115 +115 @@
-%transform the original x,y,z positions to the new positions accounting for
-%heading, pitch and roll... we also add adcpheight back in
-
+
-new_xyzpos(1,:)=xyzpos(1,:)*a+xyzpos(2,:)*b+xyzpos(3,:)*c;
-new_xyzpos(2,:)=xyzpos(1,:)*d+xyzpos(2,:)*e+xyzpos(3,:)*f;
@@ -174 +174 @@
-SM.xaxisdir= 90;
-%the estimation parameter
-EMEP
-100
+IMLM
+3
-
-if data_type == 1

DPWP/trunk/DPWP/nortek/nortek_specmultiplot.m

@@ -1 @@
-; 
+
-
-%NOTE:  This function is for the Nortek AWAC profiler!
@@ -30 +30 @@
-    end
-end
-
+
+
+
-      
-%set up time, which is Winfo.time as date str in the yymmddHHMM format
@@ -36 +38 @@
-
-%set up data structure for wave info
-IMLM
+EMEP
-Winfo.hsig=[];
-Winfo.hconf=[];
@@ -45 +47 @@
-
-%load the wave data from the nortek quick wave software
-
+%
-
-%Load the data and run the script
@@ -55 +57 @@
-    orbit=strcat('orbit_',dateinfo,'.txt');
-    sysinfo=strcat('sysinfo_',dateinfo,'.txt');
-
+%
-
-    pressure=load(pressure);
@@ -61 +63 @@
-    orbit=load(orbit);
-    sysinfo=load(sysinfo);
-
+%
-
-    %set up data with standard AST freq at 0.01 and dir at 2
@@ -74 +76 @@
-    %Use waveplot to plot the polar, freq and dir plots of the spectra
-
-
+
+
-    
-    saveas(fig1,['polar1_' dateinfo '.fig']);
-    saveas(fig2,['dirfreq1_' dateinfo '.fig']);
+    
+    movefile(['polar1_' dateinfo '.fig'],'tempdir');
+    movefile(['dirfreq1_' dateinfo '.fig'],'tempdir');
-    
-    close all;
@@ -97 +103 @@
-end
-
+save(['specdata_' dateinfo],'Winfo');
+movefile(['specdata_' dateinfo '.mat'],'tempdir');
+
+movefile('tempdir',strcat('procdata_',dateinfo));
+
-%now create the time series plots of the wave info
-
+%
-
-
-
-
-
+%
+%
+%
+%
-
-close all;

DPWP/trunk/DPWP/nortek/nortek_waveplot.m

@@ -1 @@
-E_WI,I_WI,nortek_WI,fig1,fig2]=nortek_waveplot(EMEP,IMLM,sysinfo,nortekspec
+I_WI,fig1,fig2]=nortek_waveplot(IMLM
-
-%make sure to load the EMEP, IMLM and wavesmon samples
@@ -5 +5 @@
-%rangeE=load('EMEP_range'), rangeI=load('IMLM_range')
-
-
+
-
-%what is the magnetic variation to nearest degree
-
+-
-
-%what is the frequency and dir resolution for those generated in DIWASP
@@ -16 +16 @@
-dirs=[-180:2:180];
-
-%what is the frequency and dir resolution for those created by nortek
-%freqres is the same
-nortekfreqs=[0.01:0.01:.4];
-nortekdirres=4;
-nortekdirs=[270:-4:-86];
-nortek.S=nortekspec;
-nortek.dirs=nortekdirs;
-nortek.freqs=nortekfreqs;
-nortek.xaxisdir=90;
-
-% plot the spectrum generated through DIWASP 
-
-scrsz = get(0,'ScreenSize');
-fig1=figure('Position',[scrsz]);
-
-
-
+
-
-subplot(2,2,2);
-subplotspec(IMLM,4);
-IMLM
+EMEP
-
-
-
-
+
-
-
-%calculate just the dir energy spectrum on a single graph
-
-
+
-IMLMdir=sum(real(IMLM.S))*freqres;
-
+
-
-
-%calculate just the frequency energy spectrum
-EMEPfreq=sum(EMEP.S')*dirres;
-IMLMfreq=sum(real(IMLM.S)')*dirres;
-
+
-
-%Compute the coefficient for the upper and lower error bounds for the
-%frequency
-%spectrum assuming 95% confidence.  Added on 9/17/08
-EMEP
+IMLM
-chiUp=chi2inv(.975,degF);
-chiLow=chi2inv(.025,degF);
@@ -65 +50 @@
-
-%calculate the conf limits throughout the frequency spectrum
-
-
+
-IMLMfreqUP=IMLMfreq*coeffUp;
-IMLMfreqLOW=IMLMfreq*coeffLow;
@@ -72 +56 @@
-%Find the maximum for the directional spectrum so we can set up the proper
-%x-axis
-EMEP
+IMLM
-maxdir=dirs(maxindex);
-% set up the x-axis for all of the spectra depending on the max
-
+|
-    %for diwasp spectra
-    index1=find(dirs < 0);
-    index2=find(dirs > -1);
-    dirs(index1)=dirs(index1) +360;
-    %for nortek
-    Aindex=find(nortek.dirs < 0);               
-    Bindex=find((-1 < nortek.dirs) & (nortek.dirs < 361));
-    Bindex2=find(nortek.dirs > 360);
-    nortek.dirs(Bindex2)=nortek.dirs(Bindex2)-360;
-    nortek.dirs(Aindex)=nortek.dirs(Aindex)+360;
-
-    %plot the directional energy spectrum
-    fig2=figure('Position',[scrsz]);
-    subplot(1,2,1);
-
-
-
-
-
-
-
-
-
+
+
+
-else
-    %for diwasp spectra do nothing
-    
-    %for nortek
-    Aindex=find(nortek.dirs > 180);
-    Bindex=find(nortek.dirs < 181);
-    nortek.dirs(Aindex)=nortek.dirs(Aindex)-360;
-    %plot the directional energy spectrum
-    fig2=figure('Position',[scrsz]);
-    subplot(1,2,1);
-    h1 = plot(dirs,EMEPdir,'b');
-    hold on
-
-
-
-
+
-    
-end
-
-[h1, h2, h3a],'EMEP','IMLM','nortek quickwave','location','best
+h2a,'EMEP
-title('directional wave spectrum integrated over frequency');
-xlabel('axis angle (degrees true)');
@@ -125 +88 @@
-%plot the frequency energy spectrum
-subplot(1,2,2);
-1=plot(freqs,EMEPfreq,'b
+3=plot(freqs,IMLMfreq,'r
-hold on
-h2=plot(freqs,EMEPfreqUP,'b--');
-plot(freqs,EMEPfreqLOW,'b--');
-h3=plot(freqs,IMLMfreq,'r');
-h4=plot(freqs,IMLMfreqUP,'r--');
-plot(freqs,IMLMfreqLOW,'r--');
-
-
+
-title('directional wave spectrum integrated over direction');
-xlabel('frequency in Hz');
@@ -140 +99 @@
-% ______Calculate and display the wave parameters SigH, Tp, Dp,DTp_______
-
-%For EMEP AST and radial velocities
-
-%calculate the 0,1,2 moments
-m0=sum(EMEPfreq*freqres);                              
-m1=sum(freqs.*EMEPfreq*freqres);
-m2=sum((freqs.^2).*EMEPfreq*freqres);
-% Calculate the Sig wave height
-EMEP_Hsig=4*sqrt(m0);
-%Use the function HsigConf.m to calculate the sigH confidence limits
-EMEP_HsConf=nortek_HsigConf(EMEP);
-
-% Calculate the peak period Tp
-[P,I]=max(EMEPfreq);
-EMEP_Tp=1/(freqs(I));
-
-%Calculate the Direction of the peak period DTp
-[P,I]=max(real(EMEP.S(I,:)));
-EMEP_DTp=dirs(I);
-
-%Calculate the Dominant Direction Dp
-[P,I]=max(EMEPdir);
-EMEP_Dp=dirs(I);
-
-%Display on the screen the SigH,Tp,Dp,DTp
-disp(['EMEP']);
-disp(['SigH (meters): ' num2str(EMEP_Hsig)]);
-disp(['SigH 95% conf. (meters): ' num2str(EMEP_HsConf)]);
-disp(['peak period (seconds): ' num2str(EMEP_Tp)]);
-disp(['Dir of peak period: ' num2str(compangle(EMEP_DTp, EMEP.xaxisdir))]);
-disp(['Dominant Direction: ' num2str(compangle(EMEP_Dp, EMEP.xaxisdir))]);
-disp(['  ']);
-
-E_WI.hsig=EMEP_Hsig;
-E_WI.hconf=EMEP_HsConf;
-E_WI.tp=EMEP_Tp;
-E_WI.dtp=compangle(EMEP_DTp, EMEP.xaxisdir);
-E_WI.dp=compangle(EMEP_Dp, EMEP.xaxisdir);
-
-
@@ -203 +125 @@
-
-%Display on the screen the SigH,Tp,Dp,DTp
-IMLM
+EMEP
-disp(['SigH (meters): ' num2str(IMLM_Hsig)]);
-disp(['SigH 95% conf. (meters): ' num2str(IMLM_HsConf)]);
@@ -219 +141 @@
-
-
-%for nortek generated spectrum
-
-%calculate the 0,1,2 moments
-m0=sum(nortekfreq*freqres);                              
-m1=sum(nortekfreqs.*nortekfreq*freqres);
-m2=sum((nortekfreqs.^2).*nortekfreq*freqres);
-% Calculate the Sig wave height
-nortek_Hsig=4*sqrt(m0);
-
-% Calculate the peak period Tp
-[P,I]=max(nortekfreq);
-nortek_Tp=1/(nortekfreqs(I));
-
-%Calculate the Direction of the peak period DTp
-[P,I]=max(real(nortek.S(I,:)));
-nortek_DTp=nortekdirs(I);
-
-%Calculate the Dominant Direction Dp
-[P,I]=max(nortekdir);
-nortek_Dp=nortekdirs(I);
-
-%Display on the screen the SigH,Tp,Dp,DTp
-disp(['nortek']);
-disp(['SigH (meters): ' num2str(nortek_Hsig)]);
-disp(['peak period (seconds): ' num2str(nortek_Tp)]);
-disp(['Dir of peak period: ' num2str(compangle(nortek_DTp, nortek.xaxisdir))]);
-disp(['Dominant Direction: ' num2str(compangle(nortek_Dp, nortek.xaxisdir))]);
-disp(['  ']);
-
-nortek_WI.hsig=nortek_Hsig;
-nortek_WI.hconf=[NaN NaN];
-nortek_WI.tp=nortek_Tp;
-nortek_WI.dtp=compangle(nortek_DTp, nortek.xaxisdir);
-nortek_WI.dp=compangle(nortek_Dp, nortek.xaxisdir);
-
-
-
-%function to change from axis angles to compass bearings