--- a/HISTORY Wed Mar 05 13:59:45 2014 +0000
+++ b/HISTORY Tue Jul 08 21:50:22 2014 -0400
@@ -1,9 +1,9 @@
======================================================================
- C U R R E N T / H I S T O R Y
+ H I S T O R Y
doc: Tue Aug 16 11:41:46 2005
- dlm: Wed Mar 5 13:46:26 2014
+ dlm: Wed Jun 11 08:52:11 2014
(c) 2005 A.M. Thurnherr
- uE-Info: 230 36 NIL 0 0 72 3 2 4 NIL ofnI
+ uE-Info: 238 48 NIL 0 0 72 3 2 4 NIL ofnI
======================================================================
NB: CHANGE VERSION IN [default.m] BEFORE UPLOADING
@@ -229,3 +229,10 @@
- version updated to IX_10
- added Processing_HowTo.pdf
- uploaded for DIMES UK5
+
+IX_11:
+ Mar 21, 2014:
+ - updated version to IX_11beta in [default.m] [.hg/hgrc]
+ - minor bug fix in [loadctd.m]
+ Jun 11, 2014:
+ - changed savecdf default in [default.m]
--- a/default.m Wed Mar 05 13:59:45 2014 +0000
+++ b/default.m Tue Jul 08 21:50:22 2014 -0400
@@ -1,9 +1,9 @@
%======================================================================
-% C U R R E N T / D E F A U L T . M
+% D E F A U L T . M
% doc: Sat Jun 26 06:10:09 2004
-% dlm: Wed Mar 5 13:23:17 2014
+% dlm: Wed Jun 11 08:52:24 2014
% (c) 2004 ladcp@
-% uE-Info: 33 46 NIL 0 0 72 0 2 4 NIL ofnI
+% uE-Info: 18 16 NIL 0 0 72 0 2 4 NIL ofnI
%======================================================================
% CHANGES BY ANT:
@@ -15,6 +15,8 @@
% Jun 18, 2013: - updated version to IX_9
% Jun 24, 2013: - updated version to IX_10beta
% Mar 5, 2014: - updated version to IX_10
+% Mar 21, 2014 - updated version to IX_11beta
+% Jun 11, 2014: - changed savecdf default to 0
% LADCP processing software
% M. Visbeck. LDEO/2003
@@ -30,7 +32,7 @@
% the data
% structure ps.??? contains parameter for the solution
% structure att.??? contains attributes
-p.software='LDEO LADCP software: Version IX_10';
+p.software='LDEO LADCP software: Version IX_11beta';
% file names
% f.ladcpdo is the ONLY required input
@@ -321,7 +323,7 @@
p = setdefv(p,'savemat',0);
% Write netcdf file
- p = setdefv(p,'savecdf',1);
+ p = setdefv(p,'savecdf',0);
% Collect warnings with regards to LADCP processing
p.warnp=' LADCP processing warnings: ';
--- a/loadctd.m Wed Mar 05 13:59:45 2014 +0000
+++ b/loadctd.m Tue Jul 08 21:50:22 2014 -0400
@@ -1,9 +1,9 @@
%======================================================================
% L O A D C T D . M
% doc: Sat Jun 26 15:56:43 2004
-% dlm: Fri Aug 16 10:53:40 2013
+% dlm: Fri Mar 21 11:01:39 2014
% (c) 2004 M. Visbeck & A. Thurnherr
-% uE-Info: 445 41 NIL 0 0 72 0 2 8 NIL ofnI
+% uE-Info: 52 1 NIL 0 0 72 0 2 8 NIL ofnI
%======================================================================
function [d,p]=loadctd(f,d,p)
@@ -49,7 +49,7 @@
% 0 for elapsed time in seconds
% 1 for year-day (1.0 = Jan 1, 00:00)
% 2 for Visbeck's Gregorian (see gregoria.m)
-p = setdefv(p,'ctd_time_base',0);
+f = setdefv(f,'ctd_time_base',0);
%======================================================================
@@ -82,6 +82,7 @@
% Sep 18, 2008: - BUG: moved code had assumed that nav data were loaded
% Jan 7, 2009: - tightened use of exist()
% Jun 16, 2009: - BUG: patching short nav time series did not work correctly
+% Mar 21, 2014: - BUG: f.ctd_time_base used p.ctd_time_base set as default
% read SEABIRD ctd timeseries file
disp(['LOADCTD: load CTD time series ',f.ctd])
--- a/prepinv.m Wed Mar 05 13:59:45 2014 +0000
+++ b/prepinv.m Tue Jul 08 21:50:22 2014 -0400
@@ -1,9 +1,9 @@
%======================================================================
% P R E P I N V . M
% doc: Wed Jan 7 16:46:29 2009
-% dlm: Fri Mar 5 15:49:35 2010
+% dlm: Mon Jun 9 17:03:32 2014
% (c) 2009 A.M. Thurnherr
-% uE-Info: 735 17 NIL 0 0 72 0 2 8 NIL ofnI
+% uE-Info: 677 74 NIL 0 0 72 0 2 8 NIL ofnI
%======================================================================
% CHANGES BY ANT:
@@ -13,6 +13,7 @@
% was broken => removed
% - BUG: down/upcast separation bombed wen no CTD data were
% available
+% Jun 9, 2014: - improved messages
function [di,p,d]=prepinv(d,p,dr)
% function [di,p,d]=prepinv(d,p,dr)
@@ -98,14 +99,14 @@
hoff=compoff(u1d,u1u);
% hoff=angle(u1d/u1u)*180/pi;
p.up_dn_comp_off=hoff;
- disp([' mean compass offset based on velocity is ',num2str(hoff),' deg'])
+ disp([' mean heading offset from compasses = ',num2str(hoff),' deg'])
% check tilt sensors
% rotate by compass offset
diary off
hoff2=fminsearch('checktilt',0,[],[d.rol(2,:);d.pit(2,:);d.rol(1,:);d.pit(1,:)]);
diary on
- disp([' mean compass offset based on tilt is ',num2str(hoff2),' deg'])
+ disp([' mean heading offset from pitch/roll = ',num2str(hoff2),' deg'])
p.up_dn_pit_rol_comp_off=hoff2;
[d.rol(3,:),d.pit(3,:)]=uvrot(d.rol(2,:),d.pit(2,:),-hoff2);
p.up_dn_rol_off=mean(d.rol(1,:)-d.rol(3,:));
@@ -673,7 +674,7 @@
disp([' set ',int2str(length(ii)),' values to minimum super ensemble std ',...
num2str(p.superens_std_min)]);
-disp([' reduced ensemble size is ',int2str(length(di.z))])
+disp([' reduced profile length = ',int2str(length(di.z)),' super-ensemble bins'])
if length(di.z)<5
error('not enough data to process station ')
end