new file mode 100644
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,11 @@
+#======================================================================
+# . H G I G N O R E
+# doc: Mon Oct 12 16:32:57 2015
+# dlm: Mon Oct 12 16:32:57 2015
+# (c) 2015 A.M. Thurnherr
+# uE-Info: 3 14 NIL 0 0 72 0 2 4 NIL ofnI
+#======================================================================
+
+SYNTAX: glob
+
+README.Publish
--- a/HISTORY
+++ b/HISTORY
@@ -1,9 +1,9 @@
#======================================================================
# H I S T O R Y
# doc: Thu May 7 13:12:05 2015
-# dlm: Fri Jun 12 07:24:38 2015
+# dlm: Mon Oct 12 16:34:10 2015
# (c) 2015 A.M. Thurnherr
-# uE-Info: 24 13 NIL 0 0 70 0 2 4 NIL ofnI
+# uE-Info: 30 52 NIL 0 0 70 0 2 4 NIL ofnI
#======================================================================
May 7, 2015:
@@ -21,4 +21,10 @@
- added rec indices to [lfit.pl] for binpgrams
Jun 12, 2015:
- - added &
+ - added &????
+
+...MISSING HISTORY...
+
+Oct 12, 2015:
+ - V6.2 [ants.pl] [.hg/hgrc]
+ - published on Mercurial server for LADCP_w V1.0
--- a/ants.pl
+++ b/ants.pl
@@ -2,9 +2,9 @@
#======================================================================
# A N T S . P L
# doc: Fri Jun 19 14:01:06 1998
-# dlm: Sun May 17 20:18:01 2015
+# dlm: Mon Oct 12 16:30:36 2015
# (c) 1998 A.M. Thurnherr
-# uE-Info: 17 34 NIL 0 0 72 2 2 4 NIL ofnI
+# uE-Info: 23 21 NIL 0 0 72 2 2 4 NIL ofnI
#======================================================================
# HISTORY:
@@ -15,11 +15,12 @@
# Sep 24, 2012: - added support for $ANTSLIB
# Oct 29, 2014: - added $antsLibVersion with compile-time version check (V6.0)
# May 17, 2015: - updated to V6.1
+# Oct 12, 2015: - updated to V6.2 (for LADCP_w 1.0)
exec($ENV{ANTS_PERL},$0,@ARGV),die("$ENV{ANTS_PERL}: $!")
if (defined($ENV{ANTS_PERL}) && $^X ne $ENV{ANTS_PERL});
-$antsLibVersion = 6.1;
+$antsLibVersion = 6.2;
die(sprintf("$0: obsolete library V%.1f; V%.1f required\n",
$antsLibVersion,$antsMinLibVersion))
if (!defined($antsMinLibVersion) || $antsMinLibVersion>$antsLibVersion);
--- a/antsio.pl
+++ b/antsio.pl
@@ -2,9 +2,9 @@
#======================================================================
# A N T S I O . P L
# doc: Fri Jun 19 19:22:51 1998
-# dlm: Thu Mar 5 12:57:33 2015
+# dlm: Sun Sep 27 16:06:45 2015
# (c) 1998 A.M. Thurnherr
-# uE-Info: 206 0 NIL 0 0 70 2 2 4 NIL ofnI
+# uE-Info: 209 33 NIL 0 0 70 2 2 4 NIL ofnI
#======================================================================
# HISTORY:
@@ -203,6 +203,10 @@
# - removed antsPadIn flag (made it always be true)
# Aug 7, 2014: - allow optional % in param name in &antsFileScanParam()
# Oct 29, 2014: - implemented abbreviated Layout and %PARAM definitions
+# Sep 27, 2015: - BUG: antsDeps() accumulate with multiple input files; solution is to make sure that
+# antsCheckDeps() is called whenever a new input file has been read for the first
+# time (as in [list]), because antsCheckDeps() deletes the dependencies after
+# checking
# GENERAL NOTES:
# - %P was named without an ants-prefix because associative arrays
@@ -285,12 +289,12 @@
sub antsCheckDeps()
{
+# print(STDERR "checking dependencies of file $infile (deps = @antsDeps)\n");
+ return unless (@antsDeps); # no dependency info
+ return if ($opt_D); # suppressed by user
+
my($infile) = @_ ? $_[0] : $ARGV; # default: check current input
my($indir) = ($infile =~ m{^(.*)/[^/]*$});
-# print(STDERR "checking dependencies of file $infile (deps = @antsDeps)\n");
-
- return if ($opt_D); # suppress
- return unless (@antsDeps); # no dependency info
return if defined($indir) && $indir ne '.'; # not in current directory
my(@stat) = stat($infile); # get time
@@ -306,7 +310,8 @@
&antsInfo("WARNING: dependency $antsDeps[$d] (&, possibly, others) not found");
$warned = 1;
}
- }
+ }
+ undef(@antsDeps); # don't check again
}
} # static scope
--- a/libGMT.pl
+++ b/libGMT.pl
@@ -1,7 +1,7 @@
#======================================================================
# L I B G M T . P L
# doc: Sun Jun 14 13:45:47 2015
-# dlm: Thu Jul 30 10:12:19 2015
+# dlm: Sun Sep 27 09:23:46 2015
# (c) 2015 A.M. Thurnherr
# uE-Info: 45 10 NIL 0 0 72 2 2 4 NIL ofnI
#======================================================================
--- a/libSBE.pl
+++ b/libSBE.pl
@@ -1,9 +1,9 @@
#======================================================================
# L I B S B E . P L
# doc: Mon Nov 3 12:42:14 2014
-# dlm: Thu Jun 18 10:17:03 2015
+# dlm: Tue Sep 29 11:01:30 2015
# (c) 2014 A.M. Thurnherr
-# uE-Info: 13 49 NIL 0 0 72 2 2 4 NIL ofnI
+# uE-Info: 45 54 NIL 0 0 72 2 2 4 NIL ofnI
#======================================================================
# HISTORY:
@@ -11,6 +11,7 @@
# Jun 16, 2015: - cosmetics
# Jun 17, 2015: - ensured numeric retvals of SBE_parseheader are returned as numbers
# Jun 18, 2015: - BUG: binary code had several bugs
+# Sep 29, 2015: - added potemp and sigma standard field names
#----------------------------------------------------------------------
# fname_SBE2std($)
@@ -30,6 +31,10 @@
return 'salin' if /^sal00/;
return 'alt_salin' if /^sal11/;
return 'elapsed' if /^timeS/;
+ return 'sigma0' if /^sigma.*00/;
+ return 'alt_sigma0' if /^sigma.*11/;
+ return 'rho0' if /^density00/;
+ return 'alt_rho0' if /^density11/;
if (/^t090/) { # temperatures with different scales
croak("$0: inconsistent temperature scales\n")
@@ -55,6 +60,30 @@
return 'alt_temp';
}
+ if (/^potemp090/) { # potential temperatures with different scales
+ croak("$0: inconsistent temperature scales\n")
+ if defined($P{ITS}) && ($P{ITS} != 90);
+ &antsAddParams('ITS',90); $P{ITS} = 90;
+ return 'theta0';
+ } elsif (/^potemp068/) {
+ croak("$0: inconsistent temperature scales\n")
+ if defined($P{ITS}) && ($P{ITS} != 68);
+ &antsAddParams('ITS',68); $P{ITS} = 68;
+ return 'theta0';
+ }
+
+ if (/^potemp190/) {
+ croak("$0: inconsistent temperature scales\n")
+ if defined($P{ITS}) && ($P{ITS} != 90);
+ &antsAddParams('ITS',90); $P{ITS} = 90;
+ return 'alt_theta0';
+ } elsif (/^potemp168/) {
+ croak("$0: inconsistent temperature scales\n")
+ if defined($P{ITS}) && ($P{ITS} != 68);
+ &antsAddParams('ITS',68); $P{ITS} = 68;
+ return 'alt_theta0';
+ }
+
if (m{^c0S/m}) { # conductivity with different units
croak("$0: inconsistent conductivity units\n")
if defined($P{cond.unit}) && ($P{cond.unit} ne 'S/m');
@@ -107,6 +136,26 @@
&antsAddParams('ITS',68); $P{ITS} = 68;
}
+ if (/^potemp090/) {
+ croak("$0: inconsistent temperature scales\n")
+ if defined($P{ITS}) && ($P{ITS} != 90);
+ &antsAddParams('ITS',90); $P{ITS} = 90;
+ } elsif (/^potemp068/) {
+ croak("$0: inconsistent temperature scales\n")
+ if defined($P{ITS}) && ($P{ITS} != 68);
+ &antsAddParams('ITS',68); $P{ITS} = 68;
+ }
+
+ if (/^potemp190/) {
+ croak("$0: inconsistent temperature scales\n")
+ if defined($P{ITS}) && ($P{ITS} != 90);
+ &antsAddParams('ITS',90); $P{ITS} = 90;
+ } elsif (/^potemp168/) {
+ croak("$0: inconsistent temperature scales\n")
+ if defined($P{ITS}) && ($P{ITS} != 68);
+ &antsAddParams('ITS',68); $P{ITS} = 68;
+ }
+
if (m{^c0S/m}) { # conductivity with different units
croak("$0: inconsistent conductivity units\n")
if defined($P{cond.unit}) && ($P{cond.unit} ne 'S/m');