Mercurial Mercurial > cgi-bin > ladcp-cgi-bin > hgweb.cgi > LADCP_shearmethod / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
V1.0beta4
authorA.M. Thurnherr <athurnherr@yahoo.com>
Thu, 17 May 2012 07:28:18 +0000
changeset 13 b2a581b79645
parent 12 65582c172355
child 14 e22f4b440407
V1.0beta4
HISTORY file | annotate | diff | comparison | revisions
LADCPproc file | annotate | diff | comparison | revisions
LADCPproc.version file | annotate | diff | comparison | revisions 
--- a/HISTORY
+++ b/HISTORY
@@ -1,9 +1,9 @@
 ======================================================================
                     H I S T O R Y 
                     doc: Tue May 15 18:04:39 2012
-                    dlm: Wed May 16 18:52:31 2012
+                    dlm: Thu May 17 07:19:03 2012
                     (c) 2012 A.M. Thurnherr
-                    uE-Info: 22 35 NIL 0 0 72 3 2 8 NIL ofnI
+                    uE-Info: 25 43 NIL 0 0 72 3 2 8 NIL ofnI
 ======================================================================
 
 May 15, 2012:
@@ -20,3 +20,10 @@
   - V1.0beta3 [.hg/hgrc]
   - bug fixes for shallow casts [LADCPproc.backscatter]
   - added support for -r)DI BT data
+
+May 17, 2012:
+  - V1.0beta4 [.hg/hgrc] [LADCPproc.version]
+  - minor improvements
+  - relaxation of profile-depth consistency check [LADCPproc]
+
+
--- a/LADCPproc
+++ b/LADCPproc
@@ -2,13 +2,11 @@
 #======================================================================
 #                    L A D C P P R O C 
 #                    doc: Thu Sep 16 20:36:10 2010
-#                    dlm: Wed May 16 18:44:45 2012
+#                    dlm: Thu May 17 07:27:41 2012
 #                    (c) 2010 A.M. Thurnherr
-#                    uE-Info: 73 0 NIL 0 0 72 10 2 4 NIL ofnI
+#                    uE-Info: 363 57 NIL 0 0 72 10 2 4 NIL ofnI
 #======================================================================
 
-$antsSummary = 'process LADCP data to get shear, time series';
-
 # NOTES:
 #   - the shear-method editing in this code is based on Eric Firing's merge.c
 #   - as described in [LADCPproc.backscatter], there are three different codes 
@@ -70,6 +68,10 @@
 #	Apr 18, 2012: - replaced Sv.n by Sv.nsamp
 #	May 16, 2012: - adapted to ANTSlib V5.0
 #				  - added support for -r)DI BT data
+#				  - added $LADCP{MEAN_DT} from vertical-velocity code
+#	May 17, 2012: - significantly relaxed profile-range consistency check (from 20% to 50%)
+#					which is required for Dan Torres' shallow casts
+#				  - added version info
 
 ($ANTS)    = (`which ANTSlib` =~ m{^(.*)/[^/]*$});
 ($PERL_TOOLS) = (`which mkProfile` =~ m{^(.*)/[^/]*$});
@@ -78,6 +80,7 @@
 require "$ANTS/ants.pl";
 require "$ANTS/libEOS83.pl";
 require "$ANTS/libstats.pl";
+require "$LADCPPROC/LADCPproc.version";
 require "$LADCPPROC/LADCPproc.loadCTD";
 require "$LADCPPROC/LADCPproc.bestLag";
 require "$LADCPPROC/LADCPproc.BT";
@@ -87,6 +90,8 @@
 require "$PERL_TOOLS/RDI_Coords.pl";
 require "$PERL_TOOLS/RDI_Utils.pl";
 
+$antsSummary = "$version -- process LADCP data to get shear, time series";
+
 $antsParseHeader = 0;
 &antsUsage('24a:b:c:df:g:i:kl:n:o:p:rs:t:u:w:',2,
     '[use -2)dary CTD sensor pair]',
@@ -324,6 +329,12 @@
 croak("\n$LADCP_file: no good ensembles found\n")
     unless defined($LADCP_start);
 
+my($cast_duration) = $LADCP{ENSEMBLE}[$LADCP_end]->{UNIX_TIME} -
+                     $LADCP{ENSEMBLE}[$LADCP_start]->{UNIX_TIME};
+croak("$0: implausibly short cast ($cast_duration seconds)\n")
+	unless ($cast_duration > 600);
+$LADCP{MEAN_DT} = $cast_duration / ($LADCP_end-$LADCP_start-1);
+
 if ($opt_d) {
 	printf(STDERR "\n\t\t\tStart of cast    : %s (#%5d) at %6.1fm\n",
 	                    $LADCP{ENSEMBLE}[$LADCP_start]->{TIME},
@@ -333,19 +344,23 @@
 	                    $LADCP{ENSEMBLE}[$LADCP_bottom]->{TIME},
 	                    $LADCP{ENSEMBLE}[$LADCP_bottom]->{NUMBER},
 	                    $LADCP{ENSEMBLE}[$LADCP_bottom]->{DEPTH});
-	printf(STDERR "\t\t\tEnd of cast      : %s (#%5d) at %6.1fm",
+	printf(STDERR "\t\t\tEnd of cast      : %s (#%5d) at %6.1fm\n",
 	                    $LADCP{ENSEMBLE}[$LADCP_end]->{TIME},
 	                    $LADCP{ENSEMBLE}[$LADCP_end]->{NUMBER},
 	                    $LADCP{ENSEMBLE}[$LADCP_end]->{DEPTH});
+	printf(STDERR "\t\t\tAvg ping interval: %.1fs",$LADCP{MEAN_DT});
 }
 
 print(STDERR "\n");
 
 my($LADCP_prof_range) = $LADCP{ENSEMBLE}[$LADCP_bottom]->{DEPTH} -
 							min($LADCP{ENSEMBLE}[$LADCP_start]->{DEPTH},$LADCP{ENSEMBLE}[$LADCP_end]->{DEPTH});
+my($CTD_prof_range) = $CTD{maxpress} - $CTD{minpress};
 croak(sprintf("$0: LADCP profile depth range (%dm) inconsistent with max CTD pressure range (%ddbar)\n",
-		$LADCP_prof_range,$CTD{maxpress}-$CTD{minpress}))
-	if (abs($LADCP_prof_range-($CTD{maxpress}-$CTD{minpress}))/(0.99*($CTD{maxpress}-$CTD{minpress})) > 0.2);
+		$LADCP_prof_range,$CTD_prof_range))
+	if (abs($LADCP_prof_range-0.99*$CTD_prof_range) > max(0.2*0.99*$CTD_prof_range,
+														  abs($LADCP{ENSEMBLE}[$LADCP_end]->{DEPTH}),
+														  50));
 
 #----------------------------------------------------------------------
 # Step 5: Add CTD to LADCP Data & correct velocities for sound speed
new file mode 100644
--- /dev/null
+++ b/LADCPproc.version
@@ -0,0 +1,9 @@
+#======================================================================
+#                    L A D C P P R O C . V E R S I O N 
+#                    doc: Thu May 17 07:18:44 2012
+#                    dlm: Thu May 17 07:18:44 2012
+#                    (c) 2012 A.M. Thurnherr
+#                    uE-Info: 1 23 NIL 0 0 72 0 2 4 NIL ofnI
+#======================================================================
+
+$version = 'V1.0beta4';
LADCP_shearmethod