[cig-commits] [commit] master: Merge branch 'baagaard/remove-1d' (7d56eaa)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/pylith

On branch  : master
Link       : https://github.com/geodynamics/pylith/compare/777a9540450edb3581113a587483993521dd1ac8...7d56eaa0d2976daba676f7f106c7c16360d7c36e

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

commit 7d56eaa0d2976daba676f7f106c7c16360d7c36e
Merge: 777a954 10bcfba
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Thu Nov 7 11:15:32 2013 -0800

    Merge branch 'baagaard/remove-1d'
    
    * baagaard/remove-1d:
      Remove 1-D stuff from modules, python, and Python unit tests.



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

7d56eaa0d2976daba676f7f106c7c16360d7c36e
 modulesrc/feassemble/CellGeometry.i                |   1 -
 modulesrc/feassemble/GeometryLine1D.i              | 106 -----------
 modulesrc/feassemble/GeometryPoint1D.i             | 106 -----------
 modulesrc/feassemble/GeometryPoint2D.i             | 106 -----------
 modulesrc/feassemble/GeometryPoint3D.i             | 106 -----------
 modulesrc/feassemble/Makefile.am                   |   4 -
 modulesrc/feassemble/feassemble.i                  |   8 -
 pylith/feassemble/CellGeometry.py                  |  68 --------
 pylith/feassemble/FIATLagrange.py                  |  11 +-
 pylith/feassemble/FIATSimplex.py                   |  11 +-
 unittests/pytests/feassemble/TestCellGeometry.py   |   8 +-
 unittests/pytests/feassemble/TestFIATLagrange.py   | 191 --------------------
 unittests/pytests/feassemble/TestFIATSimplex.py    | 193 ---------------------
 unittests/pytests/feassemble/TestMeshQuadrature.py |  42 -----
 unittests/pytests/materials/Makefile.am            |   2 -
 unittests/pytests/materials/TestElasticMaterial.py |   4 +-
 unittests/pytests/materials/TestElasticStrain1D.py | 101 -----------
 unittests/pytests/materials/TestElasticStress1D.py | 101 -----------
 unittests/pytests/materials/TestMaterial.py        |   8 +-
 unittests/pytests/materials/testmaterials.py       |   6 -
 20 files changed, 12 insertions(+), 1171 deletions(-)