Merge pull request #24 from dwcaress/caress-tmp

Caress tmp

ChangeLog

@@ -15,6 +15,7 @@ MB-SYSTEM VERSION 5 RELEASE DATES:
 Here "*" denotes source distribution release made available for ftp download.
 Releases without an "*" are discrete revisions available from the source code
 archive at http://svn.ilab.ldeo.columbia.edu/listing.php?repname=MB-System.
+  Version 5.6.20181214   December 14, 2018
   Version 5.6.20181129   November 29, 2018
   Version 5.6.20181016   October 16, 2018
   Version 5.6.002        September 14, 2018
@@ -291,6 +292,21 @@ archive at http://svn.ilab.ldeo.columbia.edu/listing.php?repname=MB-System.
 -------------------------------------------------------------------------------
 MB-SYSTEM VERSION 5.6 RELEASE NOTES:
 -------------------------------------------------------------------------------
+-----> 5.6.20181214 (December 14, 2018)
+
+Format 121 (MBF_GSFGENMB): Changed GSFlib version to 3.08. MB-System also now
+builds and installs the program dump_gsf.
+
+MBgrid: Added two new gridding algorithms, minimum weighted mean and maximum
+weighted mean. These are both implementations of Gaussian weighted mean in which
+only valid soundings that are close to the minimum (or maximum) value in each
+grid cell are used. A threshold value in meters defines what close means; only
+soundings no further from the minimum (or maximum) than the threshold are used.
+These algorithms are useful when bathymetry data include areas that are not truly
+representable with a 2D grid because of vertical walls or multiple values (e.g.
+overhangs). These algorithms allow one to choose to follow the shallowest or
+deepest surfaces in the gridded model. These algorithms were specifically added
+to handle subsea lidar data that maps animals as well as the seafloor.
 
 -----> 5.6.20181129 (November 29, 2018)
 

autom4te.cache/output.4

@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for mbsystem 5.6.20181129.
+@%:@ Generated by GNU Autoconf 2.69 for mbsystem 5.6.20181214.
 @%:@
 @%:@ Report bugs to <http://listserver.mbari.org/sympa/arc/mbsystem>.
 @%:@ 
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='mbsystem'
 PACKAGE_TARNAME='mbsystem'
-PACKAGE_VERSION='5.6.20181129'
-PACKAGE_STRING='mbsystem 5.6.20181129'
+PACKAGE_VERSION='5.6.20181214'
+PACKAGE_STRING='mbsystem 5.6.20181214'
 PACKAGE_BUGREPORT='http://listserver.mbari.org/sympa/arc/mbsystem'
 PACKAGE_URL='http://www.mbari.org/data/mbsystem/'
 
