# HG changeset patch # User A.M. Thurnherr # Date 1624972483 14400 # Node ID e83393696a249794d6ce86a3f3a97455ae773360 # Parent 624b1ed6e9c9771c1b4bafbb238c5e9a4b042073 IX_14 Release Version diff -r 624b1ed6e9c9 -r e83393696a24 HISTORY --- a/HISTORY Sat Apr 10 08:03:07 2021 -0400 +++ b/HISTORY Tue Jun 29 09:14:43 2021 -0400 @@ -1,9 +1,9 @@ ====================================================================== H I S T O R Y doc: Tue Aug 16 11:41:46 2005 - dlm: Wed Sep 4 18:13:56 2019 + dlm: Tue Jun 29 09:14:14 2021 (c) 2005 A.M. Thurnherr - uE-Info: 343 0 NIL 0 0 72 3 2 4 NIL ofnI + uE-Info: 370 10 NIL 0 0 72 3 2 4 NIL ofnI ====================================================================== NB: CHANGE VERSION IN [default.m] BEFORE UPLOADING @@ -323,22 +323,29 @@ - updated version to IX_13 in [default.m] [.hg/hgrc] - commit - publish - ... + + +IX_14: Sep 14, 2018: - updated version to IX_14beta in [default.m] [.hg/hgrc] - fixed (without much checking) bug introduced in 2008 code move - from [loadctd.m] to [loadnav.m] - ... + from [loadctd.m] to [loadnav.m] (had to be undone in 2020) + Sep 15, 2018: + - [process_cast.m] disabled serial-number code + Feb 8, 2019: - added pauses to figure-saving loop, because on TheThinMint occasionally the wrong figures were saved Feb 16, 2019: - moved post-processing to step 17 to ensure it is done before results are saved - ... + Aug 30, 2019: + - changed error message about p.getdepth in process_cast.m + - BUG: missing pressure values cause problem in output [getdpthi.m] Sep 4, 2019: + - MAY HAVE UPDATED VERSION TO 15beta AND LATER RETURNED TO 14beta2 - changed p.btrk_default from 3 to 2 - - fixed [savearch.m] date bug + - fixed [savearch.m] date bug reported by EF - swapped in Gerd's code [magdev.m] and made default in [loadnav.m] - modifications suggested by Gerd: - [getinv.m] rounded default ps.dz @@ -347,5 +354,17 @@ - [checkbtrk.m] fixed plotting error - adapted [process_cast.m] to new [calc_shear3.m] from GK - [calc_shear3.m] required some adaptation - - updated version in [default.m] to 15beta, skipping 14, which - was used for GO-SHIP work but never published + + Jan 27, 2020: + - BUG: btmi was set to nan for JR195 stations 20 and 30; + fixed by skipping sub-plots if btmi is not finite in [geterr.m] + - had to undo Sep 14, 2018 bug "fix" in [loadctd.m] [loadnav.m] + - [loadrdi.m] moved magdev call further back, where start time is known + + Apr 29, 2021: + - disable use of bin-1 data for integration of w; this was necessitated + by A22 030, which is a shallow profile where bin 1 of the on-deck DL + data seems valid, messing up the zmax calculation + + Jun 29, 2021: + - published IX_14 diff -r 624b1ed6e9c9 -r e83393696a24 Processing_HowTo.pdf Binary file Processing_HowTo.pdf has changed diff -r 624b1ed6e9c9 -r e83393696a24 default.m --- a/default.m Sat Apr 10 08:03:07 2021 -0400 +++ b/default.m Tue Jun 29 09:14:43 2021 -0400 @@ -1,9 +1,9 @@ %====================================================================== -% D E F A U L T . M +% C U R R E N T / D E F A U L T . M % doc: Sat Jun 26 06:10:09 2004 -% dlm: Wed Sep 4 18:10:56 2019 +% dlm: Mon Jun 28 13:07:28 2021 % (c) 2004 ladcp@ -% uE-Info: 26 48 NIL 0 0 72 0 2 4 NIL ofnI +% uE-Info: 44 46 NIL 0 0 72 0 2 4 NIL ofnI %====================================================================== % CHANGES BY ANT: @@ -23,7 +23,9 @@ % Mar 29, 2017: - added saveplot_pdf % Jan 17, 2018: - changed ersion to IX_13 and published % Sep 4, 2019: - changed p.btrk_mode from 3 to 2 (own only) -% - updated to version IX_15beta +% - updated to version IX_14beta +% ??? - updated to version IX_14beta2 +% Jun 28, 2021: - updated version to IX_14 % LADCP processing software % M. Visbeck. LDEO/2003 @@ -39,7 +41,7 @@ % the data % structure ps.??? contains parameter for the solution % structure att.??? contains attributes -p.software='LDEO LADCP software: Version IX_14beta2'; +p.software='LDEO LADCP software: Version IX_14'; % file names % f.ladcpdo is the ONLY required input diff -r 624b1ed6e9c9 -r e83393696a24 loadctd.m --- a/loadctd.m Sat Apr 10 08:03:07 2021 -0400 +++ b/loadctd.m Tue Jun 29 09:14:43 2021 -0400 @@ -1,9 +1,9 @@ %====================================================================== % L O A D C T D . M % doc: Sat Jun 26 15:56:43 2004 -% dlm: Tue Jan 28 13:22:51 2020 +% dlm: Thu Apr 29 21:44:11 2021 % (c) 2004 M. Visbeck & A. Thurnherr -% uE-Info: 94 45 NIL 0 0 72 0 2 8 NIL ofnI +% uE-Info: 97 69 NIL 0 0 72 0 2 8 NIL ofnI %====================================================================== function [d,p]=loadctd(f,d,p) @@ -92,6 +92,9 @@ % during loadnav p.time_start and end are not known (LADCP turn on/off % times are used); present code works with SR1b repeat cruises, which % all have single gps files +% Apr 29, 2021: - disable use of bin-1 data for integration of w; this was necessitated +% by A22 030, which is a shallow profile where bin 1 of the on-deck DL +% data seems valid, messing up the zmax calculation % read SEABIRD ctd timeseries file disp(['LOADCTD: load CTD time series ',f.ctd]) @@ -172,7 +175,16 @@ end % calc LADCP depth -w=meannan(d.rw); +% - don't use bin 1, which is contaminated by ringing +% when zero blanking is used + +if length(d.zu)>0 && length(d.zd)>0 % dual-head system + w = meannan(d.rw([1:(p.nbin_d-1),(end-p.nbin_u+1):end],:)); +elseif length(d.zu)>0 % uplooker only(?) + w = meannan(d.rw([(end-p.nbin_u+1):end],:)); +else + w = meannan(d.rw([1:(p.nbin_d-1)],:)); % downlooker only +end if sum(isfinite(w)) == 0 error('No valid vertical velocities --- aborting'); end