before trying to fix plotraw bug reported by Dan Torres
***
Added tag IX_9 for changeset 20dc0dc52ad5
***
Version IX_9
***
after revert
--- a/HISTORY Fri May 04 09:25:47 2012 +0000
+++ b/HISTORY Tue Jun 18 11:34:41 2013 +0000
@@ -1,9 +1,9 @@
======================================================================
H I S T O R Y
doc: Tue Aug 16 11:41:46 2005
- dlm: Fri May 4 09:24:01 2012
+ dlm: Tue May 22 11:02:49 2012
(c) 2005 A.M. Thurnherr
- uE-Info: 192 51 NIL 0 0 72 3 2 4 NIL ofnI
+ uE-Info: 198 74 NIL 0 0 72 3 2 4 NIL ofnI
======================================================================
NB: CHANGE VERSION IN [default.m] BEFORE UPLOADING
@@ -191,3 +191,9 @@
May 4, 2012:
- updated version in [default.m] [.hg/hgrc]
- published on Mercurial server
+
+IX_9:
+ May 22, 2012:
+ - updated version to IX_9beta in [default.m] [.hg/hgrc]
+ - disabled code to use GPS info from SADCP stream in [loadsadcp.m]
+
--- a/README.variables Fri May 04 09:25:47 2012 +0000
+++ b/README.variables Tue Jun 18 11:34:41 2013 +0000
@@ -1,9 +1,9 @@
======================================================================
R E A D M E . V A R I A B L E S
doc: Tue Apr 13 10:51:01 2010
- dlm: Thu Apr 15 10:17:11 2010
+ dlm: Mon Jun 3 12:35:43 2013
(c) 2010 A.M. Thurnherr
- uE-Info: 22 25 NIL 0 0 72 3 2 4 NIL ofnI
+ uE-Info: 30 22 NIL 0 0 72 3 2 4 NIL ofnI
======================================================================
----------------------------------------------------------------------
@@ -26,6 +26,12 @@
- d.izd(1) is first bin of downlooker
- d.izu(end) is last bin of uplooker
+d.z(ensemble)
+ - instrument depth
+
+d.izm(combo_bin,ensemble)
+ - depth of each measurement
+
----------------------------------------------------------------------
OUTPUT FIELDS
----------------------------------------------------------------------
--- a/default.m Fri May 04 09:25:47 2012 +0000
+++ b/default.m Tue Jun 18 11:34:41 2013 +0000
@@ -1,9 +1,9 @@
%======================================================================
% D E F A U L T . M
% doc: Sat Jun 26 06:10:09 2004
-% dlm: Fri May 4 08:45:46 2012
+% dlm: Tue May 22 11:02:16 2012
% (c) 2004 ladcp@
-% uE-Info: 30 45 NIL 0 0 72 0 2 4 NIL ofnI
+% uE-Info: 30 49 NIL 0 0 72 0 2 4 NIL ofnI
%======================================================================
% CHANGES BY ANT:
@@ -27,7 +27,7 @@
% the data
% structure ps.??? contains parameter for the solution
% structure att.??? contains attributes
-p.software='LDEO LADCP software: Version IX_8';
+p.software='LDEO LADCP software: Version IX_9beta';
% file names
% f.ladcpdo is the ONLY required input
--- a/loadsadcp.m Fri May 04 09:25:47 2012 +0000
+++ b/loadsadcp.m Tue Jun 18 11:34:41 2013 +0000
@@ -1,9 +1,9 @@
%======================================================================
% L O A D S A D C P . M
% doc: Sun Jun 27 23:42:04 2004
-% dlm: Fri Mar 5 15:49:11 2010
+% dlm: Tue May 22 11:01:21 2012
% (c) 2004 ladcp@
-% uE-Info: 133 14 NIL 0 0 72 0 2 8 NIL ofnI
+% uE-Info: 109 4 NIL 0 0 72 0 2 8 NIL ofnI
%======================================================================
% CHANGES BY ANT:
@@ -11,6 +11,10 @@
% Jul 9, 2004: - made lack of SADCP data in time window into real warning
% Jan 7, 2009: - tightened use of exist()
% Mar 4, 2010: - changed default of p.sadcp_dtok from 5min to zero
+% May 22, 2012: - removed code that took GPS information from SADCP data,
+% because these data are unlikely to be accurate enough
+% for the ship-drift constraint; if they are, the user
+% should verify and make a GPS file during pre-processing
function [di,p]=loadsadcp(f,di,p)
% function [di,p]=loadsadcp(f,di,p)
@@ -78,14 +82,15 @@
streamer([p.name,' Figure 9']);
pause(0.001)
return;
- end
+ end % if no SADCP data in LADCP region
-% interpolate SADCP navigation to LADCP time series
+ % interpolate SADCP navigation to LADCP time series
di.sadcp_lon=interp1(tim_sadcp,lon_sadcp(:),di.time_jul);
di.sadcp_lat=interp1(tim_sadcp,lat_sadcp(:),di.time_jul);
% set position from SADCP nav
if abs(p.lon)+abs(p.lat)==0
+ error('as of version IX_9, using GPS info from SADCP data stream is no longer supported');
slat=di.sadcp_lat(1);
slon=di.sadcp_lon(1);
elat=di.sadcp_lat(end);
@@ -96,10 +101,12 @@
% if no other ship navigation exists, use SADCP navigation
if existf(di,'slon')==0
+ error('as of version IX_9, using GPS info from SADCP data stream is no longer supported');
di.slon=di.sadcp_lon;
di.slat=di.sadcp_lat;
else
if sum(isfinite(di.slon+di.slat))==0
+ error('as of version IX_9, using GPS info from SADCP data stream is no longer supported');
di.slon=di.sadcp_lon;
di.slat=di.sadcp_lat;
end