[cig-commits] [commit] master: Merge branch 'master' of github.com:geodynamics/spatialdata (259c0f8)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Aug 21 16:17:47 PDT 2014
Repository : https://github.com/geodynamics/spatialdata
On branch : master
Link : https://github.com/geodynamics/spatialdata/compare/fca7cc9ab6c680e4ffedb8b498c068ac1bf966d5...259c0f80668bcc0fc99cab22fb750f69a583b42e
>---------------------------------------------------------------
commit 259c0f80668bcc0fc99cab22fb750f69a583b42e
Merge: 1570598 fca7cc9
Author: Brad Aagaard <baagaard at usgs.gov>
Date: Thu Aug 21 16:17:54 2014 -0700
Merge branch 'master' of github.com:geodynamics/spatialdata
>---------------------------------------------------------------
259c0f80668bcc0fc99cab22fb750f69a583b42e
.gitignore | 1 +
CHANGES | 5 +++++
COPYING | 2 +-
Makefile.am | 2 +-
README | 6 +++---
applications/Makefile.am | 2 +-
applications/gensimpledb.py | 2 +-
applications/pyconvert.py | 2 +-
configure.ac | 4 ++--
doc/Makefile.am | 2 +-
libsrc/spatialdata/Makefile.am | 2 +-
libsrc/spatialdata/geocoords/CSCart.cc | 2 +-
libsrc/spatialdata/geocoords/CSCart.hh | 2 +-
libsrc/spatialdata/geocoords/CSGeo.cc | 2 +-
libsrc/spatialdata/geocoords/CSGeo.hh | 2 +-
libsrc/spatialdata/geocoords/CSGeoLocalCart.cc | 2 +-
libsrc/spatialdata/geocoords/CSGeoLocalCart.hh | 2 +-
libsrc/spatialdata/geocoords/CSGeoProj.cc | 2 +-
libsrc/spatialdata/geocoords/CSGeoProj.hh | 2 +-
libsrc/spatialdata/geocoords/CSPicklerAscii.cc | 2 +-
libsrc/spatialdata/geocoords/CSPicklerAscii.hh | 2 +-
libsrc/spatialdata/geocoords/Converter.cc | 2 +-
libsrc/spatialdata/geocoords/Converter.hh | 2 +-
libsrc/spatialdata/geocoords/CoordSys.cc | 2 +-
libsrc/spatialdata/geocoords/CoordSys.hh | 2 +-
libsrc/spatialdata/geocoords/Geoid.cc | 2 +-
libsrc/spatialdata/geocoords/Geoid.hh | 2 +-
libsrc/spatialdata/geocoords/Makefile.am | 2 +-
libsrc/spatialdata/geocoords/Projector.cc | 2 +-
libsrc/spatialdata/geocoords/Projector.hh | 2 +-
libsrc/spatialdata/geocoords/data/Makefile.am | 2 +-
libsrc/spatialdata/geocoords/geocoordsfwd.hh | 2 +-
libsrc/spatialdata/spatialdb/CompositeDB.cc | 2 +-
libsrc/spatialdata/spatialdb/CompositeDB.hh | 2 +-
libsrc/spatialdata/spatialdb/Exception.hh | 2 +-
libsrc/spatialdata/spatialdb/GocadVoxet.cc | 2 +-
libsrc/spatialdata/spatialdb/GocadVoxet.hh | 2 +-
libsrc/spatialdata/spatialdb/GravityField.cc | 2 +-
libsrc/spatialdata/spatialdb/GravityField.hh | 2 +-
libsrc/spatialdata/spatialdb/Makefile.am | 2 +-
libsrc/spatialdata/spatialdb/SCECCVMH.cc | 2 +-
libsrc/spatialdata/spatialdb/SCECCVMH.hh | 2 +-
libsrc/spatialdata/spatialdb/SimpleDB.cc | 2 +-
libsrc/spatialdata/spatialdb/SimpleDB.hh | 2 +-
libsrc/spatialdata/spatialdb/SimpleDBData.cc | 2 +-
libsrc/spatialdata/spatialdb/SimpleDBData.hh | 2 +-
libsrc/spatialdata/spatialdb/SimpleDBQuery.cc | 2 +-
libsrc/spatialdata/spatialdb/SimpleDBQuery.hh | 2 +-
libsrc/spatialdata/spatialdb/SimpleGridAscii.cc | 2 +-
libsrc/spatialdata/spatialdb/SimpleGridAscii.hh | 2 +-
libsrc/spatialdata/spatialdb/SimpleGridDB.cc | 2 +-
libsrc/spatialdata/spatialdb/SimpleGridDB.hh | 2 +-
libsrc/spatialdata/spatialdb/SimpleIO.cc | 2 +-
libsrc/spatialdata/spatialdb/SimpleIO.hh | 2 +-
libsrc/spatialdata/spatialdb/SimpleIOAscii.cc | 2 +-
libsrc/spatialdata/spatialdb/SimpleIOAscii.hh | 2 +-
libsrc/spatialdata/spatialdb/SpatialDB.cc | 2 +-
libsrc/spatialdata/spatialdb/SpatialDB.hh | 2 +-
libsrc/spatialdata/spatialdb/TimeHistory.cc | 2 +-
libsrc/spatialdata/spatialdb/TimeHistory.hh | 2 +-
libsrc/spatialdata/spatialdb/TimeHistoryIO.cc | 2 +-
libsrc/spatialdata/spatialdb/TimeHistoryIO.hh | 2 +-
libsrc/spatialdata/spatialdb/UniformDB.cc | 2 +-
libsrc/spatialdata/spatialdb/UniformDB.hh | 2 +-
libsrc/spatialdata/spatialdb/cspatialdb.cc | 2 +-
libsrc/spatialdata/spatialdb/f77spatialdb.cc | 2 +-
libsrc/spatialdata/spatialdb/spatialdbfwd.hh | 2 +-
libsrc/spatialdata/units/Makefile.am | 2 +-
libsrc/spatialdata/units/Nondimensional.cc | 2 +-
libsrc/spatialdata/units/Nondimensional.hh | 2 +-
libsrc/spatialdata/units/Parser.cc | 2 +-
libsrc/spatialdata/units/Parser.hh | 2 +-
libsrc/spatialdata/units/unitsfwd.hh | 2 +-
libsrc/spatialdata/utils/LineParser.cc | 2 +-
libsrc/spatialdata/utils/LineParser.hh | 2 +-
libsrc/spatialdata/utils/Makefile.am | 2 +-
libsrc/spatialdata/utils/PointsStream.cc | 2 +-
libsrc/spatialdata/utils/PointsStream.hh | 2 +-
libsrc/spatialdata/utils/utilsfwd.hh | 2 +-
m4 | 2 +-
modulesrc/Makefile.am | 2 +-
modulesrc/geocoords/CSCart.i | 2 +-
modulesrc/geocoords/CSGeo.i | 2 +-
modulesrc/geocoords/CSGeoLocalCart.i | 2 +-
modulesrc/geocoords/CSGeoProj.i | 2 +-
modulesrc/geocoords/Converter.i | 2 +-
modulesrc/geocoords/CoordSys.i | 2 +-
modulesrc/geocoords/Makefile.am | 2 +-
modulesrc/geocoords/Projector.i | 2 +-
modulesrc/geocoords/geocoords.i | 2 +-
modulesrc/include/Makefile.am | 2 +-
modulesrc/include/chararray.i | 2 +-
modulesrc/spatialdb/CompositeDB.i | 2 +-
modulesrc/spatialdb/GravityField.i | 2 +-
modulesrc/spatialdb/Makefile.am | 2 +-
modulesrc/spatialdb/SCECCVMH.i | 2 +-
modulesrc/spatialdb/SimpleDB.i | 2 +-
modulesrc/spatialdb/SimpleDBData.i | 2 +-
modulesrc/spatialdb/SimpleGridAscii.i | 2 +-
modulesrc/spatialdb/SimpleGridDB.i | 2 +-
modulesrc/spatialdb/SimpleIO.i | 2 +-
modulesrc/spatialdb/SimpleIOAscii.i | 2 +-
modulesrc/spatialdb/SpatialDBObj.i | 2 +-
modulesrc/spatialdb/TimeHistory.i | 2 +-
modulesrc/spatialdb/TimeHistoryIO.i | 2 +-
modulesrc/spatialdb/UniformDB.i | 2 +-
modulesrc/spatialdb/spatialdb.i | 2 +-
modulesrc/units/Makefile.am | 2 +-
modulesrc/units/Nondimensional.i | 2 +-
modulesrc/units/units.i | 2 +-
spatialdata/Makefile.am | 2 +-
spatialdata/__init__.py | 2 +-
spatialdata/geocoords/CSCart.py | 2 +-
spatialdata/geocoords/CSGeo.py | 2 +-
spatialdata/geocoords/CSGeoLocalCart.py | 2 +-
spatialdata/geocoords/CSGeoProj.py | 2 +-
spatialdata/geocoords/Converter.py | 2 +-
spatialdata/geocoords/CoordSys.py | 2 +-
spatialdata/geocoords/Projector.py | 2 +-
spatialdata/geocoords/__init__.py | 2 +-
spatialdata/spatialdb/CompositeDB.py | 2 +-
spatialdata/spatialdb/GravityField.py | 2 +-
spatialdata/spatialdb/SCECCVMH.py | 2 +-
spatialdata/spatialdb/SimpleDB.py | 2 +-
spatialdata/spatialdb/SimpleGridAscii.py | 2 +-
spatialdata/spatialdb/SimpleGridDB.py | 2 +-
spatialdata/spatialdb/SimpleIO.py | 2 +-
spatialdata/spatialdb/SimpleIOAscii.py | 2 +-
spatialdata/spatialdb/SpatialDBObj.py | 2 +-
spatialdata/spatialdb/TimeHistory.py | 2 +-
spatialdata/spatialdb/TimeHistoryIO.py | 2 +-
spatialdata/spatialdb/UniformDB.py | 2 +-
spatialdata/spatialdb/__init__.py | 2 +-
spatialdata/spatialdb/generator/GenSimpleDBApp.py | 2 +-
spatialdata/spatialdb/generator/Geometry.py | 2 +-
spatialdata/spatialdb/generator/Shaper.py | 2 +-
spatialdata/spatialdb/generator/Shapers.py | 2 +-
spatialdata/spatialdb/generator/Value.py | 2 +-
spatialdata/spatialdb/generator/Values.py | 2 +-
spatialdata/spatialdb/generator/__init__.py | 2 +-
spatialdata/units/NondimElasticDynamic.py | 2 +-
spatialdata/units/NondimElasticQuasistatic.py | 2 +-
spatialdata/units/Nondimensional.py | 2 +-
spatialdata/units/__init__.py | 2 +-
spatialdata/utils/ChangeCoordSys.py | 2 +-
spatialdata/utils/ConvertApp.py | 2 +-
spatialdata/utils/CppData.py | 2 +-
spatialdata/utils/PointsStream.py | 2 +-
spatialdata/utils/__init__.py | 2 +-
subpackage.am | 2 +-
templates/Makefile.am | 2 +-
templates/spatialdb/Makefile.am | 2 +-
templates/spatialdb/UniformVelModel.cc | 2 +-
templates/spatialdb/UniformVelModel.hh | 2 +-
templates/spatialdb/UniformVelModel.i | 2 +-
templates/spatialdb/UniformVelModel.py | 2 +-
templates/spatialdb/__init__.py | 2 +-
templates/spatialdb/spatialdbcontrib.i | 2 +-
templates/spatialdb/tests/Makefile.am | 2 +-
templates/spatialdb/tests/TestUniformVelModel.py | 2 +-
templates/spatialdb/tests/testcontrib.py | 2 +-
tests/Makefile.am | 2 +-
tests/libtests/Makefile.am | 2 +-
tests/libtests/geocoords/Makefile.am | 2 +-
tests/libtests/geocoords/TestCSCart.cc | 2 +-
tests/libtests/geocoords/TestCSCart.hh | 2 +-
tests/libtests/geocoords/TestCSGeo.cc | 2 +-
tests/libtests/geocoords/TestCSGeo.hh | 2 +-
tests/libtests/geocoords/TestCSGeoLocalCart.cc | 2 +-
tests/libtests/geocoords/TestCSGeoLocalCart.hh | 2 +-
tests/libtests/geocoords/TestCSGeoProj.cc | 2 +-
tests/libtests/geocoords/TestCSGeoProj.hh | 2 +-
tests/libtests/geocoords/TestCSPicklerAscii.cc | 2 +-
tests/libtests/geocoords/TestCSPicklerAscii.hh | 2 +-
tests/libtests/geocoords/TestConverter.cc | 2 +-
tests/libtests/geocoords/TestConverter.hh | 2 +-
tests/libtests/geocoords/TestGeoid.cc | 2 +-
tests/libtests/geocoords/TestGeoid.hh | 2 +-
tests/libtests/geocoords/TestProjector.cc | 2 +-
tests/libtests/geocoords/TestProjector.hh | 2 +-
tests/libtests/geocoords/data/ConvertData.py | 2 +-
tests/libtests/geocoords/data/ConvertDataApp.py | 2 +-
tests/libtests/geocoords/data/Makefile.am | 2 +-
tests/libtests/geocoords/testgeocoords.cc | 2 +-
tests/libtests/spatialdb/Makefile.am | 2 +-
tests/libtests/spatialdb/TestCompositeDB.cc | 2 +-
tests/libtests/spatialdb/TestCompositeDB.hh | 2 +-
tests/libtests/spatialdb/TestGravityField.cc | 2 +-
tests/libtests/spatialdb/TestGravityField.hh | 2 +-
tests/libtests/spatialdb/TestSCECCVMH.cc | 2 +-
tests/libtests/spatialdb/TestSCECCVMH.hh | 2 +-
tests/libtests/spatialdb/TestSimpleDB.cc | 2 +-
tests/libtests/spatialdb/TestSimpleDB.hh | 2 +-
tests/libtests/spatialdb/TestSimpleDBArea3D.cc | 2 +-
tests/libtests/spatialdb/TestSimpleDBArea3D.hh | 2 +-
tests/libtests/spatialdb/TestSimpleDBData.cc | 2 +-
tests/libtests/spatialdb/TestSimpleDBData.hh | 2 +-
tests/libtests/spatialdb/TestSimpleDBLine3D.cc | 2 +-
tests/libtests/spatialdb/TestSimpleDBLine3D.hh | 2 +-
tests/libtests/spatialdb/TestSimpleDBPoint3D.cc | 2 +-
tests/libtests/spatialdb/TestSimpleDBPoint3D.hh | 2 +-
tests/libtests/spatialdb/TestSimpleDBQuery.cc | 2 +-
tests/libtests/spatialdb/TestSimpleDBQuery.hh | 2 +-
tests/libtests/spatialdb/TestSimpleDBQuery3D.cc | 2 +-
tests/libtests/spatialdb/TestSimpleDBQuery3D.hh | 2 +-
tests/libtests/spatialdb/TestSimpleDBVolume3D.cc | 2 +-
tests/libtests/spatialdb/TestSimpleDBVolume3D.hh | 2 +-
tests/libtests/spatialdb/TestSimpleGridDB.cc | 2 +-
tests/libtests/spatialdb/TestSimpleGridDB.hh | 2 +-
tests/libtests/spatialdb/TestSimpleGridDBCases.cc | 2 +-
tests/libtests/spatialdb/TestSimpleGridDBCases.hh | 2 +-
tests/libtests/spatialdb/TestSimpleIOAscii.cc | 2 +-
tests/libtests/spatialdb/TestSimpleIOAscii.hh | 2 +-
tests/libtests/spatialdb/TestSpatialDB.cc | 2 +-
tests/libtests/spatialdb/TestSpatialDB.hh | 2 +-
tests/libtests/spatialdb/TestTimeHistory.cc | 2 +-
tests/libtests/spatialdb/TestTimeHistory.hh | 2 +-
tests/libtests/spatialdb/TestTimeHistoryIO.cc | 2 +-
tests/libtests/spatialdb/TestTimeHistoryIO.hh | 2 +-
tests/libtests/spatialdb/TestUniformDB.cc | 2 +-
tests/libtests/spatialdb/TestUniformDB.hh | 2 +-
tests/libtests/spatialdb/data/Makefile.am | 2 +-
tests/libtests/spatialdb/data/SimpleDBApp.py | 2 +-
tests/libtests/spatialdb/data/SimpleDBQueryApp.py | 2 +-
tests/libtests/spatialdb/data/SimpleDBQueryData.cc | 2 +-
tests/libtests/spatialdb/data/SimpleDBQueryData.hh | 2 +-
tests/libtests/spatialdb/data/SimpleDBQueryData.py | 2 +-
tests/libtests/spatialdb/data/SimpleDBQueryData3D.cc | 2 +-
tests/libtests/spatialdb/data/SimpleDBQueryData3D.hh | 2 +-
tests/libtests/spatialdb/data/SimpleDBQueryData3D.py | 2 +-
tests/libtests/spatialdb/data/SimpleDBTestData.cc | 2 +-
tests/libtests/spatialdb/data/SimpleDBTestData.hh | 2 +-
tests/libtests/spatialdb/data/SimpleDBTestDataArea3D.cc | 2 +-
tests/libtests/spatialdb/data/SimpleDBTestDataArea3D.hh | 2 +-
tests/libtests/spatialdb/data/SimpleDBTestDataArea3D.py | 2 +-
tests/libtests/spatialdb/data/SimpleDBTestDataLine3D.cc | 2 +-
tests/libtests/spatialdb/data/SimpleDBTestDataLine3D.hh | 2 +-
tests/libtests/spatialdb/data/SimpleDBTestDataLine3D.py | 2 +-
tests/libtests/spatialdb/data/SimpleDBTestDataPoint3D.cc | 2 +-
tests/libtests/spatialdb/data/SimpleDBTestDataPoint3D.hh | 2 +-
tests/libtests/spatialdb/data/SimpleDBTestDataPoint3D.py | 2 +-
tests/libtests/spatialdb/data/SimpleDBTestDataVolume3D.cc | 2 +-
tests/libtests/spatialdb/data/SimpleDBTestDataVolume3D.hh | 2 +-
tests/libtests/spatialdb/data/SimpleDBTestDataVolume3D.py | 2 +-
tests/libtests/spatialdb/data/SimpleGridDBTestData.cc | 2 +-
tests/libtests/spatialdb/data/SimpleGridDBTestData.hh | 2 +-
tests/libtests/spatialdb/data/SimpleGridDBTestDataArea2D.cc | 2 +-
tests/libtests/spatialdb/data/SimpleGridDBTestDataArea2D.hh | 2 +-
tests/libtests/spatialdb/data/SimpleGridDBTestDataArea3D.cc | 2 +-
tests/libtests/spatialdb/data/SimpleGridDBTestDataArea3D.hh | 2 +-
tests/libtests/spatialdb/data/SimpleGridDBTestDataLine1D.cc | 2 +-
tests/libtests/spatialdb/data/SimpleGridDBTestDataLine1D.hh | 2 +-
tests/libtests/spatialdb/data/SimpleGridDBTestDataLine2D.cc | 2 +-
tests/libtests/spatialdb/data/SimpleGridDBTestDataLine2D.hh | 2 +-
tests/libtests/spatialdb/data/SimpleGridDBTestDataLine3D.cc | 2 +-
tests/libtests/spatialdb/data/SimpleGridDBTestDataLine3D.hh | 2 +-
tests/libtests/spatialdb/data/SimpleGridDBTestDataVolume3D.cc | 2 +-
tests/libtests/spatialdb/data/SimpleGridDBTestDataVolume3D.hh | 2 +-
tests/libtests/spatialdb/data/header.hh | 2 +-
tests/libtests/spatialdb/testspatial.cc | 2 +-
tests/libtests/units/Makefile.am | 2 +-
tests/libtests/units/TestNondimensional.cc | 2 +-
tests/libtests/units/TestNondimensional.hh | 2 +-
tests/libtests/units/TestParser.cc | 2 +-
tests/libtests/units/TestParser.hh | 2 +-
tests/libtests/units/testunits.cc | 2 +-
tests/libtests/utils/Makefile.am | 2 +-
tests/libtests/utils/TestPointsStream.cc | 2 +-
tests/libtests/utils/TestPointsStream.hh | 2 +-
tests/libtests/utils/data/Makefile.am | 2 +-
tests/libtests/utils/testutils.cc | 2 +-
tests/pytests/Makefile.am | 2 +-
tests/pytests/geocoords/Makefile.am | 2 +-
tests/pytests/geocoords/TestCSCart.py | 2 +-
tests/pytests/geocoords/TestCSGeo.py | 2 +-
tests/pytests/geocoords/TestCSGeoLocalCart.py | 2 +-
tests/pytests/geocoords/TestCSGeoProj.py | 2 +-
tests/pytests/geocoords/TestConverter.py | 2 +-
tests/pytests/geocoords/TestProjector.py | 2 +-
tests/pytests/geocoords/testgeocoords.py | 2 +-
tests/pytests/spatialdb/Makefile.am | 2 +-
tests/pytests/spatialdb/TestCompositeDB.py | 2 +-
tests/pytests/spatialdb/TestGenSimpleDBApp.py | 2 +-
tests/pytests/spatialdb/TestGravityField.py | 2 +-
tests/pytests/spatialdb/TestSimpleDB.py | 2 +-
tests/pytests/spatialdb/TestSimpleGridDB.py | 2 +-
tests/pytests/spatialdb/TestSimpleIOAscii.py | 2 +-
tests/pytests/spatialdb/TestTimeHistory.py | 2 +-
tests/pytests/spatialdb/TestTimeHistoryIO.py | 2 +-
tests/pytests/spatialdb/TestUniformDB.py | 2 +-
tests/pytests/spatialdb/data/Makefile.am | 2 +-
tests/pytests/spatialdb/test_sceccvmh.py | 2 +-
tests/pytests/spatialdb/testspatial.py | 2 +-
tests/pytests/units/Makefile.am | 2 +-
tests/pytests/units/TestNondimElasticDynamic.py | 2 +-
tests/pytests/units/TestNondimElasticQuasistatic.py | 2 +-
tests/pytests/units/TestNondimensional.py | 2 +-
tests/pytests/units/testunits.py | 2 +-
tests/pytests/utils/Makefile.am | 2 +-
tests/pytests/utils/TestChangeCoordSys.py | 2 +-
tests/pytests/utils/TestConvertApp.py | 2 +-
tests/pytests/utils/testutils.py | 2 +-
302 files changed, 309 insertions(+), 303 deletions(-)
More information about the CIG-COMMITS
mailing list