Merge pull request #114 from baagaard-usgs/feature-binary-package

Add scripts to build binary package

Author: baagaard-usgs

.dockerignore

@@ -5,6 +5,8 @@ autom4te.cache
 aux-config
 docker
 !docker/certs
+!docker/build_binary.py
+!docker/pip.conf
 build
 models/plotting/data
 models/plotting/plots

CHANGES.md

@@ -1 +1,8 @@
-# Version X.X
+# Version 1.0.0rc1
+
+## Known issues
+
+* The interpolation algorithm does not respect fault block and zone boundaries and the boundary between water and solid materials. This means fault block and zone ids will be interpolated across block and zone boundaries, and Vp and density will be interpolated Vp and density across the boundary between water and solid materials. Vs is not interpolated across the boundary between water and solid material, because it is not defined in water.
+* GeoModelGrids does not support unit conversions. All values returned in queries are in the units of the underlying models. We do check that all models have consistent units for values contained in multiple models. Queries for the elevations of the top surface or topography/bathymetry will be returned in the units of the input Coordinate Reference System.
+* The model storage has been optimized for faster successive queries in the vertical direction. That is, querying for points on a vertical slice will generally be faster than querying the same number of points on a horizontal slice.
+

Makefile.am

@@ -29,8 +29,20 @@ EXTRA_DIST = \
 	code.json \
 	developer/autopep8.cfg \
 	developer/uncrustify.cfg \
-	docker/debian-stable-gcc8 \
-	docker/geomodelgrids-testenv
+	docker/README.md \
+	docker/build_binary.py \
+	docker/builder.py \
+	docker/update_testenv.py \
+	docker/debian-stable \
+	docker/debian-testing \
+	docker/ubuntu-20.04 \
+	docker/ubuntu-20.10 \
+	docker/fedora-32 \
+	docker/fedora-33 \
+	docker/centos-8 \
+	docker/geomodelgrids-testenv \
+	docker/geomodelgrids-devenv \
+	docker/geomodelgrids-userenv
 
 
 .PHONY: coverage-libtests coverage-html clean-coverage

configure.ac

@@ -6,7 +6,7 @@
 # ----------------------------------------------------------------------
 
 AC_PREREQ(2.59)
-AC_INIT([geomodelgrids], [0.2.0], [baagaard@usgs.gov])
+AC_INIT([geomodelgrids], [1.0.0rc1], [baagaard@usgs.gov])
 AC_CONFIG_HEADER([portinfo])
 AC_CONFIG_AUX_DIR([./aux-config])
 AC_CONFIG_MACRO_DIR([m4])
@@ -41,7 +41,7 @@ AC_ARG_ENABLE([test-coverage],
 	[enable_test_coverage=no])
 AC_ARG_WITH([python-coverage],
     [AC_HELP_STRING([--with-python-coverage],
-        [set executable for python-coverage @<:@default=python3-coverage@:>@])],
+        [Specify executable for python-coverage @<:@default=python3-coverage@:>@])],
 	[python_coverage=$withval],
 	[python_coverage="python3-coverage"])
 AC_SUBST(python_coverage)
@@ -66,55 +66,55 @@ AC_ARG_ENABLE([spatialdata],
 # CPPUNIT
 AC_ARG_WITH([cppunit-incdir],
     [AC_HELP_STRING([--with-cppunit-incdir],
-        [location of cppunit header files @<:@default=no@:>@])],
+        [Specify location of cppunit header files @<:@default=no@:>@])],
 	[with_cppunit_incdir=$withval],
 	[with_cppunit_incdir=no])
 AC_SUBST(with_cppunit_incdir)
 AC_ARG_WITH([cppunit-libdir],
     [AC_HELP_STRING([--with-cppunit-libdir],
-        [location of cppunit library @<:@default=no@:>@])],
+        [Specify location of cppunit library @<:@default=no@:>@])],
 	[with_cppunit_libdir=$withval],
 	[with_cppunit_libdir=no])
 AC_SUBST(with_cppunit_libdir)
 
 # PROJ
 AC_ARG_WITH([proj-incdir],
     [AC_HELP_STRING([--with-proj-incdir],
-        [location of proj header files @<:@default=no@:>@])],
+        [Specify location of proj header files @<:@default=no@:>@])],
 	[with_proj_incdir=$withval],
 	[with_proj_incdir=no])
 AC_SUBST(with_proj_incdir)
 AC_ARG_WITH([proj-libdir],
     [AC_HELP_STRING([--with-proj-libdir],
-        [location of proj library @<:@default=no@:>@])],
+        [Specify location of proj library @<:@default=no@:>@])],
 	[with_proj_libdir=$withval],
 	[with_proj_libdir=no])
 AC_SUBST(with_proj_libdir)
 
 # HDF5
 AC_ARG_WITH([hdf5-incdir],
     [AC_HELP_STRING([--with-hdf5-incdir],
-        [location of hdf5 header files @<:@default=no@:>@])],
+        [Specify location of hdf5 header files @<:@default=no@:>@])],
 	[with_hdf5_incdir=$withval],
 	[with_hdf5_incdir=no])
 AC_SUBST(with_hdf5_incdir)
 AC_ARG_WITH([hdf5-libdir],
     [AC_HELP_STRING([--with-hdf5-libdir],
-        [location of hdf5 library @<:@default=no@:>@])],
+        [Specify location of hdf5 library @<:@default=no@:>@])],
 	[with_hdf5_libdir=$withval],
 	[with_hdf5_libdir=no])
 AC_SUBST(with_hdf5_libdir)
 
 # GDAL
 AC_ARG_WITH([gdal-incdir],
     [AC_HELP_STRING([--with-gdal-incdir],
-        [location of gdal header files @<:@default=no@:>@])],
+        [Specify location of gdal header files @<:@default=no@:>@])],
 	[with_gdal_incdir=$withval],
 	[with_gdal_incdir=no])
 AC_SUBST(with_gdal_incdir)
 AC_ARG_WITH([gdal-libdir],
     [AC_HELP_STRING([--with-gdal-libdir],
-        [location of gdal library @<:@default=no@:>@])],
+        [Specify location of gdal library @<:@default=no@:>@])],
 	[with_gdal_libdir=$withval],
 	[with_gdal_libdir=no])
 AC_SUBST(with_gdal_libdir)
@@ -127,6 +127,10 @@ AC_PROG_CC
 AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 
+# Require C++-11
+AX_CXX_COMPILE_STDCXX(11)
+
+
 AC_PROG_LIBTOOL
 if test "$allow_undefined_flag" = unsupported; then
     # See issue119.
@@ -197,9 +201,6 @@ fi
 
 # CPPUNIT
 if test "$enable_testing" = "yes" ; then
-  # Require C++-11
-  AX_CXX_COMPILE_STDCXX(11)
-
   if test "$with_cppunit_incdir" != no; then
     CPPUNIT_INCLUDES="-I$with_cppunit_incdir"
   fi
@@ -294,7 +295,7 @@ AC_CONFIG_FILES([Makefile
 	tests/libtests/utils/Makefile
 	tests/libtests/serial/Makefile
 	tests/libtests/apps/Makefile
-  tests/pytests/Makefile
+  	tests/pytests/Makefile
 	docs/Makefile
 	models/Makefile
 	])