[cig-commits] r6998 -
short/3D/PyLith/trunk/unittests/libtests/feassemble/data
brad at geodynamics.org
brad at geodynamics.org
Tue May 29 23:24:26 PDT 2007
Author: brad
Date: 2007-05-29 23:24:24 -0700 (Tue, 29 May 2007)
New Revision: 6998
Added:
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/MaterialElasticStrain1D.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1DLinear.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1DQuadratic.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din2DLinear.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din2DQuadratic.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din3DLinear.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din3DQuadratic.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2DLinear.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2DQuadratic.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearXY.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearXYZ.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearXZ.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearYZ.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DQuadratic.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh3DLinear.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh3DQuadratic.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DLinear.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DQuadratic.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din2DLinear.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din2DQuadratic.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din3DLinear.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din3DQuadratic.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DLinear.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DQuadratic.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2Din3DLinear.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2Din3DQuadratic.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DLinear.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DQuadratic.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Solution1DLinear.py
Removed:
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/MaterialElasticStrain1D.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1DLinear.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1DQuadratic.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din2DLinear.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din2DQuadratic.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din3DLinear.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din3DQuadratic.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2DLinear.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2DQuadratic.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearXY.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearXYZ.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearXZ.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearYZ.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DQuadratic.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh3DLinear.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh3DQuadratic.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DLinear.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DQuadratic.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din2DLinear.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din2DQuadratic.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din3DLinear.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din3DQuadratic.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DLinear.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DQuadratic.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2Din3DLinear.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2Din3DQuadratic.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DLinear.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DQuadratic.odb
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Solution1DLinear.odb
Modified:
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DLinear.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DLinear.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DQuadratic.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DQuadratic.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DLinear.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DLinear.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DQuadratic.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DQuadratic.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DLinear.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DLinear.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DQuadratic.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DQuadratic.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXY.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXY.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXYZ.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXYZ.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXZ.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXZ.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearYZ.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearYZ.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DQuadratic.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DQuadratic.hh
Log:
Changed filename extensions of data files from .odb to .py to allow easy importing. Finished updating/cleaning Python Quadrature data generation.
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/MaterialElasticStrain1D.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/MaterialElasticStrain1D.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/MaterialElasticStrain1D.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,56 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/MaterialElasticStrain1D.py
-
-## @brief Python container holding material information for elastic
-## strain 1-D material used in testing finite-element C++ routines.
-
-from pyre.components.Component import Component
-
-# ----------------------------------------------------------------------
-
-# MaterialElasticStrain1D class
-class MaterialElasticStrain1D(Component):
- """
- Python container holding material information for elastic strain 1-D
- material used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="materialelasticstrain1d"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="material")
-
- self.dimension = 1
- self.type = "ElasticStrain1D"
- self.dbFilename = "data/elasticstrain1d.spatialdb"
- self.id = 0
- self.label = "elastic strain 1-D"
- self.density = 2500.0
- self.lameMu = 3.0e+10
- self.lameLambda = self.lameMu
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def material():
- """
- Factory for MaterialElasticStrain1D.
- """
- return MaterialElasticStrain1D()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/MaterialElasticStrain1D.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/MaterialElasticStrain1D.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1DLinear.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1DLinear.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1DLinear.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,57 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Mesh1DLinear.odb
-##
-## @brief Python container holding mesh information for a 1-D
-## linear finite-element cell used in testing finite-element C++
-## routines.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-
-# Mesh1DLinear class
-class Mesh1DLinear(Component):
- """
- Python container holding mesh information for a 1-D linear
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="mesh1dlinear"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="mesh")
-
- self.spaceDim = 1
- self.cellDim = 1
- self.numVertices = 2
- self.numCells = 1
- self.vertices = numpy.array( [[-0.25], [2.0]], dtype=numpy.float64)
- self.cells = numpy.array( [[0, 1]], dtype=numpy.int32)
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def mesh():
- """
- Factory for Mesh1DLinear.
- """
- return Mesh1DLinear()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1DLinear.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1DLinear.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1DQuadratic.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1DQuadratic.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1DQuadratic.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,58 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Mesh1DQuadratic.odb
-##
-## @brief Python container holding mesh information for a 1-D
-## quadratic finite-element cell used in testing finite-element C++
-## routines.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-
-# Mesh1DQuadratic class
-class Mesh1DQuadratic(Component):
- """
- Python container holding mesh information for a 1-D quadratic
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="mesh1dquadratic"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="mesh")
-
- self.spaceDim = 1
- self.cellDim = 1
- self.numVertices = 3
- self.numCells = 1
- self.vertices = numpy.array( [[-0.25], [0.875], [2.0]],
- dtype=numpy.float64)
- self.cells = numpy.array( [[0, 1, 2]], dtype=numpy.int32)
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def mesh():
- """
- Factory for Mesh1DQuadratic.
- """
- return Mesh1DQuadratic()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1DQuadratic.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1DQuadratic.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din2DLinear.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din2DLinear.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din2DLinear.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,58 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Mesh1Din2DLinear.odb
-##
-## @brief Python container holding mesh information for a 1-D
-## linear finite-element cell used in testing finite-element C++
-## routines.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-
-# Mesh1Din2DLinear class
-class Mesh1Din2DLinear(Component):
- """
- Python container holding mesh information for a 1-D linear
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="mesh1din2dlinear"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="mesh")
-
- self.spaceDim = 2
- self.cellDim = 1
- self.numVertices = 2
- self.numCells = 1
- self.vertices = numpy.array( [[-0.2, -0.5], [0.7, 0.3]],
- dtype=numpy.float64)
- self.cells = numpy.array( [[0, 1]], dtype=numpy.int32)
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def mesh():
- """
- Factory for Mesh1Din2DLinear.
- """
- return Mesh1Din2DLinear()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din2DLinear.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din2DLinear.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din2DQuadratic.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din2DQuadratic.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din2DQuadratic.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,58 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Mesh1Din2DQuadratic.odb
-##
-## @brief Python container holding mesh information for a 1-D
-## quadratic finite-element cell used in testing finite-element C++
-## routines.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-
-# Mesh1Din2DQuadratic class
-class Mesh1Din2DQuadratic(Component):
- """
- Python container holding mesh information for a 1-D quadratic
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="mesh1din2dquadratic"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="mesh")
-
- self.spaceDim = 2
- self.cellDim = 1
- self.numVertices = 3
- self.numCells = 1
- self.vertices = numpy.array( [[-0.2, -0.5], [0.3, -0.2], [0.7, 0.3]],
- dtype=numpy.float64)
- self.cells = numpy.array( [[0, 1, 2]], dtype=numpy.int32)
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def mesh():
- """
- Factory for Mesh1Din2DQuadratic.
- """
- return Mesh1Din2DQuadratic()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din2DQuadratic.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din2DQuadratic.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din3DLinear.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din3DLinear.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din3DLinear.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,59 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Mesh1Din3DLinear.odb
-##
-## @brief Python container holding mesh information for a 1-D
-## linear finite-element cell used in testing finite-element C++
-## routines.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-
-# Mesh1Din3DLinear class
-class Mesh1Din3DLinear(Component):
- """
- Python container holding mesh information for a 1-D linear
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="mesh1din3dlinear"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="mesh")
-
- self.spaceDim = 3
- self.cellDim = 1
- self.numVertices = 2
- self.numCells = 1
- self.vertices = numpy.array( [[1.0, -1.5, -2.0],
- [-0.5, 2.0, 3.0]],
- dtype=numpy.float64)
- self.cells = numpy.array( [[0, 1]], dtype=numpy.int32)
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def mesh():
- """
- Factory for Mesh1Din3DLinear.
- """
- return Mesh1Din3DLinear()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din3DLinear.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din3DLinear.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din3DQuadratic.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din3DQuadratic.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din3DQuadratic.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,60 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Mesh1Din3DQuadratic.odb
-##
-## @brief Python container holding mesh information for a 1-D
-## quadratic finite-element cell used in testing finite-element C++
-## routines.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-
-# Mesh1Din3DQuadratic class
-class Mesh1Din3DQuadratic(Component):
- """
- Python container holding mesh information for a 1-D quadratic
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="mesh1din3dquadratic"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="mesh")
-
- self.spaceDim = 3
- self.cellDim = 1
- self.numVertices = 3
- self.numCells = 1
- self.vertices = numpy.array( [[1.0, -1.5, -2.0],
- [0.3, 0.3, 0.8],
- [-0.5, 2.0, 3.0]],
- dtype=numpy.float64)
- self.cells = numpy.array( [[0, 1, 2]], dtype=numpy.int32)
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def mesh():
- """
- Factory for Mesh1Din3DQuadratic.
- """
- return Mesh1Din3DQuadratic()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din3DQuadratic.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh1Din3DQuadratic.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2DLinear.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2DLinear.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2DLinear.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,59 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Mesh2DLinear.odb
-##
-## @brief Python container holding mesh information for a 2-D
-## linear finite-element cell used in testing finite-element C++
-## routines.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-
-# Mesh2DLinear class
-class Mesh2DLinear(Component):
- """
- Python container holding mesh information for a 2-D linear
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="mesh2dlinear"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="mesh")
-
- self.spaceDim = 2
- self.cellDim = 2
- self.numVertices = 3
- self.numCells = 1
- self.vertices = numpy.array( [[0.2, -0.4],
- [0.3, 0.5],
- [-1.0, -0.2]], dtype=numpy.float64)
- self.cells = numpy.array( [[0, 1, 2]], dtype=numpy.int32)
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def mesh():
- """
- Factory for Mesh2DLinear.
- """
- return Mesh2DLinear()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2DLinear.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2DLinear.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2DQuadratic.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2DQuadratic.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2DQuadratic.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,63 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Mesh2DQuadratic.odb
-##
-## @brief Python container holding mesh information for a 2-D
-## quadratic finite-element cell used in testing finite-element C++
-## routines.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-
-# Mesh2DQuadratic class
-class Mesh2DQuadratic(Component):
- """
- Python container holding mesh information for a 2-D quadratic
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="mesh2dquadratic"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="mesh")
-
- self.spaceDim = 2
- self.cellDim = 2
- self.numVertices = 6
- self.numCells = 1
- self.vertices = numpy.array( [[-1.0, -1.0],
- [+1.0, +0.2],
- [-1.5, +0.5],
- [+0.0, -0.6],
- [+0.25, +0.35],
- [-1.25, -0.25]],
- dtype=numpy.float64)
- self.cells = numpy.array( [[0, 1, 2, 3, 4, 5]], dtype=numpy.int32)
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def mesh():
- """
- Factory for Mesh2DQuadratic.
- """
- return Mesh2DQuadratic()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2DQuadratic.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2DQuadratic.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearXY.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearXY.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearXY.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,60 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Mesh2Din3DLinearXY.odb
-##
-## @brief Python container holding mesh information for a 2-D
-## linear finite-element cell used in testing finite-element C++
-## routines.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-
-# Mesh2Din3DLinearXY class
-class Mesh2Din3DLinearXY(Component):
- """
- Python container holding mesh information for a 2-D linear
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="mesh2din3dlinearxy"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="mesh")
-
- self.spaceDim = 3
- self.cellDim = 2
- self.numVertices = 3
- self.numCells = 1
- self.vertices = numpy.array( [[ 0.0, 0.0, 0.0],
- [-1.0, 0.0, 0.0],
- [ 0.0, 0.0, 1.0]],
- dtype=numpy.float64)
- self.cells = numpy.array( [[0, 1, 2]], dtype=numpy.int32)
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def mesh():
- """
- Factory for Mesh2Din3DLinearXY.
- """
- return Mesh2Din3DLinearXY()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearXY.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearXY.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearXYZ.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearXYZ.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearXYZ.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,60 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Mesh2Din3DLinearXYZ.odb
-##
-## @brief Python container holding mesh information for a 2-D
-## linear finite-element cell used in testing finite-element C++
-## routines.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-
-# Mesh2Din3DLinearXYZ class
-class Mesh2Din3DLinearXYZ(Component):
- """
- Python container holding mesh information for a 2-D linear
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="mesh2din3dlinearxyz"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="mesh")
-
- self.spaceDim = 3
- self.cellDim = 2
- self.numVertices = 3
- self.numCells = 1
- self.vertices = numpy.array( [[ 0.0, 0.0, 0.0],
- [-1.0, 0.0, 0.0],
- [ 0.0, 0.0, 1.0]],
- dtype=numpy.float64)
- self.cells = numpy.array( [[0, 1, 2]], dtype=numpy.int32)
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def mesh():
- """
- Factory for Mesh2Din3DLinearXYZ.
- """
- return Mesh2Din3DLinearXYZ()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearXYZ.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearXYZ.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearXZ.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearXZ.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearXZ.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,60 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Mesh2Din3DLinearXZ.odb
-##
-## @brief Python container holding mesh information for a 2-D
-## linear finite-element cell used in testing finite-element C++
-## routines.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-
-# Mesh2Din3DLinearXZ class
-class Mesh2Din3DLinearXZ(Component):
- """
- Python container holding mesh information for a 2-D linear
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="mesh2din3dlinearxz"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="mesh")
-
- self.spaceDim = 3
- self.cellDim = 2
- self.numVertices = 3
- self.numCells = 1
- self.vertices = numpy.array( [[ 0.0, 0.0, 0.0],
- [-1.0, 0.0, 0.0],
- [ 0.0, 0.0, 1.0]],
- dtype=numpy.float64)
- self.cells = numpy.array( [[0, 1, 2]], dtype=numpy.int32)
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def mesh():
- """
- Factory for Mesh2Din3DLinearXZ.
- """
- return Mesh2Din3DLinearXZ()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearXZ.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearXZ.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearYZ.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearYZ.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearYZ.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,60 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Mesh2Din3DLinearYZ.odb
-##
-## @brief Python container holding mesh information for a 2-D
-## linear finite-element cell used in testing finite-element C++
-## routines.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-
-# Mesh2Din3DLinearYZ class
-class Mesh2Din3DLinearYZ(Component):
- """
- Python container holding mesh information for a 2-D linear
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="mesh2din3dlinearyz"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="mesh")
-
- self.spaceDim = 3
- self.cellDim = 2
- self.numVertices = 3
- self.numCells = 1
- self.vertices = numpy.array( [[ 0.0, 0.0, 0.0],
- [ 0.0, 1.0, 0.0],
- [ 0.0, 0.0, 1.0]],
- dtype=numpy.float64)
- self.cells = numpy.array( [[0, 1, 2]], dtype=numpy.int32)
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def mesh():
- """
- Factory for Mesh2Din3DLinearYZ.
- """
- return Mesh2Din3DLinearYZ()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearYZ.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DLinearYZ.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DQuadratic.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DQuadratic.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DQuadratic.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,63 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Mesh2Din3DQuadratic.odb
-##
-## @brief Python container holding mesh information for a 2-D
-## quadratic finite-element cell used in testing finite-element C++
-## routines.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-
-# Mesh2Din3DQuadratic class
-class Mesh2Din3DQuadratic(Component):
- """
- Python container holding mesh information for a 2-D quadratic
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="mesh2din3dquadratic"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="mesh")
-
- self.spaceDim = 3
- self.cellDim = 2
- self.numVertices = 6
- self.numCells = 1
- self.vertices = numpy.array( [[ 2.0, -0.5, -0.5],
- [ 0.5, 3.0, 0.0],
- [-0.5, 0.0, 2.0],
- [ 1.3, 1.2, -0.3],
- [ 0.1, 1.4, 0.9],
- [ 0.8, -0.3, 0.7]],
- dtype=numpy.float64)
- self.cells = numpy.array( [[0, 1, 2, 3, 4, 5]], dtype=numpy.int32)
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def mesh():
- """
- Factory for Mesh2Din3DQuadratic.
- """
- return Mesh2Din3DQuadratic()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DQuadratic.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh2Din3DQuadratic.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh3DLinear.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh3DLinear.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh3DLinear.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,60 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Mesh3DLinear.odb
-##
-## @brief Python container holding mesh information for a 3-D
-## linear finite-element cell used in testing finite-element C++
-## routines.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-
-# Mesh3DLinear class
-class Mesh3DLinear(Component):
- """
- Python container holding mesh information for a 3-D linear
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="mesh3dlinear"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="mesh")
-
- self.spaceDim = 3
- self.cellDim = 3
- self.numVertices = 4
- self.numCells = 1
- self.vertices = numpy.array( [[-0.5, -1.0, -0.5],
- [ 2.0, -0.5, -0.4],
- [ 1.0, -0.1, -0.3],
- [-0.2, 0.5, 2.0]], dtype=numpy.float64)
- self.cells = numpy.array( [[0, 1, 2, 3]], dtype=numpy.int32)
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def mesh():
- """
- Factory for Mesh3DLinear.
- """
- return Mesh3DLinear()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh3DLinear.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh3DLinear.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh3DQuadratic.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh3DQuadratic.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh3DQuadratic.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,68 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Mesh3DQuadratic.odb
-##
-## @brief Python container holding mesh information for a 2-D
-## quadratic finite-element cell used in testing finite-element C++
-## routines.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-
-# Mesh3DQuadratic class
-class Mesh3DQuadratic(Component):
- """
- Python container holding mesh information for a 1-D quadratic
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="mesh3dquadratic"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="mesh")
-
- self.spaceDim = 3
- self.cellDim = 3
- self.numVertices = 10
- self.numCells = 1
- self.vertices = numpy.array( [[-0.5, -2.0, -1.0],
- [ 2.0, -2.0, -0.5],
- [ 1.0, 1.0, 0.0],
- [ 0.2, 0.5, 2.0],
- [ 0.7, -2.1, -0.8],
- [ 0.3, -0.5, -0.5],
- [-0.2, -0.8, 0.5],
- [ 1.5, -0.6, -0.2],
- [ 0.6, 0.8, 0.9],
- [ 1.1, -0.8, 0.7]],
- dtype=numpy.float64)
- self.cells = numpy.array( [[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]],
- dtype=numpy.int32)
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def mesh():
- """
- Factory for Mesh3DQuadratic.
- """
- return Mesh3DQuadratic()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh3DQuadratic.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Mesh3DQuadratic.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DLinear.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DLinear.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DLinear.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,93 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Quadrature1DLinear.odb
-##
-## @brief Python container holding quadrature information for a 1-D
-## linear finite-element cell used in testing finite-element C++
-## routines.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-def N0(p):
- return 0.5*(1.0-p)
-
-def N0p(p):
- return -0.5
-
-def N1(p):
- return 0.5*(1.0+p)
-
-def N1p(p):
- return +0.5
-
-# ----------------------------------------------------------------------
-
-# Quadrature1DLinear class
-class Quadrature1DLinear(Component):
- """
- Python container holding quadrature information for a 1-D linear
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="quadrature1dlinear"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="quadrature")
-
- self.quadPtsRef = numpy.array( [[0.0]], dtype=numpy.float64)
- self.quadWts = numpy.array([2.0], dtype=numpy.float64)
- self.numBasis = 2
- self.numQuadPts = 1
- self.spaceDim = 1
- self.cellDim = 1
- return
-
-
- def calculateBasis(self):
- """
- Calculate basis functions and their derivatives at quadrature points.
- """
-
- basis = numpy.zeros( (self.numQuadPts, self.numBasis), dtype=numpy.float64)
- basisDeriv = numpy.zeros( (self.numQuadPts, self.numBasis, self.cellDim),
- dtype=numpy.float64)
-
- iQuad = 0
- for q in self.quadPtsRef:
- # Basis functions at quadrature points
- basisQ = numpy.array([N0(q), N1(q)], dtype=numpy.float64)
- basis[iQuad,:] = basisQ.reshape( (self.numBasis,) )
-
- # Derivatives of basis functions at quadrature points
- derivQ = numpy.array([[N0p(q)], [N1p(q)]], dtype=numpy.float64)
- basisDeriv[iQuad,:] = derivQ.reshape((self.numBasis, self.cellDim))
-
- iQuad += 1
- return (basis, basisDeriv)
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def quadrature():
- """
- Factory for Quadrature1DLinear.
- """
- return Quadrature1DLinear()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DLinear.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DLinear.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DQuadratic.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DQuadratic.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DQuadratic.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,103 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Quadrature1DQuadratic.odb
-##
-## @brief Python application for generating C++ data files for testing
-## C++ Quadrature1D object w/quadratic basis functions.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-def N0(p):
- return -0.5*p*(1.0-p)
-
-def N0p(p):
- return -0.5*(1.0-p) + 0.5*p
-
-def N1(p):
- return (1.0-p**2)
-
-def N1p(p):
- return -2.0*p
-
-def N2(p):
- return 0.5*p*(1.0+p)
-
-def N2p(p):
- return +0.5*(1.0+p) + 0.5*p
-
-# ----------------------------------------------------------------------
-
-# Quadrature1DQuadratic class
-class Quadrature1DQuadratic(Component):
- """
- Python application for generating C++ data files for testing C++
- Quadrature1D object w/quadratic basis functions.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="quadrature1dquadratic"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="quadrature")
-
- self.quadPtsRef = numpy.array( [[-1.0/3**0.5],
- [+1.0/3**0.5]],
- dtype=numpy.float64)
- self.quadWts = numpy.array([1.0, 1.0], dtype=numpy.float64)
- self.numBasis = 3
- self.numQuadPts = 2
- self.spaceDim = 1
- self.cellDim = 1
- return
-
-
- def calculateBasis(self):
- """
- Calculate basis functions and their derivatives at quadrature points.
- """
-
- basis = numpy.zeros( (self.numQuadPts, self.numBasis),
- dtype=numpy.float64)
- basisDeriv = numpy.zeros( (self.numQuadPts,
- self.numBasis, self.cellDim),
- dtype=numpy.float64)
-
- iQuad = 0
- for q in self.quadPtsRef:
- # Basis functions at quadrature points
- basisQ = numpy.array([N0(q), N1(q), N2(q)], dtype=numpy.float64)
- basis[iQuad] = basisQ.reshape( (self.numBasis,) )
-
- # Derivatives of basis functions at quadrature points
- derivQ = numpy.array([[N0p(q)], [N1p(q)], [N2p(q)]],
- dtype=numpy.float64)
- basisDeriv[iQuad] = derivQ.reshape((self.numBasis, self.cellDim))
-
- iQuad += 1
- return (basis, basisDeriv)
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def quadrature():
- """
- Factory for Quadrature1DLinear.
- """
- return Quadrature1DQuadratic()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DQuadratic.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DQuadratic.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din2DLinear.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din2DLinear.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din2DLinear.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,50 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Quadrature1Din2DLinear.odb
-##
-## @brief Python container holding quadrature information for a 1-D
-## linear finite-element cell used in testing finite-element C++
-## routines.
-
-from Quadrature1DLinear import *
-
-# ----------------------------------------------------------------------
-
-# Quadrature1Din2DLinear class
-class Quadrature1Din2DLinear(Quadrature1DLinear):
- """
- Python container holding quadrature information for a 1-D linear
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="quadrature1din2dlinear"):
- """
- Constructor.
- """
- Quadrature1DLinear.__init__(self, name)
-
- self.spaceDim = 2
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def quadrature():
- """
- Factory for Quadrature1Din2DLinear.
- """
- return Quadrature1Din2DLinear()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din2DLinear.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din2DLinear.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din2DQuadratic.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din2DQuadratic.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din2DQuadratic.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,50 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Quadrature1Din2DQuadratic.odb
-##
-## @brief Python container holding quadrature information for a 1-D
-## quadratic finite-element cell used in testing finite-element C++
-## routines.
-
-from Quadrature1DQuadratic import *
-
-# ----------------------------------------------------------------------
-
-# Quadrature1Din2DQuadratic class
-class Quadrature1Din2DQuadratic(Quadrature1DQuadratic):
- """
- Python container holding quadrature information for a 1-D quadratic
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="quadrature1din2dquadratic"):
- """
- Constructor.
- """
- Quadrature1DQuadratic.__init__(self, name)
-
- self.spaceDim = 2
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def quadrature():
- """
- Factory for Quadrature1DQuadratic.
- """
- return Quadrature1Din2DQuadratic()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din2DQuadratic.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din2DQuadratic.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din3DLinear.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din3DLinear.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din3DLinear.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,52 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Quadrature1Din3DLinear.odb
-##
-## @brief Python container holding quadrature information for a 1-D
-## linear finite-element cell used in testing finite-element C++
-## routines.
-
-from Quadrature1DLinear import *
-
-import numpy
-
-# ----------------------------------------------------------------------
-
-# Quadrature1Din3DLinear class
-class Quadrature1Din3DLinear(Quadrature1DLinear):
- """
- Python container holding quadrature information for a 1-D linear
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="quadrature1din3dlinear"):
- """
- Constructor.
- """
- Quadrature1DLinear.__init__(self, name)
-
- self.spaceDim = 3
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def quadrature():
- """
- Factory for Quadrature1Din3DLinear.
- """
- return Quadrature1Din3DLinear()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din3DLinear.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din3DLinear.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din3DQuadratic.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din3DQuadratic.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din3DQuadratic.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,50 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Quadrature1Din3DQuadratic.odb
-##
-## @brief Python container holding quadrature information for a 1-D
-## quadratic finite-element cell used in testing finite-element C++
-## routines.
-
-from Quadrature1DQuadratic import *
-
-# ----------------------------------------------------------------------
-
-# Quadrature1Din3DQuadratic class
-class Quadrature1Din3DQuadratic(Quadrature1DQuadratic):
- """
- Python container holding quadrature information for a 1-D quadratic
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="quadrature1din3dquadratic"):
- """
- Constructor.
- """
- Quadrature1DQuadratic.__init__(self, name)
-
- self.spaceDim = 3
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def quadrature():
- """
- Factory for Quadrature1Din3DQuadratic.
- """
- return Quadrature1Din3DQuadratic()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din3DQuadratic.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1Din3DQuadratic.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DLinear.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DLinear.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DLinear.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,112 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Quadrature2DLinear.odb
-##
-## @brief Python container holding quadrature information for a 2-D
-## linear finite-element cell used in testing finite-element C++
-## routines.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-def N0(p):
- return 1.0-p[0]-p[1]
-
-def N0p(p):
- return -1.0
-
-def N0q(p):
- return -1.0
-
-def N1(p):
- return p[0]
-
-def N1p(p):
- return 1.0
-
-def N1q(p):
- return 0.0
-
-def N2(p):
- return p[1]
-
-def N2p(p):
- return 0.0
-
-def N2q(p):
- return 1.0
-
-# ----------------------------------------------------------------------
-
-# Quadrature2DLinear class
-class Quadrature2DLinear(Component):
- """
- Python container holding quadrature information for a 2-D linear
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="quadrature2dlinear", facility="quadrature"):
- """
- Constructor.
- """
- QuadratureApp.__init__(self, name)
-
- self.quadPtsRef = numpy.array( [[1.0/3.0, 1.0/3.0]], dtype=numpy.float64)
- self.quadWts = numpy.array([0.5], dtype=numpy.float64)
- self.numBasis = 3
- self.numQuadPts = 1
- self.spaceDim = 2
- self.cellDim = 2
-
- return
-
-
- def calculateBasis(self):
- """
- Calculate basis functions and their derivatives at quadrature points.
- """
-
- basis = numpy.zeros( (self.numQuadPts, self.numBasis),
- dtype=numpy.float64)
- basisDeriv = numpy.zeros( (self.numQuadPts, self.numBasis, self.cellDim),
- dtype=numpy.float64)
-
- iQuad = 0
- for q in self.quadPtsRef:
- # Basis functions at quadrature points
- basisQ = numpy.array([N0(q), N1(q), N2(q)], dtype=numpy.float64)
- basis[iQuad] = basisQ.reshape( (self.numBasis,) )
-
- # Derivatives of basis functions at quadrature points
- derivQ = numpy.array([[N0p(q), N0q(q)],
- [N1p(q), N1q(q)],
- [N2p(q), N2q(q)]], dtype=numpy.float64)
- basisDeriv[iQuad] = derivQ.reshape((self.numBasis, self.cellDim))
-
- iQuad += 1
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def quadrature():
- """
- Factory for Quadrature2DLinear.
- """
- return Quadrature2DLinear()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DLinear.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DLinear.odb)
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DLinear.odb 2007-05-30 05:54:33 UTC (rev 6996)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DLinear.py 2007-05-30 06:24:24 UTC (rev 6998)
@@ -0,0 +1,112 @@
+#!/usr/bin/env python
+#
+# ----------------------------------------------------------------------
+#
+# Brad T. Aagaard
+# U.S. Geological Survey
+#
+# <LicenseText>
+#
+# ----------------------------------------------------------------------
+#
+
+## @file unittests/libtests/feassemble/data/Quadrature2DLinear.odb
+##
+## @brief Python container holding quadrature information for a 2-D
+## linear finite-element cell used in testing finite-element C++
+## routines.
+
+from pyre.components.Component import Component
+
+import numpy
+
+# ----------------------------------------------------------------------
+def N0(p):
+ return 1.0-p[0]-p[1]
+
+def N0p(p):
+ return -1.0
+
+def N0q(p):
+ return -1.0
+
+def N1(p):
+ return p[0]
+
+def N1p(p):
+ return 1.0
+
+def N1q(p):
+ return 0.0
+
+def N2(p):
+ return p[1]
+
+def N2p(p):
+ return 0.0
+
+def N2q(p):
+ return 1.0
+
+# ----------------------------------------------------------------------
+
+# Quadrature2DLinear class
+class Quadrature2DLinear(Component):
+ """
+ Python container holding quadrature information for a 2-D linear
+ finite-element cell used in testing finite-element C++ routines.
+ """
+
+ # PUBLIC METHODS /////////////////////////////////////////////////////
+
+ def __init__(self, name="quadrature2dlinear"):
+ """
+ Constructor.
+ """
+ Component.__init__(self, name, facility="quadrature")
+
+ self.quadPtsRef = numpy.array( [[1.0/3.0, 1.0/3.0]], dtype=numpy.float64)
+ self.quadWts = numpy.array([0.5], dtype=numpy.float64)
+ self.numBasis = 3
+ self.numQuadPts = 1
+ self.spaceDim = 2
+ self.cellDim = 2
+
+ return
+
+
+ def calculateBasis(self):
+ """
+ Calculate basis functions and their derivatives at quadrature points.
+ """
+
+ basis = numpy.zeros( (self.numQuadPts, self.numBasis),
+ dtype=numpy.float64)
+ basisDeriv = numpy.zeros( (self.numQuadPts, self.numBasis, self.cellDim),
+ dtype=numpy.float64)
+
+ iQuad = 0
+ for q in self.quadPtsRef:
+ # Basis functions at quadrature points
+ basisQ = numpy.array([N0(q), N1(q), N2(q)], dtype=numpy.float64)
+ basis[iQuad] = basisQ.reshape( (self.numBasis,) )
+
+ # Derivatives of basis functions at quadrature points
+ derivQ = numpy.array([[N0p(q), N0q(q)],
+ [N1p(q), N1q(q)],
+ [N2p(q), N2q(q)]], dtype=numpy.float64)
+ basisDeriv[iQuad] = derivQ.reshape((self.numBasis, self.cellDim))
+
+ iQuad += 1
+ return (basis, basisDeriv)
+
+
+# FACTORIES ////////////////////////////////////////////////////////////
+def quadrature():
+ """
+ Factory for Quadrature2DLinear.
+ """
+ return Quadrature2DLinear()
+
+
+# End of file
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DQuadratic.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DQuadratic.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DQuadratic.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,147 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Quadrature2DQuadratic.odb
-##
-## @brief Python container holding quadrature information for a 2-D
-## quadratic finite-element cell used in testing finite-element C++
-## routines.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-def N0(p):
- return (1.0-p[0]-p[1])*(1-2.0*p[0]-2.0*p[1])
-
-def N0p(p):
- return 4.0*p[0]+4.0*p[1]-3.0
-
-def N0q(p):
- return 4.0*p[0]+4.0*p[1]-3.0
-
-def N1(p):
- return p[0]*(2.0*p[0]-1.0)
-
-def N1p(p):
- return 4.0*p[0]-1.0
-
-def N1q(p):
- return 0.0
-
-def N2(p):
- return p[1]*(2.0*p[1]-1.0)
-
-def N2p(p):
- return 0.0
-
-def N2q(p):
- return 4.0*p[1]-1.0
-
-def N3(p):
- return 4.0*p[0]*(1.0-p[0]-p[1])
-
-def N3p(p):
- return -8.0*p[0]-4.0*p[1]+4.0
-
-def N3q(p):
- return -4.0*p[0]
-
-def N4(p):
- return 4.0*p[0]*p[1]
-
-def N4p(p):
- return 4.0*p[1]
-
-def N4q(p):
- return 4.0*p[0]
-
-def N5(p):
- return 4.0*p[1]*(1.0-p[0]-p[1])
-
-def N5p(p):
- return -4.0*p[1]
-
-def N5q(p):
- return -8.0*p[1]-4.0*p[0]+4.0
-
-# ----------------------------------------------------------------------
-
-# Quadrature2DQuadratic class
-class Quadrature2DQuadratic(Component):
- """
- Python container holding quadrature information for a 1-D quadratic
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="quadrature2dquadratic"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="quadrature")
-
- self.quadPtsRef = numpy.array( [[2.0/3.0, 1.0/6.0],
- [1.0/6.0, 2.0/3.0],
- [1.0/6.0, 1.0/6.0]],
- dtype=numpy.float64)
- self.quadWts = numpy.array([1.0/6.0, 1.0/6.0, 1.0/6.0],
- dtype=numpy.float64)
- self.numBasis = 6
- self.numQuadPts = 3
- self.spaceDim = 2
- self.cellDim = 2
- return
-
-
- def calculateBasis(self):
- """
- Calculate basis functions and their derivatives at quadrature points.
- """
-
- basis = numpy.zeros( (self.numQuadPts, self.numBasis),
- dtype=numpy.float64)
- basisDeriv = numpy.zeros( (self.numQuadPts, self.numBasis, self.cellDim),
- dtype=numpy.float64)
-
- iQuad = 0
- for q in self.quadPtsRef:
- # Basis functions at quadrature points
- basisQ = numpy.array([N0(q), N1(q), N2(q), N3(q), N4(q), N5(q)],
- dtype=numpy.float64)
- basis[iQuad] = basisQ.reshape( (self.numBasis,) )
-
- # Derivatives of basis functions at quadrature points
- derivQ = numpy.array([[N0p(q), N0q(q)],
- [N1p(q), N1q(q)],
- [N2p(q), N2q(q)],
- [N3p(q), N3q(q)],
- [N4p(q), N4q(q)],
- [N5p(q), N5q(q)]],
- dtype=numpy.float64)
- basisDeriv[iQuad] = derivQ.reshape((self.numBasis, self.cellDim))
-
- iQuad += 1
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def quadrature():
- """
- Factory for Quadrature2DQuadratic.
- """
- return Quadrature2DQuadratic()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DQuadratic.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DQuadratic.odb)
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DQuadratic.odb 2007-05-30 05:54:33 UTC (rev 6996)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DQuadratic.py 2007-05-30 06:24:24 UTC (rev 6998)
@@ -0,0 +1,147 @@
+#!/usr/bin/env python
+#
+# ----------------------------------------------------------------------
+#
+# Brad T. Aagaard
+# U.S. Geological Survey
+#
+# <LicenseText>
+#
+# ----------------------------------------------------------------------
+#
+
+## @file unittests/libtests/feassemble/data/Quadrature2DQuadratic.odb
+##
+## @brief Python container holding quadrature information for a 2-D
+## quadratic finite-element cell used in testing finite-element C++
+## routines.
+
+from pyre.components.Component import Component
+
+import numpy
+
+# ----------------------------------------------------------------------
+def N0(p):
+ return (1.0-p[0]-p[1])*(1-2.0*p[0]-2.0*p[1])
+
+def N0p(p):
+ return 4.0*p[0]+4.0*p[1]-3.0
+
+def N0q(p):
+ return 4.0*p[0]+4.0*p[1]-3.0
+
+def N1(p):
+ return p[0]*(2.0*p[0]-1.0)
+
+def N1p(p):
+ return 4.0*p[0]-1.0
+
+def N1q(p):
+ return 0.0
+
+def N2(p):
+ return p[1]*(2.0*p[1]-1.0)
+
+def N2p(p):
+ return 0.0
+
+def N2q(p):
+ return 4.0*p[1]-1.0
+
+def N3(p):
+ return 4.0*p[0]*(1.0-p[0]-p[1])
+
+def N3p(p):
+ return -8.0*p[0]-4.0*p[1]+4.0
+
+def N3q(p):
+ return -4.0*p[0]
+
+def N4(p):
+ return 4.0*p[0]*p[1]
+
+def N4p(p):
+ return 4.0*p[1]
+
+def N4q(p):
+ return 4.0*p[0]
+
+def N5(p):
+ return 4.0*p[1]*(1.0-p[0]-p[1])
+
+def N5p(p):
+ return -4.0*p[1]
+
+def N5q(p):
+ return -8.0*p[1]-4.0*p[0]+4.0
+
+# ----------------------------------------------------------------------
+
+# Quadrature2DQuadratic class
+class Quadrature2DQuadratic(Component):
+ """
+ Python container holding quadrature information for a 1-D quadratic
+ finite-element cell used in testing finite-element C++ routines.
+ """
+
+ # PUBLIC METHODS /////////////////////////////////////////////////////
+
+ def __init__(self, name="quadrature2dquadratic"):
+ """
+ Constructor.
+ """
+ Component.__init__(self, name, facility="quadrature")
+
+ self.quadPtsRef = numpy.array( [[2.0/3.0, 1.0/6.0],
+ [1.0/6.0, 2.0/3.0],
+ [1.0/6.0, 1.0/6.0]],
+ dtype=numpy.float64)
+ self.quadWts = numpy.array([1.0/6.0, 1.0/6.0, 1.0/6.0],
+ dtype=numpy.float64)
+ self.numBasis = 6
+ self.numQuadPts = 3
+ self.spaceDim = 2
+ self.cellDim = 2
+ return
+
+
+ def calculateBasis(self):
+ """
+ Calculate basis functions and their derivatives at quadrature points.
+ """
+
+ basis = numpy.zeros( (self.numQuadPts, self.numBasis),
+ dtype=numpy.float64)
+ basisDeriv = numpy.zeros( (self.numQuadPts, self.numBasis, self.cellDim),
+ dtype=numpy.float64)
+
+ iQuad = 0
+ for q in self.quadPtsRef:
+ # Basis functions at quadrature points
+ basisQ = numpy.array([N0(q), N1(q), N2(q), N3(q), N4(q), N5(q)],
+ dtype=numpy.float64)
+ basis[iQuad] = basisQ.reshape( (self.numBasis,) )
+
+ # Derivatives of basis functions at quadrature points
+ derivQ = numpy.array([[N0p(q), N0q(q)],
+ [N1p(q), N1q(q)],
+ [N2p(q), N2q(q)],
+ [N3p(q), N3q(q)],
+ [N4p(q), N4q(q)],
+ [N5p(q), N5q(q)]],
+ dtype=numpy.float64)
+ basisDeriv[iQuad] = derivQ.reshape((self.numBasis, self.cellDim))
+
+ iQuad += 1
+ return (basis, basisDeriv)
+
+
+# FACTORIES ////////////////////////////////////////////////////////////
+def quadrature():
+ """
+ Factory for Quadrature2DQuadratic.
+ """
+ return Quadrature2DQuadratic()
+
+
+# End of file
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2Din3DLinear.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2Din3DLinear.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2Din3DLinear.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,50 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Quadrature2Din3DLinear.odb
-##
-## @brief Python container holding quadrature information for a 2-D
-## linear finite-element cell used in testing finite-element C++
-## routines.
-
-from Quadrature2DLinear import *
-
-# ----------------------------------------------------------------------
-
-# Quadrature2Din3DLinear class
-class Quadrature2Din3DLinear(Quadrature2DLinear):
- """
- Python container holding quadrature information for a 2-D linear
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="quadrature2din3dlinear"):
- """
- Constructor.
- """
- Quadrature2DLinear.__init__(self, name)
-
- self.spaceDim = 3
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def quadrature():
- """
- Factory for Quadrature2Din3DLinear.
- """
- return Quadrature2Din3DLinear()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2Din3DLinear.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2Din3DLinear.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2Din3DQuadratic.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2Din3DQuadratic.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2Din3DQuadratic.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,50 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Quadrature2Din3DQuadratic.odb
-##
-## @brief Python container holding quadrature information for a 2-D
-## quadratic finite-element cell used in testing finite-element C++
-## routines.
-
-from Quadrature2DQuadratic import *
-
-# ----------------------------------------------------------------------
-
-# Quadrature2Din3DQuadratic class
-class Quadrature2Din3DQuadratic(Quadrature2DQuadratic):
- """
- Python container holding quadrature information for a 1-D quadratic
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="quadrature2din3dquadratic"):
- """
- Constructor.
- """
- Quadrature2DLinear.__init__(self, name)
-
- self.spaceDim = 3
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def quadrature():
- """
- Factory for Quadrature2Din3DQuadratic.
- """
- return Quadrature2Din3DQuadratic()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2Din3DQuadratic.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2Din3DQuadratic.odb)
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2Din3DQuadratic.odb 2007-05-30 05:54:33 UTC (rev 6996)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2Din3DQuadratic.py 2007-05-30 06:24:24 UTC (rev 6998)
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+#
+# ----------------------------------------------------------------------
+#
+# Brad T. Aagaard
+# U.S. Geological Survey
+#
+# <LicenseText>
+#
+# ----------------------------------------------------------------------
+#
+
+## @file unittests/libtests/feassemble/data/Quadrature2Din3DQuadratic.odb
+##
+## @brief Python container holding quadrature information for a 2-D
+## quadratic finite-element cell used in testing finite-element C++
+## routines.
+
+from Quadrature2DQuadratic import *
+
+# ----------------------------------------------------------------------
+
+# Quadrature2Din3DQuadratic class
+class Quadrature2Din3DQuadratic(Quadrature2DQuadratic):
+ """
+ Python container holding quadrature information for a 1-D quadratic
+ finite-element cell used in testing finite-element C++ routines.
+ """
+
+ # PUBLIC METHODS /////////////////////////////////////////////////////
+
+ def __init__(self, name="quadrature2din3dquadratic"):
+ """
+ Constructor.
+ """
+ Quadrature2DQuadratic.__init__(self, name)
+
+ self.spaceDim = 3
+ return
+
+
+# FACTORIES ////////////////////////////////////////////////////////////
+def quadrature():
+ """
+ Factory for Quadrature2Din3DQuadratic.
+ """
+ return Quadrature2Din3DQuadratic()
+
+
+# End of file
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DLinear.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DLinear.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DLinear.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,136 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Quadrature3DLinear.odb
-##
-## @brief Python container holding quadrature information for a 3-D
-## linear finite-element cell used in testing finite-element C++
-## routines.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-def N0(p):
- return 1.0-p[0]-p[1]-p[2]
-
-def N0p(p):
- return -1.0
-
-def N0q(p):
- return -1.0
-
-def N0r(p):
- return -1.0
-
-def N1(p):
- return p[0]
-
-def N1p(p):
- return 1.0
-
-def N1q(p):
- return 0.0
-
-def N1r(p):
- return 0.0
-
-def N2(p):
- return p[1]
-
-def N2p(p):
- return 0.0
-
-def N2q(p):
- return 1.0
-
-def N2r(p):
- return 0.0
-
-def N3(p):
- return p[2]
-
-def N3p(p):
- return 0.0
-
-def N3q(p):
- return 0.0
-
-def N3r(p):
- return 1.0
-
-
-# ----------------------------------------------------------------------
-
-# Quadrature3DLinear class
-class Quadrature3DLinear(Component):
- """
- Python container holding quadrature information for a 3-D linear
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="quadrature3dlinear"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="quadrature")
-
- self.quadPtsRef = numpy.array( [[1.0/4.0, 1.0/4.0, 1.0/4.0]],
- dtype=numpy.float64)
- self.quadWts = numpy.array([1.0/6.0], dtype=numpy.float64)
- self.numBasis = 4
- self.numQuadPts = 1
- self.spaceDim = 3
- self.cellDim = 3
- return
-
-
- def calculateBasis(self):
- """
- Calculate basis functions and their derivatives at quadrature points.
- """
-
- basis = numpy.zeros( (self.numQuadPts, self.numBasis),
- dtype=numpy.float64)
- basisDeriv = numpy.zeros( (self.numQuadPts, self.numBasis, self.cellDim),
- dtype=numpy.float64)
-
- iQuad = 0
- for q in self.quadPtsRef:
- # Basis functions at quadrature points
- basisQ = numpy.array([N0(q), N1(q), N2(q), N3(q)], dtype=numpy.float64)
- basis[iQuad] = basisQ.reshape( (self.numBasis,) )
-
- # Derivatives of basis functions at quadrature points
- derivQ = numpy.array([[N0p(q), N0q(q), N0r(q)],
- [N1p(q), N1q(q), N1r(q)],
- [N2p(q), N2q(q), N2r(q)],
- [N3p(q), N3q(q), N3r(q)]],
- dtype=numpy.float64)
- basisDeriv[iQuad] = derivQ.reshape((self.numBasis, self.cellDim))
-
- iQuad += 1
- return (basis, basisDeriv)
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def quadrature():
- """
- Factory for Quadrature3DLinear.
- """
- return Quadrature3DLinear()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DLinear.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DLinear.odb)
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DQuadratic.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DQuadratic.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DQuadratic.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,222 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Quadrature3DQuadratic.odb
-##
-## @brief Python container holding quadrature information for a 3-D
-## quadratic finite-element cell used in testing finite-element C++
-## routines.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-def N0(p):
- return (1.0-p[0]-p[1]-p[2])*(1.0-2.0*p[0]-2.0*p[1]-2.0*p[2])
-
-def N0p(p):
- return 4.0*p[0]+4.0*p[1]+4.0*p[2]-3.0
-
-def N0q(p):
- return 4.0*p[0]+4.0*p[1]+4.0*p[2]-3.0
-
-def N0r(p):
- return 4.0*p[0]+4.0*p[1]+4.0*p[2]-3.0
-
-def N1(p):
- return p[0]*(2.0*p[0]-1.0)
-
-def N1p(p):
- return 4.0*p[0]-1
-
-def N1q(p):
- return 0.0
-
-def N1r(p):
- return 0.0
-
-def N2(p):
- return p[1]*(2.0*p[1]-1.0)
-
-def N2p(p):
- return 0.0
-
-def N2q(p):
- return 4.0*p[1]-1.0
-
-def N2r(p):
- return 0.0
-
-def N3(p):
- return p[2]*(2.0*p[2]-1.0)
-
-def N3p(p):
- return 0.0
-
-def N3q(p):
- return 0.0
-
-def N3r(p):
- return 4.0*p[2]-1.0
-
-def N4(p):
- return 4.0*p[0]*(1.0-p[0]-p[1]-p[2])
-
-def N4p(p):
- return -8.0*p[0]+4.0*(1.0-p[1]-p[2])
-
-def N4q(p):
- return -4.0*p[0]
-
-def N4r(p):
- return -4.0*p[0]
-
-def N5(p):
- return 4.0*p[1]*(1.0-p[0]-p[1]-p[2])
-
-def N5p(p):
- return -4.0*p[1]
-
-def N5q(p):
- return -8.0*p[1]+4.0*(1.0-p[0]-p[2])
-
-def N5r(p):
- return -4.0*p[1]
-
-def N6(p):
- return 4.0*p[2]*(1.0-p[0]-p[1]-p[2])
-
-def N6p(p):
- return -4.0*p[2]
-
-def N6q(p):
- return -4.0*p[2]
-
-def N6r(p):
- return -8.0*p[2]+4.0*(1.0-p[0]-p[1])
-
-def N7(p):
- return 4.0*p[0]*p[1]
-
-def N7p(p):
- return 4.0*p[1]
-
-def N7q(p):
- return 4.0*p[0]
-
-def N7r(p):
- return 0.0
-
-def N8(p):
- return 4.0*p[1]*p[2]
-
-def N8p(p):
- return 0.0
-
-def N8q(p):
- return 4.0*p[2]
-
-def N8r(p):
- return 4.0*p[1]
-
-def N9(p):
- return 4.0*p[0]*p[2]
-
-def N9p(p):
- return 4.0*p[2]
-
-def N9q(p):
- return 0.0
-
-def N9r(p):
- return 4.0*p[0]
-
-
-# ----------------------------------------------------------------------
-
-# Quadrature3DQuadratic class
-class Quadrature3DQuadratic(Component):
- """
- Python container holding quadrature information for a 3-D quadratic
- finite-element cell used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="quadrature3dquadratic"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="quadrature")
-
-
- # These are just approximate points used to test the quadrature routine
- self.quadPtsRef = numpy.array( [[1.0/12.0, 1.0/12.0, 1.0/12.0],
- [3.0/4.0, 1.0/12.0, 1.0/12.0],
- [1.0/12.0, 3.0/4.0, 1.0/12.0],
- [1.0/12.0, 1.0/12.0, 3.0/4.0]],
- dtype=numpy.float64)
- self.quadWts = numpy.array([1.0/8.0, 1.0/8.0, 1.0/8.0, 1.0/8.0],
- dtype=numpy.float64)
- self.numBasis = 10
- self.numQuadPts = 4
- self.spaceDim = 3
- self.cellDim = 3
- return
-
-
- def calculateBasis(self):
- """
- Calculate basis functions and their derivatives at quadrature points.
- """
-
- basis = numpy.zeros( (self.numQuadPts, self.numBasis),
- dtype=numpy.float64)
- basisDeriv = numpy.zeros( (self.numQuadPts, self.numBasis, self.cellDim),
- dtype=numpy.float64)
-
- iQuad = 0
- for q in self.quadPtsRef:
- # Basis functions at quadrature points
- basisQ = numpy.array([N0(q), N1(q), N2(q), N3(q), N4(q),
- N5(q), N6(q), N7(q), N8(q), N9(q)],
- dtype=numpy.float64)
- basis[iQuad] = basisQ.reshape( (self.numBasis,) )
-
- # Derivatives of basis functions at quadrature points
- derivQ = numpy.array([[N0p(q), N0q(q), N0r(q)],
- [N1p(q), N1q(q), N1r(q)],
- [N2p(q), N2q(q), N2r(q)],
- [N3p(q), N3q(q), N3r(q)],
- [N4p(q), N4q(q), N4r(q)],
- [N5p(q), N5q(q), N5r(q)],
- [N6p(q), N6q(q), N6r(q)],
- [N7p(q), N7q(q), N7r(q)],
- [N8p(q), N8q(q), N8r(q)],
- [N9p(q), N9q(q), N9r(q)]],
- dtype=numpy.float64)
- basisDeriv[iQuad] = derivQ.reshape((self.numBasis, self.cellDim))
-
- iQuad += 1
- return (basis, basisDeriv)
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def quadrature():
- """
- Factory for Quadrature3DQuadratic.
- """
- return Quadrature3DQuadratic()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DQuadratic.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DQuadratic.odb)
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DLinear.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DLinear.cc 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DLinear.cc 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature1din2dlinear.
+// This file was generated from python application quadratureapp.
#include "QuadratureData1Din2DLinear.hh"
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DLinear.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DLinear.hh 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DLinear.hh 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature1din2dlinear.
+// This file was generated from python application quadratureapp.
#if !defined(pylith_feassemble_quadraturedata1din2dlinear_hh)
#define pylith_feassemble_quadraturedata1din2dlinear_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DQuadratic.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DQuadratic.cc 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DQuadratic.cc 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature1din2dquadratic.
+// This file was generated from python application quadratureapp.
#include "QuadratureData1Din2DQuadratic.hh"
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DQuadratic.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DQuadratic.hh 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DQuadratic.hh 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature1din2dquadratic.
+// This file was generated from python application quadratureapp.
#if !defined(pylith_feassemble_quadraturedata1din2dquadratic_hh)
#define pylith_feassemble_quadraturedata1din2dquadratic_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DLinear.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DLinear.cc 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DLinear.cc 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature1din3dlinear.
+// This file was generated from python application quadratureapp.
#include "QuadratureData1Din3DLinear.hh"
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DLinear.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DLinear.hh 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DLinear.hh 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature1din3dlinear.
+// This file was generated from python application quadratureapp.
#if !defined(pylith_feassemble_quadraturedata1din3dlinear_hh)
#define pylith_feassemble_quadraturedata1din3dlinear_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DQuadratic.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DQuadratic.cc 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DQuadratic.cc 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature1din3dquadratic.
+// This file was generated from python application quadratureapp.
#include "QuadratureData1Din3DQuadratic.hh"
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DQuadratic.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DQuadratic.hh 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DQuadratic.hh 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature1din3dquadratic.
+// This file was generated from python application quadratureapp.
#if !defined(pylith_feassemble_quadraturedata1din3dquadratic_hh)
#define pylith_feassemble_quadraturedata1din3dquadratic_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DLinear.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DLinear.cc 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DLinear.cc 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature1dlinear.
+// This file was generated from python application quadratureapp.
#include "QuadratureData2DLinear.hh"
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DLinear.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DLinear.hh 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DLinear.hh 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature1dlinear.
+// This file was generated from python application quadratureapp.
#if !defined(pylith_feassemble_quadraturedata2dlinear_hh)
#define pylith_feassemble_quadraturedata2dlinear_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DQuadratic.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DQuadratic.cc 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DQuadratic.cc 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature2dquadratic.
+// This file was generated from python application quadratureapp.
#include "QuadratureData2DQuadratic.hh"
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DQuadratic.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DQuadratic.hh 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DQuadratic.hh 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature2dquadratic.
+// This file was generated from python application quadratureapp.
#if !defined(pylith_feassemble_quadraturedata2dquadratic_hh)
#define pylith_feassemble_quadraturedata2dquadratic_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXY.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXY.cc 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXY.cc 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature2din3dlinear.
+// This file was generated from python application quadratureapp.
#include "QuadratureData2Din3DLinearXY.hh"
@@ -29,8 +29,8 @@
const double pylith::feassemble::QuadratureData2Din3DLinearXY::_vertices[] = {
0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00, 0.00000000e+00,
+ -1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
};
const int pylith::feassemble::QuadratureData2Din3DLinearXY::_cells[] = {
@@ -46,7 +46,7 @@
};
const double pylith::feassemble::QuadratureData2Din3DLinearXY::_quadPts[] = {
- 3.33333333e-01, 3.33333333e-01, 0.00000000e+00,
+ -3.33333333e-01, 0.00000000e+00, 3.33333333e-01,
};
const double pylith::feassemble::QuadratureData2Din3DLinearXY::_basis[] = {
@@ -60,9 +60,9 @@
};
const double pylith::feassemble::QuadratureData2Din3DLinearXY::_jacobian[] = {
- 1.00000000e+00, 0.00000000e+00,
+ -1.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
0.00000000e+00, 1.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
};
const double pylith::feassemble::QuadratureData2Din3DLinearXY::_jacobianDet[] = {
@@ -70,8 +70,8 @@
};
const double pylith::feassemble::QuadratureData2Din3DLinearXY::_jacobianInv[] = {
- 1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00, 0.00000000e+00,
+ -1.00000000e+00, 0.00000000e+00, -0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
};
pylith::feassemble::QuadratureData2Din3DLinearXY::QuadratureData2Din3DLinearXY(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXY.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXY.hh 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXY.hh 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature2din3dlinear.
+// This file was generated from python application quadratureapp.
#if !defined(pylith_feassemble_quadraturedata2din3dlinearxy_hh)
#define pylith_feassemble_quadraturedata2din3dlinearxy_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXYZ.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXYZ.cc 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXYZ.cc 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature2din3dlinear.
+// This file was generated from python application quadratureapp.
#include "QuadratureData2Din3DLinearXYZ.hh"
@@ -28,9 +28,9 @@
const int pylith::feassemble::QuadratureData2Din3DLinearXYZ::_numQuadPts = 1;
const double pylith::feassemble::QuadratureData2Din3DLinearXYZ::_vertices[] = {
- 5.00000000e-01, -2.00000000e+00, -5.00000000e-01,
- 3.00000000e+00, 5.00000000e-01, 0.00000000e+00,
- -1.00000000e+00, 2.00000000e+00, 4.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
+ -1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
};
const int pylith::feassemble::QuadratureData2Din3DLinearXYZ::_cells[] = {
@@ -46,7 +46,7 @@
};
const double pylith::feassemble::QuadratureData2Din3DLinearXYZ::_quadPts[] = {
- 8.33333333e-01, 1.66666667e-01, 1.16666667e+00,
+ -3.33333333e-01, 0.00000000e+00, 3.33333333e-01,
};
const double pylith::feassemble::QuadratureData2Din3DLinearXYZ::_basis[] = {
@@ -60,18 +60,18 @@
};
const double pylith::feassemble::QuadratureData2Din3DLinearXYZ::_jacobian[] = {
- 2.50000000e+00, -1.50000000e+00,
- 2.50000000e+00, 4.00000000e+00,
- 5.00000000e-01, 4.50000000e+00,
+ -1.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 1.00000000e+00,
};
const double pylith::feassemble::QuadratureData2Din3DLinearXYZ::_jacobianDet[] = {
- 2.04603275e+01,
+ 1.00000000e+00,
};
const double pylith::feassemble::QuadratureData2Din3DLinearXYZ::_jacobianInv[] = {
- 2.90909091e-01, 1.09090909e-01, -4.32432432e-01,
- -1.81818182e-01, 1.81818182e-01, 2.70270270e-01,
+ -1.00000000e+00, 0.00000000e+00, -0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
};
pylith::feassemble::QuadratureData2Din3DLinearXYZ::QuadratureData2Din3DLinearXYZ(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXYZ.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXYZ.hh 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXYZ.hh 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature2din3dlinear.
+// This file was generated from python application quadratureapp.
#if !defined(pylith_feassemble_quadraturedata2din3dlinearxyz_hh)
#define pylith_feassemble_quadraturedata2din3dlinearxyz_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXZ.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXZ.cc 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXZ.cc 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature2din3dlinear.
+// This file was generated from python application quadratureapp.
#include "QuadratureData2Din3DLinearXZ.hh"
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXZ.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXZ.hh 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXZ.hh 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature2din3dlinear.
+// This file was generated from python application quadratureapp.
#if !defined(pylith_feassemble_quadraturedata2din3dlinearxz_hh)
#define pylith_feassemble_quadraturedata2din3dlinearxz_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearYZ.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearYZ.cc 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearYZ.cc 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature2din3dlinear.
+// This file was generated from python application quadratureapp.
#include "QuadratureData2Din3DLinearYZ.hh"
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearYZ.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearYZ.hh 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearYZ.hh 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature2din3dlinear.
+// This file was generated from python application quadratureapp.
#if !defined(pylith_feassemble_quadraturedata2din3dlinearyz_hh)
#define pylith_feassemble_quadraturedata2din3dlinearyz_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DQuadratic.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DQuadratic.cc 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DQuadratic.cc 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature2din3dquadratic.
+// This file was generated from python application quadratureapp.
#include "QuadratureData2Din3DQuadratic.hh"
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DQuadratic.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DQuadratic.hh 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DQuadratic.hh 2007-05-30 06:24:24 UTC (rev 6998)
@@ -11,7 +11,7 @@
//
// DO NOT EDIT THIS FILE
-// This file was generated from python application quadrature2din3dquadratic.
+// This file was generated from python application quadratureapp.
#if !defined(pylith_feassemble_quadraturedata2din3dquadratic_hh)
#define pylith_feassemble_quadraturedata2din3dquadratic_hh
Deleted: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Solution1DLinear.odb
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Solution1DLinear.odb 2007-05-30 06:03:49 UTC (rev 6997)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Solution1DLinear.odb 2007-05-30 06:24:24 UTC (rev 6998)
@@ -1,55 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file unittests/libtests/feassemble/data/Solution1DLinear.py
-
-## @brief Python container holding solution information for 1-D mesh
-## with linear cells used in testing finite-element C++ routines.
-
-from pyre.components.Component import Component
-
-import numpy
-
-# ----------------------------------------------------------------------
-
-# Solution1DLinear class
-class Solution1DLinear(Component):
- """
- Python container holding solution information for 1-D mesh with
- linear cells used in testing finite-element C++ routines.
- """
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="solution1dlinear"):
- """
- Constructor.
- """
- Component.__init__(self, name, facility="solution")
-
- # Input fields
- self.dt = 0.01
- self.fieldTpdt = numpy.array( [[1.2], [1.7]], dtype=numpy.float64)
- self.fieldT = numpy.array( [[1.1], [1.5]], dtype=numpy.float64)
- self.fieldTmdt = numpy.array( [[1.0], [1.3]], dtype=numpy.float64)
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-def solution():
- """
- Factory for Solution1DLinear.
- """
- return Solution1DLinear()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Solution1DLinear.py (from rev 6996, short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Solution1DLinear.odb)
More information about the cig-commits
mailing list