@@ -1395,7 +1395,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mbsystem 5.6.20181129 to adapt to many kinds of systems.
+\`configure' configures mbsystem 5.6.20181214 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1465,7 +1465,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mbsystem 5.6.20181129:";;
+     short | recursive ) echo "Configuration of mbsystem 5.6.20181214:";;
    esac
   cat <<\_ACEOF
 
@@ -1612,7 +1612,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mbsystem configure 5.6.20181129
+mbsystem configure 5.6.20181214
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2057,7 +2057,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mbsystem $as_me 5.6.20181129, which was
+It was created by mbsystem $as_me 5.6.20181214, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2398,7 +2398,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-$as_echo "@%:@define VERSION_DATE \"29 November 2018\"" >>confdefs.h
+$as_echo "@%:@define VERSION_DATE \"14 December 2018\"" >>confdefs.h
 
 
 ac_aux_dir=
@@ -3077,7 +3077,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mbsystem'
- VERSION='5.6.20181129'
+ VERSION='5.6.20181214'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16433,7 +16433,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mbsystem $as_me 5.6.20181129, which was
+This file was extended by mbsystem $as_me 5.6.20181214, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16500,7 +16500,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-mbsystem config.status 5.6.20181129
+mbsystem config.status 5.6.20181214
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mbsystem 5.6.20181129.
+# Generated by GNU Autoconf 2.69 for mbsystem 5.6.20181214.
 #
 # Report bugs to <http://listserver.mbari.org/sympa/arc/mbsystem>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='mbsystem'
 PACKAGE_TARNAME='mbsystem'
-PACKAGE_VERSION='5.6.20181129'
-PACKAGE_STRING='mbsystem 5.6.20181129'
+PACKAGE_VERSION='5.6.20181214'
+PACKAGE_STRING='mbsystem 5.6.20181214'
 PACKAGE_BUGREPORT='http://listserver.mbari.org/sympa/arc/mbsystem'
 PACKAGE_URL='http://www.mbari.org/data/mbsystem/'
 
@@ -1395,7 +1395,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mbsystem 5.6.20181129 to adapt to many kinds of systems.
+\`configure' configures mbsystem 5.6.20181214 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1465,7 +1465,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mbsystem 5.6.20181129:";;
+     short | recursive ) echo "Configuration of mbsystem 5.6.20181214:";;
    esac
   cat <<\_ACEOF
 
@@ -1612,7 +1612,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mbsystem configure 5.6.20181129
+mbsystem configure 5.6.20181214
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2057,7 +2057,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mbsystem $as_me 5.6.20181129, which was
+It was created by mbsystem $as_me 5.6.20181214, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2398,7 +2398,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-$as_echo "#define VERSION_DATE \"29 November 2018\"" >>confdefs.h
+$as_echo "#define VERSION_DATE \"14 December 2018\"" >>confdefs.h
 
 
 ac_aux_dir=
@@ -3077,7 +3077,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mbsystem'
- VERSION='5.6.20181129'
+ VERSION='5.6.20181214'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16433,7 +16433,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mbsystem $as_me 5.6.20181129, which was
+This file was extended by mbsystem $as_me 5.6.20181214, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16500,7 +16500,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-mbsystem config.status 5.6.20181129
+mbsystem config.status 5.6.20181214
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -19,11 +19,11 @@ define([AC_CACHE_LOAD], )
 define([AC_CACHE_SAVE], )
 
 dnl Initialize and set version and version date
-AC_INIT([mbsystem],[5.6.20181129],[http://listserver.mbari.org/sympa/arc/mbsystem],[mbsystem],[http://www.mbari.org/data/mbsystem/])
+AC_INIT([mbsystem],[5.6.20181214],[http://listserver.mbari.org/sympa/arc/mbsystem],[mbsystem],[http://www.mbari.org/data/mbsystem/])
 
 AC_CONFIG_MACRO_DIR(m4)
 AC_LANG(C)
-AC_DEFINE(VERSION_DATE, "29 November 2018", [Set VERSION_DATE define in mb_config.h])
+AC_DEFINE(VERSION_DATE, "14 December 2018", [Set VERSION_DATE define in mb_config.h])
 
 dnl Check system arch
 AC_CANONICAL_HOST

libtool

@@ -1,6 +1,6 @@
 #! /bin/sh
-# Generated automatically by config.status (mbsystem) 5.6.20181129
-# Libtool was configured on host mbari1887.shore.mbari.org:
+# Generated automatically by config.status (mbsystem) 5.6.20181214
+# Libtool was configured on host Haxby.local:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 
 # Provide generalized library-building support services.

src/gsf/Makefile.am

@@ -1,10 +1,20 @@
-AM_CPPFLAGS = -I${top_srcdir}/src/mbio -DUSE_DEFAULT_FILE_FUNCTIONS
+
+bin_PROGRAMS = dump_gsf
 
 include_HEADERS = gsf.h
 
+AM_CFLAGS =
+
+AM_CPPFLAGS = -DUSE_DEFAULT_FILE_FUNCTIONS
+
+AM_LDFLAGS =
+
 lib_LTLIBRARIES = libmbgsf.la
 
 libmbgsf_la_LDFLAGS = -no-undefined -version-info 0:0:0
 
+dump_gsf_SOURCES = dump_gsf.c
+dump_gsf_LDADD = libmbgsf.la
+
 libmbgsf_la_SOURCES = \
-dump_gsf.c  gsf.c  gsf_dec.c  gsf_enc.c  gsf_indx.c gsf_info.c
+        gsf.c  gsf_dec.c  gsf_enc.c  gsf_indx.c gsf_info.c