Mercurial Mercurial > cgi-bin > ladcp-cgi-bin > hgweb.cgi > LADCP_w / 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.2beta2
authorA.M. Thurnherr <athurnherr@yahoo.com>
Thu, 10 Mar 2016 11:25:56 +0000
changeset 37 2c4479351544
parent 36 be205fe7ad76
child 38 5d4bbb0a8379
V1.2beta2
HISTORY file | annotate | diff | comparison | revisions
LADCP_w_ocean file | annotate | diff | comparison | revisions
LADCP_w_postproc file | annotate | diff | comparison | revisions
version.pl file | annotate | diff | comparison | revisions 
--- a/HISTORY	Tue Mar 08 16:21:50 2016 +0000
+++ b/HISTORY	Thu Mar 10 11:25:56 2016 +0000
@@ -1,9 +1,9 @@
 ======================================================================
                     H I S T O R Y 
                     doc: Mon Oct 12 16:09:24 2015
-                    dlm: Tue Mar  8 16:21:03 2016
+                    dlm: Wed Mar  9 17:26:35 2016
                     (c) 2015 A.M. Thurnherr
-                    uE-Info: 45 31 NIL 0 0 72 3 2 4 NIL ofnI
+                    uE-Info: 48 0 NIL 0 0 72 3 2 4 NIL ofnI
 ======================================================================
 
 V1.0:
@@ -43,3 +43,5 @@
 		- added updated howto pdf
 		- updated [version.pl] with new ANTSlib prerequisite version
 		- published as V1.2beta
+	Mar 9, 2016: V1.2beta2
+		- added hab field to .wprof output [LADCP_w_ocean]
--- a/LADCP_w_ocean	Tue Mar 08 16:21:50 2016 +0000
+++ b/LADCP_w_ocean	Thu Mar 10 11:25:56 2016 +0000
@@ -2,14 +2,23 @@
 #======================================================================
 #                    L A D C P _ W _ O C E A N 
 #                    doc: Fri Dec 17 18:11:13 2010
-#                    dlm: Tue Mar  8 14:07:23 2016
+#                    dlm: Wed Mar  9 17:18:37 2016
 #                    (c) 2010 A.M. Thurnherr
-#                    uE-Info: 215 54 NIL 0 0 72 0 2 4 NIL ofnI
+#                    uE-Info: 225 46 NIL 0 0 72 0 2 4 NIL ofnI
 #======================================================================
 
 # TODO:
-#	! use instrument tilt in sidelobe editing
-#	! worry about water-depth differences (disabled warning) 
+#	! plots:
+#		- make blue labels consistent
+#		- avoid over-plotting axis labels
+#		- allow for different nsamp magnitudes
+#		- add "dc" "uc" labels
+#		- add software version
+#		- eps.VKE limits
+#		- add seabed to eps.VKE profile
+#		- add seabed to LADCP_w_postproc .wprof output
+#	- use instrument tilt in sidelobe editing
+#	- worry about water-depth differences (disabled warning) 
 #	- make upcast-flag valid for yoyo casts
 #	- make diagnostic output 3-beam field work for Earth coordinates
 #	? remove water-depth from BT code, which is not really used and a bit of an outlier
@@ -213,6 +222,7 @@
 #				  - BUG: dn field name did not use zero filling for year number
 #	Mar  8, 2016: - removed L0 water-depth-difference warning
 #				  - added test for 1500m/s sound speed
+#	Mar  9, 2016: - added hab field to .wprof output
 # HISTORY END
 
 # CTD REQUIREMENTS
