[cig-commits] [commit] next: Merge branch 'baagaard/feature-output-station-names' into next (78c198a)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/pylith

On branch  : next
Link       : https://github.com/geodynamics/pylith/compare/3efd7c3bab4647abea5e09db47cbeb670a57a588...78c198a5c3423f05d7a652ed95299710128e568c

>---------------------------------------------------------------

commit 78c198a5c3423f05d7a652ed95299710128e568c
Merge: 37f9ed5 9e23a4c
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Wed Nov 19 08:26:25 2014 -0800

    Merge branch 'baagaard/feature-output-station-names' into next
    
    * baagaard/feature-output-station-names:
      Added station names to documentation.
      Add station names to examples with OutputSolnPoints.
      Added testing of OutputSolnPoints to 3-D full-scale test.
      Add testing of OutputSolnPoints to full-scale test.
      Use list for station names.
      Added output of station name at Python level.
      Added unit tests for writing point data with DataWriterHDF5Ext.
      Finished C++ implementation of writing station names.
      Switch to fixed length string dataset in HDF5 to allow parallel I/O.
      Add station name to list of points for output.
      Small improvement to unit test.
      Add writePointNames() to DataWriter.



>---------------------------------------------------------------

78c198a5c3423f05d7a652ed95299710128e568c
 doc/userguide/fileformats/fileformats.lyx          |  29 +-
 doc/userguide/runpylith/figs/hdf5layout.pdf        | Bin 9007 -> 26373 bytes
 doc/userguide/runpylith/figs/hdf5layout.svg        | 567 ---------------------
 doc/userguide/runpylith/figs/hdf5layout.tex        |  60 +++
 doc/userguide/runpylith/runpylith.lyx              |  10 +-
 examples/2d/greensfns/reverse/output_points.txt    |  26 +-
 examples/2d/greensfns/strikeslip/output_points.txt |  66 +--
 examples/3d/hex8/output_points.txt                 |  10 +-
 libsrc/pylith/meshio/DataWriter.cc                 |  11 +
 libsrc/pylith/meshio/DataWriter.hh                 |  11 +
 libsrc/pylith/meshio/DataWriterHDF5.cc             |  36 +-
 libsrc/pylith/meshio/DataWriterHDF5.hh             |  15 +
 libsrc/pylith/meshio/DataWriterHDF5Ext.cc          |  32 +-
 libsrc/pylith/meshio/DataWriterHDF5Ext.hh          |  11 +
 libsrc/pylith/meshio/HDF5.cc                       | 416 +++++++++------
 libsrc/pylith/meshio/HDF5.hh                       |  67 ++-
 libsrc/pylith/meshio/OutputManager.hh              |  15 +-
 libsrc/pylith/meshio/OutputSolnPoints.cc           |  14 +
 libsrc/pylith/meshio/OutputSolnPoints.hh           |  10 +
 libsrc/pylith/meshio/Xdmf.cc                       |   9 +-
 modulesrc/meshio/DataWriter.i                      |  11 +
 modulesrc/meshio/DataWriterHDF5.i                  |  10 +
 modulesrc/meshio/DataWriterHDF5Ext.i               |  10 +
 modulesrc/meshio/OutputSolnPoints.i                |  12 +
 modulesrc/meshio/meshio.i                          |   1 +
 pylith/Makefile.am                                 |   1 +
 pylith/meshio/OutputSolnPoints.py                  |  18 +-
 pylith/meshio/PointsList.py                        |  56 +-
 pylith/tests/{Solution.py => SolutionPoints.py}    |  29 +-
 tests_auto/2d/tri3/Makefile.am                     |   1 +
 tests_auto/2d/tri3/TestSlipOneFault.py             |  27 +
 tests_auto/2d/tri3/points.txt                      |   4 +
 tests_auto/2d/tri3/sliponefault.cfg                |  12 +-
 tests_auto/2d/tri3/sliponefault_soln.py            |   5 +-
 tests_auto/3d/tet4/Makefile.am                     |   1 +
 tests_auto/3d/tet4/TestSlipOneFault.py             |  27 +
 tests_auto/3d/tet4/points.txt                      |   4 +
 tests_auto/3d/tet4/sliponefault.cfg                |  10 +-
 tests_auto/3d/tet4/sliponefault_soln.py            |   5 +-
 unittests/libtests/meshio/Makefile.am              |  16 +
 unittests/libtests/meshio/TestDataWriterHDF5.cc    | 156 +++---
 ...VTKPoints.cc => TestDataWriterHDF5ExtPoints.cc} |  61 +--
 ...VTKPoints.hh => TestDataWriterHDF5ExtPoints.hh} |  26 +-
 ...ases.cc => TestDataWriterHDF5ExtPointsCases.cc} |  47 +-
 ...ases.hh => TestDataWriterHDF5ExtPointsCases.hh} |  60 +--
 ...terVTKPoints.cc => TestDataWriterHDF5Points.cc} |  59 +--
 ...terVTKPoints.hh => TestDataWriterHDF5Points.hh} |  26 +-
 ...shCases.cc => TestDataWriterHDF5PointsCases.cc} |  47 +-
 ...tsCases.hh => TestDataWriterHDF5PointsCases.hh} |  60 +--
 .../libtests/meshio/TestDataWriterVTKPoints.cc     |   2 +
 unittests/libtests/meshio/TestHDF5.cc              |  80 ++-
 unittests/libtests/meshio/TestHDF5.hh              |  13 +-
 .../libtests/meshio/data/DataWriterDataPoints.cc   |   3 +-
 .../libtests/meshio/data/DataWriterDataPoints.hh   |   1 +
 ...intsHex8.cc => DataWriterHDF5DataPointsHex8.cc} |  52 +-
 ...intsTet4.hh => DataWriterHDF5DataPointsHex8.hh} |  23 +-
 ...tsQuad4.cc => DataWriterHDF5DataPointsQuad4.cc} |  47 +-
 ...tsQuad4.hh => DataWriterHDF5DataPointsQuad4.hh} |  23 +-
 ...intsTet4.cc => DataWriterHDF5DataPointsTet4.cc} |  52 +-
 ...intsTet4.hh => DataWriterHDF5DataPointsTet4.hh} |  23 +-
 ...ntsQuad4.cc => DataWriterHDF5DataPointsTri3.cc} |  67 +--
 ...intsTet4.hh => DataWriterHDF5DataPointsTri3.hh} |  23 +-
 unittests/libtests/meshio/data/Makefile.am         |  11 +-
 .../meshio/data/{tet4_surf.h5 => hex8_points.h5}   | Bin 11016 -> 11288 bytes
 .../{tri3_mat_cell.h5 => hex8_points_vertex.h5}    | Bin 29088 -> 29536 bytes
 .../meshio/data/{tri3_bc.h5 => quad4_points.h5}    | Bin 11016 -> 11288 bytes
 .../{tri3_bc_cell.h5 => quad4_points_vertex.h5}    | Bin 29088 -> 29536 bytes
 .../meshio/data/{tet4_surf.h5 => tet4_points.h5}   | Bin 11016 -> 11288 bytes
 .../{tet4_surf_cell.h5 => tet4_points_vertex.h5}   | Bin 29088 -> 29536 bytes
 .../meshio/data/{tri3_bc.h5 => tri3_points.h5}     | Bin 11016 -> 11288 bytes
 .../{tet4_bc_cell.h5 => tri3_points_vertex.h5}     | Bin 29088 -> 29536 bytes
 unittests/pytests/meshio/data/point.txt            |   2 +-
 unittests/pytests/meshio/data/points.txt           |   6 +-
 73 files changed, 1339 insertions(+), 1306 deletions(-)