[cig-commits] [commit] master: Merge branch 'baagaard/remove-1d' (a8c7e5d)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 6 14:01:18 PST 2013
Repository : ssh://geoshell/pylith
On branch : master
Link : https://github.com/geodynamics/pylith/compare/f519500f19c0bfe00e61ae355580343fc9d511be...a8c7e5d73048e8b9f5fab552ab217c9af9741892
>---------------------------------------------------------------
commit a8c7e5d73048e8b9f5fab552ab217c9af9741892
Merge: f519500 23710a7
Author: Brad Aagaard <baagaard at usgs.gov>
Date: Wed Nov 6 14:03:46 2013 -0800
Merge branch 'baagaard/remove-1d'
* baagaard/remove-1d:
Removed more 1-D stuff from lib and tests.
>---------------------------------------------------------------
a8c7e5d73048e8b9f5fab552ab217c9af9741892
libsrc/pylith/Makefile.am | 6 -
libsrc/pylith/feassemble/CellGeometry.cc | 16 --
libsrc/pylith/feassemble/CellGeometry.hh | 25 ---
libsrc/pylith/feassemble/ElasticityExplicit.cc | 7 +-
.../feassemble/ElasticityExplicitLgDeform.cc | 11 +-
libsrc/pylith/feassemble/ElasticityImplicit.cc | 12 +-
.../feassemble/ElasticityImplicitLgDeform.cc | 26 ++-
libsrc/pylith/feassemble/GeometryLine1D.cc | 177 ---------------------
libsrc/pylith/feassemble/GeometryLine1D.hh | 130 ---------------
libsrc/pylith/feassemble/GeometryLine2D.cc | 4 +-
libsrc/pylith/feassemble/GeometryLine3D.cc | 4 +-
libsrc/pylith/feassemble/GeometryPoint1D.cc | 133 ----------------
libsrc/pylith/feassemble/GeometryPoint1D.hh | 130 ---------------
libsrc/pylith/feassemble/GeometryPoint2D.cc | 134 ----------------
libsrc/pylith/feassemble/GeometryPoint2D.hh | 130 ---------------
libsrc/pylith/feassemble/GeometryPoint3D.cc | 134 ----------------
libsrc/pylith/feassemble/GeometryPoint3D.hh | 130 ---------------
libsrc/pylith/feassemble/IntegratorElasticity.cc | 94 +----------
libsrc/pylith/feassemble/IntegratorElasticity.hh | 29 ----
.../feassemble/IntegratorElasticityLgDeform.cc | 109 +------------
libsrc/pylith/feassemble/Makefile.am | 8 -
libsrc/pylith/feassemble/Quadrature.cc | 19 +--
libsrc/pylith/feassemble/Quadrature0D.cc | 85 ----------
libsrc/pylith/feassemble/Quadrature0D.hh | 87 ----------
libsrc/pylith/feassemble/Quadrature0D.icc | 32 ----
libsrc/pylith/feassemble/Quadrature1D.cc | 130 ---------------
libsrc/pylith/feassemble/Quadrature1D.hh | 83 ----------
libsrc/pylith/feassemble/Quadrature1D.icc | 32 ----
libsrc/pylith/feassemble/Quadrature1Din2D.hh | 2 +-
libsrc/pylith/feassemble/Quadrature1Din3D.hh | 2 +-
libsrc/pylith/feassemble/Quadrature2D.hh | 2 +-
libsrc/pylith/feassemble/Quadrature2Din3D.hh | 2 +-
libsrc/pylith/feassemble/Quadrature3D.hh | 2 +-
libsrc/pylith/feassemble/QuadratureEngine.hh | 2 +-
libsrc/pylith/feassemble/feassemblefwd.hh | 6 -
unittests/libtests/faults/TestBruneSlipFn.cc | 35 ----
unittests/libtests/faults/TestBruneSlipFn.hh | 4 -
unittests/libtests/faults/TestConstRateSlipFn.cc | 31 ----
unittests/libtests/faults/TestConstRateSlipFn.hh | 4 -
.../libtests/faults/TestFaultCohesiveKinCases.cc | 22 ---
.../faults/TestFaultCohesiveKinSrcsCases.cc | 22 ---
unittests/libtests/faults/TestLiuCosSlipFn.cc | 35 ----
unittests/libtests/faults/TestLiuCosSlipFn.hh | 4 -
unittests/libtests/faults/TestStepSlipFn.cc | 31 ----
unittests/libtests/faults/TestStepSlipFn.hh | 4 -
unittests/libtests/faults/TestTimeHistorySlipFn.cc | 33 ----
unittests/libtests/faults/TestTimeHistorySlipFn.hh | 4 -
unittests/libtests/feassemble/Makefile.am | 56 -------
unittests/libtests/feassemble/TestCellGeometry.cc | 23 ---
unittests/libtests/feassemble/TestCellGeometry.hh | 4 -
.../feassemble/TestElasticityExplicitCases.cc | 124 ---------------
.../feassemble/TestElasticityExplicitCases.hh | 108 -------------
.../TestElasticityExplicitLgDeformCases.cc | 108 -------------
.../TestElasticityExplicitLgDeformCases.hh | 106 +-----------
.../feassemble/TestElasticityImplicitCases.cc | 124 ---------------
.../feassemble/TestElasticityImplicitCases.hh | 108 -------------
.../TestElasticityImplicitLgDeformCases.cc | 124 ---------------
.../TestElasticityImplicitLgDeformCases.hh | 104 ------------
unittests/libtests/feassemble/TestGeometryHex3D.cc | 8 +-
.../libtests/feassemble/TestGeometryLine1D.cc | 78 ---------
.../libtests/feassemble/TestGeometryLine1D.hh | 74 ---------
.../libtests/feassemble/TestGeometryLine2D.cc | 8 +-
.../libtests/feassemble/TestGeometryLine3D.cc | 8 +-
.../libtests/feassemble/TestGeometryPoint1D.cc | 106 ------------
.../libtests/feassemble/TestGeometryPoint1D.hh | 77 ---------
.../libtests/feassemble/TestGeometryPoint2D.cc | 106 ------------
.../libtests/feassemble/TestGeometryPoint2D.hh | 77 ---------
.../libtests/feassemble/TestGeometryPoint3D.cc | 109 -------------
.../libtests/feassemble/TestGeometryPoint3D.hh | 78 ---------
.../libtests/feassemble/TestGeometryQuad2D.cc | 6 +-
.../libtests/feassemble/TestGeometryQuad3D.cc | 8 +-
unittests/libtests/feassemble/TestGeometryTet3D.cc | 8 +-
unittests/libtests/feassemble/TestGeometryTri2D.cc | 8 +-
unittests/libtests/feassemble/TestGeometryTri3D.cc | 8 +-
unittests/libtests/feassemble/TestIntegrator.cc | 17 --
unittests/libtests/feassemble/TestIntegrator.hh | 4 -
.../feassemble/TestIntegratorElasticity.cc | 39 -----
.../feassemble/TestIntegratorElasticity.hh | 4 -
.../feassemble/TestIntegratorElasticityLgDeform.cc | 87 ----------
.../feassemble/TestIntegratorElasticityLgDeform.hh | 8 -
unittests/libtests/feassemble/TestQuadrature.cc | 19 ++-
unittests/libtests/feassemble/TestQuadrature0D.cc | 96 -----------
unittests/libtests/feassemble/TestQuadrature0D.hh | 64 --------
unittests/libtests/feassemble/TestQuadrature1D.cc | 87 ----------
unittests/libtests/feassemble/TestQuadrature1D.hh | 69 --------
.../libtests/feassemble/TestQuadratureEngine.cc | 6 +-
.../libtests/feassemble/TestQuadratureRefCell.cc | 4 +-
.../data/ElasticityExplicitData1DLinear.cc | 142 -----------------
.../data/ElasticityExplicitData1DLinear.hh | 100 ------------
.../data/ElasticityExplicitData1DQuadratic.cc | 158 ------------------
.../data/ElasticityExplicitData1DQuadratic.hh | 100 ------------
.../data/ElasticityExplicitGravData1DLinear.cc | 142 -----------------
.../data/ElasticityExplicitGravData1DLinear.hh | 100 ------------
.../data/ElasticityExplicitGravData1DQuadratic.cc | 158 ------------------
.../data/ElasticityExplicitGravData1DQuadratic.hh | 100 ------------
.../data/ElasticityExplicitLgDeformData1DLinear.cc | 142 -----------------
.../data/ElasticityExplicitLgDeformData1DLinear.hh | 100 ------------
.../ElasticityExplicitLgDeformData1DQuadratic.cc | 158 ------------------
.../ElasticityExplicitLgDeformData1DQuadratic.hh | 100 ------------
.../ElasticityExplicitLgDeformGravData1DLinear.cc | 142 -----------------
.../ElasticityExplicitLgDeformGravData1DLinear.hh | 100 ------------
...lasticityExplicitLgDeformGravData1DQuadratic.cc | 158 ------------------
...lasticityExplicitLgDeformGravData1DQuadratic.hh | 100 ------------
.../data/ElasticityImplicitData1DLinear.cc | 141 ----------------
.../data/ElasticityImplicitData1DLinear.hh | 98 ------------
.../data/ElasticityImplicitData1DQuadratic.cc | 161 -------------------
.../data/ElasticityImplicitData1DQuadratic.hh | 98 ------------
.../data/ElasticityImplicitGravData1DLinear.cc | 141 ----------------
.../data/ElasticityImplicitGravData1DLinear.hh | 98 ------------
.../data/ElasticityImplicitGravData1DQuadratic.cc | 161 -------------------
.../data/ElasticityImplicitGravData1DQuadratic.hh | 98 ------------
.../data/ElasticityImplicitLgDeformData1DLinear.cc | 141 ----------------
.../data/ElasticityImplicitLgDeformData1DLinear.hh | 98 ------------
.../ElasticityImplicitLgDeformData1DQuadratic.cc | 161 -------------------
.../ElasticityImplicitLgDeformData1DQuadratic.hh | 98 ------------
.../ElasticityImplicitLgDeformGravData1DLinear.cc | 141 ----------------
.../ElasticityImplicitLgDeformGravData1DLinear.hh | 98 ------------
...lasticityImplicitLgDeformGravData1DQuadratic.cc | 161 -------------------
...lasticityImplicitLgDeformGravData1DQuadratic.hh | 98 ------------
.../libtests/feassemble/data/GeomDataLine1D.cc | 71 ---------
.../libtests/feassemble/data/GeomDataLine1D.hh | 61 -------
.../libtests/feassemble/data/GeomDataPoint1D.cc | 69 --------
.../libtests/feassemble/data/GeomDataPoint1D.hh | 61 -------
.../libtests/feassemble/data/GeomDataPoint2D.cc | 69 --------
.../libtests/feassemble/data/GeomDataPoint2D.hh | 61 -------
.../libtests/feassemble/data/GeomDataPoint3D.cc | 69 --------
.../libtests/feassemble/data/GeomDataPoint3D.hh | 61 -------
.../data/IntegratorInertia1DQuadratic.py | 67 --------
.../feassemble/data/MaterialElasticStrain1D.py | 62 --------
unittests/libtests/feassemble/data/Mesh1DLinear.py | 67 --------
.../libtests/feassemble/data/Mesh1DQuadratic.py | 69 --------
.../libtests/feassemble/data/Quadrature1DLinear.py | 99 ------------
.../feassemble/data/Quadrature1DQuadratic.py | 109 -------------
.../feassemble/data/QuadratureData1DLinear.cc | 115 -------------
.../feassemble/data/QuadratureData1DLinear.hh | 86 ----------
.../feassemble/data/QuadratureData1DQuadratic.cc | 133 ----------------
.../feassemble/data/QuadratureData1DQuadratic.hh | 86 ----------
.../libtests/feassemble/data/Solution1DLinear.py | 61 -------
.../feassemble/data/Solution1DQuadratic.py | 61 -------
.../libtests/materials/TestElasticStrain1D.cc | 59 -------
.../libtests/materials/TestElasticStrain1D.hh | 78 ---------
.../libtests/materials/TestElasticStress1D.cc | 59 -------
.../libtests/materials/TestElasticStress1D.hh | 78 ---------
143 files changed, 70 insertions(+), 10157 deletions(-)
More information about the CIG-COMMITS
mailing list