@@ -1645,9 +1655,9 @@
 
 if (@out_profile) {
 	progress("Writing vertical-velocity profiles to ");
-	@antsNewLayout = ('depth','dc_depth','dc_elapsed','dc_w','dc_w.mad','dc_w.nsamp','dc_w12','dc_w34',
-							  'uc_depth','uc_elapsed','uc_w','uc_w.mad','uc_w.nsamp','uc_w12','uc_w34',
-	                          'BT_w','BT_w.mad','BT_w.nsamp');
+	@antsNewLayout = ('depth','hab','dc_depth','dc_elapsed','dc_w','dc_w.mad','dc_w.nsamp','dc_w12','dc_w34',
+							  		'uc_depth','uc_elapsed','uc_w','uc_w.mad','uc_w.nsamp','uc_w12','uc_w34',
+	                          		'BT_w','BT_w.mad','BT_w.nsamp');
 
 	foreach my $of (@out_profile) {
 	    progress("<$of> ");
@@ -1664,16 +1674,17 @@
 		undef($antsActiveHeader) unless ($ANTS_TOOLS_AVAILABLE);
 	    
 		for (my($bi)=0; $bi<=max($#{$DNCAST{ENSEMBLE}},$#{$UPCAST{ENSEMBLE}},$#{$BT{NSAMP}}); $bi++) {
-			&antsOut(($bi+0.5)*$opt_o,					# nominal depth
-					 $DNCAST{MEAN_DEPTH}[$bi],$DNCAST{MEAN_ELAPSED}[$bi],
+			&antsOut(($bi+0.5)*$opt_o,												# nominal depth
+					 defined($water_depth)?$water_depth-($bi+0.5)*$opt_o:nan,		# nominal hab
+					 $DNCAST{MEAN_DEPTH}[$bi],$DNCAST{MEAN_ELAPSED}[$bi],			# dc data
 					 $DNCAST{N_SAMP}[$bi]>=$opt_k?$DNCAST{MEDIAN_W}[$bi]:nan,
 					 $DNCAST{MAD_W}[$bi],$DNCAST{N_SAMP}[$bi],
 					 $DNCAST{MEDIAN_W12}[$bi],$DNCAST{MEDIAN_W34}[$bi],
-					 $UPCAST{MEAN_DEPTH}[$bi],$UPCAST{MEAN_ELAPSED}[$bi],
+					 $UPCAST{MEAN_DEPTH}[$bi],$UPCAST{MEAN_ELAPSED}[$bi],			# uc data
 					 $UPCAST{N_SAMP}[$bi]>=$opt_k?$UPCAST{MEDIAN_W}[$bi]:nan,
 					 $UPCAST{MAD_W}[$bi],$UPCAST{N_SAMP}[$bi],
 					 $UPCAST{MEDIAN_W12}[$bi],$UPCAST{MEDIAN_W34}[$bi],
-					 $BT{N_SAMP}[$bi]>=$opt_k?$BT{MEDIAN_W}[$bi]:nan,
+					 $BT{N_SAMP}[$bi]>=$opt_k?$BT{MEDIAN_W}[$bi]:nan,				# BT data
 					 $BT{MAD_W}[$bi],$BT{N_SAMP}[$bi]
 			);
 		}
--- a/LADCP_w_postproc	Tue Mar 08 16:21:50 2016 +0000
+++ b/LADCP_w_postproc	Thu Mar 10 11:25:56 2016 +0000
@@ -2,9 +2,9 @@
 #======================================================================
 #                    L A D C P _ W _ P O S T P R O C 
 #                    doc: Fri Apr 24 17:15:59 2015
-#                    dlm: Mon Mar  7 21:03:31 2016
+#                    dlm: Wed Mar  9 17:20:46 2016
 #                    (c) 2015 A.M. Thurnherr
-#                    uE-Info: 199 71 NIL 0 0 72 2 2 4 NIL ofnI
+#                    uE-Info: 510 1 NIL 0 0 72 2 2 4 NIL ofnI
 #======================================================================
 
 $antsSummary = 'edit and re-grid LADCP vertical-velocity samples';
@@ -487,12 +487,12 @@
 # Average and Output Profiles, Add to Summary Plot
 #----------------------------------------------------------------------
 
-if ($dual_head) {										# selected %PARAMs only
+if ($dual_head) {																# dual-head output
 	@antsNewLayout = ('depth','hab',
 					  'dc_elapsed','dc_w','dc_w.mad','dc_w.nsamp',
 	                  'uc_elapsed','uc_w','uc_w.mad','uc_w.nsamp',
-					  'dc_w.diff','uc_w.diff');
-	&antsAddParams('profile_id',$id,'lat',$P{lat},'lon',$P{lon});
+					  'dc_w.diff','uc_w.diff');									# DL-UL differences
+	&antsAddParams('profile_id',$id,'lat',$P{lat},'lon',$P{lon});				# selected %PARAMs
 	&antsAddParams($dayNoP,$dn,'run_label',"$first_label & $P{run_label}");
 	&antsAddParams('outgrid_dz',$opt_o,'outgrid_minsamp',$opt_k);
 	&antsAddParams('min_depth',round($min_depth),'max_depth',round($max_depth));
@@ -501,13 +501,13 @@
 	&antsAddParams('ADCP_blanking_distance',$blanking_dist);
 	undef($antsOldHeaders);
 } else {
-	@antsNewLayout = ('depth','hab',
+	@antsNewLayout = ('depth','hab',											# single-head output
 					  'dc_elapsed','dc_w','dc_w.mad','dc_w.nsamp',
 	                  'uc_elapsed','uc_w','uc_w.mad','uc_w.nsamp');
 }
 
-&antsInfo("WARNING: unknown water depth (no height-above-bottom)")
-	unless numberp($P{water_depth});
+#&antsInfo("WARNING: unknown water depth (no height-above-bottom)")
+#	unless numberp($P{water_depth});
 
 my(@dcwm,@ucwm,@dcns,@ucns,@dcwmad,@ucwmad);
 for (my($bi)=0; $bi<=max($#dcw,$#ucw); $bi++) {
--- a/version.pl	Tue Mar 08 16:21:50 2016 +0000
+++ b/version.pl	Thu Mar 10 11:25:56 2016 +0000
@@ -1,9 +1,9 @@
 #======================================================================
 #                    V E R S I O N . P L 
 #                    doc: Tue Oct 13 10:40:57 2015
-#                    dlm: Tue Mar  8 15:57:19 2016
+#                    dlm: Wed Mar  9 17:13:52 2016
 #                    (c) 2015 A.M. Thurnherr
-#                    uE-Info: 12 52 NIL 0 0 72 0 2 4 NIL ofnI
+#                    uE-Info: 16 20 NIL 0 0 72 0 2 4 NIL ofnI
 #======================================================================
 
 # HISTORY:
@@ -13,7 +13,7 @@
 
 #$VERSION = '1.1beta1';			# Oct 12, 2015
 #$VERSION = '1.1';				# Jan  4, 2016
-$VERSION = '1.2beta';			# Jan  5, 2016
+$VERSION = '1.2beta2';			# Jan  5, 2016
 
 $antsMinLibVersion 		= 6.3;
 $ADCP_tools_minVersion 	= 1.4;
LADCP_w